From 409b7b5955d5b3df4ec1284449a156a5d94a115e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Fri, 11 Apr 2025 11:07:23 +0200 Subject: [PATCH] feat: added dragon colors to editor --- assets/outfits/dragons.tres | 11 ++++ assets/outfits/hats.tres | 1 + assets/outfits/shirts.tres | 1 + assets/outfits/shoes.tres | 1 + assets/sprites/hat.png | Bin 5137 -> 0 bytes assets/sprites/hat.png.import | 34 ---------- assets/sprites/shirt.png | Bin 6024 -> 0 bytes assets/sprites/shirt.png.import | 34 ---------- assets/sprites/shoes.png | Bin 5043 -> 0 bytes assets/sprites/shoes.png.import | 34 ---------- scenes/dragon_adder/dragon_adder.tscn | 1 + scenes/dragon_editor/dragon_editor.gd | 10 +++ scenes/dragon_editor/dragon_editor.tscn | 82 ++++++++++++++++++------ scenes/main.tscn | 4 ++ src/dragon_outfit.gd | 21 ++++++ 15 files changed, 114 insertions(+), 120 deletions(-) create mode 100644 assets/outfits/dragons.tres delete mode 100644 assets/sprites/hat.png delete mode 100644 assets/sprites/hat.png.import delete mode 100644 assets/sprites/shirt.png delete mode 100644 assets/sprites/shirt.png.import delete mode 100644 assets/sprites/shoes.png delete mode 100644 assets/sprites/shoes.png.import diff --git a/assets/outfits/dragons.tres b/assets/outfits/dragons.tres new file mode 100644 index 0000000..272f0ec --- /dev/null +++ b/assets/outfits/dragons.tres @@ -0,0 +1,11 @@ +[gd_resource type="Resource" script_class="DragonOutfit" load_steps=5 format=3 uid="uid://bcs60f2k7h0jc"] + +[ext_resource type="Texture2D" uid="uid://dl87ffgh2hl68" path="res://assets/sprites/dragons/DragonPet_drac01.png" id="1_3e6qx"] +[ext_resource type="Texture2D" uid="uid://davsy68qknywo" path="res://assets/sprites/dragons/DragonPet_drac02.png" id="2_lvc22"] +[ext_resource type="Texture2D" uid="uid://c4l1h6ecobnsu" path="res://assets/sprites/dragons/DragonPet_drac03.png" id="3_8ji77"] +[ext_resource type="Script" uid="uid://rw26nny160xh" path="res://src/dragon_outfit.gd" id="4_sxi2r"] + +[resource] +script = ExtResource("4_sxi2r") +outfits = Array[Texture2D]([ExtResource("1_3e6qx"), ExtResource("2_lvc22"), ExtResource("3_8ji77")]) +metadata/_custom_type_script = "uid://rw26nny160xh" diff --git a/assets/outfits/hats.tres b/assets/outfits/hats.tres index d865452..dd7f690 100644 --- a/assets/outfits/hats.tres +++ b/assets/outfits/hats.tres @@ -10,5 +10,6 @@ [resource] script = ExtResource("1_e7uo0") +allow_null = true outfits = Array[Texture2D]([ExtResource("1_jhy4n"), ExtResource("2_cmu3h"), ExtResource("3_330df"), ExtResource("4_7rdvc"), ExtResource("5_1scq7"), ExtResource("6_2f5tc")]) metadata/_custom_type_script = "uid://rw26nny160xh" diff --git a/assets/outfits/shirts.tres b/assets/outfits/shirts.tres index 93159cb..f8bee6d 100644 --- a/assets/outfits/shirts.tres +++ b/assets/outfits/shirts.tres @@ -8,5 +8,6 @@ [resource] script = ExtResource("1_yaxr2") +allow_null = true outfits = Array[Texture2D]([ExtResource("1_8ueji"), ExtResource("2_rue66"), ExtResource("3_rq2qf"), ExtResource("4_tgfck")]) metadata/_custom_type_script = "uid://rw26nny160xh" diff --git a/assets/outfits/shoes.tres b/assets/outfits/shoes.tres index 13d42a3..64b63c1 100644 --- a/assets/outfits/shoes.tres +++ b/assets/outfits/shoes.tres @@ -7,5 +7,6 @@ [resource] script = ExtResource("1_lu1y3") +allow_null = true outfits = Array[Texture2D]([ExtResource("1_5pwyu"), ExtResource("2_d5wid"), ExtResource("3_yasvr")]) metadata/_custom_type_script = "uid://rw26nny160xh" diff --git a/assets/sprites/hat.png b/assets/sprites/hat.png deleted file mode 100644 index 4179ea772e2c4a936ea208f620468a25e12dd4b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5137 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 diff --git a/assets/sprites/shirt.png.import b/assets/sprites/shirt.png.import deleted file mode 100644 index 9449f3e..0000000 --- a/assets/sprites/shirt.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dc2uk6tqtwl4n" -path="res://.godot/imported/shirt.png-e59b3d32b60ac1a259719e0f7d9fdc17.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/sprites/shirt.png" -dest_files=["res://.godot/imported/shirt.png-e59b3d32b60ac1a259719e0f7d9fdc17.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -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/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/assets/sprites/shoes.png b/assets/sprites/shoes.png deleted file mode 100644 index 5c8c653041a4182c11291369b9ac2ccd1723de72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5043 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 diff --git a/assets/sprites/shoes.png.import b/assets/sprites/shoes.png.import deleted file mode 100644 index 814b173..0000000 --- a/assets/sprites/shoes.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://8srlwinjr3tt" -path="res://.godot/imported/shoes.png-47dd2ca75c2aff89c900c933c1df27c2.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://assets/sprites/shoes.png" -dest_files=["res://.godot/imported/shoes.png-47dd2ca75c2aff89c900c933c1df27c2.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -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/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/dragon_adder/dragon_adder.tscn b/scenes/dragon_adder/dragon_adder.tscn index c0d2b3c..ec18f25 100644 --- a/scenes/dragon_adder/dragon_adder.tscn +++ b/scenes/dragon_adder/dragon_adder.tscn @@ -29,6 +29,7 @@ offset_top = -31.0 offset_right = 32.0 grow_horizontal = 2 grow_vertical = 0 +focus_mode = 0 text = "afegeix" [node name="LineEdit" type="LineEdit" parent="CanvasLayer"] diff --git a/scenes/dragon_editor/dragon_editor.gd b/scenes/dragon_editor/dragon_editor.gd index 2185701..f2c5018 100644 --- a/scenes/dragon_editor/dragon_editor.gd +++ b/scenes/dragon_editor/dragon_editor.gd @@ -5,10 +5,12 @@ class_name DragonEditor @onready var hat: TextureRect = $CanvasLayer/Dragon/Hat @onready var shirt: TextureRect = $CanvasLayer/Dragon/Shirt @onready var shoes: TextureRect = $CanvasLayer/Dragon/Shoes +@onready var dragon: TextureRect = $CanvasLayer/Dragon @export var hat_outfits: DragonOutfit @export var shirt_outfits: DragonOutfit @export var shoes_outfits: DragonOutfit +@export var dragon_colors: DragonOutfit @onready var dragon_name: LineEdit = $CanvasLayer/LineEdit @@ -25,6 +27,14 @@ func _on_close_requested() -> void: queue_free() +func _on_next_color_pressed() -> void: + dragon.texture = dragon_colors.pick_next() + + +func _on_previous_color_pressed() -> void: + dragon.texture = dragon_colors.pick_previous() + + func _on_change_hat_pressed() -> void: hat.texture = hat_outfits.pick_next() diff --git a/scenes/dragon_editor/dragon_editor.tscn b/scenes/dragon_editor/dragon_editor.tscn index cf53f76..4313713 100644 --- a/scenes/dragon_editor/dragon_editor.tscn +++ b/scenes/dragon_editor/dragon_editor.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=10 format=3 uid="uid://fut42ruut302"] +[gd_scene load_steps=11 format=3 uid="uid://fut42ruut302"] [ext_resource type="Script" uid="uid://bfuos2kgfgber" path="res://scenes/dragon_editor/dragon_editor.gd" id="1_8vkll"] [ext_resource type="Resource" uid="uid://cnhwn6kfcbjl5" path="res://assets/outfits/hats.tres" id="2_vvtct"] [ext_resource type="Resource" uid="uid://etegcak2sphs" path="res://assets/outfits/shirts.tres" id="3_xhgxf"] [ext_resource type="Resource" uid="uid://ba5684xylts3f" path="res://assets/outfits/shoes.tres" id="4_1ivi1"] +[ext_resource type="Resource" uid="uid://bcs60f2k7h0jc" path="res://assets/outfits/dragons.tres" id="5_1ivi1"] [ext_resource type="Texture2D" uid="uid://dl87ffgh2hl68" path="res://assets/sprites/dragons/DragonPet_drac01.png" id="5_xhgxf"] [ext_resource type="Texture2D" uid="uid://12fv5nymaljj" path="res://assets/sprites/hats/DragonPet_barret_barretina.png" id="6_1ivi1"] [ext_resource type="Texture2D" uid="uid://cs0ke244c33t2" path="res://assets/sprites/shirts/DragonPet_roba_armadura.png" id="7_giwys"] @@ -20,29 +21,71 @@ script = ExtResource("1_8vkll") hat_outfits = ExtResource("2_vvtct") shirt_outfits = ExtResource("3_xhgxf") shoes_outfits = ExtResource("4_1ivi1") +dragon_colors = ExtResource("5_1ivi1") [node name="CanvasLayer" type="CanvasLayer" parent="."] -[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer"] -anchors_preset = 1 -anchor_left = 1.0 -anchor_right = 1.0 -offset_left = -89.0 -offset_bottom = 101.0 -grow_horizontal = 0 - -[node name="change_hat" type="Button" parent="CanvasLayer/VBoxContainer"] -layout_mode = 2 +[node name="change_hat" type="Button" parent="CanvasLayer"] +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -130.0 +offset_top = -206.0 +offset_right = -62.0 +offset_bottom = -175.0 +grow_horizontal = 2 +grow_vertical = 2 +focus_mode = 0 text = "barret" -[node name="change_shirt" type="Button" parent="CanvasLayer/VBoxContainer"] -layout_mode = 2 +[node name="change_shirt" type="Button" parent="CanvasLayer"] +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -47.0 +offset_top = -242.0 +offset_right = 42.0 +offset_bottom = -211.0 +grow_horizontal = 2 +grow_vertical = 2 +focus_mode = 0 text = "samarreta" -[node name="change_shoes" type="Button" parent="CanvasLayer/VBoxContainer"] -layout_mode = 2 +[node name="change_shoes" type="Button" parent="CanvasLayer"] +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = 54.0 +offset_top = -206.0 +offset_right = 114.0 +offset_bottom = -175.0 +grow_horizontal = 2 +grow_vertical = 2 +focus_mode = 0 text = "sabata" +[node name="dragon_previous" type="Button" parent="CanvasLayer"] +offset_left = 40.0 +offset_top = 232.0 +offset_right = 58.0 +offset_bottom = 263.0 +focus_mode = 0 +text = "<" + +[node name="dragon_next" type="Button" parent="CanvasLayer"] +offset_left = 235.0 +offset_top = 232.0 +offset_right = 253.0 +offset_bottom = 263.0 +focus_mode = 0 +text = ">" + [node name="create" type="Button" parent="CanvasLayer"] anchors_preset = 3 anchor_left = 1.0 @@ -53,6 +96,7 @@ offset_left = -42.0 offset_top = -31.0 grow_horizontal = 0 grow_vertical = 0 +focus_mode = 0 text = "crea" [node name="Dragon" type="TextureRect" parent="CanvasLayer"] @@ -125,7 +169,9 @@ max_length = 8 script = ExtResource("9_xhgxf") [connection signal="close_requested" from="." to="." method="_on_close_requested"] -[connection signal="pressed" from="CanvasLayer/VBoxContainer/change_hat" to="." method="_on_change_hat_pressed"] -[connection signal="pressed" from="CanvasLayer/VBoxContainer/change_shirt" to="." method="_on_change_shirt_pressed"] -[connection signal="pressed" from="CanvasLayer/VBoxContainer/change_shoes" to="." method="_on_change_shoes_pressed"] +[connection signal="pressed" from="CanvasLayer/change_hat" to="." method="_on_change_hat_pressed"] +[connection signal="pressed" from="CanvasLayer/change_shirt" to="." method="_on_change_shirt_pressed"] +[connection signal="pressed" from="CanvasLayer/change_shoes" to="." method="_on_change_shoes_pressed"] +[connection signal="pressed" from="CanvasLayer/dragon_previous" to="." method="_on_previous_color_pressed"] +[connection signal="pressed" from="CanvasLayer/dragon_next" to="." method="_on_next_color_pressed"] [connection signal="pressed" from="CanvasLayer/create" to="." method="_on_create_pressed"] diff --git a/scenes/main.tscn b/scenes/main.tscn index f1f53fe..cc638e2 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -38,6 +38,7 @@ offset_top = 50.0 offset_right = -57.0 offset_bottom = 150.0 grow_horizontal = 0 +focus_mode = 0 text = "crea" script = ExtResource("4_tbgi4") dragon_editor = ExtResource("5_tefeu") @@ -51,6 +52,7 @@ offset_top = 168.0 offset_right = -56.0 offset_bottom = 268.0 grow_horizontal = 0 +focus_mode = 0 text = "tanca" [node name="List" type="Button" parent="CanvasLayer"] @@ -62,6 +64,7 @@ offset_top = 288.0 offset_right = -56.0 offset_bottom = 388.0 grow_horizontal = 0 +focus_mode = 0 text = "llista" script = ExtResource("9_choun") dragon_list = ExtResource("10_ya4ey") @@ -75,6 +78,7 @@ offset_top = 407.0 offset_right = -56.0 offset_bottom = 507.0 grow_horizontal = 0 +focus_mode = 0 text = "afegeix" script = ExtResource("11_eb6dy") dragon_adder = ExtResource("12_trceg") diff --git a/src/dragon_outfit.gd b/src/dragon_outfit.gd index b59e364..9015ca2 100644 --- a/src/dragon_outfit.gd +++ b/src/dragon_outfit.gd @@ -2,6 +2,7 @@ extends Resource class_name DragonOutfit +@export var allow_null: bool @export var outfits: Array[Texture2D] var index: int = 0 @@ -12,6 +13,21 @@ func _init(outfits: Array[Texture2D] = []): func pick_next() -> Texture2D: index += 1 + if allow_null: + return _pick_nullable() + else: + return _pick_non_nullable() + + +func pick_previous() -> Texture2D: + index -= 1 + if allow_null: + return _pick_nullable() + else: + return _pick_non_nullable() + + +func _pick_nullable(): index %= (len(outfits) + 1) if index == 0: return null @@ -19,6 +35,11 @@ func pick_next() -> Texture2D: return outfits[index - 1] +func _pick_non_nullable(): + index %= len(outfits) + return outfits[index] + + func get_index(texture: Texture2D) -> int: return outfits.find(texture)