diff --git a/assets/outfits/hats.tres b/assets/outfits/hats.tres index a749773..d865452 100644 --- a/assets/outfits/hats.tres +++ b/assets/outfits/hats.tres @@ -1,9 +1,14 @@ -[gd_resource type="Resource" script_class="DragonOutfit" load_steps=3 format=3 uid="uid://cnhwn6kfcbjl5"] +[gd_resource type="Resource" script_class="DragonOutfit" load_steps=8 format=3 uid="uid://cnhwn6kfcbjl5"] -[ext_resource type="Texture2D" uid="uid://s1gx0l4qciqn" path="res://assets/sprites/hat.png" id="1_ahj5i"] [ext_resource type="Script" uid="uid://rw26nny160xh" path="res://src/dragon_outfit.gd" id="1_e7uo0"] +[ext_resource type="Texture2D" uid="uid://12fv5nymaljj" path="res://assets/sprites/hats/DragonPet_barret_barretina.png" id="1_jhy4n"] +[ext_resource type="Texture2D" uid="uid://bmw61grwcpoik" path="res://assets/sprites/hats/DragonPet_barret_casc.png" id="2_cmu3h"] +[ext_resource type="Texture2D" uid="uid://dy46ipxh5g5up" path="res://assets/sprites/hats/DragonPet_barret_copa.png" id="3_330df"] +[ext_resource type="Texture2D" uid="uid://ct4ilf6g8fe44" path="res://assets/sprites/hats/DragonPet_barret_corona.png" id="4_7rdvc"] +[ext_resource type="Texture2D" uid="uid://d2jh1mprvmnpk" path="res://assets/sprites/hats/DragonPet_barret_palla.png" id="5_1scq7"] +[ext_resource type="Texture2D" uid="uid://b8pf6op2f51p7" path="res://assets/sprites/hats/DragonPet_barret_princesa.png" id="6_2f5tc"] [resource] script = ExtResource("1_e7uo0") -outfits = Array[Texture2D]([ExtResource("1_ahj5i")]) +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 cd8948c..93159cb 100644 --- a/assets/outfits/shirts.tres +++ b/assets/outfits/shirts.tres @@ -1,9 +1,12 @@ -[gd_resource type="Resource" script_class="DragonOutfit" load_steps=3 format=3 uid="uid://etegcak2sphs"] +[gd_resource type="Resource" script_class="DragonOutfit" load_steps=6 format=3 uid="uid://etegcak2sphs"] -[ext_resource type="Texture2D" uid="uid://dc2uk6tqtwl4n" path="res://assets/sprites/shirt.png" id="1_136ph"] +[ext_resource type="Texture2D" uid="uid://cs0ke244c33t2" path="res://assets/sprites/shirts/DragonPet_roba_armadura.png" id="1_8ueji"] [ext_resource type="Script" uid="uid://rw26nny160xh" path="res://src/dragon_outfit.gd" id="1_yaxr2"] +[ext_resource type="Texture2D" uid="uid://d13xg46q5a7as" path="res://assets/sprites/shirts/DragonPet_roba_faixa.png" id="2_rue66"] +[ext_resource type="Texture2D" uid="uid://b3xnii6r00hol" path="res://assets/sprites/shirts/DragonPet_roba_traje.png" id="3_rq2qf"] +[ext_resource type="Texture2D" uid="uid://bhfmyrxor0fli" path="res://assets/sprites/shirts/DragonPet_roba_tutu.png" id="4_tgfck"] [resource] script = ExtResource("1_yaxr2") -outfits = Array[Texture2D]([ExtResource("1_136ph")]) +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 0bee600..13d42a3 100644 --- a/assets/outfits/shoes.tres +++ b/assets/outfits/shoes.tres @@ -1,9 +1,11 @@ -[gd_resource type="Resource" script_class="DragonOutfit" load_steps=3 format=3 uid="uid://ba5684xylts3f"] +[gd_resource type="Resource" script_class="DragonOutfit" load_steps=5 format=3 uid="uid://ba5684xylts3f"] -[ext_resource type="Texture2D" uid="uid://8srlwinjr3tt" path="res://assets/sprites/shoes.png" id="1_2hegr"] +[ext_resource type="Texture2D" uid="uid://onajhbpjtnil" path="res://assets/sprites/decor/DragonPet_acc_escut.png" id="1_5pwyu"] [ext_resource type="Script" uid="uid://rw26nny160xh" path="res://src/dragon_outfit.gd" id="1_lu1y3"] +[ext_resource type="Texture2D" uid="uid://bkiuuvv4kp1oi" path="res://assets/sprites/decor/DragonPet_acc_espasa.png" id="2_d5wid"] +[ext_resource type="Texture2D" uid="uid://c1b8gp5uf2ehk" path="res://assets/sprites/decor/DragonPet_acc_rosa.png" id="3_yasvr"] [resource] script = ExtResource("1_lu1y3") -outfits = Array[Texture2D]([ExtResource("1_2hegr")]) +outfits = Array[Texture2D]([ExtResource("1_5pwyu"), ExtResource("2_d5wid"), ExtResource("3_yasvr")]) metadata/_custom_type_script = "uid://rw26nny160xh" diff --git a/assets/sprites/decor/DragonPet_acc_escut.png b/assets/sprites/decor/DragonPet_acc_escut.png new file mode 100644 index 0000000..efc20ca Binary files /dev/null and b/assets/sprites/decor/DragonPet_acc_escut.png differ diff --git a/assets/sprites/decor/DragonPet_acc_escut.png.import b/assets/sprites/decor/DragonPet_acc_escut.png.import new file mode 100644 index 0000000..1ee039b --- /dev/null +++ b/assets/sprites/decor/DragonPet_acc_escut.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://onajhbpjtnil" +path="res://.godot/imported/DragonPet_acc_escut.png-ab5c138b3d2900950a73fcd404b97a42.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/decor/DragonPet_acc_escut.png" +dest_files=["res://.godot/imported/DragonPet_acc_escut.png-ab5c138b3d2900950a73fcd404b97a42.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/decor/DragonPet_acc_espasa.png b/assets/sprites/decor/DragonPet_acc_espasa.png new file mode 100644 index 0000000..40b462f Binary files /dev/null and b/assets/sprites/decor/DragonPet_acc_espasa.png differ diff --git a/assets/sprites/decor/DragonPet_acc_espasa.png.import b/assets/sprites/decor/DragonPet_acc_espasa.png.import new file mode 100644 index 0000000..fa80534 --- /dev/null +++ b/assets/sprites/decor/DragonPet_acc_espasa.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bkiuuvv4kp1oi" +path="res://.godot/imported/DragonPet_acc_espasa.png-0d25074a5e22603702f6057ab57bdfb4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/decor/DragonPet_acc_espasa.png" +dest_files=["res://.godot/imported/DragonPet_acc_espasa.png-0d25074a5e22603702f6057ab57bdfb4.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/decor/DragonPet_acc_rosa.png b/assets/sprites/decor/DragonPet_acc_rosa.png new file mode 100644 index 0000000..0173a2d Binary files /dev/null and b/assets/sprites/decor/DragonPet_acc_rosa.png differ diff --git a/assets/sprites/decor/DragonPet_acc_rosa.png.import b/assets/sprites/decor/DragonPet_acc_rosa.png.import new file mode 100644 index 0000000..961d0f3 --- /dev/null +++ b/assets/sprites/decor/DragonPet_acc_rosa.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c1b8gp5uf2ehk" +path="res://.godot/imported/DragonPet_acc_rosa.png-1bc66f61f27cc23193c5a9c4de9d2ff3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/decor/DragonPet_acc_rosa.png" +dest_files=["res://.godot/imported/DragonPet_acc_rosa.png-1bc66f61f27cc23193c5a9c4de9d2ff3.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/dragons/DragonPet_drac01.png b/assets/sprites/dragons/DragonPet_drac01.png new file mode 100644 index 0000000..30a09f6 Binary files /dev/null and b/assets/sprites/dragons/DragonPet_drac01.png differ diff --git a/assets/sprites/dragons/DragonPet_drac01.png.import b/assets/sprites/dragons/DragonPet_drac01.png.import new file mode 100644 index 0000000..8f0ffc7 --- /dev/null +++ b/assets/sprites/dragons/DragonPet_drac01.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dl87ffgh2hl68" +path="res://.godot/imported/DragonPet_drac01.png-225ecd48e88f7c99a74b06cb880c2607.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/dragons/DragonPet_drac01.png" +dest_files=["res://.godot/imported/DragonPet_drac01.png-225ecd48e88f7c99a74b06cb880c2607.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/dragons/DragonPet_drac02.png b/assets/sprites/dragons/DragonPet_drac02.png new file mode 100644 index 0000000..c87d089 Binary files /dev/null and b/assets/sprites/dragons/DragonPet_drac02.png differ diff --git a/assets/sprites/dragons/DragonPet_drac02.png.import b/assets/sprites/dragons/DragonPet_drac02.png.import new file mode 100644 index 0000000..6f2229e --- /dev/null +++ b/assets/sprites/dragons/DragonPet_drac02.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://davsy68qknywo" +path="res://.godot/imported/DragonPet_drac02.png-529be99ec19decf574a0f3715e12aee4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/dragons/DragonPet_drac02.png" +dest_files=["res://.godot/imported/DragonPet_drac02.png-529be99ec19decf574a0f3715e12aee4.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/dragons/DragonPet_drac03.png b/assets/sprites/dragons/DragonPet_drac03.png new file mode 100644 index 0000000..aa4b1da Binary files /dev/null and b/assets/sprites/dragons/DragonPet_drac03.png differ diff --git a/assets/sprites/dragons/DragonPet_drac03.png.import b/assets/sprites/dragons/DragonPet_drac03.png.import new file mode 100644 index 0000000..fe2339c --- /dev/null +++ b/assets/sprites/dragons/DragonPet_drac03.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c4l1h6ecobnsu" +path="res://.godot/imported/DragonPet_drac03.png-4c0df3b4fcbc1020139df5f2df1408f0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/dragons/DragonPet_drac03.png" +dest_files=["res://.godot/imported/DragonPet_drac03.png-4c0df3b4fcbc1020139df5f2df1408f0.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/hats/DragonPet_barret_barretina.png b/assets/sprites/hats/DragonPet_barret_barretina.png new file mode 100644 index 0000000..9a68f8c Binary files /dev/null and b/assets/sprites/hats/DragonPet_barret_barretina.png differ diff --git a/assets/sprites/hats/DragonPet_barret_barretina.png.import b/assets/sprites/hats/DragonPet_barret_barretina.png.import new file mode 100644 index 0000000..37e5489 --- /dev/null +++ b/assets/sprites/hats/DragonPet_barret_barretina.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://12fv5nymaljj" +path="res://.godot/imported/DragonPet_barret_barretina.png-c34714d149520b48d66d5ee32f5868c1.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/hats/DragonPet_barret_barretina.png" +dest_files=["res://.godot/imported/DragonPet_barret_barretina.png-c34714d149520b48d66d5ee32f5868c1.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/hats/DragonPet_barret_casc.png b/assets/sprites/hats/DragonPet_barret_casc.png new file mode 100644 index 0000000..2003023 Binary files /dev/null and b/assets/sprites/hats/DragonPet_barret_casc.png differ diff --git a/assets/sprites/hats/DragonPet_barret_casc.png.import b/assets/sprites/hats/DragonPet_barret_casc.png.import new file mode 100644 index 0000000..3b0d74f --- /dev/null +++ b/assets/sprites/hats/DragonPet_barret_casc.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bmw61grwcpoik" +path="res://.godot/imported/DragonPet_barret_casc.png-9389702c0c7f572e4c425dbfd8679dab.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/hats/DragonPet_barret_casc.png" +dest_files=["res://.godot/imported/DragonPet_barret_casc.png-9389702c0c7f572e4c425dbfd8679dab.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/hats/DragonPet_barret_copa.png b/assets/sprites/hats/DragonPet_barret_copa.png new file mode 100644 index 0000000..b9651f1 Binary files /dev/null and b/assets/sprites/hats/DragonPet_barret_copa.png differ diff --git a/assets/sprites/hats/DragonPet_barret_copa.png.import b/assets/sprites/hats/DragonPet_barret_copa.png.import new file mode 100644 index 0000000..456f209 --- /dev/null +++ b/assets/sprites/hats/DragonPet_barret_copa.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dy46ipxh5g5up" +path="res://.godot/imported/DragonPet_barret_copa.png-b8b5d7726989033eea7ee43edb9fd8c0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/hats/DragonPet_barret_copa.png" +dest_files=["res://.godot/imported/DragonPet_barret_copa.png-b8b5d7726989033eea7ee43edb9fd8c0.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/hats/DragonPet_barret_corona.png b/assets/sprites/hats/DragonPet_barret_corona.png new file mode 100644 index 0000000..c467915 Binary files /dev/null and b/assets/sprites/hats/DragonPet_barret_corona.png differ diff --git a/assets/sprites/hats/DragonPet_barret_corona.png.import b/assets/sprites/hats/DragonPet_barret_corona.png.import new file mode 100644 index 0000000..5944770 --- /dev/null +++ b/assets/sprites/hats/DragonPet_barret_corona.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ct4ilf6g8fe44" +path="res://.godot/imported/DragonPet_barret_corona.png-443cfb9afeb5411eb2422ba84b8d2355.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/hats/DragonPet_barret_corona.png" +dest_files=["res://.godot/imported/DragonPet_barret_corona.png-443cfb9afeb5411eb2422ba84b8d2355.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/hats/DragonPet_barret_palla.png b/assets/sprites/hats/DragonPet_barret_palla.png new file mode 100644 index 0000000..715b054 Binary files /dev/null and b/assets/sprites/hats/DragonPet_barret_palla.png differ diff --git a/assets/sprites/hats/DragonPet_barret_palla.png.import b/assets/sprites/hats/DragonPet_barret_palla.png.import new file mode 100644 index 0000000..1e02d64 --- /dev/null +++ b/assets/sprites/hats/DragonPet_barret_palla.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d2jh1mprvmnpk" +path="res://.godot/imported/DragonPet_barret_palla.png-c88f74292e140e6b18b2a0fad97f8ce0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/hats/DragonPet_barret_palla.png" +dest_files=["res://.godot/imported/DragonPet_barret_palla.png-c88f74292e140e6b18b2a0fad97f8ce0.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/hats/DragonPet_barret_princesa.png b/assets/sprites/hats/DragonPet_barret_princesa.png new file mode 100644 index 0000000..14003e6 Binary files /dev/null and b/assets/sprites/hats/DragonPet_barret_princesa.png differ diff --git a/assets/sprites/hats/DragonPet_barret_princesa.png.import b/assets/sprites/hats/DragonPet_barret_princesa.png.import new file mode 100644 index 0000000..fb8192d --- /dev/null +++ b/assets/sprites/hats/DragonPet_barret_princesa.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b8pf6op2f51p7" +path="res://.godot/imported/DragonPet_barret_princesa.png-a7405ff9ae8adb55cd6bbaef37b01ee3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/hats/DragonPet_barret_princesa.png" +dest_files=["res://.godot/imported/DragonPet_barret_princesa.png-a7405ff9ae8adb55cd6bbaef37b01ee3.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/shirts/DragonPet_roba_armadura.png b/assets/sprites/shirts/DragonPet_roba_armadura.png new file mode 100644 index 0000000..a3b5be6 Binary files /dev/null and b/assets/sprites/shirts/DragonPet_roba_armadura.png differ diff --git a/assets/sprites/shirts/DragonPet_roba_armadura.png.import b/assets/sprites/shirts/DragonPet_roba_armadura.png.import new file mode 100644 index 0000000..5f555ea --- /dev/null +++ b/assets/sprites/shirts/DragonPet_roba_armadura.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cs0ke244c33t2" +path="res://.godot/imported/DragonPet_roba_armadura.png-3cad0d14b8ca1ac4914a907d8acf7ec5.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/shirts/DragonPet_roba_armadura.png" +dest_files=["res://.godot/imported/DragonPet_roba_armadura.png-3cad0d14b8ca1ac4914a907d8acf7ec5.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/shirts/DragonPet_roba_faixa.png b/assets/sprites/shirts/DragonPet_roba_faixa.png new file mode 100644 index 0000000..ac8e59f Binary files /dev/null and b/assets/sprites/shirts/DragonPet_roba_faixa.png differ diff --git a/assets/sprites/shirts/DragonPet_roba_faixa.png.import b/assets/sprites/shirts/DragonPet_roba_faixa.png.import new file mode 100644 index 0000000..ffc41e3 --- /dev/null +++ b/assets/sprites/shirts/DragonPet_roba_faixa.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d13xg46q5a7as" +path="res://.godot/imported/DragonPet_roba_faixa.png-f4a3eade65583caa1723ed9730e5fa27.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/shirts/DragonPet_roba_faixa.png" +dest_files=["res://.godot/imported/DragonPet_roba_faixa.png-f4a3eade65583caa1723ed9730e5fa27.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/shirts/DragonPet_roba_traje.png b/assets/sprites/shirts/DragonPet_roba_traje.png new file mode 100644 index 0000000..0e54ef5 Binary files /dev/null and b/assets/sprites/shirts/DragonPet_roba_traje.png differ diff --git a/assets/sprites/shirts/DragonPet_roba_traje.png.import b/assets/sprites/shirts/DragonPet_roba_traje.png.import new file mode 100644 index 0000000..9e92bf8 --- /dev/null +++ b/assets/sprites/shirts/DragonPet_roba_traje.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b3xnii6r00hol" +path="res://.godot/imported/DragonPet_roba_traje.png-7284413a39a408ef2e8aaceab10af027.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/shirts/DragonPet_roba_traje.png" +dest_files=["res://.godot/imported/DragonPet_roba_traje.png-7284413a39a408ef2e8aaceab10af027.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/shirts/DragonPet_roba_tutu.png b/assets/sprites/shirts/DragonPet_roba_tutu.png new file mode 100644 index 0000000..17e0401 Binary files /dev/null and b/assets/sprites/shirts/DragonPet_roba_tutu.png differ diff --git a/assets/sprites/shirts/DragonPet_roba_tutu.png.import b/assets/sprites/shirts/DragonPet_roba_tutu.png.import new file mode 100644 index 0000000..d462060 --- /dev/null +++ b/assets/sprites/shirts/DragonPet_roba_tutu.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bhfmyrxor0fli" +path="res://.godot/imported/DragonPet_roba_tutu.png-96d7fba9f8e4327bed40a9599fea1b10.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/sprites/shirts/DragonPet_roba_tutu.png" +dest_files=["res://.godot/imported/DragonPet_roba_tutu.png-96d7fba9f8e4327bed40a9599fea1b10.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 59a4320..50059ac 100644 --- a/project.godot +++ b/project.godot @@ -30,6 +30,7 @@ project/assembly_name="SantJordiJam25" [rendering] +textures/canvas_textures/default_texture_filter=0 renderer/rendering_method="gl_compatibility" renderer/rendering_method.mobile="gl_compatibility" viewport/transparent_background=true diff --git a/scenes/dragon_editor/dragon_editor.tscn b/scenes/dragon_editor/dragon_editor.tscn index d705d17..cf53f76 100644 --- a/scenes/dragon_editor/dragon_editor.tscn +++ b/scenes/dragon_editor/dragon_editor.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=10 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="Texture2D" uid="uid://fdqnc2qrrvn1" path="res://assets/sprites/icon.svg" id="2_un5ur"] [ext_resource type="Resource" uid="uid://cnhwn6kfcbjl5" path="res://assets/outfits/hats.tres" id="2_vvtct"] -[ext_resource type="Texture2D" uid="uid://s1gx0l4qciqn" path="res://assets/sprites/hat.png" id="3_4q6gv"] [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="Texture2D" uid="uid://dc2uk6tqtwl4n" path="res://assets/sprites/shirt.png" id="4_6sr44"] -[ext_resource type="Texture2D" uid="uid://8srlwinjr3tt" path="res://assets/sprites/shoes.png" id="5_wby0j"] +[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"] +[ext_resource type="Texture2D" uid="uid://onajhbpjtnil" path="res://assets/sprites/decor/DragonPet_acc_escut.png" id="8_udwtk"] [ext_resource type="Script" uid="uid://mhudiyt5gnt1" path="res://scenes/dragon_editor/line_edit.gd" id="9_xhgxf"] [node name="DragonEditor" type="Window"] @@ -61,13 +61,13 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -64.0 -offset_top = -64.0 -offset_right = 64.0 -offset_bottom = 64.0 +offset_left = -38.0 +offset_top = -57.0 +offset_right = 38.0 +offset_bottom = 31.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("2_un5ur") +texture = ExtResource("5_xhgxf") [node name="Hat" type="TextureRect" parent="CanvasLayer/Dragon"] layout_mode = 1 @@ -76,14 +76,13 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -90.0 -offset_top = -109.0 -offset_right = 93.0 -offset_bottom = 74.0 +offset_left = -38.0 +offset_top = -44.0 +offset_right = 38.0 +offset_bottom = 44.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("3_4q6gv") -expand_mode = 1 +texture = ExtResource("6_1ivi1") [node name="Shirt" type="TextureRect" parent="CanvasLayer/Dragon"] layout_mode = 1 @@ -92,14 +91,13 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -113.0 -offset_top = -59.0 -offset_right = 124.0 -offset_bottom = 79.0 +offset_left = -38.0 +offset_top = -44.0 +offset_right = 38.0 +offset_bottom = 44.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("4_6sr44") -expand_mode = 1 +texture = ExtResource("7_giwys") [node name="Shoes" type="TextureRect" parent="CanvasLayer/Dragon"] layout_mode = 1 @@ -108,14 +106,13 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -96.0 -offset_top = -119.0 -offset_right = 113.0 -offset_bottom = 90.0 +offset_left = -38.0 +offset_top = -44.0 +offset_right = 38.0 +offset_bottom = 44.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("5_wby0j") -expand_mode = 1 +texture = ExtResource("8_udwtk") [node name="LineEdit" type="LineEdit" parent="CanvasLayer"] offset_left = 59.0 diff --git a/scenes/dragons/dragon.tscn b/scenes/dragons/dragon.tscn index 3922e1b..00e6643 100644 --- a/scenes/dragons/dragon.tscn +++ b/scenes/dragons/dragon.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://baa8gpicw2yg0" path="res://scenes/dragons/dragon_sprite.tscn" id="2_l1h0r"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_6eaxg"] -size = Vector2(128, 128) +size = Vector2(76, 88) [node name="Dragon" type="Area2D" node_paths=PackedStringArray("dragon")] script = ExtResource("1_jccds") @@ -14,8 +14,8 @@ min_exit_time = 60.0 max_exit_time = 600.0 [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2(0, 1) +position = Vector2(-2, 6) shape = SubResource("RectangleShape2D_6eaxg") [node name="Dragon" parent="CollisionShape2D" instance=ExtResource("2_l1h0r")] -position = Vector2(-64, -65) +position = Vector2(-38, -44) diff --git a/scenes/dragons/dragon_sprite.tscn b/scenes/dragons/dragon_sprite.tscn index a14eaae..64ecb22 100644 --- a/scenes/dragons/dragon_sprite.tscn +++ b/scenes/dragons/dragon_sprite.tscn @@ -1,13 +1,13 @@ [gd_scene load_steps=7 format=3 uid="uid://baa8gpicw2yg0"] -[ext_resource type="Texture2D" uid="uid://fdqnc2qrrvn1" path="res://assets/sprites/icon.svg" id="1_ixu8j"] [ext_resource type="Script" uid="uid://bjiap06gs02j" path="res://scenes/dragons/dragon_sprite.gd" id="1_oaoux"] -[ext_resource type="Texture2D" uid="uid://s1gx0l4qciqn" path="res://assets/sprites/hat.png" id="2_hdh4v"] -[ext_resource type="Texture2D" uid="uid://dc2uk6tqtwl4n" path="res://assets/sprites/shirt.png" id="3_oaoux"] -[ext_resource type="Texture2D" uid="uid://8srlwinjr3tt" path="res://assets/sprites/shoes.png" id="4_yf7bj"] +[ext_resource type="Texture2D" uid="uid://dl87ffgh2hl68" path="res://assets/sprites/dragons/DragonPet_drac01.png" id="2_oaoux"] +[ext_resource type="Texture2D" uid="uid://12fv5nymaljj" path="res://assets/sprites/hats/DragonPet_barret_barretina.png" id="3_oaoux"] +[ext_resource type="Texture2D" uid="uid://b3xnii6r00hol" path="res://assets/sprites/shirts/DragonPet_roba_traje.png" id="4_oaoux"] +[ext_resource type="Texture2D" uid="uid://c1b8gp5uf2ehk" path="res://assets/sprites/decor/DragonPet_acc_rosa.png" id="5_stf6f"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_oaoux"] -size = Vector2(128, 129) +size = Vector2(76, 88) [node name="Dragon" type="Node2D" node_paths=PackedStringArray("hat", "shirt", "shoes", "name_label")] script = ExtResource("1_oaoux") @@ -19,36 +19,27 @@ name_label = NodePath("Label") [node name="Area2D" type="Area2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] -position = Vector2(64, 64.5) +position = Vector2(38, 44) shape = SubResource("RectangleShape2D_oaoux") [node name="Sprite" type="Sprite2D" parent="."] -position = Vector2(0, 1) -texture = ExtResource("1_ixu8j") -offset = Vector2(64, 64) +position = Vector2(38, 44) +texture = ExtResource("2_oaoux") [node name="Hat" type="Sprite2D" parent="Sprite"] -position = Vector2(39, 22) -scale = Vector2(0.503906, 0.503906) -texture = ExtResource("2_hdh4v") -offset = Vector2(64, 64) +texture = ExtResource("3_oaoux") [node name="Shirt" type="Sprite2D" parent="Sprite"] -position = Vector2(40, 56) -scale = Vector2(0.477783, 0.288361) -texture = ExtResource("3_oaoux") -offset = Vector2(64, 64) +texture = ExtResource("4_oaoux") [node name="Shoes" type="Sprite2D" parent="Sprite"] -position = Vector2(48, 39) -scale = Vector2(0.353516, 0.353516) -texture = ExtResource("4_yf7bj") -offset = Vector2(64, 64) +texture = ExtResource("5_stf6f") [node name="Label" type="Label" parent="."] -offset_top = 105.0 -offset_right = 128.0 -offset_bottom = 128.0 +offset_left = -10.0 +offset_top = 78.0 +offset_right = 86.0 +offset_bottom = 101.0 theme_override_colors/font_color = Color(1, 1, 1, 1) theme_override_colors/font_outline_color = Color(0, 0, 0, 1) theme_override_constants/outline_size = 5 diff --git a/scenes/main.gd b/scenes/main.gd index 6ad57f7..4b10e57 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -75,7 +75,7 @@ func move_window_to_bottom_right(): var work_area_position: Vector2i = DisplayServer.screen_get_usable_rect(display_index).position var work_area_size: Vector2i = DisplayServer.screen_get_usable_rect(display_index).size - var window_size: Vector2i = Vector2i(work_area_size.y / 3 * 1.77777, work_area_size.y / 3) + var window_size: Vector2i = DisplayServer.window_get_size() var new_position: Vector2i = work_area_position + Vector2i(work_area_size.x - window_size.x, work_area_size.y - window_size.y) diff --git a/scenes/window/dragon.gd b/scenes/window/dragon.gd index 62b01ae..cce702d 100644 --- a/scenes/window/dragon.gd +++ b/scenes/window/dragon.gd @@ -73,11 +73,3 @@ func _pick_random_screen_position() -> void: ) _target_pos = random_pos - - -func set_scale(scale: float) -> void: - var original_size: Vector2i = size - size = Vector2i(size.x * scale, size.y * scale) - dragon.scale = Vector2(scale, scale) - - position += Vector2i((original_size.x - size.x) / 2.0, (original_size.y - size.y) / 2.0) diff --git a/scenes/window/dragon_popup.tscn b/scenes/window/dragon_popup.tscn index 34415e6..8567473 100644 --- a/scenes/window/dragon_popup.tscn +++ b/scenes/window/dragon_popup.tscn @@ -7,10 +7,11 @@ [node name="DragonPopup" type="Window" node_paths=PackedStringArray("dragon", "draggable")] disable_3d = true transparent_bg = true -size = Vector2i(128, 128) +size = Vector2i(76, 88) unresizable = true borderless = true transparent = true +content_scale_mode = 2 script = ExtResource("1_ctdir") dragon_speed = 100.0 dragon = NodePath("Dragon") diff --git a/src/dragon_instantiator.gd b/src/dragon_instantiator.gd index 477ae5c..170a404 100644 --- a/src/dragon_instantiator.gd +++ b/src/dragon_instantiator.gd @@ -43,7 +43,6 @@ func _instantiate_dragon(relative_position: Vector2i, hat: Texture2D, shirt: Tex dragon.set_dragon_name(dragon_name) var size: float = _calculate_window_scale().y - dragon.set_scale(size) dragon.main_window_rect = Rect2i(window_position, window_size) dragon.show()