From 117d23dc4e87e4d23a039753eadc9997e5397505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= Date: Fri, 18 Apr 2025 00:28:50 +0200 Subject: [PATCH 01/10] feat: dragon list now with correct outfits --- scenes/dragon_list/dragon/dragon.tscn | 10 ++++- .../dragon_list/dragon/dragon_list_entry.gd | 38 +++++++++++++------ scenes/dragon_list/dragon_list_view.gd | 1 + 3 files changed, 37 insertions(+), 12 deletions(-) diff --git a/scenes/dragon_list/dragon/dragon.tscn b/scenes/dragon_list/dragon/dragon.tscn index 46e8501..df71cc7 100644 --- a/scenes/dragon_list/dragon/dragon.tscn +++ b/scenes/dragon_list/dragon/dragon.tscn @@ -1,10 +1,14 @@ -[gd_scene load_steps=6 format=3 uid="uid://cq3orf2ktmel0"] +[gd_scene load_steps=10 format=3 uid="uid://cq3orf2ktmel0"] [ext_resource type="SpriteFrames" uid="uid://duxxw4mfxql3c" path="res://assets/animations/dragons/verd.tres" id="1_o3jkx"] [ext_resource type="Script" uid="uid://b7knkhjgtdy4l" path="res://scenes/dragon_list/dragon/dragon_list_entry.gd" id="2_uckob"] [ext_resource type="SpriteFrames" uid="uid://ccxyplt2t7t6y" path="res://assets/animations/hats/barretina.tres" id="3_jl6px"] +[ext_resource type="Resource" uid="uid://c03ejnvavmcj5" path="res://assets/outfits/dragons.tres" id="3_jpsrj"] +[ext_resource type="Resource" uid="uid://x063x858re3f" path="res://assets/outfits/hats.tres" id="4_58xh2"] [ext_resource type="SpriteFrames" uid="uid://dsxhfu2ekw7j" path="res://assets/animations/shirts/traje.tres" id="4_v3rc7"] +[ext_resource type="Resource" uid="uid://bsydervvb1jpe" path="res://assets/outfits/shirts.tres" id="5_6mheo"] [ext_resource type="SpriteFrames" uid="uid://c5rqqy7b5ihi5" path="res://assets/animations/decor/rosa.tres" id="5_jpsrj"] +[ext_resource type="Resource" uid="uid://dkm7d10c1lp2n" path="res://assets/outfits/decor.tres" id="6_dtw4b"] [node name="Dragon" type="AnimatedSprite2D" node_paths=PackedStringArray("color", "hat", "shirt", "decor")] sprite_frames = ExtResource("1_o3jkx") @@ -14,6 +18,10 @@ color = NodePath(".") hat = NodePath("Hat") shirt = NodePath("Shirt") decor = NodePath("Decor") +color_outfits = ExtResource("3_jpsrj") +hat_outfits = ExtResource("4_58xh2") +shirt_outfits = ExtResource("5_6mheo") +decor_outfits = ExtResource("6_dtw4b") [node name="Hat" type="AnimatedSprite2D" parent="."] sprite_frames = ExtResource("3_jl6px") diff --git a/scenes/dragon_list/dragon/dragon_list_entry.gd b/scenes/dragon_list/dragon/dragon_list_entry.gd index 9c62297..de1b285 100644 --- a/scenes/dragon_list/dragon/dragon_list_entry.gd +++ b/scenes/dragon_list/dragon/dragon_list_entry.gd @@ -7,20 +7,36 @@ class_name DragonListEntry @export var shirt: AnimatedSprite2D @export var decor: AnimatedSprite2D - -func play_animation(anim: String): - color.set_frame(0) - color.play(anim) - hat.set_frame(0) - hat.play(anim) - shirt.set_frame(0) - shirt.play(anim) - decor.set_frame(0) - decor.play(anim) +@export var color_outfits: DragonOutfit +@export var hat_outfits: DragonOutfit +@export var shirt_outfits: DragonOutfit +@export var decor_outfits: DragonOutfit -func face_direction(left: bool): +func play_animation(anim: String) -> void: + if color.sprite_frames != null: + color.set_frame(0) + color.play(anim) + if hat.sprite_frames != null: + hat.set_frame(0) + hat.play(anim) + if shirt.sprite_frames != null: + shirt.set_frame(0) + shirt.play(anim) + if decor.sprite_frames != null: + decor.set_frame(0) + decor.play(anim) + + +func face_direction(left: bool) -> void: color.flip_h = not left hat.flip_h = not left shirt.flip_h = not left decor.flip_h = not left + + +func dress(properties: DragonProperties) -> void: + color.sprite_frames = color_outfits.get_texture(properties.color) + hat.sprite_frames = hat_outfits.get_texture(properties.hat) + shirt.sprite_frames = shirt_outfits.get_texture(properties.shirt) + decor.sprite_frames = decor_outfits.get_texture(properties.decor) diff --git a/scenes/dragon_list/dragon_list_view.gd b/scenes/dragon_list/dragon_list_view.gd index 7890147..4b3356b 100644 --- a/scenes/dragon_list/dragon_list_view.gd +++ b/scenes/dragon_list/dragon_list_view.gd @@ -35,6 +35,7 @@ func set_library(library: DragonLibrary): func _instantiate_dragon(dragon: DragonProperties, offset_step: int): var instance: DragonListEntry = dragon_list_entry_template.instantiate() + instance.dress(dragon) dragon_list_pivot.add_child(instance) instance.position.x += offset_step * 110 _dragons.push_back(instance) From 8a3f22de9b4f8a184ca1fdd78013de07f099c263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= Date: Fri, 18 Apr 2025 12:16:11 +0200 Subject: [PATCH 02/10] feat: prioritize internet dragons --- scenes/main.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenes/main.gd b/scenes/main.gd index 41de138..d186878 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -63,7 +63,7 @@ func _instantiate_random_dragon(): return var r = rng.randi_range(0, 99) - if r < 30: + if r >= 30: _instantiate_dragon_from_internet(spot) else: _instantiate_dragon_from_library(spot) From 922b326a66685e03a94c3e25fc39fe633556d16f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= Date: Fri, 18 Apr 2025 15:27:56 +0200 Subject: [PATCH 03/10] build: export settings --- export_presets.cfg | 4 ++-- icon.png | Bin 0 -> 1558 bytes icon.png.import | 34 ++++++++++++++++++++++++++++++++++ project.godot | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 icon.png create mode 100644 icon.png.import diff --git a/export_presets.cfg b/export_presets.cfg index 4db05aa..52af46e 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -9,7 +9,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../../Builds/SantJordiJam25/LaPlacetaDelDrac.exe" +export_path="../../Builds/La Torreta del Drac.exe" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" @@ -22,7 +22,7 @@ script_export_mode=2 custom_template/debug="" custom_template/release="" -debug/export_console_wrapper=0 +debug/export_console_wrapper=1 binary_format/embed_pck=true texture_format/s3tc_bptc=true texture_format/etc2_astc=false diff --git a/icon.png b/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5a716d5da79f769026b91512faac760305ca9d4c GIT binary patch literal 1558 zcmV+x2I={UP)Px)&`Cr=RCt{2olj^TMI6V!tq%!lduR%#Sc?dvw1)(HXapaIzC$2sh{S{F!HS@0 zQ^bNrgsKFj2c?IK_7C(R{=pUxmWGl-4k?C!D7B?IMEnCqTEQM(dJs#kPwQdw%X{<7 z+qbj3GduJ4{XVD6?(FWo%I5*&jA27K0FElsD8Z(0I;_2Qvkq!3omE~eLti2?;NUX<)Sit;%5NB`Bxv& z%82LjscYSZ+g0_?aagS zIUy>6ka0kpVH^V}?*~-Y6yO^KQVumk70iH=b7u2q}iV0cOB?|CN zVY48Y*o-MbD`0e6H%7O0`)-C)j1{nw0iAHwlzhk%3tVJVK?Y&6`r98I1pss{m*XY? zxmtLAzW-3d8|W^`6a&bLLe8^o;PUqcsQ_Z}sG&*qlPEq})^UjQ(-%%rh^7&^OGYfly>+l8uKp9JF zL&eM@$@lYeTr8NM?NQgOENR<^&hEv`Q^$?kys9m!jw(2LW@@>1K-9xa0wIi(O( zRIEsQ7p##?9U%FCcD#%ONC}+29=$nFj12$)t_`YZ;%j3sHa)I%<`V$GbN4)xsy(DE zKA*#tK*}V`r~Qp}l9IXu#QK|)^gW6oN5W)Hv_wvAyt(BQEBmMPrx|QzOx-B{<8ppi>DW?oVWKqW%*g>_vwur7rvj!y#tDx{Sbx7f_y=W+0kUK#}%nNfTonA zCe}KIw3Bc|Pzs=Vf8cK`=c8v#7tAfbafBSV9)&5!tEa#A=oW1w zt&`udN_a;?3gF*W_~@tK=}%cbJ!Fg(z}Ll(`gTg_@b8*Ml{x%-Y4z3Q74$6~{=GGb z0>UP73?SdeV?w9H|1S~)+64KUsypOss)8U0f*=TjAP6DyKlmg9+u|6^0RR9107*qo IM6N<$f|dE@j{pDw literal 0 HcmV?d00001 diff --git a/icon.png.import b/icon.png.import new file mode 100644 index 0000000..f965140 --- /dev/null +++ b/icon.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://vt266gxkfb5j" +path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://icon.png" +dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.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/project.godot b/project.godot index 13810c2..7b3baee 100644 --- a/project.godot +++ b/project.godot @@ -15,7 +15,7 @@ run/main_scene="uid://ctytpqaed0yqx" config/features=PackedStringArray("4.4", "GL Compatibility") boot_splash/bg_color=Color(0.14, 0.14, 0.14, 0) boot_splash/show_image=false -config/icon="res://assets/sprites/icon.svg" +config/icon="uid://vt266gxkfb5j" [display] From 9093c5a98877ba5d03383978af80f4aff9160569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Tue, 22 Apr 2025 15:18:07 +0200 Subject: [PATCH 04/10] feat: new dragon list view --- assets/sprites/ui/DP_UI_CharList_BG.png | Bin 4052 -> 13567 bytes scenes/dragon_editor/dragon_editor.tscn | 2 +- scenes/dragon_list/dragon_list.tscn | 53 ++++++++++++------------ scenes/main.tscn | 2 +- 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/assets/sprites/ui/DP_UI_CharList_BG.png b/assets/sprites/ui/DP_UI_CharList_BG.png index 8a720f0aadd9d23b471620c5c13a3d17ef2e1af3..2295dcb3916932089f9e2ffd9325d4d085c5c54d 100644 GIT binary patch literal 13567 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 OxMX|9rtX4Y>i+@

&S` diff --git a/scenes/dragon_editor/dragon_editor.tscn b/scenes/dragon_editor/dragon_editor.tscn index b592062..7d92a5a 100644 --- a/scenes/dragon_editor/dragon_editor.tscn +++ b/scenes/dragon_editor/dragon_editor.tscn @@ -8,7 +8,7 @@ [ext_resource type="Resource" uid="uid://c03ejnvavmcj5" path="res://assets/outfits/dragons.tres" id="5_1ivi1"] [ext_resource type="SpriteFrames" uid="uid://c5rqqy7b5ihi5" path="res://assets/animations/decor/rosa.tres" id="6_c4sli"] [ext_resource type="Texture2D" uid="uid://dceoy4417v83e" path="res://assets/sprites/ui/DP_UI_CharCreation_BG.png" id="6_udwtk"] -[ext_resource type="Script" path="res://src/draggable.gd" id="7_1vw8k"] +[ext_resource type="Script" uid="uid://dxl7onk7x6h8b" path="res://src/draggable.gd" id="7_1vw8k"] [ext_resource type="Texture2D" uid="uid://bu5xa7tgfk3h3" path="res://assets/sprites/ui/DP_UI_Buttons01.png" id="7_qppok"] [ext_resource type="Texture2D" uid="uid://bgpbbkmwt8ysq" path="res://assets/sprites/ui/DP_UI_Button_Text.png" id="8_ofxsr"] [ext_resource type="Texture2D" uid="uid://bdrm1nxydvf5t" path="res://assets/sprites/ui/DP_UI_Label_Big.png" id="12_qppok"] diff --git a/scenes/dragon_list/dragon_list.tscn b/scenes/dragon_list/dragon_list.tscn index c06a92c..e22ef0a 100644 --- a/scenes/dragon_list/dragon_list.tscn +++ b/scenes/dragon_list/dragon_list.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=10 format=3 uid="uid://tubxrqxjic6r"] +[gd_scene load_steps=11 format=3 uid="uid://tubxrqxjic6r"] [ext_resource type="Script" uid="uid://dm8d0ikf1n8qa" path="res://scenes/dragon_list/dragon_list_view.gd" id="1_q7g8i"] [ext_resource type="PackedScene" uid="uid://cq3orf2ktmel0" path="res://scenes/dragon_list/dragon/dragon.tscn" id="2_h4iwm"] +[ext_resource type="Texture2D" uid="uid://cup2lrb8lou72" path="res://assets/sprites/ui/DP_UI_CharList_BG.png" id="4_f227k"] [ext_resource type="Texture2D" uid="uid://d27vpp71fe4de" path="res://assets/sprites/ui/DP_UI_CharList_Frame.png" id="6_74fyi"] [ext_resource type="FontFile" uid="uid://u1pey2ilx31c" path="res://assets/fonts/Montjuic.ttf" id="8_74fyi"] -[ext_resource type="Script" path="res://src/draggable.gd" id="8_b7eir"] +[ext_resource type="Script" uid="uid://dxl7onk7x6h8b" path="res://src/draggable.gd" id="8_b7eir"] [ext_resource type="Texture2D" uid="uid://bdrm1nxydvf5t" path="res://assets/sprites/ui/DP_UI_Label_Big.png" id="9_cv2ce"] [ext_resource type="Texture2D" uid="uid://bu5xa7tgfk3h3" path="res://assets/sprites/ui/DP_UI_Buttons01.png" id="9_k4ppc"] @@ -18,7 +19,7 @@ region = Rect2(0, 160, 38, 40) [node name="DragonList" type="Window" node_paths=PackedStringArray("dragon_list_pivot", "origin_name_label", "dragon_name_label")] transparent_bg = true -size = Vector2i(300, 332) +size = Vector2i(344, 332) unresizable = true borderless = true always_on_top = true @@ -31,13 +32,6 @@ dragon_name_label = NodePath("CanvasLayer/NameLabel/Label") [node name="CanvasLayer" type="CanvasLayer" parent="."] -[node name="ColorRect" type="ColorRect" parent="CanvasLayer"] -offset_left = 22.0 -offset_top = 38.0 -offset_right = 296.0 -offset_bottom = 308.0 -color = Color(0.176471, 0.227451, 0.239216, 1) - [node name="Background" type="NinePatchRect" parent="CanvasLayer"] offset_left = 18.0 offset_top = 32.0 @@ -49,11 +43,16 @@ patch_margin_top = 32 patch_margin_right = 32 patch_margin_bottom = 32 +[node name="TextureRect" type="TextureRect" parent="CanvasLayer"] +offset_right = 40.0 +offset_bottom = 40.0 +texture = ExtResource("4_f227k") + [node name="TowerNameLabel" type="NinePatchRect" parent="CanvasLayer"] -offset_left = 34.0 -offset_top = 50.0 -offset_right = 284.0 -offset_bottom = 98.0 +offset_left = 40.0 +offset_top = 51.0 +offset_right = 290.0 +offset_bottom = 99.0 texture = ExtResource("9_cv2ce") patch_margin_left = 74 patch_margin_right = 74 @@ -71,9 +70,9 @@ horizontal_alignment = 1 vertical_alignment = 1 [node name="NameLabel" type="TextureRect" parent="CanvasLayer"] -offset_left = 89.0 +offset_left = 94.0 offset_top = 228.0 -offset_right = 237.0 +offset_right = 242.0 offset_bottom = 276.0 texture = ExtResource("9_cv2ce") @@ -100,22 +99,22 @@ script = ExtResource("8_b7eir") [node name="SubViewportContainer" type="SubViewportContainer" parent="CanvasLayer"] offset_left = 24.0 offset_top = 105.0 -offset_right = 224.0 +offset_right = 306.0 offset_bottom = 213.0 [node name="SubViewport" type="SubViewport" parent="CanvasLayer/SubViewportContainer"] transparent_bg = true handle_input_locally = false -size = Vector2i(270, 108) +size = Vector2i(282, 108) render_target_update_mode = 4 [node name="Pivot" type="Node2D" parent="CanvasLayer/SubViewportContainer/SubViewport"] -position = Vector2(135, 54) +position = Vector2(143, 54) [node name="dragon_previous" type="Button" parent="CanvasLayer"] -offset_left = 127.0 +offset_left = 136.0 offset_top = 136.0 -offset_right = 173.0 +offset_right = 182.0 offset_bottom = 184.0 scale = Vector2(-1, 1) focus_mode = 0 @@ -123,19 +122,19 @@ icon = SubResource("AtlasTexture_1n46k") flat = true [node name="dragon_next" type="Button" parent="CanvasLayer"] -offset_left = 185.0 +offset_left = 194.0 offset_top = 136.0 -offset_right = 231.0 +offset_right = 240.0 offset_bottom = 184.0 focus_mode = 0 icon = SubResource("AtlasTexture_1n46k") flat = true [node name="close" type="Button" parent="CanvasLayer"] -offset_left = 264.0 -offset_top = 12.0 -offset_right = 310.0 -offset_bottom = 60.0 +offset_left = 292.0 +offset_top = 6.0 +offset_right = 338.0 +offset_bottom = 54.0 focus_mode = 0 icon = SubResource("AtlasTexture_u20w8") flat = true diff --git a/scenes/main.tscn b/scenes/main.tscn index 962dd61..eef2283 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -11,7 +11,7 @@ [ext_resource type="Texture2D" uid="uid://bc2lykc3gwykh" path="res://assets/sprites/environment/castle/DP_castle_back.png" id="15_muem4"] [ext_resource type="Texture2D" uid="uid://o1e8lge2vuqu" path="res://assets/sprites/environment/castle/DP_castle_mid.png" id="16_dp3eg"] [ext_resource type="Texture2D" uid="uid://b1w6y1qvetsaw" path="res://assets/sprites/environment/castle/DP_castle_front.png" id="17_0ld40"] -[ext_resource type="Script" path="res://scenes/dragon_sharing.gd" id="17_muem4"] +[ext_resource type="Script" uid="uid://bg58e3dobon4j" path="res://scenes/dragon_sharing.gd" id="17_muem4"] [node name="Base" type="Node2D" node_paths=PackedStringArray("dragon_spots", "dragon_start_spots")] script = ExtResource("1_sugp2") From f8165d91cbfc970f5b7c54df651a76a3e7b29879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Tue, 22 Apr 2025 22:52:18 +0200 Subject: [PATCH 05/10] feat: ui buttons --- .../ui/buttons/add-dragon-highlight.png | Bin 0 -> 554 bytes .../buttons/add-dragon-highlight.png.import | 34 ++++++++ .../sprites/ui/buttons/add-dragon-press.png | Bin 0 -> 532 bytes .../ui/buttons/add-dragon-press.png.import | 34 ++++++++ assets/sprites/ui/buttons/add-dragon.png | Bin 0 -> 534 bytes .../sprites/ui/buttons/add-dragon.png.import | 34 ++++++++ .../ui/buttons/close-game-highlight.png | Bin 0 -> 552 bytes .../buttons/close-game-highlight.png.import | 34 ++++++++ assets/sprites/ui/buttons/close-game.png | Bin 0 -> 534 bytes .../sprites/ui/buttons/close-game.png.import | 34 ++++++++ .../ui/buttons/dragon-list-highlight.png | Bin 0 -> 543 bytes .../buttons/dragon-list-highlight.png.import | 34 ++++++++ assets/sprites/ui/buttons/dragon-list.png | Bin 0 -> 523 bytes .../sprites/ui/buttons/dragon-list.png.import | 34 ++++++++ scenes/create_button.gd | 2 +- scenes/list_button.gd | 2 +- scenes/main.tscn | 78 +++++++++--------- 17 files changed, 281 insertions(+), 39 deletions(-) create mode 100644 assets/sprites/ui/buttons/add-dragon-highlight.png create mode 100644 assets/sprites/ui/buttons/add-dragon-highlight.png.import create mode 100644 assets/sprites/ui/buttons/add-dragon-press.png create mode 100644 assets/sprites/ui/buttons/add-dragon-press.png.import create mode 100644 assets/sprites/ui/buttons/add-dragon.png create mode 100644 assets/sprites/ui/buttons/add-dragon.png.import create mode 100644 assets/sprites/ui/buttons/close-game-highlight.png create mode 100644 assets/sprites/ui/buttons/close-game-highlight.png.import create mode 100644 assets/sprites/ui/buttons/close-game.png create mode 100644 assets/sprites/ui/buttons/close-game.png.import create mode 100644 assets/sprites/ui/buttons/dragon-list-highlight.png create mode 100644 assets/sprites/ui/buttons/dragon-list-highlight.png.import create mode 100644 assets/sprites/ui/buttons/dragon-list.png create mode 100644 assets/sprites/ui/buttons/dragon-list.png.import diff --git a/assets/sprites/ui/buttons/add-dragon-highlight.png b/assets/sprites/ui/buttons/add-dragon-highlight.png new file mode 100644 index 0000000000000000000000000000000000000000..22fec4ccabf4a0b39f775e6963115bad774f7775 GIT binary patch literal 554 zcmV+_0@eMAP)Px$QIKorNnS33w!Qm1wmySWHO+`0s;F7_XA)Wt=d9Q+H!#igsG z2)c-Zi<^kz;-Od?H@QTJ3=_)6Pl@o`~~F*(;!ZcwgBQ+Z*JF z3Uqk9u*Uu$EG?OH%&+hr(;e}1D%ClFukY+Jb}`t!oHh0JnwT?*VJoIJ=FT98IArSZN$-}d*@^pS7ZIl~0D!G}&G6N1NK@h}2bK}NjiYTnH9}qRd#WPx$&PhZ;R9J=Wm@!KOF&KuQtBQgS-RdA%aVQizxeG3WKfoX0ASj4nXGbT83RSS1 zi<_IHi*UP>AUKE?T)K6rR1rCc^Sd@Nxwf{47xA5%FS#T<`SK>I7X$%mROYuQVAHt# z@I24fCMl%G0c8c#Pt2eI;OJmS4L+YK<)^zD0P@9_QtqXy-;k9sl1nWyPu8?6#}rbR z$LEO*Tq;ZgQ1u(pT)=@G>n3I-b@MtF--CRg$!OvD&Ac@A0emMH1c3)BCT880LaLq3 zD)IOF0{|2Ai^jMvy|v9H>g#F}{9K{as?iDsll|ji;8_|HKB> z&^Z=4yl-m}f2NAhfqK7lhuH1?8vxsduzXrKp9K9nxJ`$fYk>XTnp$Gkm-tF9ypzkj zuU{>!u7{m`ot>Q=QYECW8_j4g;MhxCuT#j4S~{s{P?w2`{{KfMVX{hOY9Rb W#IcY1H@PqX0000Px$&`Cr=R9J=Wm@!MkKoo$#R0ly2q)v4eySWHO+`1H6T`V{|>f$0!4*mjhamnf^ zf-a)q;wGZFxLI7Qi@_oY4$?S;m*&n~+S(R#(r;>BF1hP>ukY^a_`XjX$^7*IOpMA0 z$8k(;2BkE%Lz%(!8;ijQczZfig3X6D<@)wA3qYadDc9{NyEU1KSaYd0=E$5za!fI` zyR<%#jw{7+0LpGH91B>GV^L$VrjFl}(lGK3Gb38OnfTo5#24_>obUS%q}Z5IhnQ;Q zrj_{T{WSn%^NX=@9lc%n{^vRX6+{2_7?V2H$mNx|7?B*DoLN@x>-A2McDlLNOuWWE zXOA%*-IN&hPJ#-bt$IqlU)W^3Mji=Vw zaA4iibB=`--ZiyIUQ?ycfx5r5$JqJR2LPwV;Ce+{GlfnoxQUme9l(5UO|3EGNqjRO z?8)Wa*C`9z`#@{$Y~_%Om^yf@hhqWDPU8AK#azG9O@*D>Y)lybqZp-=%5PLTNK$L; Y8-OUUS7LGwX#fBK07*qoM6N<$f+yquE&u=k literal 0 HcmV?d00001 diff --git a/assets/sprites/ui/buttons/add-dragon.png.import b/assets/sprites/ui/buttons/add-dragon.png.import new file mode 100644 index 0000000..aae71fa --- /dev/null +++ b/assets/sprites/ui/buttons/add-dragon.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bbd3p787bmg3m" +path="res://.godot/imported/add-dragon.png-82a36ce738cebfeaa5078dd6de9b9710.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/ui/buttons/add-dragon.png" +dest_files=["res://.godot/imported/add-dragon.png-82a36ce738cebfeaa5078dd6de9b9710.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/ui/buttons/close-game-highlight.png b/assets/sprites/ui/buttons/close-game-highlight.png new file mode 100644 index 0000000000000000000000000000000000000000..d716a004dfb121405b946079c9cb9eb9372ad5a4 GIT binary patch literal 552 zcmV+@0@wYCP)Px$;z>k7R9J=Gm?2LCF%-xD9TQ7XWT;^YI1C9PxET@#2EG6i3=T5{*(bov%p%DW zFa#0|4gta7MzDZkVId(w?GU#=cP)KuH@4);&s}@FclqtT*Irc=MF0S$6l_GiVZ2e>&IZyARvi_3c#=0I;;$)~;Rf`I5QJ8dIsF zvzj_w-x*8bN_i3hu-15tgD3ByfD9YU!(poVAr>xxRNu)>7~|dkk*_}i0GGRSNXKW+ zW!jh(n(CBhydLy*e**w0EUtLn-+Xxn091teaE!4}bxQMne@H`wxj8kvp^ZxhlYipP zIv*!92CPx$&`Cr=R9J=Gn7>QIKp2MKREL5fNS*2`baN3z+`0&@E(*?$PHrxBkp2ZOS-Lt( zK^JjwadS{y+*(}K#bPN44$^aoZ{l6^CD&qY&S$$H>7`G;@4HJpr4#_b^E_k$-cN4A z_aQQEF-MJQ?Zijqq%j2mZ;uyRXa8YWYu{cK001lN9j%>4rP1b-h&7j4V_r;FYNn1h z_QtYswLAj=s5IK)y#Nkm~6`Za($`X06}qX#J)^zZKM}I_ypx zChi!sJx>wFjBiwa#$;~k@pF literal 0 HcmV?d00001 diff --git a/assets/sprites/ui/buttons/close-game.png.import b/assets/sprites/ui/buttons/close-game.png.import new file mode 100644 index 0000000..31c2673 --- /dev/null +++ b/assets/sprites/ui/buttons/close-game.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ci7cb3kgavax4" +path="res://.godot/imported/close-game.png-618d96e50398df2aacb8d97f2ab8cd43.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/ui/buttons/close-game.png" +dest_files=["res://.godot/imported/close-game.png-618d96e50398df2aacb8d97f2ab8cd43.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/ui/buttons/dragon-list-highlight.png b/assets/sprites/ui/buttons/dragon-list-highlight.png new file mode 100644 index 0000000000000000000000000000000000000000..416d9de77ff33dabdab3c10052c92f2fe881c538 GIT binary patch literal 543 zcmV+)0^t3LP)Px$*-1n}R9J=Wn6XO(F%-tXoE-!w(W$OtHy5FZTNlCF#lN7VE-vDtgSfefOP8*W zBIqItE^Z=iq9-0Dv;{y*tDxPqp#|qXCg>p4sIqZ~hnnFgaTR z5Rwc3i4U`#)$ISE{##BGk>V-=m+_0J8vCQ<4zZ|OcXzl2Agqlfy*;elA=drn57S12 z#qA@d9T{T-l5~gID8?dWoySO{7>jE_=d}HUw$jg$p;`%4jN@Iqx@H%5VSgoSVst8~ z(K&3#d`|1tV0Q-hiIIB9#kAAK#h^RHE`M(?=cS;%#?(xXfUO!Qy8!rmYo>__!1THk z>^dT6E2<1s5yBW!MWkxa!EMQzo4C+l6m@c&1>1ZTPdX`j?Q!o#QCfN0FN%skUG5Mg h>Ex0YM~akLVm}d{zeyYWn27)Y002ovPDHLkV1ltG_y+(0 literal 0 HcmV?d00001 diff --git a/assets/sprites/ui/buttons/dragon-list-highlight.png.import b/assets/sprites/ui/buttons/dragon-list-highlight.png.import new file mode 100644 index 0000000..55a9fb7 --- /dev/null +++ b/assets/sprites/ui/buttons/dragon-list-highlight.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://emm3gwb5fuqo" +path="res://.godot/imported/dragon-list-highlight.png-94c8866c0da9b8252b4e4bead07f7b0a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/ui/buttons/dragon-list-highlight.png" +dest_files=["res://.godot/imported/dragon-list-highlight.png-94c8866c0da9b8252b4e4bead07f7b0a.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/ui/buttons/dragon-list.png b/assets/sprites/ui/buttons/dragon-list.png new file mode 100644 index 0000000000000000000000000000000000000000..f703d3e1efbfed22c636180d2f697eccb43b4725 GIT binary patch literal 523 zcmV+m0`&cfP)Px$#Ysd#R9J=Wm@h~JQ5?rVHw}Uyh^AQun?)F6TM;%_4CY0XMJyV`W)aKEs!;?j zVzAgm6pPJaofd~f5Ef)-7{5E;?Y-UGblW}HxBcF`-@V^`-k;z5o#*>L0G{WO1W7!p zA;)3VxWzMmpT_PuMNSg)0X|+XmB!{%QL*o@X8_2o))YHVxpGBjLQ5{O#5~QeR7mZw zZT4m0e0CCmT)7g&0uJoT-^8?}&OSSD+~5mSW0Ce|N574!Z=ju=@B1Dkn3xfVkgBKW zwEd08+pY$hSXxov|5^ngZ+PAvVscK^(+gS$AyqrKJFilUCjd;(7l4plI1}%BKdZM7 zK{mM(2uYbTf$7B0P}H`^$sJ;Gx$f?08whiwC~E&z?hp&U{9#t>u)K4u*s*J@N0ROk z8?CVzS)XH~(HiU4LGEb>hYh9OL`HHY6tw+;UpeB}ZD50vH8Hsrl;j?^tG}nUtGAlL zePW_Ea$WjGWm<#o5WBkh0^lOsveykc(?q~lZ>M{Jxo%A?F=HjZwb0siQuoZiWB= N002ovPDHLkV1mGR@A&`# literal 0 HcmV?d00001 diff --git a/assets/sprites/ui/buttons/dragon-list.png.import b/assets/sprites/ui/buttons/dragon-list.png.import new file mode 100644 index 0000000..05fda57 --- /dev/null +++ b/assets/sprites/ui/buttons/dragon-list.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cpdhhhdmh5n58" +path="res://.godot/imported/dragon-list.png-95bf8cf726fb5913cfced32d642f1f0b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/ui/buttons/dragon-list.png" +dest_files=["res://.godot/imported/dragon-list.png-95bf8cf726fb5913cfced32d642f1f0b.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/create_button.gd b/scenes/create_button.gd index d8c14f4..e326adc 100644 --- a/scenes/create_button.gd +++ b/scenes/create_button.gd @@ -1,4 +1,4 @@ -extends Button +extends TextureButton @export var dragon_editor: PackedScene diff --git a/scenes/list_button.gd b/scenes/list_button.gd index 0d9a274..5cfd162 100644 --- a/scenes/list_button.gd +++ b/scenes/list_button.gd @@ -1,4 +1,4 @@ -extends Button +extends TextureButton @export var dragon_list: PackedScene diff --git a/scenes/main.tscn b/scenes/main.tscn index eef2283..de79da9 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,13 +1,20 @@ -[gd_scene load_steps=13 format=3 uid="uid://ctytpqaed0yqx"] +[gd_scene load_steps=20 format=3 uid="uid://ctytpqaed0yqx"] [ext_resource type="Script" uid="uid://3kyt3shje5r1" path="res://scenes/main.gd" id="1_sugp2"] [ext_resource type="PackedScene" uid="uid://c7nfcgjxqeg7l" path="res://scenes/window/dragon_popup.tscn" id="2_jyhfs"] [ext_resource type="PackedScene" uid="uid://miutbdsgccd1" path="res://scenes/dragons/dragon.tscn" id="4_jyhfs"] [ext_resource type="Script" uid="uid://cj4l3a6a8ro0r" path="res://scenes/create_button.gd" id="4_tbgi4"] [ext_resource type="PackedScene" uid="uid://cdlipr8l1k38a" path="res://scenes/name_setter/name_setter.tscn" id="4_trceg"] +[ext_resource type="Texture2D" uid="uid://bbd3p787bmg3m" path="res://assets/sprites/ui/buttons/add-dragon.png" id="5_jkv2x"] [ext_resource type="PackedScene" uid="uid://fut42ruut302" path="res://scenes/dragon_editor/dragon_editor.tscn" id="5_tefeu"] +[ext_resource type="Texture2D" uid="uid://d1k808702cbcw" path="res://assets/sprites/ui/buttons/add-dragon-press.png" id="6_muem4"] +[ext_resource type="Texture2D" uid="uid://75txlqcp2ucn" path="res://assets/sprites/ui/buttons/add-dragon-highlight.png" id="7_dp3eg"] +[ext_resource type="Texture2D" uid="uid://ci7cb3kgavax4" path="res://assets/sprites/ui/buttons/close-game.png" id="8_jbj1t"] [ext_resource type="Script" uid="uid://oc6mw86npbii" path="res://scenes/list_button.gd" id="9_choun"] +[ext_resource type="Texture2D" uid="uid://cpdhhhdmh5n58" path="res://assets/sprites/ui/buttons/dragon-list.png" id="9_muem4"] [ext_resource type="PackedScene" uid="uid://tubxrqxjic6r" path="res://scenes/dragon_list/dragon_list.tscn" id="10_ya4ey"] +[ext_resource type="Texture2D" uid="uid://emm3gwb5fuqo" path="res://assets/sprites/ui/buttons/dragon-list-highlight.png" id="12_dp3eg"] +[ext_resource type="Texture2D" uid="uid://bawbgis3cgdtu" path="res://assets/sprites/ui/buttons/close-game-highlight.png" id="15_0ld40"] [ext_resource type="Texture2D" uid="uid://bc2lykc3gwykh" path="res://assets/sprites/environment/castle/DP_castle_back.png" id="15_muem4"] [ext_resource type="Texture2D" uid="uid://o1e8lge2vuqu" path="res://assets/sprites/environment/castle/DP_castle_mid.png" id="16_dp3eg"] [ext_resource type="Texture2D" uid="uid://b1w6y1qvetsaw" path="res://assets/sprites/environment/castle/DP_castle_front.png" id="17_0ld40"] @@ -29,46 +36,43 @@ max_dragon_instantiation_time = 600.0 [node name="CanvasLayer" type="CanvasLayer" parent="."] -[node name="Create" type="Button" parent="CanvasLayer"] -anchors_preset = 1 -anchor_left = 1.0 -anchor_right = 1.0 -offset_left = -585.0 -offset_top = 11.0 -offset_right = -543.0 -offset_bottom = 42.0 -grow_horizontal = 0 -focus_mode = 0 -text = "crea" +[node name="Create" type="TextureButton" parent="CanvasLayer"] +offset_left = 535.0 +offset_top = 42.0 +offset_right = 575.0 +offset_bottom = 82.0 +texture_normal = ExtResource("5_jkv2x") +texture_pressed = ExtResource("7_dp3eg") +texture_hover = ExtResource("7_dp3eg") +texture_disabled = ExtResource("6_muem4") +texture_focused = ExtResource("5_jkv2x") script = ExtResource("4_tbgi4") dragon_editor = ExtResource("5_tefeu") -[node name="Close" type="Button" parent="CanvasLayer"] -anchors_preset = 1 -anchor_left = 1.0 -anchor_right = 1.0 -offset_left = -525.0 -offset_top = 12.0 -offset_right = -474.0 -offset_bottom = 43.0 -grow_horizontal = 0 -focus_mode = 0 -text = "tanca" - -[node name="List" type="Button" parent="CanvasLayer"] -anchors_preset = 1 -anchor_left = 1.0 -anchor_right = 1.0 -offset_left = -456.0 -offset_top = 14.0 -offset_right = -411.0 -offset_bottom = 45.0 -grow_horizontal = 0 -focus_mode = 0 -text = "llista" +[node name="List" type="TextureButton" parent="CanvasLayer"] +offset_left = 535.0 +offset_top = 82.0 +offset_right = 575.0 +offset_bottom = 122.0 +texture_normal = ExtResource("9_muem4") +texture_pressed = ExtResource("12_dp3eg") +texture_hover = ExtResource("12_dp3eg") +texture_disabled = ExtResource("9_muem4") +texture_focused = ExtResource("9_muem4") script = ExtResource("9_choun") dragon_list = ExtResource("10_ya4ey") +[node name="Close" type="TextureButton" parent="CanvasLayer"] +offset_left = 535.0 +offset_top = 122.0 +offset_right = 575.0 +offset_bottom = 162.0 +texture_normal = ExtResource("8_jbj1t") +texture_pressed = ExtResource("15_0ld40") +texture_hover = ExtResource("15_0ld40") +texture_disabled = ExtResource("8_jbj1t") +texture_focused = ExtResource("8_jbj1t") + [node name="Castle" type="Node2D" parent="."] [node name="DpCastleBack" type="Sprite2D" parent="Castle"] @@ -109,6 +113,6 @@ script = ExtResource("17_muem4") [connection signal="tree_entered" from="." to="." method="_on_tree_entered"] [connection signal="tree_exiting" from="." to="." method="_on_tree_exiting"] -[connection signal="button_up" from="CanvasLayer/Create" to="CanvasLayer/Create" method="_on_button_up"] -[connection signal="pressed" from="CanvasLayer/Close" to="." method="_on_close_pressed"] +[connection signal="pressed" from="CanvasLayer/Create" to="CanvasLayer/Create" method="_on_button_up"] [connection signal="pressed" from="CanvasLayer/List" to="CanvasLayer/List" method="_on_pressed"] +[connection signal="pressed" from="CanvasLayer/Close" to="." method="_on_close_pressed"] From b9caa6e94f1e23c8f940b1fcf8b83125e210f077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Wed, 23 Apr 2025 01:01:39 +0200 Subject: [PATCH 06/10] game finished --- assets/sprites/ui/buttons/close-highlight.png | Bin 0 -> 398 bytes .../ui/buttons/close-highlight.png.import | 34 ++++ assets/sprites/ui/buttons/close.png | Bin 0 -> 389 bytes assets/sprites/ui/buttons/close.png.import | 34 ++++ assets/sprites/ui/buttons/decor-highlight.png | Bin 0 -> 540 bytes .../ui/buttons/decor-highlight.png.import | 34 ++++ assets/sprites/ui/buttons/decor.png | Bin 0 -> 558 bytes assets/sprites/ui/buttons/decor.png.import | 34 ++++ .../ui/buttons/direction-highlight.png | Bin 0 -> 314 bytes .../ui/buttons/direction-highlight.png.import | 34 ++++ assets/sprites/ui/buttons/direction.png | Bin 0 -> 311 bytes .../sprites/ui/buttons/direction.png.import | 34 ++++ assets/sprites/ui/buttons/hat-highlight.png | Bin 0 -> 529 bytes .../ui/buttons/hat-highlight.png.import | 34 ++++ assets/sprites/ui/buttons/hat.png | Bin 0 -> 509 bytes assets/sprites/ui/buttons/hat.png.import | 34 ++++ assets/sprites/ui/buttons/shirt-highlight.png | Bin 0 -> 522 bytes .../ui/buttons/shirt-highlight.png.import | 34 ++++ assets/sprites/ui/buttons/shirt.png | Bin 0 -> 505 bytes assets/sprites/ui/buttons/shirt.png.import | 34 ++++ export_presets.cfg | 2 +- scenes/dragon_editor/dragon_editor.tscn | 152 +++++++++--------- scenes/dragon_list/dragon_list.tscn | 73 ++++----- scenes/name_setter/name_setter.tscn | 14 +- 24 files changed, 467 insertions(+), 114 deletions(-) create mode 100644 assets/sprites/ui/buttons/close-highlight.png create mode 100644 assets/sprites/ui/buttons/close-highlight.png.import create mode 100644 assets/sprites/ui/buttons/close.png create mode 100644 assets/sprites/ui/buttons/close.png.import create mode 100644 assets/sprites/ui/buttons/decor-highlight.png create mode 100644 assets/sprites/ui/buttons/decor-highlight.png.import create mode 100644 assets/sprites/ui/buttons/decor.png create mode 100644 assets/sprites/ui/buttons/decor.png.import create mode 100644 assets/sprites/ui/buttons/direction-highlight.png create mode 100644 assets/sprites/ui/buttons/direction-highlight.png.import create mode 100644 assets/sprites/ui/buttons/direction.png create mode 100644 assets/sprites/ui/buttons/direction.png.import create mode 100644 assets/sprites/ui/buttons/hat-highlight.png create mode 100644 assets/sprites/ui/buttons/hat-highlight.png.import create mode 100644 assets/sprites/ui/buttons/hat.png create mode 100644 assets/sprites/ui/buttons/hat.png.import create mode 100644 assets/sprites/ui/buttons/shirt-highlight.png create mode 100644 assets/sprites/ui/buttons/shirt-highlight.png.import create mode 100644 assets/sprites/ui/buttons/shirt.png create mode 100644 assets/sprites/ui/buttons/shirt.png.import diff --git a/assets/sprites/ui/buttons/close-highlight.png b/assets/sprites/ui/buttons/close-highlight.png new file mode 100644 index 0000000000000000000000000000000000000000..a462f28af40be0d744b00299d6a8e72b2cc76606 GIT binary patch literal 398 zcmV;90df9`P)Px$NJ&INR9J=Wmp@7bF%*ZtCl;2%HoGEyeE*6v3&>5K=9NF2{-1>H87qzC`cs{eHZa(c6vA5Atv@wSOG^>Sg zZng*fHf6`oRI^%m^|54YEGGFwyxSL=nqPebFgjb?#mckg$kv$VjP>SJc>CO$i}*rp zq-bLs6Ft0rVa}zRE83XHkST_8t~IA6TVv`M?09krL?yas?yXtc$Px$KS@MER9J=Wma$62KoEw%krcL)#Y5-oj?!@_IK zH9VbD_woPm{+Ej+pKXumQff3U{kCsb4)99^FyF+s#>e5 z;{8nkeoHWp-Wrpxe}3&#zNy9C7XbOJ{MicO$q=Hq#>_S5cl6fl+nEdXxma_&&AGGpWz!*LZ+0EIV-(27Tw3R#*QabplvFIn%fj>U<5zd&Yl0S>8-I8 j%t{JoB?YsRf?4?n&m((=WnIIE00000NkvXXu0mjf$Zf5- literal 0 HcmV?d00001 diff --git a/assets/sprites/ui/buttons/close.png.import b/assets/sprites/ui/buttons/close.png.import new file mode 100644 index 0000000..f7e3bb9 --- /dev/null +++ b/assets/sprites/ui/buttons/close.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d2n43pu0wvplp" +path="res://.godot/imported/close.png-d7ca0d1188fa83b8e622fa244178a0f6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/ui/buttons/close.png" +dest_files=["res://.godot/imported/close.png-d7ca0d1188fa83b8e622fa244178a0f6.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/ui/buttons/decor-highlight.png b/assets/sprites/ui/buttons/decor-highlight.png new file mode 100644 index 0000000000000000000000000000000000000000..f9c545cecf532fda7cbf7ebcb404f22c7d8fb4af GIT binary patch literal 540 zcmV+%0^|LOP)Px$)=5M`R9J=Wn7>N{F%-wYIXehWQm5)D*2zT>aqA+qy68XPsEZEL$-%!s9O}~5 zQ3|?V4 zUPey;tO7mk&CdviM!OpT0At#LSu5aE#fJSi+FbxSCdMQ&CXniNE(PP@c}pli+!O%- zORK(6HmTZt4V`iS!qhlHOiJo-Z95akwaNqlHM!gpE5Jai^;M9!j6@^#ysUsxcr&vrIYwi#;NwtGrt{(&7u@}dxrACKXa*t0^ty0tKjQeSd_3jg+ z)l_XpyNP&&idah6NB7TflI?CmC2!$0dJ=Q4JH)P{)5}FAEN>Wcrma5C4gjdnt+^(~ z0Dhk1w>#mUoXDjWWdO<$JcdLOsgsxRwB*c5+<4owTh8WOsUk&kiWn*D8^!n=WOgTs ek^XP3hxH4NU%31YM$+~G0000Px$=t)FDR9J=Gn7>QIKorNni4FxpkUF)FVx3$B5w|WvtBZoOqb_xjP7eMB;$WAo zj#AJ?D!6nLQCysCakRQvS_HvC8i({H+;J}#BB8l{r`&t@BmMMU?!B{I*F_p-kNO2T zP13``;+(QWt<^~cX{C_2RQ9u%HvlFOlSQO@uh)Wo@VqOuA8xY%fR**G(AKHsv|WHF zXAUu$)bYli)FUIczX1S^W=3f1bhEzzfG3w)VitYJEXz`os(-Oz2mqk*wml))2chG3 zrhfqd<>C|opyae^J_|@OF%}1r>gV!_EL?x@007F2-yCA}o$BWbktXMRS%WI+I zf`8&u={JX1R1qoeWXNuNejPbZ<`C1Jbuy`$`AucN?xi{Y`TAV0-o)L1izm`+>Px#^hrcPR9J=WmoW~)FbqY1Dh5`>$cn_qMc@vMOdNm(b>je>fD15j5;i1OM#Re0 zFjS^;MNyqZBC`Cpwz2#5l%%Qi-Xlkfe+THof=RJpQU(cnw3oF@&{L-|4*{!{4o(H7#t8ebl#;|yn{16)Few&HiUpJM2KDAs_^W4#_W%F@ M07*qoM6N<$g7D;t1^@s6 literal 0 HcmV?d00001 diff --git a/assets/sprites/ui/buttons/direction-highlight.png.import b/assets/sprites/ui/buttons/direction-highlight.png.import new file mode 100644 index 0000000..49c8e27 --- /dev/null +++ b/assets/sprites/ui/buttons/direction-highlight.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://btw3cpkp5bgi" +path="res://.godot/imported/direction-highlight.png-7d25bf093f6d01a02053d2a979b60e1a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/ui/buttons/direction-highlight.png" +dest_files=["res://.godot/imported/direction-highlight.png-7d25bf093f6d01a02053d2a979b60e1a.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/ui/buttons/direction.png b/assets/sprites/ui/buttons/direction.png new file mode 100644 index 0000000000000000000000000000000000000000..899256198af1134de5fa3081400ac8c77568db1c GIT binary patch literal 311 zcmV-70m%M|P)Px#@kvBMR9J=WmMsnfF%U-I5CoQh!;;{*2q-RqL~#HN!Epdizy-i?5*!H@xnNNg z!-(ZKvkReV=Bc*ZZoa&<(@F?|7^(a_z$-kM6%S^`gITE-T__^j%oV~Af;`T)lb$hd zrcV1!Zcs!5lsA{8F#s;xVXm(R)f^xI);l>`V^Z{Wp+?4?767yPIrqKNT>?;V_W}E! zOVXG&13=V=8sL;A3jlDgMvq=qr#qOX(Y1FZ=@3FF`lxU58 z?XFZ_nex}gaoq%Px$%Sl8*R9J=Wm@Q8OF&M}HJtjzyLv82{HA6xGLuN=eFz^MCU_hY|d;|nDvq-W8 z41r_@Lm(N!pnxEGFDf9+jgSQv)Tpe-;YEG^Ts z6!gdB=wfqnLde*=eGCDBvDAhQO~|`S8X)_|h@`2vhhrf>xLFm_opv4oFumXlX&v-_ zmAT9sV|`zx)YQ)6nw7xy>KFi^*1V5`^Lj8K!^U#Zm}?)6kFd*qf>Lz`@AP!rTOj{ z(?O<8XM|caDz7r9!X0C#a~+X1^;@`Oj8+M_8vpCM2)JWx&@pBUcZ``*Y+M2Wf^+!{ zVLCIYaNigi@DHOg=v8I`0Kt4yTE5dR32D^~5dQ@duW{cPwKTs%V`oY8gfD&G6!(o0 zgSK3USK04fi9O(sv6J5J<)|8^mo3eiF9+KI)ce*<8)E?9&+*fpXiZM$Oqto*1;E#7 zd<=<@sm5KjTXJS69-m#%`B?I_XQOOqU#T)hWZ#$s+b4=~9c1}V8YBKst^4@`3-Y8; T%By`K00000NkvXXu0mjfpGoTi literal 0 HcmV?d00001 diff --git a/assets/sprites/ui/buttons/hat-highlight.png.import b/assets/sprites/ui/buttons/hat-highlight.png.import new file mode 100644 index 0000000..8610642 --- /dev/null +++ b/assets/sprites/ui/buttons/hat-highlight.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b3wp7cawhj5eb" +path="res://.godot/imported/hat-highlight.png-65adb88f36a43086e02f9a1b64f2e661.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/ui/buttons/hat-highlight.png" +dest_files=["res://.godot/imported/hat-highlight.png-65adb88f36a43086e02f9a1b64f2e661.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/ui/buttons/hat.png b/assets/sprites/ui/buttons/hat.png new file mode 100644 index 0000000000000000000000000000000000000000..896341a3f197c7c484a23e5adcef4278801a2268 GIT binary patch literal 509 zcmVPx$w@E}nR9J=8m@Q8OF&M}HJrMIlZRia(LqY&UFeJPf_yR~UL!l6S1kB7Vk}Ls3 zMlv%)AQ{2nmS6{lWeW)j>Wb(+j5d9CU9w~CPu)r2~_MQqUC43~B^#gFs)5Xcs zqP0P-+sj0$lv0eV_urTanHs#_YUT0Ep%!;qc>uu5R$q(L5JE_RHy4gE)71Iyk_FY1|!`0PyDgH^!N2e6rIJ06^{GH~Oq z2LRY%>ccTc>(sDN9^3Kz`N3&`-154$eDozgto7j-OM^_g?g-m;)t)oQ5sop}y^b(V zO^a}h(O&|d7XJHLG{P}9=^V?7aE!T9tUUq%;(PlJ;kq+$gl~)t^sm(%j4EpYfOw;B zZQp5?w3yogepdnGHsKqiH_ac=+}TU%(YN+@C46JVq;H-^RJly9^e+&Ov1XFJ+-$0N zKchYK{pt*WEpJu$Z>(A_3gGYQj`}AjbFQqOUH};Vr;X;24wigP)Px$#7RU!R9J=Wm@iMmKp2OAS0+eM1k|vEISdIQxS1sz7(M|K3=W0hBVaJKNHT#T zkYI2K2nGki0)~Z!gaoxBy5DX+?!B&slHS7Oy7$(%_w?=kQ&AKlh13Q)QLbQ6P|_b$ zal|43P|De{+(i0SSrd3=EMe;H@iYvQOm@v0fD`sCQnIc{pBSoJm4xYgl_tF^oKeZm_3pxUPx$vq?ljR9J=Wm@QAkP!xvW76b{3fEt!Chan*ZH?w2|!!JOB!J!cR1Po>tNhUA^ z5)2Lj!Qdd+fni}GAwjK(^=)&{dit?YcJIRDZqIFR`}EvTF9-tIh(GQZ(3sAu;CWst zN`oNq(&FwJqp6RV3*&nKamOg%UC#pm*6LlOoCTk+nX}fICwrwdb+ox#O2f_CEC8U< zdIm6T&RSzpj%lXapXnW!#(jTET<@p1eDehWxY}Db+NU}DjY(*#S6M8j;r43>0MJz8 z?ik}Z)vHufZ~T6^1pv&fZj2O<|HOM@+#O?C&;)z$+|pKJJsH=`X}Dudo9k$b;|_CC z&ZUHL)^D`Zb57!pF|HDDzW`v^ltivJG>V#Y$C%79ei^@1GnWNd5tEl=8q!?1o^PdE z)D&^wn8aT>%~>;fW+2fh&=Sut{z`vCVPnh{ZI0CH7iDsckx@-Z;#@WVfIG%6!`;hy zZBX70=gi;c?d%YMzHhbP825AW>CRwHPIGx#KR5;uuR65xj;2nYI!61%T4O_J7f~QI vw_h!1U#XcQ?iq_J{GTYAWEvY6)*AZ(EeENN5X?qX00000NkvXXu0mjf9p~d| literal 0 HcmV?d00001 diff --git a/assets/sprites/ui/buttons/shirt.png.import b/assets/sprites/ui/buttons/shirt.png.import new file mode 100644 index 0000000..ba186b7 --- /dev/null +++ b/assets/sprites/ui/buttons/shirt.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dr2d4jv6bxghn" +path="res://.godot/imported/shirt.png-33a1880ffc494f6f0e6b5f79f5b9b650.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/ui/buttons/shirt.png" +dest_files=["res://.godot/imported/shirt.png-33a1880ffc494f6f0e6b5f79f5b9b650.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/export_presets.cfg b/export_presets.cfg index 52af46e..253d46a 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -9,7 +9,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../../Builds/La Torreta del Drac.exe" +export_path="../../Builds/SantJordiJam25/La Torreta del Drac.exe" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" diff --git a/scenes/dragon_editor/dragon_editor.tscn b/scenes/dragon_editor/dragon_editor.tscn index 7d92a5a..a0937c9 100644 --- a/scenes/dragon_editor/dragon_editor.tscn +++ b/scenes/dragon_editor/dragon_editor.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=3 uid="uid://fut42ruut302"] +[gd_scene load_steps=28 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="SpriteFrames" uid="uid://ccxyplt2t7t6y" path="res://assets/animations/hats/barretina.tres" id="2_aystc"] @@ -9,43 +9,31 @@ [ext_resource type="SpriteFrames" uid="uid://c5rqqy7b5ihi5" path="res://assets/animations/decor/rosa.tres" id="6_c4sli"] [ext_resource type="Texture2D" uid="uid://dceoy4417v83e" path="res://assets/sprites/ui/DP_UI_CharCreation_BG.png" id="6_udwtk"] [ext_resource type="Script" uid="uid://dxl7onk7x6h8b" path="res://src/draggable.gd" id="7_1vw8k"] -[ext_resource type="Texture2D" uid="uid://bu5xa7tgfk3h3" path="res://assets/sprites/ui/DP_UI_Buttons01.png" id="7_qppok"] [ext_resource type="Texture2D" uid="uid://bgpbbkmwt8ysq" path="res://assets/sprites/ui/DP_UI_Button_Text.png" id="8_ofxsr"] +[ext_resource type="Texture2D" uid="uid://dr2d4jv6bxghn" path="res://assets/sprites/ui/buttons/shirt.png" id="12_hukd7"] [ext_resource type="Texture2D" uid="uid://bdrm1nxydvf5t" path="res://assets/sprites/ui/DP_UI_Label_Big.png" id="12_qppok"] +[ext_resource type="Texture2D" uid="uid://b6latlr2mhm37" path="res://assets/sprites/ui/buttons/shirt-highlight.png" id="13_6eo4l"] +[ext_resource type="Texture2D" uid="uid://cwkegj7oj8rok" path="res://assets/sprites/ui/buttons/hat.png" id="13_aystc"] +[ext_resource type="Texture2D" uid="uid://dlm0degcpvyoj" path="res://assets/sprites/ui/buttons/decor.png" id="13_mc14k"] [ext_resource type="FontFile" uid="uid://u1pey2ilx31c" path="res://assets/fonts/Montjuic.ttf" id="14_1vw8k"] [ext_resource type="SpriteFrames" uid="uid://duxxw4mfxql3c" path="res://assets/animations/dragons/verd.tres" id="14_aystc"] [ext_resource type="StyleBox" uid="uid://bhe580k04w6ve" path="res://assets/styles/style_box_empty.tres" id="14_bh8dj"] +[ext_resource type="Texture2D" uid="uid://dygetjxbcktef" path="res://assets/sprites/ui/buttons/decor-highlight.png" id="14_jtpn4"] [ext_resource type="FontFile" uid="uid://5nniov81t44i" path="res://assets/fonts/m3x6.ttf" id="14_rrp4v"] +[ext_resource type="Texture2D" uid="uid://b3wp7cawhj5eb" path="res://assets/sprites/ui/buttons/hat-highlight.png" id="14_x0448"] [ext_resource type="SpriteFrames" uid="uid://dsxhfu2ekw7j" path="res://assets/animations/shirts/traje.tres" id="15_x0448"] - -[sub_resource type="AtlasTexture" id="AtlasTexture_ofxsr"] -atlas = ExtResource("7_qppok") -region = Rect2(0, 40, 38, 40) - -[sub_resource type="AtlasTexture" id="AtlasTexture_bh8dj"] -atlas = ExtResource("7_qppok") -region = Rect2(0, 80, 38, 40) - -[sub_resource type="AtlasTexture" id="AtlasTexture_1vw8k"] -atlas = ExtResource("7_qppok") -region = Rect2(0, 0, 38, 40) - -[sub_resource type="AtlasTexture" id="AtlasTexture_rrp4v"] -atlas = ExtResource("7_qppok") -region = Rect2(0, 120, 38, 40) +[ext_resource type="Texture2D" uid="uid://dwm2bfuamf3bp" path="res://assets/sprites/ui/buttons/direction.png" id="18_xxrn0"] +[ext_resource type="Texture2D" uid="uid://btw3cpkp5bgi" path="res://assets/sprites/ui/buttons/direction-highlight.png" id="19_q2c4g"] +[ext_resource type="Texture2D" uid="uid://d2n43pu0wvplp" path="res://assets/sprites/ui/buttons/close.png" id="21_c4sli"] +[ext_resource type="Texture2D" uid="uid://bsn66gnb08x3u" path="res://assets/sprites/ui/buttons/close-highlight.png" id="22_xxrn0"] [sub_resource type="AtlasTexture" id="AtlasTexture_mc14k"] atlas = ExtResource("8_ofxsr") region = Rect2(0, 0, 62, 24) -[sub_resource type="AtlasTexture" id="AtlasTexture_kohpo"] -atlas = ExtResource("7_qppok") -region = Rect2(0, 160, 38, 40) - [node name="DragonEditor" type="Window"] transparent_bg = true title = "Dragon Editor" -position = Vector2i(0, 36) size = Vector2i(230, 332) unresizable = true borderless = true @@ -90,51 +78,61 @@ offset_right = 198.0 offset_bottom = 320.0 script = ExtResource("7_1vw8k") -[node name="change_hat" type="Button" parent="CanvasLayer"] -offset_left = 48.0 -offset_top = 38.0 -offset_right = 94.0 -offset_bottom = 86.0 -focus_mode = 0 -icon = SubResource("AtlasTexture_ofxsr") -flat = true +[node name="change_shirt" type="TextureButton" parent="CanvasLayer"] +offset_left = 88.0 +offset_top = 54.0 +offset_right = 128.0 +offset_bottom = 94.0 +texture_normal = ExtResource("12_hukd7") +texture_pressed = ExtResource("13_6eo4l") +texture_hover = ExtResource("13_6eo4l") +texture_disabled = ExtResource("12_hukd7") +texture_focused = ExtResource("12_hukd7") -[node name="change_shirt" type="Button" parent="CanvasLayer"] -offset_left = 84.0 -offset_top = 50.0 -offset_right = 130.0 -offset_bottom = 98.0 -focus_mode = 0 -icon = SubResource("AtlasTexture_bh8dj") -flat = true +[node name="change_hat" type="TextureButton" parent="CanvasLayer"] +offset_left = 52.0 +offset_top = 42.0 +offset_right = 92.0 +offset_bottom = 82.0 +texture_normal = ExtResource("13_aystc") +texture_pressed = ExtResource("14_x0448") +texture_hover = ExtResource("14_x0448") +texture_disabled = ExtResource("13_aystc") +texture_focused = ExtResource("13_aystc") -[node name="change_shoes" type="Button" parent="CanvasLayer"] -offset_left = 120.0 -offset_top = 38.0 -offset_right = 166.0 -offset_bottom = 86.0 -focus_mode = 0 -icon = SubResource("AtlasTexture_1vw8k") -flat = true +[node name="change_decor" type="TextureButton" parent="CanvasLayer"] +offset_left = 124.0 +offset_top = 42.0 +offset_right = 164.0 +offset_bottom = 82.0 +texture_normal = ExtResource("13_mc14k") +texture_pressed = ExtResource("14_jtpn4") +texture_hover = ExtResource("14_jtpn4") +texture_disabled = ExtResource("13_mc14k") +texture_focused = ExtResource("13_mc14k") -[node name="dragon_previous" type="Button" parent="CanvasLayer"] -offset_left = 76.0 -offset_top = 136.0 -offset_right = 122.0 -offset_bottom = 184.0 -scale = Vector2(-1, 1) -focus_mode = 0 -icon = SubResource("AtlasTexture_rrp4v") -flat = true +[node name="dragon_next" type="TextureButton" parent="CanvasLayer"] +offset_left = 138.0 +offset_top = 140.0 +offset_right = 178.0 +offset_bottom = 180.0 +texture_normal = ExtResource("18_xxrn0") +texture_pressed = ExtResource("19_q2c4g") +texture_hover = ExtResource("19_q2c4g") +texture_disabled = ExtResource("18_xxrn0") +texture_focused = ExtResource("18_xxrn0") -[node name="dragon_next" type="Button" parent="CanvasLayer"] -offset_left = 134.0 -offset_top = 136.0 -offset_right = 180.0 -offset_bottom = 184.0 -focus_mode = 0 -icon = SubResource("AtlasTexture_rrp4v") -flat = true +[node name="dragon_previous" type="TextureButton" parent="CanvasLayer"] +offset_left = 34.0 +offset_top = 140.0 +offset_right = 74.0 +offset_bottom = 180.0 +texture_normal = ExtResource("18_xxrn0") +texture_pressed = ExtResource("19_q2c4g") +texture_hover = ExtResource("19_q2c4g") +texture_disabled = ExtResource("18_xxrn0") +texture_focused = ExtResource("18_xxrn0") +flip_h = true [node name="create" type="Button" parent="CanvasLayer"] offset_left = 112.0 @@ -157,14 +155,16 @@ theme_override_font_sizes/font_size = 33 text = "crea" horizontal_alignment = 1 -[node name="close" type="Button" parent="CanvasLayer"] -offset_left = 178.0 -offset_top = 6.0 -offset_right = 224.0 -offset_bottom = 54.0 -focus_mode = 0 -icon = SubResource("AtlasTexture_kohpo") -flat = true +[node name="close" type="TextureButton" parent="CanvasLayer"] +offset_left = 182.0 +offset_top = 10.0 +offset_right = 222.0 +offset_bottom = 50.0 +texture_normal = ExtResource("21_c4sli") +texture_pressed = ExtResource("22_xxrn0") +texture_hover = ExtResource("22_xxrn0") +texture_disabled = ExtResource("21_c4sli") +texture_focused = ExtResource("21_c4sli") [node name="NameLabel" type="TextureRect" parent="CanvasLayer"] offset_left = 34.0 @@ -184,15 +184,15 @@ theme_override_font_sizes/font_size = 28 theme_override_styles/focus = ExtResource("14_bh8dj") placeholder_text = "NOM" alignment = 1 -max_length = 8 +max_length = 9 flat = true caret_blink = true [connection signal="close_requested" from="." to="." method="_on_close_requested"] -[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/change_hat" to="." method="_on_change_hat_pressed"] +[connection signal="pressed" from="CanvasLayer/change_decor" to="." method="_on_change_shoes_pressed"] [connection signal="pressed" from="CanvasLayer/dragon_next" to="." method="_on_next_color_pressed"] +[connection signal="pressed" from="CanvasLayer/dragon_previous" to="." method="_on_previous_color_pressed"] [connection signal="pressed" from="CanvasLayer/create" to="." method="_on_create_pressed"] [connection signal="pressed" from="CanvasLayer/close" to="." method="_on_close_pressed"] diff --git a/scenes/dragon_list/dragon_list.tscn b/scenes/dragon_list/dragon_list.tscn index e22ef0a..d47546b 100644 --- a/scenes/dragon_list/dragon_list.tscn +++ b/scenes/dragon_list/dragon_list.tscn @@ -1,21 +1,16 @@ -[gd_scene load_steps=11 format=3 uid="uid://tubxrqxjic6r"] +[gd_scene load_steps=12 format=3 uid="uid://tubxrqxjic6r"] [ext_resource type="Script" uid="uid://dm8d0ikf1n8qa" path="res://scenes/dragon_list/dragon_list_view.gd" id="1_q7g8i"] [ext_resource type="PackedScene" uid="uid://cq3orf2ktmel0" path="res://scenes/dragon_list/dragon/dragon.tscn" id="2_h4iwm"] [ext_resource type="Texture2D" uid="uid://cup2lrb8lou72" path="res://assets/sprites/ui/DP_UI_CharList_BG.png" id="4_f227k"] [ext_resource type="Texture2D" uid="uid://d27vpp71fe4de" path="res://assets/sprites/ui/DP_UI_CharList_Frame.png" id="6_74fyi"] +[ext_resource type="Texture2D" uid="uid://dwm2bfuamf3bp" path="res://assets/sprites/ui/buttons/direction.png" id="8_1n46k"] [ext_resource type="FontFile" uid="uid://u1pey2ilx31c" path="res://assets/fonts/Montjuic.ttf" id="8_74fyi"] [ext_resource type="Script" uid="uid://dxl7onk7x6h8b" path="res://src/draggable.gd" id="8_b7eir"] +[ext_resource type="Texture2D" uid="uid://d2n43pu0wvplp" path="res://assets/sprites/ui/buttons/close.png" id="9_1n46k"] [ext_resource type="Texture2D" uid="uid://bdrm1nxydvf5t" path="res://assets/sprites/ui/DP_UI_Label_Big.png" id="9_cv2ce"] -[ext_resource type="Texture2D" uid="uid://bu5xa7tgfk3h3" path="res://assets/sprites/ui/DP_UI_Buttons01.png" id="9_k4ppc"] - -[sub_resource type="AtlasTexture" id="AtlasTexture_1n46k"] -atlas = ExtResource("9_k4ppc") -region = Rect2(0, 120, 38, 40) - -[sub_resource type="AtlasTexture" id="AtlasTexture_u20w8"] -atlas = ExtResource("9_k4ppc") -region = Rect2(0, 160, 38, 40) +[ext_resource type="Texture2D" uid="uid://btw3cpkp5bgi" path="res://assets/sprites/ui/buttons/direction-highlight.png" id="9_u20w8"] +[ext_resource type="Texture2D" uid="uid://bsn66gnb08x3u" path="res://assets/sprites/ui/buttons/close-highlight.png" id="10_u20w8"] [node name="DragonList" type="Window" node_paths=PackedStringArray("dragon_list_pivot", "origin_name_label", "dragon_name_label")] transparent_bg = true @@ -111,35 +106,41 @@ render_target_update_mode = 4 [node name="Pivot" type="Node2D" parent="CanvasLayer/SubViewportContainer/SubViewport"] position = Vector2(143, 54) -[node name="dragon_previous" type="Button" parent="CanvasLayer"] -offset_left = 136.0 -offset_top = 136.0 -offset_right = 182.0 -offset_bottom = 184.0 -scale = Vector2(-1, 1) -focus_mode = 0 -icon = SubResource("AtlasTexture_1n46k") -flat = true +[node name="dragon_next" type="TextureButton" parent="CanvasLayer"] +offset_left = 198.0 +offset_top = 140.0 +offset_right = 238.0 +offset_bottom = 180.0 +texture_normal = ExtResource("8_1n46k") +texture_pressed = ExtResource("9_u20w8") +texture_hover = ExtResource("9_u20w8") +texture_disabled = ExtResource("8_1n46k") +texture_focused = ExtResource("8_1n46k") -[node name="dragon_next" type="Button" parent="CanvasLayer"] -offset_left = 194.0 -offset_top = 136.0 -offset_right = 240.0 -offset_bottom = 184.0 -focus_mode = 0 -icon = SubResource("AtlasTexture_1n46k") -flat = true +[node name="dragon_previous" type="TextureButton" parent="CanvasLayer"] +offset_left = 94.0 +offset_top = 140.0 +offset_right = 134.0 +offset_bottom = 180.0 +texture_normal = ExtResource("8_1n46k") +texture_pressed = ExtResource("9_u20w8") +texture_hover = ExtResource("9_u20w8") +texture_disabled = ExtResource("8_1n46k") +texture_focused = ExtResource("8_1n46k") +flip_h = true -[node name="close" type="Button" parent="CanvasLayer"] -offset_left = 292.0 -offset_top = 6.0 -offset_right = 338.0 -offset_bottom = 54.0 -focus_mode = 0 -icon = SubResource("AtlasTexture_u20w8") -flat = true +[node name="close" type="TextureButton" parent="CanvasLayer"] +offset_left = 296.0 +offset_top = 10.0 +offset_right = 336.0 +offset_bottom = 50.0 +texture_normal = ExtResource("9_1n46k") +texture_pressed = ExtResource("10_u20w8") +texture_hover = ExtResource("10_u20w8") +texture_disabled = ExtResource("9_1n46k") +texture_focused = ExtResource("9_1n46k") [connection signal="close_requested" from="." to="." method="_on_close_requested"] -[connection signal="pressed" from="CanvasLayer/dragon_previous" to="." method="_on_dragon_previous_pressed"] [connection signal="pressed" from="CanvasLayer/dragon_next" to="." method="_on_dragon_next_pressed"] +[connection signal="pressed" from="CanvasLayer/dragon_previous" to="." method="_on_dragon_previous_pressed"] [connection signal="pressed" from="CanvasLayer/close" to="." method="_on_close_pressed"] diff --git a/scenes/name_setter/name_setter.tscn b/scenes/name_setter/name_setter.tscn index fae1702..ffa6719 100644 --- a/scenes/name_setter/name_setter.tscn +++ b/scenes/name_setter/name_setter.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=3 uid="uid://cdlipr8l1k38a"] +[gd_scene load_steps=9 format=3 uid="uid://cdlipr8l1k38a"] [ext_resource type="Script" uid="uid://drulv5ptupx2w" path="res://scenes/name_setter/name_setter.gd" id="1_f3gk5"] [ext_resource type="Texture2D" uid="uid://d27vpp71fe4de" path="res://assets/sprites/ui/DP_UI_CharList_Frame.png" id="2_wkl5f"] @@ -6,6 +6,7 @@ [ext_resource type="FontFile" uid="uid://u1pey2ilx31c" path="res://assets/fonts/Montjuic.ttf" id="3_fjxtl"] [ext_resource type="Texture2D" uid="uid://bdrm1nxydvf5t" path="res://assets/sprites/ui/DP_UI_Label_Big.png" id="3_rlhj7"] [ext_resource type="StyleBox" uid="uid://bhe580k04w6ve" path="res://assets/styles/style_box_empty.tres" id="4_fjxtl"] +[ext_resource type="FontFile" uid="uid://5nniov81t44i" path="res://assets/fonts/m3x6.ttf" id="7_crfd2"] [sub_resource type="AtlasTexture" id="AtlasTexture_27shg"] atlas = ExtResource("3_1ipfa") @@ -83,4 +84,15 @@ focus_mode = 0 icon = SubResource("AtlasTexture_27shg") flat = true +[node name="Label" type="Label" parent="create"] +offset_left = 6.0 +offset_top = -2.0 +offset_right = 64.0 +offset_bottom = 26.0 +theme_override_colors/font_color = Color(0.537255, 0.603922, 0.615686, 1) +theme_override_fonts/font = ExtResource("7_crfd2") +theme_override_font_sizes/font_size = 33 +text = "crea" +horizontal_alignment = 1 + [connection signal="pressed" from="create" to="." method="_on_submit_pressed"] From ef61225eb7c8091932a70e03b83a2758be129002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Wed, 23 Apr 2025 01:28:41 +0200 Subject: [PATCH 07/10] fix: first time bug --- scenes/create_button.gd | 1 + scenes/dragon_editor/dragon_editor.gd | 8 +++++--- scenes/name_setter/name_setter.tscn | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scenes/create_button.gd b/scenes/create_button.gd index e326adc..f96c675 100644 --- a/scenes/create_button.gd +++ b/scenes/create_button.gd @@ -8,6 +8,7 @@ extends TextureButton func _on_button_up() -> void: var editor: DragonEditor = dragon_editor.instantiate() + editor.set_save_load(base._save_load) editor.on_create_dragon.connect(base.add_dragon) var window_position: Vector2i = DisplayServer.window_get_position() diff --git a/scenes/dragon_editor/dragon_editor.gd b/scenes/dragon_editor/dragon_editor.gd index 2cb25f8..9de8b04 100644 --- a/scenes/dragon_editor/dragon_editor.gd +++ b/scenes/dragon_editor/dragon_editor.gd @@ -11,16 +11,18 @@ class_name DragonEditor @export var decor_outfits: DragonOutfit @export var dragon_colors: DragonOutfit -var _save_load: SaveLoad = SaveLoad.new() +var _save_load: SaveLoad @onready var dragon_name: LineEdit = $CanvasLayer/NameLabel/LineEdit @onready var dragger: DraggableWindow = $CanvasLayer/Dragger signal on_create_dragon(properties: DragonProperties) -func _ready() -> void: - _save_load.load() +func set_save_load(save_load: SaveLoad): + _save_load = save_load + +func _ready() -> void: hat.visible = false shirt.visible = false decor.visible = false diff --git a/scenes/name_setter/name_setter.tscn b/scenes/name_setter/name_setter.tscn index ffa6719..4cd235f 100644 --- a/scenes/name_setter/name_setter.tscn +++ b/scenes/name_setter/name_setter.tscn @@ -85,6 +85,7 @@ icon = SubResource("AtlasTexture_27shg") flat = true [node name="Label" type="Label" parent="create"] +layout_mode = 0 offset_left = 6.0 offset_top = -2.0 offset_right = 64.0 From 27eba74018af2a624ee629181f843e253f7c5467 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Wed, 23 Apr 2025 15:07:42 +0200 Subject: [PATCH 08/10] fix: negative color error --- icon.png | Bin 1558 -> 1736 bytes src/dragon_outfit.gd | 6 ++++++ 2 files changed, 6 insertions(+) diff --git a/icon.png b/icon.png index 5a716d5da79f769026b91512faac760305ca9d4c..d35959bb5163e4bd970d6bb1cb20e5ff89f6c78f 100644 GIT binary patch delta 1708 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 SpriteFrames: return _pick_non_nullable() +func _get_array_index(index: int, size: int) -> int: + return ((index % size) + size) % len(outfits) + + func _pick_nullable() -> SpriteFrames: _index %= (len(outfits) + 1) if _index == 0: @@ -45,6 +49,8 @@ func _pick_non_nullable() -> SpriteFrames: func get_texture(index: int) -> SpriteFrames: + if not allow_null: + index = _get_array_index(index, len(outfits)) if index < 0 or index >= len(outfits): return null From 4916d058859fa5a7b99e5678a73951909913e8f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Wed, 23 Apr 2025 15:29:22 +0200 Subject: [PATCH 09/10] build: linux export --- export_presets.cfg | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/export_presets.cfg b/export_presets.cfg index 253d46a..3d34c08 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -64,3 +64,45 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue Remove-Item -Recurse -Force '{temp_dir}'" + +[preset.1] + +name="Linux" +platform="Linux" +runnable=true +advanced_options=false +dedicated_server=false +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="../../Builds/SantJordiJam25/La Torreta del Drac.x86_64" +patches=PackedStringArray() +encryption_include_filters="" +encryption_exclude_filters="" +seed=0 +encrypt_pck=false +encrypt_directory=false +script_export_mode=2 + +[preset.1.options] + +custom_template/debug="" +custom_template/release="" +debug/export_console_wrapper=1 +binary_format/embed_pck=true +texture_format/s3tc_bptc=true +texture_format/etc2_astc=false +binary_format/architecture="x86_64" +ssh_remote_deploy/enabled=false +ssh_remote_deploy/host="user@host_ip" +ssh_remote_deploy/port="22" +ssh_remote_deploy/extra_args_ssh="" +ssh_remote_deploy/extra_args_scp="" +ssh_remote_deploy/run_script="#!/usr/bin/env bash +export DISPLAY=:0 +unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\" +\"{temp_dir}/{exe_name}\" {cmd_args}" +ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash +kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\") +rm -rf \"{temp_dir}\"" From c50f8d55a80d8d21cb11c30a40a177b2e31b1dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= <52170489+GerardGascon@users.noreply.github.com> Date: Thu, 24 Apr 2025 19:16:44 +0200 Subject: [PATCH 10/10] docs: add readme --- README.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..11e15fb --- /dev/null +++ b/README.md @@ -0,0 +1,24 @@ +# Roses + +## Description + +Create dragons and share them with other people. + +Each dragon you create gets shared with other people and might appear on their computer screens if they leave the game open. + +## The Team + +> Arnau Martín - Art\ +> Gerard Gascón - Design & Programming + +## Game Jam + +Sant Jordi Jam 2025 — April 1st - 22rd 2025 (22 days) + +## Theme + +Llegenda & Diada + +## Languages + +Catalan