Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
[ext_resource type="Script" uid="uid://cp54mgi54nywo" path="res://scenes/game_logic/fill_game_logic.gd" id="17_b7aom"]
[ext_resource type="PackedScene" uid="uid://dmevaymmt6wco" path="res://scenes/game_elements/props/powerup/powerup.tscn" id="17_w66m4"]
[ext_resource type="PackedScene" uid="uid://b82nsrh332syj" path="res://scenes/game_elements/characters/enemies/throwing_enemy/throwing_enemy.tscn" id="18_iu48k"]
[ext_resource type="SpriteFrames" uid="uid://cfgahyntmtfgu" path="res://scenes/game_elements/props/powerup/components/powerup_thread.tres" id="18_mecxj"]
[ext_resource type="SpriteFrames" uid="uid://cualgrcaaggcm" path="res://scenes/game_elements/props/powerup/components/powerup_default.tres" id="18_nev3j"]
[ext_resource type="PackedScene" uid="uid://y8ha8abfyap2" path="res://scenes/game_elements/props/filling_barrel/filling_barrel.tscn" id="19_a36ca"]

[node name="Testeo" type="Node2D" unique_id=80760666]
Expand Down Expand Up @@ -91,13 +93,15 @@ color = Color(0, 1, 1, 1)

[node name="RepelPowerup" parent="OnTheGround" unique_id=1795462717 instance=ExtResource("17_w66m4")]
position = Vector2(-307, 1622)
sprite_frames = ExtResource("18_nev3j")
highlight_color = Color(0, 0.4392157, 1, 1)

[node name="GrapplePowerup" parent="OnTheGround" unique_id=1564118198 instance=ExtResource("17_w66m4")]
position = Vector2(-307, 1770)
ability = 16
ability_name = "Grapple"
interact_action = "Collect Grapple"
sprite_frames = ExtResource("18_mecxj")
highlight_color = Color(0.8910073, 0.7227245, 0, 1)

[node name="ScreenOverlay" type="CanvasLayer" parent="." unique_id=1976326993]
Expand Down
Git LFS file not shown
11 changes: 5 additions & 6 deletions scenes/game_elements/props/powerup/components/powerup.gd
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ signal collected
set = _set_interact_action

## Asset of this powerup.
@export var sprite_frames: SpriteFrames:
@export var sprite_frames: SpriteFrames = preload("uid://cualgrcaaggcm"):
set = _set_sprite_frames

## The powerup shines with this color through a shader.
## The powerup shines with this color.
@export var highlight_color: Color = Color.WHITE:
set = _set_highlight_color

Expand All @@ -34,7 +34,7 @@ signal collected
var _tween: Tween

@onready var interact_area: InteractArea = %InteractArea
@onready var highlight_effect: Sprite2D = %HighlightEffect
@onready var highlight_effect: AnimatedSprite2D = %HighlightEffect
@onready var sprite: AnimatedSprite2D = %Sprite
@onready var interact_collision: CollisionShape2D = %InteractCollision
@onready var ground_collision: CollisionShape2D = %GroundCollision
Expand Down Expand Up @@ -99,7 +99,6 @@ func _on_interact_area_interaction_started(
_tween.kill()
_tween = create_tween()
_tween.tween_property(highlight_effect, "modulate", Color.WHITE, 0.5)
_tween.tween_property(highlight_effect, "material:shader_parameter/width", 1.0, 1.0)
await _tween.finished
if dialogue:
DialogueManager.show_dialogue_balloon(dialogue, "", [self])
Expand All @@ -113,5 +112,5 @@ func _on_interact_area_observers_changed() -> void:
if _tween:
_tween.kill()
_tween = create_tween()
var width: float = 0.8 if interact_area.is_being_observed else 0.4
_tween.tween_property(highlight_effect, "material:shader_parameter/width", width, 1.0)
var color: Color = Color.WHITE if interact_area.is_being_observed else highlight_color
_tween.tween_property(highlight_effect, "modulate", color, 0.5)
3 changes: 0 additions & 3 deletions scenes/game_elements/props/powerup/components/powerup.png

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://drfvwiaeco2b1"
path="res://.godot/imported/powerup_default.png-552e42b7860b171ba67b0c2747fd11f3.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/game_elements/props/powerup/components/powerup_default.png"
dest_files=["res://.godot/imported/powerup_default.png-552e42b7860b171ba67b0c2747fd11f3.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[gd_resource type="SpriteFrames" format=3 uid="uid://cualgrcaaggcm"]

[ext_resource type="Texture2D" uid="uid://drfvwiaeco2b1" path="res://scenes/game_elements/props/powerup/components/powerup_default.png" id="1_cyg7p"]

[resource]
animations = [{
"frames": [{
"duration": 1.0,
"texture": ExtResource("1_cyg7p")
}],
"loop": true,
"name": &"default",
"speed": 10.0
}]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

importer="texture"
type="CompressedTexture2D"
uid="uid://dr1cdu5ien6jq"
path="res://.godot/imported/powerup.png-a4ee45e73209b83508bc25ff7865937f.ctex"
uid="uid://dhsw4tbjtoa46"
path="res://.godot/imported/powerup_shadow.png-fc59d6f1ed68daaa632d29c5b80396fc.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/game_elements/props/powerup/components/powerup.png"
dest_files=["res://.godot/imported/powerup.png-a4ee45e73209b83508bc25ff7865937f.ctex"]
source_file="res://scenes/game_elements/props/powerup/components/powerup_shadow.png"
dest_files=["res://.godot/imported/powerup_shadow.png-fc59d6f1ed68daaa632d29c5b80396fc.ctex"]

[params]

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://dag3wdvqw680w"
path="res://.godot/imported/powerup_thread.png-0cdc0a37f05a3819bb0e19229a1a379b.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/game_elements/props/powerup/components/powerup_thread.png"
dest_files=["res://.godot/imported/powerup_thread.png-0cdc0a37f05a3819bb0e19229a1a379b.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
[gd_resource type="SpriteFrames" format=3 uid="uid://cfgahyntmtfgu"]

[ext_resource type="Texture2D" uid="uid://dag3wdvqw680w" path="res://scenes/game_elements/props/powerup/components/powerup_thread.png" id="1_f5gth"]

[sub_resource type="AtlasTexture" id="AtlasTexture_6sv62"]
atlas = ExtResource("1_f5gth")
region = Rect2(0, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_elgan"]
atlas = ExtResource("1_f5gth")
region = Rect2(128, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_maew6"]
atlas = ExtResource("1_f5gth")
region = Rect2(256, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_2k382"]
atlas = ExtResource("1_f5gth")
region = Rect2(384, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_e16ta"]
atlas = ExtResource("1_f5gth")
region = Rect2(512, 0, 128, 128)

[sub_resource type="AtlasTexture" id="AtlasTexture_b7mv3"]
atlas = ExtResource("1_f5gth")
region = Rect2(640, 0, 128, 128)

[resource]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_6sv62")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_elgan")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_maew6")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_2k382")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_e16ta")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_b7mv3")
}],
"loop": true,
"name": &"default",
"speed": 10.0
}]

This file was deleted.

This file was deleted.

Loading
Loading