From 5820c983e9d7ce4238366e9dd4951fe3d06ded6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= Date: Tue, 28 Apr 2026 11:50:01 -0300 Subject: [PATCH 1/2] Add repel powerup sprite The asset animation was done using as references: - The button sprite - The repel effect found in StoryWeaver sprite Add a SpriteFrames resource for it, and use it in the powerup of the ink_combat_round_1 and unify_abilities_test levels. --- .../components/unify_abilities_test.tscn | 2 +- .../props/powerup/components/powerup.aseprite | 4 +- .../powerup/components/powerup_button.png | 3 ++ .../components/powerup_button.png.import | 40 ++++++++++++++ .../props/powerup/powerup_button.tres | 53 +++++++++++++++++++ .../2_ink_combat/ink_combat_round_1.tscn | 2 +- 6 files changed, 100 insertions(+), 4 deletions(-) create mode 100644 scenes/game_elements/props/powerup/components/powerup_button.png create mode 100644 scenes/game_elements/props/powerup/components/powerup_button.png.import create mode 100644 scenes/game_elements/props/powerup/powerup_button.tres diff --git a/scenes/game_elements/characters/player/components/unify_abilities_test.tscn b/scenes/game_elements/characters/player/components/unify_abilities_test.tscn index 6c50afe28..f4deab0e9 100644 --- a/scenes/game_elements/characters/player/components/unify_abilities_test.tscn +++ b/scenes/game_elements/characters/player/components/unify_abilities_test.tscn @@ -17,7 +17,7 @@ [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="SpriteFrames" uid="uid://cni7ipc5funa7" path="res://scenes/game_elements/props/powerup/powerup_button.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] diff --git a/scenes/game_elements/props/powerup/components/powerup.aseprite b/scenes/game_elements/props/powerup/components/powerup.aseprite index 9503c7179..f03d25f72 100644 --- a/scenes/game_elements/props/powerup/components/powerup.aseprite +++ b/scenes/game_elements/props/powerup/components/powerup.aseprite @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55b8c510d4c250334084d142d892b006c7b3b62d80a5057e8cdc9482676132a9 -size 21580 +oid sha256:67deb9e34bb59222696e0eef3c1db0980a9c13575e386adac67d9c707f6b202b +size 24752 diff --git a/scenes/game_elements/props/powerup/components/powerup_button.png b/scenes/game_elements/props/powerup/components/powerup_button.png new file mode 100644 index 000000000..bf084ba60 --- /dev/null +++ b/scenes/game_elements/props/powerup/components/powerup_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c0140537e296793df132e174392d476afbf75c6973737640e989e37de4a2648 +size 3573 diff --git a/scenes/game_elements/props/powerup/components/powerup_button.png.import b/scenes/game_elements/props/powerup/components/powerup_button.png.import new file mode 100644 index 000000000..ce6bb47d5 --- /dev/null +++ b/scenes/game_elements/props/powerup/components/powerup_button.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://burtk2wy5wygl" +path="res://.godot/imported/powerup_button.png-22604b71dfdedac8dc6397902d2f1c94.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/game_elements/props/powerup/components/powerup_button.png" +dest_files=["res://.godot/imported/powerup_button.png-22604b71dfdedac8dc6397902d2f1c94.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 diff --git a/scenes/game_elements/props/powerup/powerup_button.tres b/scenes/game_elements/props/powerup/powerup_button.tres new file mode 100644 index 000000000..e4edf5cdc --- /dev/null +++ b/scenes/game_elements/props/powerup/powerup_button.tres @@ -0,0 +1,53 @@ +[gd_resource type="SpriteFrames" format=3 uid="uid://cni7ipc5funa7"] + +[ext_resource type="Texture2D" uid="uid://burtk2wy5wygl" path="res://scenes/game_elements/props/powerup/components/powerup_button.png" id="1_ht4tu"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_0onex"] +atlas = ExtResource("1_ht4tu") +region = Rect2(0, 0, 128, 128) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ktd5x"] +atlas = ExtResource("1_ht4tu") +region = Rect2(128, 0, 128, 128) + +[sub_resource type="AtlasTexture" id="AtlasTexture_4f466"] +atlas = ExtResource("1_ht4tu") +region = Rect2(256, 0, 128, 128) + +[sub_resource type="AtlasTexture" id="AtlasTexture_htvbg"] +atlas = ExtResource("1_ht4tu") +region = Rect2(384, 0, 128, 128) + +[sub_resource type="AtlasTexture" id="AtlasTexture_pnbcf"] +atlas = ExtResource("1_ht4tu") +region = Rect2(512, 0, 128, 128) + +[sub_resource type="AtlasTexture" id="AtlasTexture_yja38"] +atlas = ExtResource("1_ht4tu") +region = Rect2(640, 0, 128, 128) + +[resource] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_0onex") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ktd5x") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_4f466") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_htvbg") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_pnbcf") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_yja38") +}], +"loop": true, +"name": &"default", +"speed": 10.0 +}] diff --git a/scenes/quests/lore_quests/quest_001/2_ink_combat/ink_combat_round_1.tscn b/scenes/quests/lore_quests/quest_001/2_ink_combat/ink_combat_round_1.tscn index 4c5cbd50e..8c1486c15 100644 --- a/scenes/quests/lore_quests/quest_001/2_ink_combat/ink_combat_round_1.tscn +++ b/scenes/quests/lore_quests/quest_001/2_ink_combat/ink_combat_round_1.tscn @@ -23,7 +23,7 @@ [ext_resource type="PackedScene" uid="uid://7873qa54birk" path="res://scenes/game_elements/props/tree/tree.tscn" id="13_hlahk"] [ext_resource type="AudioStream" uid="uid://bbnj2fog3rdy8" path="res://assets/first_party/sounds/throwing_enemy/Spray.wav" id="14_7ekah"] [ext_resource type="PackedScene" uid="uid://c5jedlvvnnbi0" path="res://scenes/game_elements/props/projectile/ink_blob_projectile.tscn" id="16_k65js"] -[ext_resource type="SpriteFrames" uid="uid://cualgrcaaggcm" path="res://scenes/game_elements/props/powerup/components/powerup_default.tres" id="24_iu4vq"] +[ext_resource type="SpriteFrames" uid="uid://cni7ipc5funa7" path="res://scenes/game_elements/props/powerup/powerup_button.tres" id="24_iu4vq"] [ext_resource type="PackedScene" uid="uid://dmevaymmt6wco" path="res://scenes/game_elements/props/powerup/powerup.tscn" id="26_a4lwd"] [sub_resource type="Animation" id="Animation_nlryc"] From d4147a45396a01d2fac32fdd4077bc565fa40e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= Date: Tue, 28 Apr 2026 14:44:38 -0300 Subject: [PATCH 2/2] fixup! Add repel powerup sprite --- .../characters/player/components/unify_abilities_test.tscn | 2 +- .../props/powerup/{ => components}/powerup_button.tres | 0 .../lore_quests/quest_001/2_ink_combat/ink_combat_round_1.tscn | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename scenes/game_elements/props/powerup/{ => components}/powerup_button.tres (100%) diff --git a/scenes/game_elements/characters/player/components/unify_abilities_test.tscn b/scenes/game_elements/characters/player/components/unify_abilities_test.tscn index f4deab0e9..74f29f94d 100644 --- a/scenes/game_elements/characters/player/components/unify_abilities_test.tscn +++ b/scenes/game_elements/characters/player/components/unify_abilities_test.tscn @@ -17,7 +17,7 @@ [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://cni7ipc5funa7" path="res://scenes/game_elements/props/powerup/powerup_button.tres" id="18_nev3j"] +[ext_resource type="SpriteFrames" uid="uid://cni7ipc5funa7" path="res://scenes/game_elements/props/powerup/components/powerup_button.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] diff --git a/scenes/game_elements/props/powerup/powerup_button.tres b/scenes/game_elements/props/powerup/components/powerup_button.tres similarity index 100% rename from scenes/game_elements/props/powerup/powerup_button.tres rename to scenes/game_elements/props/powerup/components/powerup_button.tres diff --git a/scenes/quests/lore_quests/quest_001/2_ink_combat/ink_combat_round_1.tscn b/scenes/quests/lore_quests/quest_001/2_ink_combat/ink_combat_round_1.tscn index 8c1486c15..02e72168e 100644 --- a/scenes/quests/lore_quests/quest_001/2_ink_combat/ink_combat_round_1.tscn +++ b/scenes/quests/lore_quests/quest_001/2_ink_combat/ink_combat_round_1.tscn @@ -23,7 +23,7 @@ [ext_resource type="PackedScene" uid="uid://7873qa54birk" path="res://scenes/game_elements/props/tree/tree.tscn" id="13_hlahk"] [ext_resource type="AudioStream" uid="uid://bbnj2fog3rdy8" path="res://assets/first_party/sounds/throwing_enemy/Spray.wav" id="14_7ekah"] [ext_resource type="PackedScene" uid="uid://c5jedlvvnnbi0" path="res://scenes/game_elements/props/projectile/ink_blob_projectile.tscn" id="16_k65js"] -[ext_resource type="SpriteFrames" uid="uid://cni7ipc5funa7" path="res://scenes/game_elements/props/powerup/powerup_button.tres" id="24_iu4vq"] +[ext_resource type="SpriteFrames" uid="uid://cni7ipc5funa7" path="res://scenes/game_elements/props/powerup/components/powerup_button.tres" id="24_iu4vq"] [ext_resource type="PackedScene" uid="uid://dmevaymmt6wco" path="res://scenes/game_elements/props/powerup/powerup.tscn" id="26_a4lwd"] [sub_resource type="Animation" id="Animation_nlryc"]