diff --git a/common/plant_texture_builder/plant_texture_builder.tscn b/common/plant_texture_builder/plant_texture_builder.tscn index 144feeb..26f1d3a 100644 --- a/common/plant_texture_builder/plant_texture_builder.tscn +++ b/common/plant_texture_builder/plant_texture_builder.tscn @@ -9,54 +9,99 @@ [ext_resource type="Resource" uid="uid://53p5g07e3pb4" path="res://entities/plants/resources/plant_parts/Branch4.tres" id="7_21cjy"] [ext_resource type="Resource" uid="uid://cyfyodtfxne1w" path="res://entities/plants/resources/plant_parts/Branch5.tres" id="8_qm7aw"] [ext_resource type="Resource" uid="uid://cuvtf4y1dspcp" path="res://entities/plants/resources/plant_parts/Branch6.tres" id="9_3e4c1"] +[ext_resource type="Resource" uid="uid://6jnbms553dyd" path="res://entities/plants/resources/plant_parts/Branch7.tres" id="10_hyb2i"] +[ext_resource type="Resource" uid="uid://bkpe0b38m0prg" path="res://entities/plants/resources/plant_parts/Branch8.tres" id="11_4gk8a"] [ext_resource type="Resource" uid="uid://wgmxpk52rg7x" path="res://entities/plants/resources/plant_parts/LeafA1.tres" id="11_fc4k8"] [ext_resource type="Resource" uid="uid://cbejb0uvdke7k" path="res://entities/plants/resources/plant_parts/LeafA2.tres" id="12_1b4fr"] +[ext_resource type="Resource" uid="uid://31oq17bv1t4t" path="res://entities/plants/resources/plant_parts/Branch9.tres" id="12_alra6"] [ext_resource type="Resource" uid="uid://dujxttu80g0lo" path="res://entities/plants/resources/plant_parts/LeafA3.tres" id="13_ggcwy"] +[ext_resource type="Resource" uid="uid://b68fyu1j5d6te" path="res://entities/plants/resources/plant_parts/Branch10.tres" id="13_lggh7"] +[ext_resource type="Resource" uid="uid://bgv3nb10t6u3y" path="res://entities/plants/resources/plant_parts/LeafF1.tres" id="14_8r35x"] [ext_resource type="Resource" uid="uid://bix3qwmsvuxs4" path="res://entities/plants/resources/plant_parts/LeafA4.tres" id="14_15wue"] -[ext_resource type="Resource" uid="uid://bs66avdkmbxjm" path="res://entities/plants/resources/plant_parts/LeafD1.tres" id="15_hvwgo"] +[ext_resource type="Resource" uid="uid://be17y7clvf88e" path="res://entities/plants/resources/plant_parts/LeafE1.tres" id="15_p2blu"] +[ext_resource type="Resource" uid="uid://bkgw3wmoam10n" path="res://entities/plants/resources/plant_parts/LeafF2.tres" id="15_rbd7l"] [ext_resource type="Script" uid="uid://cfjd8jelpm8dt" path="res://entities/plants/scripts/texture_builder/part_mutation_association.gd" id="16_c3tk3"] -[ext_resource type="Resource" uid="uid://cv2iad0m88cdr" path="res://entities/plants/resources/plant_parts/LeafD2.tres" id="16_npk80"] -[ext_resource type="Resource" uid="uid://b806ml8dd7gnn" path="res://entities/plants/resources/plant_parts/LeafD3.tres" id="17_hyb2i"] -[ext_resource type="Resource" uid="uid://ciga0npobiqc4" path="res://entities/plants/resources/plant_parts/LeafD4.tres" id="18_4gk8a"] -[ext_resource type="Resource" uid="uid://clh2iduja5emm" path="res://entities/plants/resources/plant_parts/LeafD5.tres" id="19_alra6"] +[ext_resource type="Resource" uid="uid://m8j2gfumw11w" path="res://entities/plants/resources/plant_parts/LeafF3.tres" id="16_nfxo0"] +[ext_resource type="Resource" uid="uid://dw7wdihxxy0uf" path="res://entities/plants/resources/plant_parts/LeafE2.tres" id="16_xt8tm"] +[ext_resource type="Resource" uid="uid://dth4dp88vs3gh" path="res://entities/plants/resources/plant_parts/LeafF4.tres" id="17_i8j71"] +[ext_resource type="Resource" uid="uid://3yi8hk73s5mm" path="res://entities/plants/resources/plant_parts/LeafE3.tres" id="17_qm7aw"] +[ext_resource type="Resource" uid="uid://cka6sihumbjpw" path="res://entities/plants/resources/plant_parts/LeafF5.tres" id="18_l2vrg"] +[ext_resource type="Resource" uid="uid://dq5dwqherb6ac" path="res://entities/plants/resources/plant_parts/LeafF6.tres" id="19_14c4k"] [ext_resource type="Resource" uid="uid://ckef0dno4j5mn" path="res://entities/plants/resources/plant_parts/FlowerF1.tres" id="20_lggh7"] [ext_resource type="Resource" uid="uid://dhhyh56shnure" path="res://entities/plants/resources/plant_parts/FlowerF2.tres" id="21_8r35x"] +[ext_resource type="Resource" uid="uid://banfc3pgm6a0m" path="res://entities/plants/resources/plant_parts/FlowerC1.tres" id="21_alra6"] +[ext_resource type="Resource" uid="uid://dmdyj7t4g48p" path="res://entities/plants/resources/plant_parts/FlowerC2.tres" id="22_lggh7"] [ext_resource type="Resource" uid="uid://cowkewtw2lg4i" path="res://entities/plants/resources/plant_parts/FlowerA1.tres" id="22_rbd7l"] +[ext_resource type="Resource" uid="uid://bhj7j78tokt25" path="res://entities/plants/resources/plant_parts/FlowerC3.tres" id="23_8r35x"] [ext_resource type="Resource" uid="uid://drn8vt4sp7u6q" path="res://entities/plants/resources/plant_parts/FlowerA2.tres" id="23_nfxo0"] [ext_resource type="Resource" uid="uid://b3oqeugtrtera" path="res://entities/plants/resources/plant_parts/FlowerA3.tres" id="24_i8j71"] +[ext_resource type="Resource" uid="uid://bkgrwffi7m2i4" path="res://entities/plants/resources/plant_parts/FlowerC4.tres" id="24_rbd7l"] [ext_resource type="Resource" uid="uid://ydvnxfnkbr2g" path="res://entities/plants/resources/plant_parts/FlowerA4.tres" id="25_l2vrg"] +[ext_resource type="Resource" uid="uid://bchwhdmxsaqic" path="res://entities/plants/resources/plant_parts/LeafA5.tres" id="29_nfxo0"] +[ext_resource type="Resource" uid="uid://cvr81iqokda6x" path="res://entities/plants/resources/plant_parts/LeafA6.tres" id="30_i8j71"] +[ext_resource type="Resource" uid="uid://dl1k0jv662m67" path="res://entities/plants/resources/plant_parts/FlowerA5.tres" id="35_l2vrg"] +[ext_resource type="Resource" uid="uid://cwskfwdasvv0g" path="res://entities/plants/resources/plant_parts/FlowerF3.tres" id="38_rbd7l"] +[ext_resource type="Resource" uid="uid://e0u1baixvaxn" path="res://entities/plants/resources/plant_parts/LeafE4.tres" id="42_14c4k"] +[ext_resource type="Resource" uid="uid://dgivyissl512e" path="res://entities/plants/resources/plant_parts/LeafG1.tres" id="43_y02ao"] +[ext_resource type="Resource" uid="uid://u6dwq3eowpcb" path="res://entities/plants/resources/plant_parts/LeafG2.tres" id="44_s8rsj"] +[ext_resource type="Resource" uid="uid://c4artcndro0r5" path="res://entities/plants/resources/plant_parts/FlowerB1.tres" id="45_coupj"] +[ext_resource type="Resource" uid="uid://b3dfua388ub4k" path="res://entities/plants/resources/plant_parts/FlowerB2.tres" id="46_ggud5"] +[ext_resource type="Resource" uid="uid://bnn0tcoab4plv" path="res://entities/plants/resources/plant_parts/FlowerB3.tres" id="47_ufbqh"] -[sub_resource type="Resource" id="Resource_x75j3"] +[sub_resource type="Resource" id="Resource_14c4k"] script = ExtResource("16_c3tk3") -parts = Array[ExtResource("2_cfiqo")]([ExtResource("11_fc4k8"), ExtResource("12_1b4fr"), ExtResource("13_ggcwy"), ExtResource("14_15wue")]) -part_amount = 3 -metadata/_custom_type_script = "uid://cfjd8jelpm8dt" - -[sub_resource type="Resource" id="Resource_setyo"] -script = ExtResource("16_c3tk3") -parts = Array[ExtResource("2_cfiqo")]([ExtResource("15_hvwgo"), ExtResource("16_npk80"), ExtResource("17_hyb2i"), ExtResource("18_4gk8a"), ExtResource("19_alra6")]) -part_amount = 3 -metadata/_custom_type_script = "uid://cfjd8jelpm8dt" - -[sub_resource type="Resource" id="Resource_n40r1"] -script = ExtResource("16_c3tk3") -parts = Array[ExtResource("2_cfiqo")]([ExtResource("20_lggh7"), ExtResource("21_8r35x")]) -part_amount = 3 -metadata/_custom_type_script = "uid://cfjd8jelpm8dt" - -[sub_resource type="Resource" id="Resource_pw6ot"] -script = ExtResource("16_c3tk3") -parts = Array[ExtResource("2_cfiqo")]([ExtResource("22_rbd7l"), ExtResource("23_nfxo0"), ExtResource("24_i8j71"), ExtResource("25_l2vrg")]) +parts = Array[ExtResource("2_cfiqo")]([ExtResource("21_alra6"), ExtResource("22_lggh7"), ExtResource("23_8r35x"), ExtResource("24_rbd7l")]) part_amount = 4 metadata/_custom_type_script = "uid://cfjd8jelpm8dt" +[sub_resource type="Resource" id="Resource_rt6tw"] +script = ExtResource("16_c3tk3") +parts = Array[ExtResource("2_cfiqo")]([ExtResource("11_fc4k8"), ExtResource("12_1b4fr"), ExtResource("13_ggcwy"), ExtResource("14_15wue"), ExtResource("29_nfxo0"), ExtResource("30_i8j71")]) +part_amount = 4 +metadata/_custom_type_script = "uid://cfjd8jelpm8dt" + +[sub_resource type="Resource" id="Resource_y02ao"] +script = ExtResource("16_c3tk3") +parts = Array[ExtResource("2_cfiqo")]([ExtResource("22_rbd7l"), ExtResource("23_nfxo0"), ExtResource("24_i8j71"), ExtResource("25_l2vrg"), ExtResource("35_l2vrg")]) +part_amount = 5 +metadata/_custom_type_script = "uid://cfjd8jelpm8dt" + +[sub_resource type="Resource" id="Resource_nfxo0"] +script = ExtResource("16_c3tk3") +parts = Array[ExtResource("2_cfiqo")]([ExtResource("20_lggh7"), ExtResource("21_8r35x"), ExtResource("38_rbd7l")]) +part_amount = 5 +metadata/_custom_type_script = "uid://cfjd8jelpm8dt" + +[sub_resource type="Resource" id="Resource_s8rsj"] +script = ExtResource("16_c3tk3") +parts = Array[ExtResource("2_cfiqo")]([ExtResource("15_p2blu"), ExtResource("16_xt8tm"), ExtResource("17_qm7aw"), ExtResource("42_14c4k")]) +part_amount = 5 +metadata/_custom_type_script = "uid://cfjd8jelpm8dt" + +[sub_resource type="Resource" id="Resource_cfiqo"] +script = ExtResource("16_c3tk3") +parts = Array[ExtResource("2_cfiqo")]([ExtResource("43_y02ao"), ExtResource("44_s8rsj")]) +part_amount = 3 +metadata/_custom_type_script = "uid://cfjd8jelpm8dt" + +[sub_resource type="Resource" id="Resource_jbu3q"] +script = ExtResource("16_c3tk3") +parts = Array[ExtResource("2_cfiqo")]([ExtResource("45_coupj"), ExtResource("46_ggud5"), ExtResource("47_ufbqh")]) +part_amount = 5 +metadata/_custom_type_script = "uid://cfjd8jelpm8dt" + [node name="TextureBuilder" type="Node" unique_id=79184097] script = ExtResource("1_s8rsj") bases = Array[ExtResource("2_cfiqo")]([ExtResource("3_coupj")]) -branches = Array[ExtResource("2_cfiqo")]([ExtResource("4_ggud5"), ExtResource("5_ufbqh"), ExtResource("6_jbu3q"), ExtResource("7_21cjy"), ExtResource("8_qm7aw"), ExtResource("9_3e4c1")]) +branches = Array[ExtResource("2_cfiqo")]([ExtResource("4_ggud5"), ExtResource("5_ufbqh"), ExtResource("6_jbu3q"), ExtResource("7_21cjy"), ExtResource("8_qm7aw"), ExtResource("9_3e4c1"), ExtResource("10_hyb2i"), ExtResource("11_4gk8a"), ExtResource("12_alra6"), ExtResource("13_lggh7")]) +n_branches = 5 +base_leaves = Array[ExtResource("2_cfiqo")]([ExtResource("14_8r35x"), ExtResource("15_rbd7l"), ExtResource("16_nfxo0"), ExtResource("17_i8j71"), ExtResource("18_l2vrg"), ExtResource("19_14c4k")]) parts_mutation_associations = Dictionary[String, ExtResource("16_c3tk3")]({ -"ANCIENT": SubResource("Resource_x75j3"), -"PRECOCIOUS": SubResource("Resource_setyo"), -"QUALITY": SubResource("Resource_n40r1"), -"QUICK": SubResource("Resource_pw6ot") +"ANCIENT": SubResource("Resource_rt6tw"), +"EPHEMERAL": SubResource("Resource_y02ao"), +"FERTILE": SubResource("Resource_nfxo0"), +"PURIFICATION": SubResource("Resource_s8rsj"), +"QUICK": SubResource("Resource_14c4k"), +"SOCIAL": SubResource("Resource_cfiqo"), +"TOUGH": SubResource("Resource_jbu3q") }) diff --git a/entities/plants/assets/sprites/asset-plante-fin_assemble.png b/entities/plants/assets/sprites/asset-plante-fin_assemble.png new file mode 100644 index 0000000..75bfba1 Binary files /dev/null and b/entities/plants/assets/sprites/asset-plante-fin_assemble.png differ diff --git a/entities/plants/assets/sprites/asset-plante-fin_assemble.png.import b/entities/plants/assets/sprites/asset-plante-fin_assemble.png.import new file mode 100644 index 0000000..e328ac7 --- /dev/null +++ b/entities/plants/assets/sprites/asset-plante-fin_assemble.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bxnm1quxhx40i" +path="res://.godot/imported/asset-plante-fin_assemble.png-12a4965813cda4e41be0147e88d3a913.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" +dest_files=["res://.godot/imported/asset-plante-fin_assemble.png-12a4965813cda4e41be0147e88d3a913.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/entities/plants/plant_part_buider.tscn b/entities/plants/plant_part_buider.tscn index 559dc61..3a1e8e1 100644 --- a/entities/plants/plant_part_buider.tscn +++ b/entities/plants/plant_part_buider.tscn @@ -1,29 +1,25 @@ [gd_scene format=3 uid="uid://cg6r56x11bvk2"] -[ext_resource type="Texture2D" uid="uid://b7nfpxk8nfnov" path="res://entities/plants/assets/sprites/asset-plante-fin.png" id="1_aiiik"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="1_yh7e0"] [ext_resource type="Script" uid="uid://c360ic1aost1n" path="res://entities/plants/scripts/texture_builder/plant_part_builder.gd" id="2_a5yje"] [ext_resource type="Script" uid="uid://d01kj3twwcrmu" path="res://entities/plants/scripts/texture_builder/plant_attach_builder.gd" id="3_yh7e0"] -[sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] -atlas = ExtResource("1_aiiik") -region = Rect2(525, 122, 136, 98) +[sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] +atlas = ExtResource("1_yh7e0") +region = Rect2(2118, 923, 371, 391) [node name="Sprite" type="Sprite2D" unique_id=1642167049 node_paths=PackedStringArray("root", "attaches")] -texture = SubResource("AtlasTexture_khbsd") +texture = SubResource("AtlasTexture_yh7e0") script = ExtResource("2_a5yje") -part_name = "Branch1" +part_name = "LeafG2" +type = 1 root = NodePath("Root") attaches = NodePath("Attaches") [node name="Root" type="Node2D" parent="." unique_id=1437082577] -position = Vector2(-39, 2) +position = Vector2(-138, 138) script = ExtResource("3_yh7e0") -attach_types = Array[int]([0]) +attach_types = Array[int]([1, 3]) metadata/_custom_type_script = "uid://d01kj3twwcrmu" [node name="Attaches" type="Node" parent="." unique_id=1834697767] - -[node name="attach0" type="Node2D" parent="Attaches" unique_id=1511923721] -position = Vector2(8, -4) -script = ExtResource("3_yh7e0") -attach_types = Array[int]([1, 2]) diff --git a/entities/plants/resources/plant_parts/Base1.tres b/entities/plants/resources/plant_parts/Base1.tres index 0a7e3a1..2cb6411 100644 --- a/entities/plants/resources/plant_parts/Base1.tres +++ b/entities/plants/resources/plant_parts/Base1.tres @@ -7,32 +7,31 @@ [sub_resource type="Resource" id="Resource_10bgv"] script = ExtResource("1_10bgv") position = Vector2(55, 84) -attach_types = Array[int]([1, 2]) +attach_types = Array[int]([0]) [sub_resource type="Resource" id="Resource_m78t0"] script = ExtResource("1_10bgv") -position = Vector2(37, 13) -attach_types = Array[int]([1, 2]) +position = Vector2(29, -4) +attach_types = Array[int]([0, 1]) [sub_resource type="Resource" id="Resource_hbwie"] script = ExtResource("1_10bgv") position = Vector2(-13, -86) -attach_types = Array[int]([1]) +attach_types = Array[int]([0]) [sub_resource type="Resource" id="Resource_obhnl"] script = ExtResource("1_10bgv") -position = Vector2(-24, -250) -attach_types = Array[int]([0, 1]) +position = Vector2(-26, -255) +attach_types = Array[int]([1, 3]) [sub_resource type="Resource" id="Resource_dhqtw"] script = ExtResource("1_10bgv") -position = Vector2(-56, -303) -attach_types = Array[int]([0, 1]) +position = Vector2(-58, -301) +attach_types = Array[int]([2, 3]) [sub_resource type="Resource" id="Resource_54ktm"] script = ExtResource("1_10bgv") position = Vector2(-7, 270) -attach_types = Array[int]([0]) [sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] atlas = ExtResource("3_10bgv") diff --git a/entities/plants/resources/plant_parts/Branch1.tres b/entities/plants/resources/plant_parts/Branch1.tres index ac87e62..dbc2eca 100644 --- a/entities/plants/resources/plant_parts/Branch1.tres +++ b/entities/plants/resources/plant_parts/Branch1.tres @@ -4,15 +4,15 @@ [ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="1_peh48"] [ext_resource type="Texture2D" uid="uid://b7nfpxk8nfnov" path="res://entities/plants/assets/sprites/asset-plante-fin.png" id="3_o5tro"] -[sub_resource type="Resource" id="Resource_sfip3"] +[sub_resource type="Resource" id="Resource_o5tro"] script = ExtResource("1_o5tro") position = Vector2(8, -4) -attach_types = Array[int]([1, 2]) +attach_types = Array[int]([2, 3]) -[sub_resource type="Resource" id="Resource_iss37"] +[sub_resource type="Resource" id="Resource_sfip3"] script = ExtResource("1_o5tro") position = Vector2(-39, 2) -attach_types = Array[int]([0]) +attach_types = Array[int]([1]) [sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] atlas = ExtResource("3_o5tro") @@ -22,5 +22,5 @@ region = Rect2(525, 122, 136, 98) resource_name = "Branch1" script = ExtResource("1_peh48") texture = SubResource("AtlasTexture_khbsd") -root = SubResource("Resource_iss37") -attaches = Array[ExtResource("1_o5tro")]([SubResource("Resource_sfip3")]) +root = SubResource("Resource_sfip3") +attaches = Array[ExtResource("1_o5tro")]([SubResource("Resource_o5tro")]) diff --git a/entities/plants/resources/plant_parts/Branch10.tres b/entities/plants/resources/plant_parts/Branch10.tres new file mode 100644 index 0000000..02ad92c --- /dev/null +++ b/entities/plants/resources/plant_parts/Branch10.tres @@ -0,0 +1,56 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://b68fyu1j5d6te"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_fvydc"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_x08jn"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_ot5v1"] + +[sub_resource type="Resource" id="Resource_yep62"] +script = ExtResource("1_fvydc") +position = Vector2(-36, 94) +attach_types = Array[int]([1, 3]) + +[sub_resource type="Resource" id="Resource_qu1f1"] +script = ExtResource("1_fvydc") +position = Vector2(-2, 23) +attach_types = Array[int]([1, 3]) + +[sub_resource type="Resource" id="Resource_0c5bs"] +script = ExtResource("1_fvydc") +position = Vector2(26, -30) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_mybt3"] +script = ExtResource("1_fvydc") +position = Vector2(-6, -67) +attach_types = Array[int]([3, 2]) + +[sub_resource type="Resource" id="Resource_qlwyk"] +script = ExtResource("1_fvydc") +position = Vector2(-4, -127) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_4n3yo"] +script = ExtResource("1_fvydc") +position = Vector2(84, -80) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_thkvv"] +script = ExtResource("1_fvydc") +position = Vector2(11, -93) +attach_types = Array[int]([2, 3]) + +[sub_resource type="Resource" id="Resource_egi1i"] +script = ExtResource("1_fvydc") +position = Vector2(-74, 122) +attach_types = Array[int]([0]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] +atlas = ExtResource("3_ot5v1") +region = Rect2(752, 3559, 287, 339) + +[resource] +resource_name = "Branch10" +script = ExtResource("2_x08jn") +texture = SubResource("AtlasTexture_khbsd") +root = SubResource("Resource_egi1i") +attaches = Array[ExtResource("1_fvydc")]([SubResource("Resource_yep62"), SubResource("Resource_qu1f1"), SubResource("Resource_0c5bs"), SubResource("Resource_mybt3"), SubResource("Resource_qlwyk"), SubResource("Resource_4n3yo"), SubResource("Resource_thkvv")]) diff --git a/entities/plants/resources/plant_parts/Branch2.tres b/entities/plants/resources/plant_parts/Branch2.tres index 8cebcf7..a766179 100644 --- a/entities/plants/resources/plant_parts/Branch2.tres +++ b/entities/plants/resources/plant_parts/Branch2.tres @@ -4,15 +4,15 @@ [ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_h27ow"] [ext_resource type="Texture2D" uid="uid://b7nfpxk8nfnov" path="res://entities/plants/assets/sprites/asset-plante-fin.png" id="3_h27ow"] -[sub_resource type="Resource" id="Resource_svi20"] +[sub_resource type="Resource" id="Resource_h27ow"] script = ExtResource("1_h27ow") position = Vector2(-1, 1) -attach_types = Array[int]([1, 2]) +attach_types = Array[int]([2, 3]) -[sub_resource type="Resource" id="Resource_60wnb"] +[sub_resource type="Resource" id="Resource_svi20"] script = ExtResource("1_h27ow") position = Vector2(28, 0) -attach_types = Array[int]([0]) +attach_types = Array[int]([1]) [sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] atlas = ExtResource("3_h27ow") @@ -22,5 +22,5 @@ region = Rect2(743, 108, 104, 114) resource_name = "Branch2" script = ExtResource("1_1eil5") texture = SubResource("AtlasTexture_khbsd") -root = SubResource("Resource_60wnb") -attaches = Array[ExtResource("1_h27ow")]([SubResource("Resource_svi20")]) +root = SubResource("Resource_svi20") +attaches = Array[ExtResource("1_h27ow")]([SubResource("Resource_h27ow")]) diff --git a/entities/plants/resources/plant_parts/Branch3.tres b/entities/plants/resources/plant_parts/Branch3.tres index dc6a6cf..c0344b4 100644 --- a/entities/plants/resources/plant_parts/Branch3.tres +++ b/entities/plants/resources/plant_parts/Branch3.tres @@ -4,20 +4,25 @@ [ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="1_qrhlr"] [ext_resource type="Texture2D" uid="uid://b7nfpxk8nfnov" path="res://entities/plants/assets/sprites/asset-plante-fin.png" id="3_4au1t"] -[sub_resource type="Resource" id="Resource_liidl"] +[sub_resource type="Resource" id="Resource_4au1t"] script = ExtResource("1_4au1t") position = Vector2(17, 28) -attach_types = Array[int]([1, 2]) +attach_types = Array[int]([2, 3]) + +[sub_resource type="Resource" id="Resource_liidl"] +script = ExtResource("1_4au1t") +position = Vector2(-15, -36) +attach_types = Array[int]([2, 3]) [sub_resource type="Resource" id="Resource_mivnq"] script = ExtResource("1_4au1t") -position = Vector2(-15, -36) -attach_types = Array[int]([1, 2]) +position = Vector2(-43, -55) +attach_types = Array[int]([2]) [sub_resource type="Resource" id="Resource_psg71"] script = ExtResource("1_4au1t") position = Vector2(46, 43) -attach_types = Array[int]([0]) +attach_types = Array[int]([1]) [sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] atlas = ExtResource("3_4au1t") @@ -28,4 +33,4 @@ resource_name = "Branch3" script = ExtResource("1_qrhlr") texture = SubResource("AtlasTexture_khbsd") root = SubResource("Resource_psg71") -attaches = Array[ExtResource("1_4au1t")]([SubResource("Resource_liidl"), SubResource("Resource_mivnq")]) +attaches = Array[ExtResource("1_4au1t")]([SubResource("Resource_4au1t"), SubResource("Resource_liidl"), SubResource("Resource_mivnq")]) diff --git a/entities/plants/resources/plant_parts/Branch4.tres b/entities/plants/resources/plant_parts/Branch4.tres index a4f26d1..6fc7832 100644 --- a/entities/plants/resources/plant_parts/Branch4.tres +++ b/entities/plants/resources/plant_parts/Branch4.tres @@ -7,22 +7,22 @@ [sub_resource type="Resource" id="Resource_2wu38"] script = ExtResource("1_2wu38") position = Vector2(-19, 37) -attach_types = Array[int]([1, 2]) +attach_types = Array[int]([2, 3]) [sub_resource type="Resource" id="Resource_5mbvh"] script = ExtResource("1_2wu38") -position = Vector2(-3, 1) -attach_types = Array[int]([1, 2]) +position = Vector2(-1, -4) +attach_types = Array[int]([2, 3]) [sub_resource type="Resource" id="Resource_7ivk8"] script = ExtResource("1_2wu38") position = Vector2(29, -52) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="Resource" id="Resource_lwslo"] script = ExtResource("1_2wu38") position = Vector2(-44, 57) -attach_types = Array[int]([0]) +attach_types = Array[int]([1]) [sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] atlas = ExtResource("3_5mbvh") diff --git a/entities/plants/resources/plant_parts/Branch5.tres b/entities/plants/resources/plant_parts/Branch5.tres index 9b97d21..59e5f65 100644 --- a/entities/plants/resources/plant_parts/Branch5.tres +++ b/entities/plants/resources/plant_parts/Branch5.tres @@ -4,25 +4,25 @@ [ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="1_sfan5"] [ext_resource type="Texture2D" uid="uid://b7nfpxk8nfnov" path="res://entities/plants/assets/sprites/asset-plante-fin.png" id="3_kwcpq"] -[sub_resource type="Resource" id="Resource_a5n1t"] +[sub_resource type="Resource" id="Resource_7ri8e"] script = ExtResource("1_7ri8e") position = Vector2(56, 24) -attach_types = Array[int]([1, 2]) +attach_types = Array[int]([2, 3]) + +[sub_resource type="Resource" id="Resource_kwcpq"] +script = ExtResource("1_7ri8e") +position = Vector2(36, -8) +attach_types = Array[int]([2, 3]) + +[sub_resource type="Resource" id="Resource_a5n1t"] +script = ExtResource("1_7ri8e") +position = Vector2(-40, -66) +attach_types = Array[int]([2]) [sub_resource type="Resource" id="Resource_d1jt0"] script = ExtResource("1_7ri8e") -position = Vector2(36, -8) -attach_types = Array[int]([1, 2]) - -[sub_resource type="Resource" id="Resource_72tpv"] -script = ExtResource("1_7ri8e") -position = Vector2(-40, -66) -attach_types = Array[int]([1]) - -[sub_resource type="Resource" id="Resource_04uhi"] -script = ExtResource("1_7ri8e") position = Vector2(73, 61) -attach_types = Array[int]([0]) +attach_types = Array[int]([1]) [sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] atlas = ExtResource("3_kwcpq") @@ -32,5 +32,5 @@ region = Rect2(442, 491, 225, 234) resource_name = "Branch5" script = ExtResource("1_sfan5") texture = SubResource("AtlasTexture_khbsd") -root = SubResource("Resource_04uhi") -attaches = Array[ExtResource("1_7ri8e")]([SubResource("Resource_a5n1t"), SubResource("Resource_d1jt0"), SubResource("Resource_72tpv")]) +root = SubResource("Resource_d1jt0") +attaches = Array[ExtResource("1_7ri8e")]([SubResource("Resource_7ri8e"), SubResource("Resource_kwcpq"), SubResource("Resource_a5n1t")]) diff --git a/entities/plants/resources/plant_parts/Branch6.tres b/entities/plants/resources/plant_parts/Branch6.tres index d01f533..d1938bf 100644 --- a/entities/plants/resources/plant_parts/Branch6.tres +++ b/entities/plants/resources/plant_parts/Branch6.tres @@ -4,25 +4,25 @@ [ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_cps4v"] [ext_resource type="Texture2D" uid="uid://b7nfpxk8nfnov" path="res://entities/plants/assets/sprites/asset-plante-fin.png" id="3_t38ym"] -[sub_resource type="Resource" id="Resource_o1b7h"] +[sub_resource type="Resource" id="Resource_yt05g"] script = ExtResource("1_yt05g") position = Vector2(-18, 26) -attach_types = Array[int]([1, 2]) +attach_types = Array[int]([2, 3]) -[sub_resource type="Resource" id="Resource_pdqa4"] +[sub_resource type="Resource" id="Resource_cps4v"] script = ExtResource("1_yt05g") position = Vector2(16, -16) -attach_types = Array[int]([1, 2]) +attach_types = Array[int]([3, 2]) -[sub_resource type="Resource" id="Resource_y2r4w"] +[sub_resource type="Resource" id="Resource_t38ym"] script = ExtResource("1_yt05g") position = Vector2(44, -63) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) -[sub_resource type="Resource" id="Resource_83cbs"] +[sub_resource type="Resource" id="Resource_o1b7h"] script = ExtResource("1_yt05g") position = Vector2(-49, 42) -attach_types = Array[int]([0]) +attach_types = Array[int]([1]) [sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] atlas = ExtResource("3_t38ym") @@ -32,5 +32,5 @@ region = Rect2(753, 507, 173, 183) resource_name = "Branch6" script = ExtResource("2_cps4v") texture = SubResource("AtlasTexture_khbsd") -root = SubResource("Resource_83cbs") -attaches = Array[ExtResource("1_yt05g")]([SubResource("Resource_o1b7h"), SubResource("Resource_pdqa4"), SubResource("Resource_y2r4w")]) +root = SubResource("Resource_o1b7h") +attaches = Array[ExtResource("1_yt05g")]([SubResource("Resource_yt05g"), SubResource("Resource_cps4v"), SubResource("Resource_t38ym")]) diff --git a/entities/plants/resources/plant_parts/Branch7.tres b/entities/plants/resources/plant_parts/Branch7.tres new file mode 100644 index 0000000..80fee42 --- /dev/null +++ b/entities/plants/resources/plant_parts/Branch7.tres @@ -0,0 +1,61 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://6jnbms553dyd"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_62ciq"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_hmnx4"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_64xx3"] + +[sub_resource type="Resource" id="Resource_584up"] +script = ExtResource("1_62ciq") +position = Vector2(11, 129) +attach_types = Array[int]([1, 3]) + +[sub_resource type="Resource" id="Resource_7pnm7"] +script = ExtResource("1_62ciq") +position = Vector2(-53, 185) +attach_types = Array[int]([1, 3]) + +[sub_resource type="Resource" id="Resource_3cfto"] +script = ExtResource("1_62ciq") +position = Vector2(89, -34) +attach_types = Array[int]([1, 3, 2]) + +[sub_resource type="Resource" id="Resource_q6abt"] +script = ExtResource("1_62ciq") +position = Vector2(108, -107) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_xtrwx"] +script = ExtResource("1_62ciq") +position = Vector2(22, -113) +attach_types = Array[int]([1, 3, 2]) + +[sub_resource type="Resource" id="Resource_gi4wl"] +script = ExtResource("1_62ciq") +position = Vector2(1, -199) +attach_types = Array[int]([3, 2]) + +[sub_resource type="Resource" id="Resource_0pfqf"] +script = ExtResource("1_62ciq") +position = Vector2(58, 31) +attach_types = Array[int]([3, 2]) + +[sub_resource type="Resource" id="Resource_4y6x0"] +script = ExtResource("1_62ciq") +position = Vector2(-4, -259) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_tisie"] +script = ExtResource("1_62ciq") +position = Vector2(-128, 245) +attach_types = Array[int]([0]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] +atlas = ExtResource("3_64xx3") +region = Rect2(733, 2134, 355, 567) + +[resource] +resource_name = "Branch7" +script = ExtResource("2_hmnx4") +texture = SubResource("AtlasTexture_khbsd") +root = SubResource("Resource_tisie") +attaches = Array[ExtResource("1_62ciq")]([SubResource("Resource_584up"), SubResource("Resource_7pnm7"), SubResource("Resource_3cfto"), SubResource("Resource_q6abt"), SubResource("Resource_xtrwx"), SubResource("Resource_gi4wl"), SubResource("Resource_0pfqf"), SubResource("Resource_4y6x0")]) diff --git a/entities/plants/resources/plant_parts/Branch8.tres b/entities/plants/resources/plant_parts/Branch8.tres new file mode 100644 index 0000000..7bbe58d --- /dev/null +++ b/entities/plants/resources/plant_parts/Branch8.tres @@ -0,0 +1,81 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://bkpe0b38m0prg"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_4kt4t"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_27lv3"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_uywa1"] + +[sub_resource type="Resource" id="Resource_f38s6"] +script = ExtResource("1_4kt4t") +position = Vector2(75, 100) +attach_types = Array[int]([1, 3]) + +[sub_resource type="Resource" id="Resource_s0e8g"] +script = ExtResource("1_4kt4t") +position = Vector2(24, 22) +attach_types = Array[int]([3, 2]) + +[sub_resource type="Resource" id="Resource_ls1nv"] +script = ExtResource("1_4kt4t") +position = Vector2(-62, -43) +attach_types = Array[int]([1, 3]) + +[sub_resource type="Resource" id="Resource_vh6s2"] +script = ExtResource("1_4kt4t") +position = Vector2(-148, -105) +attach_types = Array[int]([1, 3]) + +[sub_resource type="Resource" id="Resource_7ej73"] +script = ExtResource("1_4kt4t") +position = Vector2(-188, -116) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_m21ts"] +script = ExtResource("1_4kt4t") +position = Vector2(-21, -148) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_2uuoj"] +script = ExtResource("1_4kt4t") +position = Vector2(194, -158) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_e1t12"] +script = ExtResource("1_4kt4t") +position = Vector2(153, -49) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_57gqx"] +script = ExtResource("1_4kt4t") +position = Vector2(70, -19) +attach_types = Array[int]([3]) + +[sub_resource type="Resource" id="Resource_vj66r"] +script = ExtResource("1_4kt4t") +position = Vector2(31, -51) +attach_types = Array[int]([3]) + +[sub_resource type="Resource" id="Resource_jn14x"] +script = ExtResource("1_4kt4t") +position = Vector2(12, -107) +attach_types = Array[int]([3]) + +[sub_resource type="Resource" id="Resource_4ly8a"] +script = ExtResource("1_4kt4t") +position = Vector2(142, -105) +attach_types = Array[int]([3, 1]) + +[sub_resource type="Resource" id="Resource_nfc7x"] +script = ExtResource("1_4kt4t") +position = Vector2(112, 179) +attach_types = Array[int]([0]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] +atlas = ExtResource("3_uywa1") +region = Rect2(619, 2760, 551, 439) + +[resource] +resource_name = "Branch8" +script = ExtResource("2_27lv3") +texture = SubResource("AtlasTexture_khbsd") +root = SubResource("Resource_nfc7x") +attaches = Array[ExtResource("1_4kt4t")]([SubResource("Resource_f38s6"), SubResource("Resource_s0e8g"), SubResource("Resource_ls1nv"), SubResource("Resource_vh6s2"), SubResource("Resource_7ej73"), SubResource("Resource_m21ts"), SubResource("Resource_2uuoj"), SubResource("Resource_e1t12"), SubResource("Resource_57gqx"), SubResource("Resource_vj66r"), SubResource("Resource_jn14x"), SubResource("Resource_4ly8a")]) diff --git a/entities/plants/resources/plant_parts/Branch9.tres b/entities/plants/resources/plant_parts/Branch9.tres new file mode 100644 index 0000000..29d6e71 --- /dev/null +++ b/entities/plants/resources/plant_parts/Branch9.tres @@ -0,0 +1,56 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://31oq17bv1t4t"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_qdh8q"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_hbagk"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_o2wa0"] + +[sub_resource type="Resource" id="Resource_w267e"] +script = ExtResource("1_qdh8q") +position = Vector2(-11, 57) +attach_types = Array[int]([1, 3]) + +[sub_resource type="Resource" id="Resource_drvpg"] +script = ExtResource("1_qdh8q") +position = Vector2(-60, 31) +attach_types = Array[int]([3, 2]) + +[sub_resource type="Resource" id="Resource_bfy67"] +script = ExtResource("1_qdh8q") +position = Vector2(48, -16) +attach_types = Array[int]([1, 3]) + +[sub_resource type="Resource" id="Resource_wvhwx"] +script = ExtResource("1_qdh8q") +position = Vector2(-77, -29) +attach_types = Array[int]([1, 3, 2]) + +[sub_resource type="Resource" id="Resource_f4sg7"] +script = ExtResource("1_qdh8q") +position = Vector2(-111, -67) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_yucn4"] +script = ExtResource("1_qdh8q") +position = Vector2(62, 33) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_3q3w8"] +script = ExtResource("1_qdh8q") +position = Vector2(101, -77) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_ltep3"] +script = ExtResource("1_qdh8q") +position = Vector2(-62, 81) +attach_types = Array[int]([0]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] +atlas = ExtResource("3_o2wa0") +region = Rect2(763, 3233, 353, 258) + +[resource] +resource_name = "Branch9" +script = ExtResource("2_hbagk") +texture = SubResource("AtlasTexture_khbsd") +root = SubResource("Resource_ltep3") +attaches = Array[ExtResource("1_qdh8q")]([SubResource("Resource_w267e"), SubResource("Resource_drvpg"), SubResource("Resource_bfy67"), SubResource("Resource_wvhwx"), SubResource("Resource_f4sg7"), SubResource("Resource_yucn4"), SubResource("Resource_3q3w8")]) diff --git a/entities/plants/resources/plant_parts/FlowerA1.tres b/entities/plants/resources/plant_parts/FlowerA1.tres index e0ea05e..2927767 100644 --- a/entities/plants/resources/plant_parts/FlowerA1.tres +++ b/entities/plants/resources/plant_parts/FlowerA1.tres @@ -7,7 +7,7 @@ [sub_resource type="Resource" id="Resource_m6w7w"] script = ExtResource("1_m6w7w") position = Vector2(12, 11) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_d3khu") diff --git a/entities/plants/resources/plant_parts/FlowerA2.tres b/entities/plants/resources/plant_parts/FlowerA2.tres index d12c3c4..9d2262f 100644 --- a/entities/plants/resources/plant_parts/FlowerA2.tres +++ b/entities/plants/resources/plant_parts/FlowerA2.tres @@ -7,7 +7,7 @@ [sub_resource type="Resource" id="Resource_ntn8n"] script = ExtResource("1_ntn8n") position = Vector2(-16, 14) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_amrra") diff --git a/entities/plants/resources/plant_parts/FlowerA3.tres b/entities/plants/resources/plant_parts/FlowerA3.tres index 69ca8da..3f1e058 100644 --- a/entities/plants/resources/plant_parts/FlowerA3.tres +++ b/entities/plants/resources/plant_parts/FlowerA3.tres @@ -7,7 +7,7 @@ [sub_resource type="Resource" id="Resource_4i4bt"] script = ExtResource("1_4i4bt") position = Vector2(6, 1) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_08wd6") diff --git a/entities/plants/resources/plant_parts/FlowerA4.tres b/entities/plants/resources/plant_parts/FlowerA4.tres index ca27990..4da58a7 100644 --- a/entities/plants/resources/plant_parts/FlowerA4.tres +++ b/entities/plants/resources/plant_parts/FlowerA4.tres @@ -7,7 +7,7 @@ [sub_resource type="Resource" id="Resource_a64b2"] script = ExtResource("1_a64b2") position = Vector2(-7, 7) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_my41n") diff --git a/entities/plants/resources/plant_parts/FlowerA5.tres b/entities/plants/resources/plant_parts/FlowerA5.tres new file mode 100644 index 0000000..4df71c2 --- /dev/null +++ b/entities/plants/resources/plant_parts/FlowerA5.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://dl1k0jv662m67"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_s67jx"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_w7tur"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_6f2ye"] + +[sub_resource type="Resource" id="Resource_wiekj"] +script = ExtResource("1_s67jx") +position = Vector2(-6, 13) +attach_types = Array[int]([2]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] +atlas = ExtResource("3_6f2ye") +region = Rect2(3114, 2090, 215, 180) + +[resource] +resource_name = "FlowerA5" +script = ExtResource("2_w7tur") +texture = SubResource("AtlasTexture_yh7e0") +type = 1 +root = SubResource("Resource_wiekj") diff --git a/entities/plants/resources/plant_parts/FlowerB1.tres b/entities/plants/resources/plant_parts/FlowerB1.tres index 6920704..f9bfa43 100644 --- a/entities/plants/resources/plant_parts/FlowerB1.tres +++ b/entities/plants/resources/plant_parts/FlowerB1.tres @@ -7,7 +7,7 @@ [sub_resource type="Resource" id="Resource_hkelp"] script = ExtResource("1_hkelp") position = Vector2(19, -19) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_yyc7d") diff --git a/entities/plants/resources/plant_parts/FlowerB2.tres b/entities/plants/resources/plant_parts/FlowerB2.tres index ae6a6c2..7e0310f 100644 --- a/entities/plants/resources/plant_parts/FlowerB2.tres +++ b/entities/plants/resources/plant_parts/FlowerB2.tres @@ -7,7 +7,7 @@ [sub_resource type="Resource" id="Resource_rnm6j"] script = ExtResource("1_rnm6j") position = Vector2(-6, -1) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_8ri3q") diff --git a/entities/plants/resources/plant_parts/FlowerB3.tres b/entities/plants/resources/plant_parts/FlowerB3.tres new file mode 100644 index 0000000..15e9cce --- /dev/null +++ b/entities/plants/resources/plant_parts/FlowerB3.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://bnn0tcoab4plv"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_b0qvt"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_rco0e"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_ayrxj"] + +[sub_resource type="Resource" id="Resource_b0qvt"] +script = ExtResource("1_b0qvt") +position = Vector2(15, -12) +attach_types = Array[int]([2, 3]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] +atlas = ExtResource("3_ayrxj") +region = Rect2(3113, 1808, 212, 217) + +[resource] +resource_name = "FlowerB3" +script = ExtResource("2_rco0e") +texture = SubResource("AtlasTexture_yh7e0") +type = 1 +root = SubResource("Resource_b0qvt") diff --git a/entities/plants/resources/plant_parts/FlowerC1.tres b/entities/plants/resources/plant_parts/FlowerC1.tres index 15af4e8..d8149bc 100644 --- a/entities/plants/resources/plant_parts/FlowerC1.tres +++ b/entities/plants/resources/plant_parts/FlowerC1.tres @@ -7,7 +7,7 @@ [sub_resource type="Resource" id="Resource_aauvf"] script = ExtResource("1_aauvf") position = Vector2(20, 18) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_xkahm") diff --git a/entities/plants/resources/plant_parts/FlowerC2.tres b/entities/plants/resources/plant_parts/FlowerC2.tres index 08740fd..0b0726f 100644 --- a/entities/plants/resources/plant_parts/FlowerC2.tres +++ b/entities/plants/resources/plant_parts/FlowerC2.tres @@ -7,7 +7,7 @@ [sub_resource type="Resource" id="Resource_nquip"] script = ExtResource("1_nquip") position = Vector2(-29, 2) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_83m6t") diff --git a/entities/plants/resources/plant_parts/FlowerC3.tres b/entities/plants/resources/plant_parts/FlowerC3.tres index 6bcb8d9..a66bed6 100644 --- a/entities/plants/resources/plant_parts/FlowerC3.tres +++ b/entities/plants/resources/plant_parts/FlowerC3.tres @@ -7,7 +7,7 @@ [sub_resource type="Resource" id="Resource_wmge1"] script = ExtResource("1_wmge1") position = Vector2(-8, -13) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_76mk8") diff --git a/entities/plants/resources/plant_parts/FlowerC4.tres b/entities/plants/resources/plant_parts/FlowerC4.tres new file mode 100644 index 0000000..30e1916 --- /dev/null +++ b/entities/plants/resources/plant_parts/FlowerC4.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://bkgrwffi7m2i4"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_bg02b"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_3vf1o"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_dvo33"] + +[sub_resource type="Resource" id="Resource_424i2"] +script = ExtResource("1_bg02b") +position = Vector2(5, 12) +attach_types = Array[int]([2, 3]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] +atlas = ExtResource("3_dvo33") +region = Rect2(342, 1485, 357, 375) + +[resource] +resource_name = "FlowerC4" +script = ExtResource("2_3vf1o") +texture = SubResource("AtlasTexture_yh7e0") +type = 1 +root = SubResource("Resource_424i2") diff --git a/entities/plants/resources/plant_parts/FlowerF1.tres b/entities/plants/resources/plant_parts/FlowerF1.tres index 624a035..cf14a3f 100644 --- a/entities/plants/resources/plant_parts/FlowerF1.tres +++ b/entities/plants/resources/plant_parts/FlowerF1.tres @@ -6,18 +6,8 @@ [sub_resource type="Resource" id="Resource_wof8s"] script = ExtResource("1_wof8s") -position = Vector2(31, -48) -attach_types = Array[int]([1]) - -[sub_resource type="Resource" id="Resource_skl62"] -script = ExtResource("1_wof8s") -position = Vector2(-41, -13) -attach_types = Array[int]([1]) - -[sub_resource type="Resource" id="Resource_7j46p"] -script = ExtResource("1_wof8s") position = Vector2(55, 51) -attach_types = Array[int]([2]) +attach_types = Array[int]([3]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_7j46p") @@ -28,5 +18,4 @@ resource_name = "FlowerF1" script = ExtResource("2_skl62") texture = SubResource("AtlasTexture_yh7e0") type = 1 -root = SubResource("Resource_7j46p") -attaches = Array[ExtResource("1_wof8s")]([SubResource("Resource_wof8s"), SubResource("Resource_skl62")]) +root = SubResource("Resource_wof8s") diff --git a/entities/plants/resources/plant_parts/FlowerF2.tres b/entities/plants/resources/plant_parts/FlowerF2.tres index 4a792e2..2bc1fc0 100644 --- a/entities/plants/resources/plant_parts/FlowerF2.tres +++ b/entities/plants/resources/plant_parts/FlowerF2.tres @@ -6,13 +6,8 @@ [sub_resource type="Resource" id="Resource_6cct5"] script = ExtResource("1_6cct5") -position = Vector2(25, -15) -attach_types = Array[int]([1]) - -[sub_resource type="Resource" id="Resource_d5e5n"] -script = ExtResource("1_6cct5") position = Vector2(22, 67) -attach_types = Array[int]([2]) +attach_types = Array[int]([3]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_yyrkf") @@ -23,5 +18,4 @@ resource_name = "FlowerF2" script = ExtResource("2_d5e5n") texture = SubResource("AtlasTexture_yh7e0") type = 1 -root = SubResource("Resource_d5e5n") -attaches = Array[ExtResource("1_6cct5")]([SubResource("Resource_6cct5")]) +root = SubResource("Resource_6cct5") diff --git a/entities/plants/resources/plant_parts/FlowerF3.tres b/entities/plants/resources/plant_parts/FlowerF3.tres new file mode 100644 index 0000000..f88f12d --- /dev/null +++ b/entities/plants/resources/plant_parts/FlowerF3.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://cwskfwdasvv0g"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_kd4el"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_h8lr6"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_p6ihu"] + +[sub_resource type="Resource" id="Resource_fcopn"] +script = ExtResource("1_kd4el") +position = Vector2(-40, 62) +attach_types = Array[int]([3]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] +atlas = ExtResource("3_p6ihu") +region = Rect2(1826, 65, 146, 177) + +[resource] +resource_name = "FlowerF3" +script = ExtResource("2_h8lr6") +texture = SubResource("AtlasTexture_yh7e0") +type = 1 +root = SubResource("Resource_fcopn") diff --git a/entities/plants/resources/plant_parts/LeafA1.tres b/entities/plants/resources/plant_parts/LeafA1.tres index e02c619..8dbb72b 100644 --- a/entities/plants/resources/plant_parts/LeafA1.tres +++ b/entities/plants/resources/plant_parts/LeafA1.tres @@ -2,16 +2,16 @@ [ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_fijpc"] [ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_kuljt"] -[ext_resource type="Texture2D" uid="uid://b7nfpxk8nfnov" path="res://entities/plants/assets/sprites/asset-plante-fin.png" id="3_gnga0"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_fijpc"] [sub_resource type="Resource" id="Resource_fijpc"] script = ExtResource("1_fijpc") -position = Vector2(68, 49) -attach_types = Array[int]([0, 2]) +position = Vector2(79, 52) +attach_types = Array[int]([1, 3]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] -atlas = ExtResource("3_gnga0") -region = Rect2(957, 500, 230, 170) +atlas = ExtResource("3_fijpc") +region = Rect2(905, 567, 205, 161) [resource] resource_name = "LeafA1" diff --git a/entities/plants/resources/plant_parts/LeafA2.tres b/entities/plants/resources/plant_parts/LeafA2.tres index dfda692..2100ed3 100644 --- a/entities/plants/resources/plant_parts/LeafA2.tres +++ b/entities/plants/resources/plant_parts/LeafA2.tres @@ -7,7 +7,7 @@ [sub_resource type="Resource" id="Resource_1fplc"] script = ExtResource("1_1fplc") position = Vector2(-50, 70) -attach_types = Array[int]([0, 2]) +attach_types = Array[int]([1, 3]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_oqrvj") diff --git a/entities/plants/resources/plant_parts/LeafA3.tres b/entities/plants/resources/plant_parts/LeafA3.tres index 6ddcf3d..bfe54f1 100644 --- a/entities/plants/resources/plant_parts/LeafA3.tres +++ b/entities/plants/resources/plant_parts/LeafA3.tres @@ -7,7 +7,7 @@ [sub_resource type="Resource" id="Resource_5fx8e"] script = ExtResource("1_5fx8e") position = Vector2(65, -58) -attach_types = Array[int]([0, 2]) +attach_types = Array[int]([1, 3]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_1ivfe") diff --git a/entities/plants/resources/plant_parts/LeafA4.tres b/entities/plants/resources/plant_parts/LeafA4.tres index d767b33..f77b840 100644 --- a/entities/plants/resources/plant_parts/LeafA4.tres +++ b/entities/plants/resources/plant_parts/LeafA4.tres @@ -2,16 +2,16 @@ [ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_1fuxg"] [ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_v5tsw"] -[ext_resource type="Texture2D" uid="uid://b7nfpxk8nfnov" path="res://entities/plants/assets/sprites/asset-plante-fin.png" id="3_rc5w4"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_1fuxg"] [sub_resource type="Resource" id="Resource_1fuxg"] script = ExtResource("1_1fuxg") -position = Vector2(-83, 30) -attach_types = Array[int]([0, 2]) +position = Vector2(-78, 14) +attach_types = Array[int]([1, 3]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] -atlas = ExtResource("3_rc5w4") -region = Rect2(1395, 745, 222, 144) +atlas = ExtResource("3_1fuxg") +region = Rect2(1311, 808, 268, 177) [resource] resource_name = "LeafA4" diff --git a/entities/plants/resources/plant_parts/LeafA5.tres b/entities/plants/resources/plant_parts/LeafA5.tres new file mode 100644 index 0000000..bfa2bc8 --- /dev/null +++ b/entities/plants/resources/plant_parts/LeafA5.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://bchwhdmxsaqic"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_ef00k"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_0qgsw"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_snml7"] + +[sub_resource type="Resource" id="Resource_2jjlr"] +script = ExtResource("1_ef00k") +position = Vector2(-11, 127) +attach_types = Array[int]([1, 3]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] +atlas = ExtResource("3_snml7") +region = Rect2(2972, 2359, 474, 384) + +[resource] +resource_name = "LeafA5" +script = ExtResource("2_0qgsw") +texture = SubResource("AtlasTexture_yh7e0") +type = 1 +root = SubResource("Resource_2jjlr") diff --git a/entities/plants/resources/plant_parts/LeafA6.tres b/entities/plants/resources/plant_parts/LeafA6.tres new file mode 100644 index 0000000..73d4f54 --- /dev/null +++ b/entities/plants/resources/plant_parts/LeafA6.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://cvr81iqokda6x"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_jqk1k"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_g6exv"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_uh1gd"] + +[sub_resource type="Resource" id="Resource_cyt3o"] +script = ExtResource("1_jqk1k") +position = Vector2(-41, 38) +attach_types = Array[int]([1, 3]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] +atlas = ExtResource("3_uh1gd") +region = Rect2(3021, 2864, 344, 185) + +[resource] +resource_name = "LeafA6" +script = ExtResource("2_g6exv") +texture = SubResource("AtlasTexture_yh7e0") +type = 1 +root = SubResource("Resource_cyt3o") diff --git a/entities/plants/resources/plant_parts/LeafB1.tres b/entities/plants/resources/plant_parts/LeafB1.tres index 25e62ac..efad08f 100644 --- a/entities/plants/resources/plant_parts/LeafB1.tres +++ b/entities/plants/resources/plant_parts/LeafB1.tres @@ -7,12 +7,12 @@ [sub_resource type="Resource" id="Resource_ss0ji"] script = ExtResource("1_ss0ji") position = Vector2(18, -24) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="Resource" id="Resource_cdvqh"] script = ExtResource("1_ss0ji") position = Vector2(90, 41) -attach_types = Array[int]([0, 2]) +attach_types = Array[int]([1, 3]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_583ad") diff --git a/entities/plants/resources/plant_parts/LeafB2.tres b/entities/plants/resources/plant_parts/LeafB2.tres index 7628c07..66eeaa8 100644 --- a/entities/plants/resources/plant_parts/LeafB2.tres +++ b/entities/plants/resources/plant_parts/LeafB2.tres @@ -6,12 +6,12 @@ [sub_resource type="Resource" id="Resource_xjkn4"] script = ExtResource("1_xjkn4") -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="Resource" id="Resource_oexr2"] script = ExtResource("1_xjkn4") position = Vector2(6, -54) -attach_types = Array[int]([0, 2]) +attach_types = Array[int]([1, 3]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_xjc6g") diff --git a/entities/plants/resources/plant_parts/LeafB3.tres b/entities/plants/resources/plant_parts/LeafB3.tres index 444434b..c6891eb 100644 --- a/entities/plants/resources/plant_parts/LeafB3.tres +++ b/entities/plants/resources/plant_parts/LeafB3.tres @@ -7,12 +7,12 @@ [sub_resource type="Resource" id="Resource_fuu6r"] script = ExtResource("1_fuu6r") position = Vector2(-2, -20) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="Resource" id="Resource_a7irw"] script = ExtResource("1_fuu6r") position = Vector2(-79, 13) -attach_types = Array[int]([0, 2]) +attach_types = Array[int]([1, 3]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_4s7gl") diff --git a/entities/plants/resources/plant_parts/LeafE1.tres b/entities/plants/resources/plant_parts/LeafE1.tres index 65edfb5..04f6ba7 100644 --- a/entities/plants/resources/plant_parts/LeafE1.tres +++ b/entities/plants/resources/plant_parts/LeafE1.tres @@ -7,12 +7,12 @@ [sub_resource type="Resource" id="Resource_oy0ue"] script = ExtResource("1_oy0ue") position = Vector2(-27, 8) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="Resource" id="Resource_6xgob"] script = ExtResource("1_oy0ue") position = Vector2(70, 55) -attach_types = Array[int]([2]) +attach_types = Array[int]([1, 3]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_y6h75") diff --git a/entities/plants/resources/plant_parts/LeafE2.tres b/entities/plants/resources/plant_parts/LeafE2.tres index e865456..e58f813 100644 --- a/entities/plants/resources/plant_parts/LeafE2.tres +++ b/entities/plants/resources/plant_parts/LeafE2.tres @@ -7,12 +7,12 @@ [sub_resource type="Resource" id="Resource_pi0vi"] script = ExtResource("1_pi0vi") position = Vector2(17, 2) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="Resource" id="Resource_5mv7l"] script = ExtResource("1_pi0vi") position = Vector2(-72, 60) -attach_types = Array[int]([2]) +attach_types = Array[int]([1, 3]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_enxeu") diff --git a/entities/plants/resources/plant_parts/LeafE3.tres b/entities/plants/resources/plant_parts/LeafE3.tres index b85ed69..b08f7fe 100644 --- a/entities/plants/resources/plant_parts/LeafE3.tres +++ b/entities/plants/resources/plant_parts/LeafE3.tres @@ -7,12 +7,12 @@ [sub_resource type="Resource" id="Resource_40tq5"] script = ExtResource("1_40tq5") position = Vector2(1, 2) -attach_types = Array[int]([1]) +attach_types = Array[int]([2]) [sub_resource type="Resource" id="Resource_4ru6m"] script = ExtResource("1_40tq5") position = Vector2(1, 2) -attach_types = Array[int]([2]) +attach_types = Array[int]([1, 3]) [sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] atlas = ExtResource("3_m6f42") diff --git a/entities/plants/resources/plant_parts/LeafE4.tres b/entities/plants/resources/plant_parts/LeafE4.tres new file mode 100644 index 0000000..2565611 --- /dev/null +++ b/entities/plants/resources/plant_parts/LeafE4.tres @@ -0,0 +1,37 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://e0u1baixvaxn"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_iaant"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_e1qth"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_lcfbs"] + +[sub_resource type="Resource" id="Resource_7wds0"] +script = ExtResource("1_iaant") +position = Vector2(95, -47) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_3im3h"] +script = ExtResource("1_iaant") +position = Vector2(-9, 78) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_wbh0b"] +script = ExtResource("1_iaant") +position = Vector2(-136, -8) +attach_types = Array[int]([2]) + +[sub_resource type="Resource" id="Resource_xhrq4"] +script = ExtResource("1_iaant") +position = Vector2(-17, 59) +attach_types = Array[int]([1, 3]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] +atlas = ExtResource("3_lcfbs") +region = Rect2(361, 1035, 458, 399) + +[resource] +resource_name = "LeafE4" +script = ExtResource("2_e1qth") +texture = SubResource("AtlasTexture_yh7e0") +type = 1 +root = SubResource("Resource_xhrq4") +attaches = Array[ExtResource("1_iaant")]([SubResource("Resource_7wds0"), SubResource("Resource_3im3h"), SubResource("Resource_wbh0b")]) diff --git a/entities/plants/resources/plant_parts/LeafF1.tres b/entities/plants/resources/plant_parts/LeafF1.tres new file mode 100644 index 0000000..40dd61a --- /dev/null +++ b/entities/plants/resources/plant_parts/LeafF1.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://bgv3nb10t6u3y"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_07pd3"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_bumeo"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_iyic1"] + +[sub_resource type="Resource" id="Resource_074m7"] +script = ExtResource("1_07pd3") +position = Vector2(45, 67) +attach_types = Array[int]([1, 3]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] +atlas = ExtResource("3_iyic1") +region = Rect2(3638, 1813, 182, 207) + +[resource] +resource_name = "LeafF1" +script = ExtResource("2_bumeo") +texture = SubResource("AtlasTexture_khbsd") +root = SubResource("Resource_074m7") diff --git a/entities/plants/resources/plant_parts/LeafF2.tres b/entities/plants/resources/plant_parts/LeafF2.tres new file mode 100644 index 0000000..3b92272 --- /dev/null +++ b/entities/plants/resources/plant_parts/LeafF2.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://bkgw3wmoam10n"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_6qc5v"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_d1evk"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_4ib3w"] + +[sub_resource type="Resource" id="Resource_8y0d4"] +script = ExtResource("1_6qc5v") +position = Vector2(-95, 147) +attach_types = Array[int]([1, 3]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] +atlas = ExtResource("3_4ib3w") +region = Rect2(3627, 2071, 322, 375) + +[resource] +resource_name = "LeafF2" +script = ExtResource("2_d1evk") +texture = SubResource("AtlasTexture_khbsd") +root = SubResource("Resource_8y0d4") diff --git a/entities/plants/resources/plant_parts/LeafF3.tres b/entities/plants/resources/plant_parts/LeafF3.tres new file mode 100644 index 0000000..5f44a43 --- /dev/null +++ b/entities/plants/resources/plant_parts/LeafF3.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://m8j2gfumw11w"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_1sa08"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_wbtnq"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_d212s"] + +[sub_resource type="Resource" id="Resource_1ioh5"] +script = ExtResource("1_1sa08") +position = Vector2(-35, 84) +attach_types = Array[int]([1, 3]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] +atlas = ExtResource("3_d212s") +region = Rect2(3654, 2499, 242, 249) + +[resource] +resource_name = "LeafF3" +script = ExtResource("2_wbtnq") +texture = SubResource("AtlasTexture_khbsd") +root = SubResource("Resource_1ioh5") diff --git a/entities/plants/resources/plant_parts/LeafF4.tres b/entities/plants/resources/plant_parts/LeafF4.tres new file mode 100644 index 0000000..e983827 --- /dev/null +++ b/entities/plants/resources/plant_parts/LeafF4.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://dth4dp88vs3gh"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_k7ykv"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_1wv1i"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_47ofa"] + +[sub_resource type="Resource" id="Resource_d8car"] +script = ExtResource("1_k7ykv") +position = Vector2(152, -49) +attach_types = Array[int]([1, 3]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] +atlas = ExtResource("3_47ofa") +region = Rect2(3518, 2862, 448, 422) + +[resource] +resource_name = "LeafF4" +script = ExtResource("2_1wv1i") +texture = SubResource("AtlasTexture_khbsd") +root = SubResource("Resource_d8car") diff --git a/entities/plants/resources/plant_parts/LeafF5.tres b/entities/plants/resources/plant_parts/LeafF5.tres new file mode 100644 index 0000000..56cda75 --- /dev/null +++ b/entities/plants/resources/plant_parts/LeafF5.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://cka6sihumbjpw"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_dbtqk"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_a7ux5"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_m15xm"] + +[sub_resource type="Resource" id="Resource_bh3ak"] +script = ExtResource("1_dbtqk") +position = Vector2(-95, 120) +attach_types = Array[int]([1, 3]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] +atlas = ExtResource("3_m15xm") +region = Rect2(3603, 3333, 428, 554) + +[resource] +resource_name = "LeafF5" +script = ExtResource("2_a7ux5") +texture = SubResource("AtlasTexture_khbsd") +root = SubResource("Resource_bh3ak") diff --git a/entities/plants/resources/plant_parts/LeafF6.tres b/entities/plants/resources/plant_parts/LeafF6.tres new file mode 100644 index 0000000..e414670 --- /dev/null +++ b/entities/plants/resources/plant_parts/LeafF6.tres @@ -0,0 +1,20 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://dq5dwqherb6ac"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_fjv82"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_tbtj1"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_xxsyi"] + +[sub_resource type="Resource" id="Resource_c0kmv"] +script = ExtResource("1_fjv82") +position = Vector2(23, 48) +attach_types = Array[int]([1, 3]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_khbsd"] +atlas = ExtResource("3_xxsyi") +region = Rect2(2822, 3119, 648, 640) + +[resource] +resource_name = "LeafF6" +script = ExtResource("2_tbtj1") +texture = SubResource("AtlasTexture_khbsd") +root = SubResource("Resource_c0kmv") diff --git a/entities/plants/resources/plant_parts/LeafG1.tres b/entities/plants/resources/plant_parts/LeafG1.tres new file mode 100644 index 0000000..8e0e42a --- /dev/null +++ b/entities/plants/resources/plant_parts/LeafG1.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://dgivyissl512e"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_nanrd"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_kd22c"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_sfqmm"] + +[sub_resource type="Resource" id="Resource_jd6ed"] +script = ExtResource("1_nanrd") +position = Vector2(107, 165) +attach_types = Array[int]([1, 3]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] +atlas = ExtResource("3_sfqmm") +region = Rect2(1617, 622, 314, 414) + +[resource] +resource_name = "LeafG1" +script = ExtResource("2_kd22c") +texture = SubResource("AtlasTexture_yh7e0") +type = 1 +root = SubResource("Resource_jd6ed") diff --git a/entities/plants/resources/plant_parts/LeafG2.tres b/entities/plants/resources/plant_parts/LeafG2.tres new file mode 100644 index 0000000..f4a7759 --- /dev/null +++ b/entities/plants/resources/plant_parts/LeafG2.tres @@ -0,0 +1,21 @@ +[gd_resource type="Resource" script_class="PlantPart" format=3 uid="uid://u6dwq3eowpcb"] + +[ext_resource type="Script" uid="uid://co46ywm8bgnfh" path="res://entities/plants/scripts/texture_builder/plant_attach.gd" id="1_v01f8"] +[ext_resource type="Script" uid="uid://b3jwglylqdqtw" path="res://entities/plants/scripts/texture_builder/plant_part.gd" id="2_frmoh"] +[ext_resource type="Texture2D" uid="uid://bxnm1quxhx40i" path="res://entities/plants/assets/sprites/asset-plante-fin_assemble.png" id="3_w5pyt"] + +[sub_resource type="Resource" id="Resource_cypiw"] +script = ExtResource("1_v01f8") +position = Vector2(-138, 138) +attach_types = Array[int]([1, 3]) + +[sub_resource type="AtlasTexture" id="AtlasTexture_yh7e0"] +atlas = ExtResource("3_w5pyt") +region = Rect2(2118, 923, 371, 391) + +[resource] +resource_name = "LeafG2" +script = ExtResource("2_frmoh") +texture = SubResource("AtlasTexture_yh7e0") +type = 1 +root = SubResource("Resource_cypiw") diff --git a/entities/plants/scripts/plant.gd b/entities/plants/scripts/plant.gd index e94ef1d..ef9ea98 100644 --- a/entities/plants/scripts/plant.gd +++ b/entities/plants/scripts/plant.gd @@ -47,7 +47,7 @@ func generate_sprite() -> PlantSprite: var sprite_object : PlantSprite = SPRITE_SCENE.instantiate() add_child(sprite_object) - sprite_object.generate_mutation_effects(self) + # sprite_object.generate_mutation_effects(self) return sprite_object diff --git a/entities/plants/scripts/plant_archetype.gd b/entities/plants/scripts/plant_archetype.gd index fb5acd7..4cd6591 100644 --- a/entities/plants/scripts/plant_archetype.gd +++ b/entities/plants/scripts/plant_archetype.gd @@ -11,9 +11,12 @@ class_name PlantArchetype @export var seed_random_loose = 1 @export var available_mutations: Array[PlantMutation] = [ AncientMutation.new(), - PrecociousMutation.new(), - QualityMutation.new(), - QuickMutation.new() + EphemeralMutation.new(), + FertileMutation.new(), + PurificationMutation.new(), + QuickMutation.new(), + SocialMutation.new(), + ToughMutation.new() ] static func get_all() -> Array[PlantArchetype]: diff --git a/entities/plants/scripts/plant_data.gd b/entities/plants/scripts/plant_data.gd index f1c8419..9cac962 100644 --- a/entities/plants/scripts/plant_data.gd +++ b/entities/plants/scripts/plant_data.gd @@ -1,19 +1,19 @@ extends EntityData class_name PlantData -signal updated(p : PlantData) -signal disappeared(p : PlantData) +signal updated(p: PlantData) +signal disappeared(p: PlantData) enum State {PLANTED, GROWING, MATURE, DEAD} @export var archetype: PlantArchetype -@export var plant_name : String -@export var mutations : Array[PlantMutation] -@export var day : int : - set(v): +@export var plant_name: String +@export var mutations: Array[PlantMutation] +@export var day: int: + set(v): day = v - updated.emit(self) -@export var random_seed : int + updated.emit(self ) +@export var random_seed: int @export var leafs = 0 # +1 score @export var roots = 0 # +1 lifetime @@ -21,11 +21,11 @@ enum State {PLANTED, GROWING, MATURE, DEAD} # var texture_builder: TextureBuilder = preload("res://entities/plants/scripts/texture_builder/texture_builder.tres") func _init( - _position : Vector2 = Vector2.ZERO, - _archetype : PlantArchetype = PlantArchetype.get_random(), - _plant_name : String = Random.generate_random_word(), - _mutations : Array[PlantMutation] = [], - _day : int = 0, + _position: Vector2 = Vector2.ZERO, + _archetype: PlantArchetype = PlantArchetype.get_random(), + _plant_name: String = Random.generate_random_word(), + _mutations: Array[PlantMutation] = [], + _day: int = 0, _random_seed = randi() ): position = _position @@ -36,9 +36,9 @@ func _init( random_seed = _random_seed for m in mutations: - m.mutate_plant_data(self) + m.mutate_plant_data(self ) -static func generate_from_seed(plant_seed : Seed, plant_position : Vector2) -> PlantData: +static func generate_from_seed(plant_seed: Seed, plant_position: Vector2) -> PlantData: return PlantData.new( plant_position, plant_seed.plant_archetype, @@ -56,7 +56,7 @@ func get_lifetime() -> int: var lifetime = archetype.lifetime + roots for m in mutations: - lifetime = m.mutate_lifetime(self, lifetime) + lifetime = m.mutate_lifetime(self , lifetime) return lifetime @@ -64,15 +64,18 @@ func get_growing_time() -> int: var growing_time = archetype.growing_time for m in mutations: - growing_time = m.mutate_growing_time(self, growing_time) + growing_time = m.mutate_growing_time(self , growing_time) return growing_time -func get_score(state : State = get_state()) -> int: +func get_score(state: State = get_state()) -> int: var score = archetype.base_score + leafs if state == State.MATURE else 0 + var mult := 1 + for m in mutations: - score = m.mutate_score(self, score) + score = m.mutate_score(self , score) + mult = m.mutate_score_multiplier(self , mult) return score @@ -89,14 +92,14 @@ func get_seed_number(state = get_state()): var seed_number = archetype.seed_number if (state == State.MATURE or state == State.DEAD) else 0 for m in mutations: - seed_number = m.mutate_seed_number(self, seed_number) + seed_number = m.mutate_seed_number(self , seed_number) return seed_number func get_seed_random_loose(): var seed_random_loose = archetype.seed_random_loose for m in mutations: - seed_random_loose = m.mutate_seed_random_loose(self, seed_random_loose) + seed_random_loose = m.mutate_seed_random_loose(self , seed_random_loose) return seed_random_loose @@ -107,4 +110,4 @@ func get_random_seed_income(): ) func disappear(): - disappeared.emit(self) + disappeared.emit(self ) diff --git a/entities/plants/scripts/plant_mutation.gd b/entities/plants/scripts/plant_mutation.gd index e522eaf..020f0cd 100644 --- a/entities/plants/scripts/plant_mutation.gd +++ b/entities/plants/scripts/plant_mutation.gd @@ -1,12 +1,12 @@ extends Resource class_name PlantMutation -@export var level : int = 1 +@export var level: int = 1 -var id : String : get = get_mutation_id -var name : String : get = get_mutation_name +var id: String: get = get_mutation_id +var name: String: get = get_mutation_name -func _init(_level : int = 1): +func _init(_level: int = 1): level = _level func get_icon() -> Texture: @@ -27,40 +27,43 @@ func get_mutation_description() -> String: printerr("Classe abstraite PlantMutation appelée") return "" -func mutate_plant_data(_plant_data : PlantData): +func mutate_plant_data(_plant_data: PlantData): pass -func mutate_score(_plant_data : PlantData, score : int) -> int: +func mutate_score(_plant_data: PlantData, score: int) -> int: return score -func mutate_lifetime(_plant_data : PlantData, lifetime : int) -> int: +func mutate_score_multiplier(_plant_data: PlantData, multiplier: int) -> int: + return multiplier + +func mutate_lifetime(_plant_data: PlantData, lifetime: int) -> int: return lifetime -func mutate_growing_time(_plant_data : PlantData, growing_time : int) -> int: +func mutate_growing_time(_plant_data: PlantData, growing_time: int) -> int: return growing_time -func mutate_seed_number(_plant_data, seed_number): +func mutate_seed_number(_plant_data: PlantData, seed_number: int): return seed_number -func mutate_seed_random_loose(_plant_data, seed_random_loose): +func mutate_seed_random_loose(_plant_data: PlantData, seed_random_loose): return seed_random_loose -func _start_planted_effect(_plant : Plant): +func _start_planted_effect(_plant: Plant): pass -func _start_day_effect(_plant : Plant): +func _start_day_effect(_plant: Plant): pass -func _start_maturation_effect(_plant : Plant): +func _start_maturation_effect(_plant: Plant): pass -func _start_dead_effect(_plant : Plant): +func _start_dead_effect(_plant: Plant): pass -func _start_harvested_effect(_plant : Plant): +func _start_harvested_effect(_plant: Plant): pass -func get_level_for_rarity(rarity : int) -> int : +func get_level_for_rarity(rarity: int) -> int: return rarity - get_base_rarity() + 1 func get_rarity() -> int: @@ -78,7 +81,7 @@ func card_section() -> CardSectionInfo: return section static func get_rarity_text(rarity) -> String: - var rarity_text : Array[String] = [ + var rarity_text: Array[String] = [ "COMMON", "RARE", "VERY_RARE", @@ -88,11 +91,11 @@ static func get_rarity_text(rarity) -> String: if rarity < len(rarity_text): return rarity_text[rarity] - else : + else: return rarity_text[len(rarity_text) - 1] -static func get_rarity_color(rarity : int) -> Color: - var rarity_colors : Array[Color] = [ +static func get_rarity_color(rarity: int) -> Color: + var rarity_colors: Array[Color] = [ Color("25C147"), Color("8B2DFF"), Color("FF006E"), diff --git a/entities/plants/scripts/plant_mutation/ephemeral_mutation.gd b/entities/plants/scripts/plant_mutation/ephemeral_mutation.gd new file mode 100644 index 0000000..6d29e3b --- /dev/null +++ b/entities/plants/scripts/plant_mutation/ephemeral_mutation.gd @@ -0,0 +1,23 @@ +extends PlantMutation +class_name EphemeralMutation + +func get_icon() -> Texture: + return preload("res://common/icons/chevrons-up.svg") + +func get_base_rarity() -> int: + return 0 + +func get_mutation_id() -> String: + return "EPHEMERAL" + +func get_mutation_name() -> String: + return tr("EPHEMERAL") + +func get_mutation_description() -> String: + return tr("EPHEMERAL_EFFECT_TEXT_LEVEL_%d") % level + +func mutate_lifetime(_plant_data: PlantData, lifetime: int) -> int: + return lifetime - ceil(0.5 * level) + +func mutate_seed_number(_plant_data: PlantData, seed_number: int): + return seed_number + level diff --git a/entities/plants/scripts/plant_mutation/ephemeral_mutation.gd.uid b/entities/plants/scripts/plant_mutation/ephemeral_mutation.gd.uid new file mode 100644 index 0000000..b44f704 --- /dev/null +++ b/entities/plants/scripts/plant_mutation/ephemeral_mutation.gd.uid @@ -0,0 +1 @@ +uid://bmo42h1p554nv diff --git a/entities/plants/scripts/plant_mutation/fertile_mutation.gd b/entities/plants/scripts/plant_mutation/fertile_mutation.gd new file mode 100644 index 0000000..ebd38d7 --- /dev/null +++ b/entities/plants/scripts/plant_mutation/fertile_mutation.gd @@ -0,0 +1,21 @@ +extends PlantMutation +class_name FertileMutation + +func get_icon() -> Texture: + return preload("res://common/icons/chevrons-up.svg") + +func get_base_rarity() -> int: + return 0 + +func get_mutation_id() -> String: + return "FERTILE" + +func get_mutation_name() -> String: + return tr("FERTILE") + +func get_mutation_description() -> String: + return tr("FERTILE_EFFECT_TEXT_LEVEL_%d") % level + +func mutate_lifetime(_plant_data : PlantData, lifetime : int) -> int: + print("TODO:: Implemnt FERTILE lifetime based on plants around") + return lifetime + level diff --git a/entities/plants/scripts/plant_mutation/fertile_mutation.gd.uid b/entities/plants/scripts/plant_mutation/fertile_mutation.gd.uid new file mode 100644 index 0000000..ce5e85d --- /dev/null +++ b/entities/plants/scripts/plant_mutation/fertile_mutation.gd.uid @@ -0,0 +1 @@ +uid://eslsw42a0ylv diff --git a/entities/plants/scripts/plant_mutation/purification_mutation.gd b/entities/plants/scripts/plant_mutation/purification_mutation.gd new file mode 100644 index 0000000..6d75d16 --- /dev/null +++ b/entities/plants/scripts/plant_mutation/purification_mutation.gd @@ -0,0 +1,21 @@ +extends PlantMutation +class_name PurificationMutation + +func get_icon() -> Texture: + return preload("res://common/icons/chevrons-up.svg") + +func get_base_rarity() -> int: + return 0 + +func get_mutation_id() -> String: + return "PURIFICATION" + +func get_mutation_name() -> String: + return tr("PURIFICATION") + +func get_mutation_description() -> String: + return tr("PURIFICATION_EFFECT_TEXT_LEVEL_%d") % level + +func _start_maturation_effect(_plant : Plant): + print("Implement purification maturation effect") + pass diff --git a/entities/plants/scripts/plant_mutation/purification_mutation.gd.uid b/entities/plants/scripts/plant_mutation/purification_mutation.gd.uid new file mode 100644 index 0000000..dfacab0 --- /dev/null +++ b/entities/plants/scripts/plant_mutation/purification_mutation.gd.uid @@ -0,0 +1 @@ +uid://buwy5v4yi3piv diff --git a/entities/plants/scripts/plant_mutation/quick_mutation.gd b/entities/plants/scripts/plant_mutation/quick_mutation.gd index 124ec17..d0a151d 100644 --- a/entities/plants/scripts/plant_mutation/quick_mutation.gd +++ b/entities/plants/scripts/plant_mutation/quick_mutation.gd @@ -16,5 +16,8 @@ func get_mutation_name() -> String: func get_mutation_description() -> String: return tr("QUICK_EFFECT_TEXT_LEVEL_%d") % level +func mutate_score(_plant_data : PlantData, score : int) -> int: + return score + level + func mutate_growing_time(_data : PlantData, grow_time : int) -> int: - return max(grow_time - level, 0) \ No newline at end of file + return max(grow_time - level, 1) diff --git a/entities/plants/scripts/plant_mutation/social_mutation.gd b/entities/plants/scripts/plant_mutation/social_mutation.gd new file mode 100644 index 0000000..8651e70 --- /dev/null +++ b/entities/plants/scripts/plant_mutation/social_mutation.gd @@ -0,0 +1,21 @@ +extends PlantMutation +class_name SocialMutation + +func get_icon() -> Texture: + return preload("res://common/icons/chevrons-up.svg") + +func get_base_rarity() -> int: + return 0 + +func get_mutation_id() -> String: + return "SOCIAL" + +func get_mutation_name() -> String: + return tr("SOCIAL") + +func get_mutation_description() -> String: + return tr("SOCIAL_EFFECT_TEXT_LEVEL_%d") % level + +func mutate_score(_plant_data : PlantData, score : int) -> int: + printerr("TODO:: implement SOCIAL score based on plants around") + return score + level diff --git a/entities/plants/scripts/plant_mutation/social_mutation.gd.uid b/entities/plants/scripts/plant_mutation/social_mutation.gd.uid new file mode 100644 index 0000000..a267863 --- /dev/null +++ b/entities/plants/scripts/plant_mutation/social_mutation.gd.uid @@ -0,0 +1 @@ +uid://bhej2wpdfveu5 diff --git a/entities/plants/scripts/plant_mutation/tough_mutation.gd b/entities/plants/scripts/plant_mutation/tough_mutation.gd new file mode 100644 index 0000000..5deae78 --- /dev/null +++ b/entities/plants/scripts/plant_mutation/tough_mutation.gd @@ -0,0 +1,23 @@ +extends PlantMutation +class_name ToughMutation + +func get_icon() -> Texture: + return preload("res://common/icons/chevrons-up.svg") + +func get_base_rarity() -> int: + return 0 + +func get_mutation_id() -> String: + return "TOUGH" + +func get_mutation_name() -> String: + return tr("TOUGH") + +func get_mutation_description() -> String: + return tr("TOUGH_EFFECT_TEXT_LEVEL_%d") % level + +func mutate_score_multiplier(_plant_data: PlantData, multiplier: int) -> int: + return multiplier + 2 + +func mutate_growing_time(_plant_data: PlantData, growing_time: int) -> int: + return growing_time + maxi(0, 3 - level) diff --git a/entities/plants/scripts/plant_mutation/tough_mutation.gd.uid b/entities/plants/scripts/plant_mutation/tough_mutation.gd.uid new file mode 100644 index 0000000..255f4b6 --- /dev/null +++ b/entities/plants/scripts/plant_mutation/tough_mutation.gd.uid @@ -0,0 +1 @@ +uid://bwsnyirytbnqj diff --git a/entities/plants/scripts/texture_builder/part_assembler.gd b/entities/plants/scripts/texture_builder/part_assembler.gd index 787ebb0..e896114 100644 --- a/entities/plants/scripts/texture_builder/part_assembler.gd +++ b/entities/plants/scripts/texture_builder/part_assembler.gd @@ -1,20 +1,71 @@ extends Node -@export var n_plants_to_generate: int +@export var n_plants_to_generate: int = 1 +@export var n_plants_per_row: int = 0 +@export var n_mutation_per_plant: int @export var space_between_plants: float +@export var randomize_pos: bool +@export var random_pos_offset: float func _ready(): + %ZoomLevel.value = %Camera2D.zoom.x + %NPlants.value = n_plants_to_generate + %NMutationsPerPlant.value = n_mutation_per_plant + %RandomizePos.button_pressed = randomize_pos + %RandomizeOffset.value = random_pos_offset generate_plants(); +func _input(_event) -> void: + var input_dir = Input.get_vector("move_left", "move_right", "move_up", "move_down") + %Camera2D.position += 1 / %Camera2D.zoom.x * 10 * input_dir + + func generate_plants(): + for child in %Plants.get_children(): + child.free() + for i in n_plants_to_generate: print("Generate plant") - var plant_position := Vector2(i * space_between_plants, 0) + var plant_pos_x = (i % n_plants_per_row) * space_between_plants + @warning_ignore("integer_division") + var plant_pos_y = (i / n_plants_per_row) * space_between_plants + var plant_position := Vector2(plant_pos_x, plant_pos_y) + if randomize_pos: + plant_position += randf_range(0, random_pos_offset) * Vector2.ONE.rotated(randf_range(0, 2 * PI)) var plant_data: PlantData = PlantData.new(plant_position) plant_data.day = plant_data.get_growing_time() - plant_data.mutations.append(plant_data.archetype.available_mutations.pick_random()) - plant_data.mutations.append(plant_data.archetype.available_mutations.pick_random()) - plant_data.mutations.append(plant_data.archetype.available_mutations.pick_random()) + for j in n_mutation_per_plant: + plant_data.mutations.append(plant_data.archetype.available_mutations.pick_random()) var plant: Plant = Plant.new(plant_data) - add_child(plant) + %Plants.add_child(plant) + plant.set_owner(self ) plant.global_position = plant_position + + +func _on_generate_plants_pressed() -> void: + generate_plants() + + +func _on_zoom_level_value_changed(value: float) -> void: + %Camera2D.zoom = Vector2.ONE * value + + +func _on_reset_zoom_pressed() -> void: + %Camera2D.zoom = Vector2.ONE + %ZoomLevel.value = 1 + + +func _on_n_plants_value_changed(value: float) -> void: + n_plants_to_generate = int(value) + +func _on_n_plants_per_row_value_changed(value: float) -> void: + n_plants_per_row = int(value) + +func _on_n_mutations_per_plant_value_changed(value: float) -> void: + n_mutation_per_plant = int(value) + +func _on_randomize_pos_toggled(toggled_on: bool) -> void: + randomize_pos = toggled_on + +func _on_randomize_offset_value_changed(value: float) -> void: + random_pos_offset = value diff --git a/entities/plants/scripts/texture_builder/plant_attach.gd b/entities/plants/scripts/texture_builder/plant_attach.gd index b17b579..842d3de 100644 --- a/entities/plants/scripts/texture_builder/plant_attach.gd +++ b/entities/plants/scripts/texture_builder/plant_attach.gd @@ -1,7 +1,7 @@ extends Resource class_name PlantAttach -enum AttachType {ORANGE_ATTACH, BLUE_ATTACH, PINK_ATTACH} +enum AttachType {ORANGE_ATTACH, PURPLE_ATTACH, BLUE_ATTACH, PINK_ATTACH} @export var position: Vector2 @export var attach_types: Array[AttachType] diff --git a/entities/plants/scripts/texture_builder/plant_part_builder.gd b/entities/plants/scripts/texture_builder/plant_part_builder.gd index a32b29d..361f692 100644 --- a/entities/plants/scripts/texture_builder/plant_part_builder.gd +++ b/entities/plants/scripts/texture_builder/plant_part_builder.gd @@ -27,6 +27,7 @@ func load_resource(): for i in maxi(attaches_children.size(), plant_part.attaches.size()): if i < attaches_children.size() && i < plant_part.attaches.size(): attaches_children[i].position = plant_part.attaches[i].position + attaches_children[i].attach_types = plant_part.attaches[i].attach_types elif i >= attaches_children.size(): var new_child = PlantAttachBuilder.new() new_child.name = "attach" + str(i) diff --git a/entities/plants/scripts/texture_builder/plant_texture_builder.gd b/entities/plants/scripts/texture_builder/plant_texture_builder.gd index 4b9d7fc..7c02556 100644 --- a/entities/plants/scripts/texture_builder/plant_texture_builder.gd +++ b/entities/plants/scripts/texture_builder/plant_texture_builder.gd @@ -1,7 +1,7 @@ extends Node -const IMAGE_WIDTH := 1000 -const IMAGE_HEIGHT := 2000 +const IMAGE_WIDTH := 1024 +const IMAGE_HEIGHT := 2048 const PLACEHOLDER_SEED_TEXTURE: Texture = preload("res://entities/plants/assets/sprites/default/seed.png") const PLACEHOLDER_MATURE_TEXTURE: Texture = preload("res://entities/plants/assets/sprites/default/mature.png") @@ -12,6 +12,7 @@ const PLACEHOLDER_GROWING_TEXTURE: Texture = preload("res://entities/plants/asse @export var baby_bases: Array[PlantPart] @export var branches: Array[PlantPart] @export var n_branches: int = 2 +@export var base_leaves: Array[PlantPart] @export var parts_mutation_associations: Dictionary[String, PartMutationAssociation] var rng := RandomNumberGenerator.new() @@ -47,7 +48,7 @@ func build_plant_texture(plant_data: PlantData) -> Texture: match plant_data.get_state(): PlantData.State.MATURE: - print("Build mature texture") + # print("Build mature texture") # var plant_archetype := plant_data.archetype if bases.size() == 0: printerr("No base in archetype") @@ -67,7 +68,7 @@ func build_plant_texture(plant_data: PlantData) -> Texture: parts_to_place.append(pick_random(branches)) for m in plant_data.mutations: - print("mutations: ", m.id) + # print("mutations: ", m.id) var association: PartMutationAssociation = parts_mutation_associations[m.id] var mutation_possible_parts := association.parts for p in association.part_amount: @@ -75,7 +76,7 @@ func build_plant_texture(plant_data: PlantData) -> Texture: PlantData.State.GROWING: - print("Build growing texture") + # print("Build growing texture") # var plant_archetype := plant_data.archetype if baby_bases.size() == 0: printerr("No baby base in archetype") @@ -89,7 +90,7 @@ func build_plant_texture(plant_data: PlantData) -> Texture: mature_image.blend_rect(base_image, Rect2i(Vector2i.ZERO, base_image.get_size()), base_image_coord - base_image_center) for m in plant_data.mutations: - print("mutations: ", m.id) + # print("mutations: ", m.id) var association: PartMutationAssociation = parts_mutation_associations[m.id] var mutation_possible_parts := association.parts for p in ceil(0.5 * association.part_amount): @@ -103,13 +104,14 @@ func build_plant_texture(plant_data: PlantData) -> Texture: parent_image_coords.fill(base_image_coord) for part: PlantPart in parts_to_place: - print("Add part : ", part.resource_name) + # print("Add part : ", part.resource_name) var ind := find_random_matching_attach_ind(part.root, available_attaches) if ind == -1: printerr("No attach found") continue var attach: PlantAttach = available_attaches.pop_at(ind) + var parent_image_coord: Vector2i = parent_image_coords.pop_at(ind) var part_image: Image = part.texture.get_image() @@ -128,4 +130,7 @@ func build_plant_texture(plant_data: PlantData) -> Texture: func find_random_matching_attach_ind(attach_to_match: PlantAttach, array: Array[PlantAttach]) -> int: var indices: Array = range(array.size()) shuffle(indices) - return indices.find_custom(func(i): return array[i].attach_types.any(func(type): return attach_to_match.attach_types.has(type))) + for i in indices: + if array[i].attach_types.any(func(type): return attach_to_match.attach_types.has(type)): + return i + return -1 diff --git a/entities/plants/test_sprites.tscn b/entities/plants/test_sprites.tscn index 4e1aea4..22204c2 100644 --- a/entities/plants/test_sprites.tscn +++ b/entities/plants/test_sprites.tscn @@ -1,28 +1,131 @@ -[gd_scene format=3 uid="uid://cfsq3hma8djk3"] +[gd_scene format=4 uid="uid://cfsq3hma8djk3"] [ext_resource type="Script" uid="uid://daod4korkrm2r" path="res://entities/plants/scripts/texture_builder/part_assembler.gd" id="1_wqioj"] -[ext_resource type="Texture2D" uid="uid://dr72xhc07i56e" path="res://stages/terrain/region/assets/textures/moss_biome/moss_contamination_atlas_texture.png" id="2_jldtq"] - -[sub_resource type="AtlasTexture" id="AtlasTexture_jldtq"] -atlas = ExtResource("2_jldtq") -region = Rect2(536, 22.5, 210, 210) +[ext_resource type="Texture2D" uid="uid://ctpo1togykb1v" path="res://stages/terrain/region/assets/textures/moss_biome/moss_contamination_atlas_texture_just_square.png" id="2_jldtq"] +[ext_resource type="TileSet" uid="uid://bqo32vh5etspf" path="res://stages/terrain/region/resources/moss_biome.tres" id="3_3mb6h"] [node name="TestSprites" type="Node2D" unique_id=1624731692] script = ExtResource("1_wqioj") n_plants_to_generate = 4 +n_plants_per_row = 5 +n_mutation_per_plant = 1 space_between_plants = 100.0 [node name="Camera2D" type="Camera2D" parent="." unique_id=628954249] +unique_name_in_owner = true position = Vector2(123, -46) -zoom = Vector2(2.26, 2.26) -[node name="MossContaminationAtlasTexture" type="Sprite2D" parent="." unique_id=1497811487] -position = Vector2(255, -66) -texture = SubResource("AtlasTexture_jldtq") +[node name="CanvasLayer" type="CanvasLayer" parent="Camera2D" unique_id=727908042] -[node name="Sprite2D" type="Sprite2D" parent="." unique_id=143026861] +[node name="FoldableContainer" type="FoldableContainer" parent="Camera2D/CanvasLayer" unique_id=1564993758] +offset_right = 24.0 +offset_bottom = 32.0 + +[node name="VBoxContainer" type="VBoxContainer" parent="Camera2D/CanvasLayer/FoldableContainer" unique_id=729625675] +layout_mode = 2 + +[node name="GeneratePlants" type="Button" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer" unique_id=1409151830] +layout_mode = 2 +text = "Generate plants" + +[node name="ZoomContainer" type="HBoxContainer" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer" unique_id=587189002] +layout_mode = 2 + +[node name="Label" type="Label" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/ZoomContainer" unique_id=89154252] +layout_mode = 2 +text = "Zoom level" + +[node name="ZoomLevel" type="HSlider" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/ZoomContainer" unique_id=179725357] +unique_name_in_owner = true +custom_minimum_size = Vector2(100, 25) +layout_mode = 2 +min_value = 0.5 +max_value = 5.0 +step = 0.05 +value = 1.0 + +[node name="ResetZoom" type="Button" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/ZoomContainer" unique_id=2109037199] +layout_mode = 2 +text = "Reset" + +[node name="NPlantsContainer" type="HBoxContainer" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer" unique_id=51445587] +layout_mode = 2 + +[node name="Label" type="Label" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/NPlantsContainer" unique_id=544183821] +layout_mode = 2 +text = "N plantes à générer" + +[node name="NPlants" type="SpinBox" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/NPlantsContainer" unique_id=988447603] +unique_name_in_owner = true +layout_mode = 2 +rounded = true + +[node name="NPlantsPerRowContainer" type="HBoxContainer" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer" unique_id=556516242] +layout_mode = 2 + +[node name="Label" type="Label" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/NPlantsPerRowContainer" unique_id=1156414417] +layout_mode = 2 +text = "N plants per row" + +[node name="NPlantsPerRow" type="SpinBox" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/NPlantsPerRowContainer" unique_id=1458830869] +layout_mode = 2 +rounded = true + +[node name="NMutationsContainer" type="HBoxContainer" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer" unique_id=30598238] +layout_mode = 2 + +[node name="Label" type="Label" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/NMutationsContainer" unique_id=482937132] +layout_mode = 2 +text = "N mutations par plantes" + +[node name="NMutationsPerPlant" type="SpinBox" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/NMutationsContainer" unique_id=345020353] +unique_name_in_owner = true +layout_mode = 2 +rounded = true + +[node name="RandomizePosContainer" type="HBoxContainer" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer" unique_id=723959891] +layout_mode = 2 + +[node name="Label" type="Label" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/RandomizePosContainer" unique_id=723453476] +layout_mode = 2 +text = "Randomize pos" + +[node name="RandomizePos" type="CheckBox" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/RandomizePosContainer" unique_id=1573956400] +unique_name_in_owner = true +layout_mode = 2 + +[node name="RandomizeOffset" type="SpinBox" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/RandomizePosContainer" unique_id=928458818] +unique_name_in_owner = true +layout_mode = 2 + +[node name="PossibleMutations" type="FoldableContainer" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer" unique_id=71622472] +layout_mode = 2 +title = "Possible Mutations" + +[node name="VBoxContainer" type="VBoxContainer" parent="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/PossibleMutations" unique_id=611287858] +layout_mode = 2 + +[node name="Icon" type="Sprite2D" parent="." unique_id=1007868132] +visible = false texture_repeat = 2 -position = Vector2(46, -67) -texture = SubResource("AtlasTexture_jldtq") +position = Vector2(495.5, 228.5) +scale = Vector2(1.78625, 1.78625) +texture = ExtResource("2_jldtq") region_enabled = true -region_rect = Rect2(0, 0, 210, 210) +region_rect = Rect2(0, 0, 2000, 2000) + +[node name="Plants" type="Node" parent="." unique_id=849342032] +unique_name_in_owner = true + +[node name="TileMapLayer" type="TileMapLayer" parent="." unique_id=961503940] +tile_map_data = PackedByteArray("AAD9/wAAAgAJAAEAAAD9////AgAJAAIAAAD8/wAAAgAKAAIAAAD8/wEAAgAKAAIAAAD9/wIAAgAJAAIAAAD7/wEAAgAJAAEAAAD7/wIAAgAJAAEAAAD8/wIAAgAKAAIAAAD9/wEAAgAKAAIAAAABAPz/AgAKAAIAAAAAAPz/AgAJAAIAAAD9/wMAAgAJAAIAAAD8/wQAAgAJAAIAAAD9/wQAAgAJAAIAAAD9//3/AgAJAAEAAAD9//7/AgAKAAEAAAD7/wMAAgAJAAEAAAD7/wQAAgAKAAIAAAD6/wUAAgAKAAIAAAD6/wYAAgAJAAEAAAD6/wQAAgAKAAIAAAD8////AgAKAAEAAAD8//7/AgAJAAEAAAD8//3/AgAKAAEAAAD8//z/AgAJAAIAAAD7/wAAAgAKAAIAAAD6/wIAAgAKAAEAAAD6/wMAAgAKAAIAAAD8//v/AgAJAAEAAAD8//r/AgAJAAEAAAD8//n/AgAJAAEAAAD7//r/AgAJAAEAAAD7//v/AgAJAAEAAAD7//z/AgAJAAEAAAD6//3/AgAJAAIAAAD6//7/AgAJAAIAAAD6////AgAKAAIAAAD6/wAAAgAJAAIAAAD5/wEAAgAKAAEAAAD5/wIAAgAKAAEAAAD6/wEAAgAKAAEAAAD6//z/AgAKAAIAAAD6//v/AgAKAAIAAAD6//r/AgAKAAEAAAD6//n/AgAJAAEAAAD7//3/AgAJAAEAAAD7//7/AgAJAAEAAAD7////AgAKAAEAAAD8/wMAAgAKAAEAAAD9//z/AgAJAAEAAAD9//v/AgAKAAIAAAD+//r/AgAJAAEAAAD+//v/AgAJAAIAAAD+//z/AgAJAAEAAAD///z/AgAKAAIAAAD///v/AgAJAAEAAAABAPv/AgAKAAIAAAABAPr/AgAKAAEAAAACAPz/AgAJAAEAAAACAPv/AgAKAAEAAAACAPr/AgAJAAEAAAADAPz/AgAKAAIAAAADAPv/AgAKAAEAAAADAPr/AgAKAAEAAAADAPn/AgAJAAIAAAAEAPz/AgAJAAEAAAAEAPv/AgAJAAIAAAAEAPr/AgAJAAIAAAAFAPz/AgAKAAIAAAAFAPv/AgAKAAEAAAAFAPr/AgAJAAEAAAAGAPv/AgAJAAEAAAAGAPz/AgAKAAIAAAAHAPz/AgAJAAEAAAAHAPv/AgAJAAEAAAAIAPz/AgAKAAIAAAAIAPv/AgAJAAEAAAAJAPz/AgAJAAIAAAAJAPv/AgAKAAIAAAAKAPz/AgAJAAIAAAD5/wUAAgAKAAIAAAD5/wYAAgAKAAEAAAD5/wQAAgAJAAEAAAD5/wMAAgAJAAEAAAD5/wAAAgAKAAIAAAD5////AgAKAAEAAAD5//7/AgAJAAIAAAD5//3/AgAKAAIAAAD5//z/AgAJAAIAAAD5//v/AgAJAAEAAAD5//r/AgAJAAIAAAD5//n/AgAKAAEAAAD7//n/AgAJAAEAAAD9//n/AgAKAAIAAAD+//n/AgAJAAIAAAD///n/AgAJAAIAAAAAAPn/AgAJAAEAAAABAPn/AgAJAAIAAAACAPn/AgAJAAEAAAAEAPn/AgAJAAIAAAAFAPn/AgAKAAEAAAAGAPn/AgAJAAEAAAAHAPn/AgAKAAIAAAAIAPn/AgAJAAIAAAAJAPn/AgAKAAEAAAAKAPn/AgAKAAEAAAALAPn/AgAKAAEAAAALAPr/AgAKAAIAAAALAPv/AgAKAAIAAAAKAPv/AgAJAAEAAAALAPz/AgAKAAEAAAD9//r/AgAJAAIAAAD///r/AgAKAAEAAAAAAPr/AgAKAAEAAAAGAPr/AgAJAAEAAAAHAPr/AgAKAAIAAAAIAPr/AgAJAAEAAAAJAPr/AgAKAAIAAAAKAPr/AgAJAAEAAAAAAPv/AgAKAAEAAAD+//3/AgAKAAEAAAD+//7/AgAKAAEAAAD+////AgAKAAEAAAD+/wAAAgAJAAEAAAD+/wEAAgAJAAEAAAD+/wIAAgAKAAEAAAD+/wMAAgAJAAIAAAD+/wQAAgAKAAIAAAD///3/AgAJAAIAAAD///7/AgAJAAIAAAD/////AgAJAAEAAAD//wAAAgAJAAIAAAD//wEAAgAKAAIAAAD//wIAAgAKAAIAAAD//wMAAgAJAAIAAAD//wQAAgAJAAEAAAAAAP3/AgAJAAIAAAAAAP7/AgAKAAIAAAAAAP//AgAKAAEAAAAAAAAAAgAJAAEAAAAAAAEAAgAJAAIAAAAAAAIAAgAKAAEAAAAAAAMAAgAJAAIAAAAAAAQAAgAKAAEAAAABAP3/AgAJAAEAAAABAP7/AgAJAAEAAAABAP//AgAJAAEAAAABAAAAAgAJAAIAAAABAAEAAgAJAAEAAAABAAIAAgAJAAEAAAABAAMAAgAKAAEAAAABAAQAAgAJAAEAAAACAP3/AgAKAAIAAAACAP7/AgAJAAEAAAACAP//AgAKAAIAAAACAAAAAgAKAAIAAAACAAEAAgAKAAIAAAACAAIAAgAKAAIAAAACAAMAAgAKAAEAAAACAAQAAgAKAAEAAAADAP3/AgAKAAIAAAADAP7/AgAKAAEAAAADAP//AgAKAAIAAAADAAAAAgAKAAEAAAADAAEAAgAKAAIAAAADAAIAAgAKAAIAAAADAAMAAgAKAAIAAAADAAQAAgAKAAEAAAAEAP3/AgAJAAEAAAAEAP7/AgAKAAIAAAAEAP//AgAKAAEAAAAEAAAAAgAKAAIAAAAEAAEAAgAJAAEAAAAEAAIAAgAKAAEAAAAEAAMAAgAKAAEAAAAEAAQAAgAKAAEAAAAFAP3/AgAJAAEAAAAFAP7/AgAKAAIAAAAFAP//AgAKAAIAAAAFAAAAAgAJAAEAAAAFAAEAAgAJAAIAAAAFAAIAAgAKAAIAAAAFAAMAAgAKAAEAAAAFAAQAAgAKAAEAAAAGAP3/AgAKAAIAAAAGAP7/AgAKAAEAAAAGAP//AgAKAAIAAAAGAAAAAgAKAAEAAAAGAAEAAgAKAAIAAAAGAAIAAgAJAAEAAAAGAAMAAgAKAAEAAAAGAAQAAgAKAAEAAAAHAP3/AgAKAAEAAAAHAP7/AgAKAAIAAAAHAP//AgAJAAIAAAAHAAAAAgAKAAEAAAAHAAEAAgAJAAIAAAAHAAIAAgAJAAEAAAAHAAMAAgAKAAIAAAAHAAQAAgAKAAEAAAAIAP3/AgAKAAIAAAAIAP7/AgAJAAIAAAAIAP//AgAJAAEAAAAIAAAAAgAKAAEAAAAIAAEAAgAKAAIAAAAIAAIAAgAKAAEAAAAIAAMAAgAKAAEAAAAIAAQAAgAKAAIAAAAJAP3/AgAKAAEAAAAJAP7/AgAJAAEAAAAJAP//AgAKAAIAAAAJAAAAAgAJAAIAAAAJAAEAAgAJAAIAAAAJAAIAAgAJAAEAAAAJAAMAAgAKAAEAAAAJAAQAAgAJAAIAAAAKAP3/AgAJAAIAAAAKAP7/AgAJAAIAAAAKAP//AgAJAAEAAAAKAAAAAgAKAAEAAAAKAAEAAgAKAAEAAAAKAAIAAgAJAAIAAAAKAAMAAgAKAAEAAAAKAAQAAgAJAAEAAAALAP3/AgAJAAIAAAALAP7/AgAKAAIAAAALAP//AgAJAAEAAAALAAAAAgAJAAIAAAALAAEAAgAKAAEAAAALAAIAAgAJAAEAAAALAAMAAgAKAAEAAAALAAQAAgAJAAEAAAAMAP3/AgAJAAEAAAAMAP7/AgAKAAIAAAAMAP//AgAKAAIAAAAMAAAAAgAJAAEAAAAMAAEAAgAKAAIAAAAMAAIAAgAKAAEAAAAMAAMAAgAKAAEAAAAMAAQAAgAKAAEAAAANAP3/AgAJAAEAAAANAP7/AgAJAAEAAAANAP//AgAKAAEAAAANAAAAAgAKAAIAAAANAAEAAgAKAAIAAAANAAIAAgAJAAEAAAANAAMAAgAKAAIAAAANAAQAAgAKAAIAAAAOAP3/AgAJAAIAAAAOAP7/AgAKAAEAAAAOAP//AgAKAAEAAAAOAAAAAgAKAAEAAAAOAAEAAgAKAAIAAAAOAAIAAgAJAAIAAAAOAAMAAgAJAAEAAAAOAAQAAgAJAAEAAAAOAAUAAgAKAAIAAAAOAAYAAgAJAAEAAAAOAAcAAgAJAAIAAAAOAAgAAgAJAAEAAAAOAAkAAgAKAAIAAAAOAAoAAgAJAAEAAAAOAAsAAgAJAAIAAAAOAAwAAgAKAAIAAAAOAA0AAgAKAAEAAAAPAP3/AgAJAAIAAAAPAP7/AgAKAAIAAAAPAP//AgAJAAEAAAAPAAAAAgAJAAIAAAAPAAEAAgAKAAIAAAAPAAIAAgAKAAIAAAAPAAMAAgAKAAEAAAAPAAQAAgAKAAEAAAAPAAUAAgAKAAEAAAAPAAYAAgAKAAEAAAAPAAcAAgAJAAEAAAAPAAgAAgAKAAIAAAAPAAkAAgAKAAIAAAAPAAoAAgAKAAIAAAAPAAsAAgAKAAIAAAAPAAwAAgAKAAIAAAAPAA0AAgAJAAIAAAAQAP3/AgAKAAEAAAAQAP7/AgAKAAEAAAAQAP//AgAJAAEAAAAQAAAAAgAKAAEAAAAQAAEAAgAJAAIAAAAQAAIAAgAJAAIAAAAQAAMAAgAJAAIAAAAQAAQAAgAJAAIAAAAQAAUAAgAKAAEAAAAQAAYAAgAJAAEAAAAQAAcAAgAJAAIAAAAQAAgAAgAJAAIAAAAQAAkAAgAJAAIAAAAQAAoAAgAKAAIAAAAQAAsAAgAKAAIAAAAQAAwAAgAJAAEAAAAQAA0AAgAKAAEAAAARAP3/AgAKAAEAAAARAP7/AgAJAAEAAAARAP//AgAJAAEAAAARAAAAAgAKAAEAAAARAAwAAgAJAAIAAAARAA0AAgAKAAEAAAALAA4AAgAJAAEAAAALAA8AAgAKAAEAAAAMAPn/AgAJAAEAAAAMAPr/AgAJAAEAAAAMAPv/AgAJAAEAAAAMAPz/AgAJAAIAAAAMAA4AAgAKAAEAAAAMAA8AAgAKAAIAAAANAPn/AgAJAAIAAAANAPr/AgAKAAEAAAANAPv/AgAKAAIAAAANAPz/AgAKAAEAAAANAA4AAgAKAAIAAAANAA8AAgAKAAEAAAAOAPn/AgAJAAIAAAAOAPr/AgAKAAEAAAAOAPv/AgAJAAEAAAAOAPz/AgAJAAIAAAAOAA4AAgAJAAIAAAAOAA8AAgAKAAIAAAAPAPn/AgAKAAIAAAAPAPr/AgAJAAEAAAAPAPv/AgAKAAIAAAAPAPz/AgAJAAEAAAAPAA4AAgAKAAEAAAAPAA8AAgAJAAEAAAAQAPn/AgAKAAEAAAAQAPr/AgAKAAIAAAAQAPv/AgAJAAIAAAAQAPz/AgAKAAEAAAAQAA4AAgAJAAEAAAAQAA8AAgAKAAEAAAARAPn/AgAKAAIAAAARAPr/AgAKAAIAAAARAPv/AgAKAAEAAAARAPz/AgAKAAEAAAARAAEAAgAKAAEAAAARAAIAAgAJAAIAAAARAAMAAgAJAAEAAAARAAQAAgAJAAIAAAARAAUAAgAJAAIAAAARAAYAAgAKAAEAAAARAAcAAgAKAAEAAAARAAgAAgAJAAEAAAARAAkAAgAKAAEAAAARAAoAAgAJAAIAAAARAAsAAgAKAAEAAAARAA4AAgAKAAEAAAARAA8AAgAKAAIAAAASAPn/AgAKAAIAAAASAPr/AgAJAAIAAAASAPv/AgAKAAIAAAASAPz/AgAJAAIAAAASAP3/AgAKAAIAAAASAP7/AgAJAAIAAAASAP//AgAJAAEAAAASAAAAAgAKAAEAAAASAAEAAgAJAAIAAAASAAIAAgAKAAIAAAASAAMAAgAKAAEAAAASAAQAAgAJAAIAAAASAAUAAgAKAAEAAAASAAYAAgAJAAEAAAASAAcAAgAJAAIAAAASAAgAAgAJAAEAAAASAAkAAgAJAAEAAAASAAoAAgAJAAEAAAASAAsAAgAKAAIAAAASAAwAAgAKAAEAAAASAA0AAgAJAAIAAAASAA4AAgAJAAIAAAASAA8AAgAJAAIAAAATAPn/AgAJAAIAAAATAPr/AgAKAAEAAAATAPv/AgAKAAEAAAATAPz/AgAKAAEAAAATAP3/AgAKAAEAAAATAP7/AgAKAAEAAAATAP//AgAJAAIAAAATAAAAAgAJAAIAAAATAAEAAgAJAAEAAAATAAIAAgAJAAEAAAATAAMAAgAKAAEAAAATAAQAAgAKAAEAAAATAAUAAgAJAAIAAAATAAYAAgAJAAEAAAATAAcAAgAJAAIAAAATAAgAAgAJAAEAAAATAAkAAgAKAAEAAAATAAoAAgAKAAIAAAATAAsAAgAKAAIAAAATAAwAAgAKAAEAAAATAA0AAgAKAAIAAAATAA4AAgAJAAEAAAATAA8AAgAKAAEAAAAUAPn/AgAJAAEAAAAUAPr/AgAKAAIAAAAUAPv/AgAKAAIAAAAUAPz/AgAJAAEAAAAUAP3/AgAJAAIAAAAUAP7/AgAJAAEAAAAUAP//AgAKAAIAAAAUAAAAAgAJAAEAAAAUAAEAAgAJAAEAAAAUAAIAAgAJAAEAAAAUAAMAAgAJAAEAAAAUAAQAAgAKAAEAAAAUAAUAAgAJAAIAAAAUAAYAAgAJAAEAAAAUAAcAAgAJAAEAAAAUAAgAAgAKAAIAAAAUAAkAAgAJAAIAAAAUAAoAAgAKAAEAAAAUAAsAAgAKAAEAAAAUAAwAAgAJAAEAAAAUAA0AAgAKAAIAAAAUAA4AAgAJAAIAAAAUAA8AAgAKAAIAAAAVAPn/AgAKAAIAAAAVAPr/AgAJAAIAAAAVAPv/AgAJAAIAAAAVAPz/AgAKAAEAAAAVAP3/AgAKAAIAAAAVAP7/AgAJAAEAAAAVAP//AgAJAAEAAAAVAAAAAgAJAAEAAAAVAAEAAgAJAAEAAAAVAAIAAgAJAAIAAAAVAAMAAgAKAAEAAAAVAAQAAgAKAAIAAAAVAAUAAgAKAAIAAAAVAAYAAgAKAAIAAAAVAAcAAgAKAAEAAAAVAAgAAgAKAAIAAAAVAAkAAgAKAAEAAAAVAAoAAgAJAAIAAAAVAAsAAgAJAAEAAAAVAAwAAgAJAAIAAAAVAA0AAgAKAAEAAAAVAA4AAgAJAAEAAAAVAA8AAgAKAAEAAAAWAPn/AgAKAAEAAAAWAPr/AgAJAAEAAAAWAPv/AgAKAAIAAAAWAPz/AgAJAAIAAAAWAP3/AgAKAAIAAAAWAP7/AgAJAAEAAAAWAP//AgAJAAIAAAAWAAAAAgAKAAEAAAAWAAEAAgAJAAEAAAAWAAIAAgAKAAIAAAAWAAMAAgAJAAIAAAAWAAQAAgAKAAIAAAAWAAUAAgAKAAIAAAAWAAYAAgAKAAEAAAAWAAcAAgAJAAIAAAAWAAgAAgAJAAEAAAAWAAkAAgAJAAEAAAAWAAoAAgAJAAEAAAAWAAsAAgAJAAEAAAAWAAwAAgAJAAEAAAAWAA0AAgAJAAIAAAAWAA4AAgAKAAEAAAAWAA8AAgAKAAIAAAAXAPn/AgAKAAEAAAAXAPr/AgAJAAEAAAAXAPv/AgAKAAIAAAAXAPz/AgAKAAEAAAAXAP3/AgAJAAEAAAAXAP7/AgAJAAIAAAAXAP//AgAKAAEAAAAXAAAAAgAJAAIAAAAXAAEAAgAJAAIAAAAXAAIAAgAJAAIAAAAXAAMAAgAKAAIAAAAXAAQAAgAKAAIAAAAXAAUAAgAJAAIAAAAXAAYAAgAKAAIAAAAXAAcAAgAJAAIAAAAXAAgAAgAKAAEAAAAXAAkAAgAJAAEAAAAXAAoAAgAKAAIAAAAXAAsAAgAKAAIAAAAXAAwAAgAJAAEAAAAXAA0AAgAKAAIAAAAXAA4AAgAJAAEAAAAXAA8AAgAKAAEAAAAYAPn/AgAJAAIAAAAYAPr/AgAJAAIAAAAYAPv/AgAKAAEAAAAYAPz/AgAKAAEAAAAYAP3/AgAJAAEAAAAYAP7/AgAKAAEAAAAYAP//AgAJAAIAAAAYAAAAAgAKAAIAAAAYAAEAAgAJAAIAAAAYAAIAAgAJAAIAAAAYAAMAAgAKAAEAAAAYAAQAAgAJAAEAAAAYAAUAAgAKAAIAAAAYAAYAAgAJAAEAAAAYAAcAAgAJAAIAAAAYAAgAAgAKAAIAAAAYAAkAAgAJAAEAAAAYAAoAAgAJAAEAAAAYAAsAAgAJAAIAAAAYAAwAAgAJAAEAAAAYAA0AAgAKAAEAAAAYAA4AAgAJAAEAAAAYAA8AAgAKAAEAAAAZAPn/AgAKAAEAAAAZAPr/AgAJAAIAAAAZAPv/AgAJAAIAAAAZAPz/AgAJAAEAAAAZAP3/AgAJAAIAAAAZAP7/AgAKAAIAAAAZAP//AgAKAAEAAAAZAAAAAgAKAAIAAAAZAAEAAgAKAAIAAAAZAAIAAgAKAAEAAAAZAAMAAgAJAAEAAAAZAAQAAgAKAAEAAAAZAAUAAgAKAAEAAAAZAAYAAgAJAAEAAAAZAAcAAgAKAAIAAAAZAAgAAgAJAAIAAAAZAAkAAgAJAAIAAAAZAAoAAgAKAAIAAAAZAAsAAgAKAAEAAAAZAAwAAgAJAAIAAAAZAA0AAgAJAAEAAAAZAA4AAgAKAAIAAAAZAA8AAgAJAAEAAAAaAPn/AgAJAAEAAAAaAPr/AgAJAAEAAAAaAPv/AgAKAAIAAAAaAPz/AgAKAAEAAAAaAP3/AgAKAAIAAAAaAP7/AgAKAAIAAAAaAP//AgAKAAIAAAAaAAAAAgAJAAIAAAAaAAEAAgAJAAEAAAAaAAIAAgAKAAEAAAAaAAMAAgAJAAIAAAAaAAQAAgAJAAEAAAAaAAUAAgAJAAEAAAAaAAYAAgAKAAEAAAAaAAcAAgAKAAIAAAAaAAgAAgAKAAIAAAAaAAkAAgAJAAEAAAAaAAoAAgAJAAIAAAAaAAsAAgAKAAIAAAAaAAwAAgAKAAEAAAAaAA0AAgAKAAEAAAAaAA4AAgAJAAEAAAAaAA8AAgAKAAIAAAAbAPn/AgAJAAEAAAAbAPr/AgAKAAIAAAAbAPv/AgAKAAEAAAAbAPz/AgAKAAIAAAAbAP3/AgAJAAEAAAAbAP7/AgAKAAEAAAAbAP//AgAJAAIAAAAbAAAAAgAKAAEAAAAbAAEAAgAKAAIAAAAbAAIAAgAJAAEAAAAbAAMAAgAJAAIAAAAbAAQAAgAKAAIAAAAbAAUAAgAKAAIAAAAbAAYAAgAJAAEAAAAbAAcAAgAJAAIAAAAbAAgAAgAKAAIAAAAbAAkAAgAKAAEAAAAbAAoAAgAKAAIAAAAbAAsAAgAJAAEAAAAbAAwAAgAJAAEAAAAbAA0AAgAJAAEAAAAbAA4AAgAJAAIAAAAbAA8AAgAKAAIAAAAcAPn/AgAKAAEAAAAcAPr/AgAJAAIAAAAcAPv/AgAJAAEAAAAcAPz/AgAJAAEAAAAcAP3/AgAJAAEAAAAcAP7/AgAJAAIAAAAcAP//AgAJAAIAAAAcAAAAAgAKAAIAAAAcAAEAAgAKAAIAAAAcAAIAAgAJAAEAAAAcAAMAAgAJAAIAAAAcAAQAAgAKAAIAAAAcAAUAAgAJAAIAAAAcAAYAAgAKAAIAAAAcAAcAAgAJAAEAAAAcAAgAAgAKAAEAAAAcAAkAAgAKAAEAAAAcAAoAAgAJAAEAAAAcAAsAAgAKAAEAAAAcAAwAAgAJAAEAAAAcAA0AAgAKAAIAAAAcAA4AAgAKAAEAAAAcAA8AAgAKAAEAAAAdAPn/AgAJAAIAAAAdAPr/AgAKAAEAAAAdAPv/AgAKAAEAAAAdAPz/AgAKAAEAAAAdAP3/AgAKAAEAAAAdAP7/AgAJAAEAAAAdAP//AgAJAAIAAAAdAAAAAgAJAAEAAAAdAAEAAgAKAAIAAAAdAAIAAgAJAAEAAAAdAAMAAgAJAAEAAAAdAAQAAgAKAAEAAAAdAAUAAgAJAAIAAAAdAAYAAgAKAAEAAAAdAAcAAgAKAAIAAAAdAAgAAgAJAAIAAAAdAAkAAgAJAAIAAAAdAAoAAgAJAAEAAAAdAAsAAgAJAAIAAAAdAAwAAgAJAAIAAAAdAA0AAgAJAAIAAAAdAA4AAgAJAAEAAAAdAA8AAgAKAAEAAAD5/wcAAgAJAAEAAAD5/wgAAgAKAAIAAAD5/wkAAgAKAAEAAAD5/woAAgAJAAIAAAD5/wsAAgAJAAIAAAD5/wwAAgAKAAEAAAD5/w0AAgAKAAIAAAD5/w4AAgAJAAIAAAD5/w8AAgAKAAIAAAD6/wcAAgAKAAEAAAD6/wgAAgAKAAIAAAD6/wkAAgAJAAEAAAD6/woAAgAKAAEAAAD6/wsAAgAKAAIAAAD6/wwAAgAJAAEAAAD6/w0AAgAKAAEAAAD6/w4AAgAKAAEAAAD6/w8AAgAKAAIAAAD7/wUAAgAJAAEAAAD7/wYAAgAJAAEAAAD7/wcAAgAJAAIAAAD7/wgAAgAKAAIAAAD7/wkAAgAJAAEAAAD7/woAAgAKAAIAAAD7/wsAAgAJAAIAAAD7/wwAAgAKAAEAAAD7/w0AAgAKAAEAAAD7/w4AAgAKAAEAAAD7/w8AAgAKAAEAAAD8/wUAAgAJAAIAAAD8/wYAAgAKAAEAAAD8/wcAAgAJAAEAAAD8/wgAAgAKAAEAAAD8/wkAAgAJAAEAAAD8/woAAgAJAAEAAAD8/wsAAgAKAAEAAAD8/wwAAgAJAAIAAAD8/w0AAgAKAAEAAAD8/w4AAgAJAAEAAAD8/w8AAgAKAAEAAAD9/wUAAgAKAAEAAAD9/wYAAgAKAAEAAAD9/wcAAgAJAAEAAAD9/wgAAgAKAAIAAAD9/wkAAgAJAAIAAAD9/woAAgAKAAIAAAD9/wsAAgAKAAIAAAD9/wwAAgAJAAIAAAD9/w0AAgAJAAIAAAD9/w4AAgAJAAEAAAD9/w8AAgAJAAEAAAD+/wUAAgAKAAIAAAD+/wYAAgAJAAIAAAD+/wcAAgAKAAEAAAD+/wgAAgAKAAIAAAD+/wkAAgAJAAEAAAD+/woAAgAJAAEAAAD+/wsAAgAKAAEAAAD+/wwAAgAJAAIAAAD+/w0AAgAJAAEAAAD+/w4AAgAJAAEAAAD+/w8AAgAKAAEAAAD//wUAAgAKAAIAAAD//wYAAgAKAAEAAAD//wcAAgAKAAIAAAD//wgAAgAJAAEAAAD//wkAAgAKAAEAAAD//woAAgAJAAIAAAD//wsAAgAKAAIAAAD//wwAAgAJAAEAAAD//w0AAgAJAAEAAAD//w4AAgAJAAIAAAD//w8AAgAKAAIAAAAAAAUAAgAJAAIAAAAAAAYAAgAKAAIAAAAAAAcAAgAJAAIAAAAAAAgAAgAJAAIAAAAAAAkAAgAKAAIAAAAAAAoAAgAKAAEAAAAAAAsAAgAJAAIAAAAAAAwAAgAKAAEAAAAAAA0AAgAJAAEAAAAAAA4AAgAJAAEAAAAAAA8AAgAKAAIAAAABAAUAAgAKAAEAAAABAAYAAgAJAAIAAAABAAcAAgAJAAIAAAABAAgAAgAJAAIAAAABAAkAAgAJAAEAAAABAAoAAgAJAAEAAAABAAsAAgAKAAIAAAABAAwAAgAJAAIAAAABAA0AAgAJAAEAAAABAA4AAgAJAAEAAAABAA8AAgAJAAIAAAACAAUAAgAJAAIAAAACAAYAAgAJAAIAAAACAAcAAgAJAAIAAAACAAgAAgAKAAEAAAACAAkAAgAJAAEAAAACAAoAAgAJAAEAAAACAAsAAgAJAAIAAAACAAwAAgAJAAIAAAACAA0AAgAKAAEAAAACAA4AAgAJAAIAAAACAA8AAgAKAAIAAAADAAUAAgAJAAEAAAADAAYAAgAKAAIAAAADAAcAAgAKAAIAAAADAAgAAgAJAAIAAAADAAkAAgAKAAEAAAADAAoAAgAKAAIAAAADAAsAAgAJAAEAAAADAAwAAgAJAAEAAAADAA0AAgAKAAEAAAADAA4AAgAJAAIAAAADAA8AAgAJAAIAAAAEAAUAAgAKAAIAAAAEAAYAAgAJAAIAAAAEAAcAAgAKAAEAAAAEAAgAAgAKAAIAAAAEAAkAAgAJAAEAAAAEAAoAAgAKAAIAAAAEAAsAAgAKAAIAAAAEAAwAAgAKAAIAAAAEAA0AAgAKAAIAAAAEAA4AAgAKAAEAAAAEAA8AAgAKAAIAAAAFAAUAAgAJAAIAAAAFAAYAAgAKAAEAAAAFAAcAAgAKAAEAAAAFAAgAAgAJAAEAAAAFAAkAAgAJAAIAAAAFAAoAAgAJAAIAAAAFAAsAAgAJAAIAAAAFAAwAAgAJAAEAAAAFAA0AAgAJAAEAAAAFAA4AAgAJAAIAAAAFAA8AAgAKAAIAAAAGAAUAAgAKAAEAAAAGAAYAAgAKAAEAAAAGAAcAAgAJAAEAAAAGAAgAAgAKAAEAAAAGAAkAAgAJAAIAAAAGAAoAAgAJAAIAAAAGAAsAAgAKAAIAAAAGAAwAAgAKAAEAAAAGAA0AAgAJAAEAAAAGAA4AAgAKAAIAAAAGAA8AAgAJAAIAAAAHAAUAAgAJAAEAAAAHAAYAAgAJAAEAAAAHAAcAAgAKAAIAAAAHAAgAAgAJAAEAAAAHAAkAAgAJAAEAAAAHAAoAAgAKAAEAAAAHAAsAAgAKAAIAAAAHAAwAAgAKAAIAAAAHAA0AAgAKAAIAAAAHAA4AAgAKAAIAAAAHAA8AAgAKAAEAAAAIAAUAAgAKAAIAAAAIAAYAAgAKAAIAAAAIAAcAAgAKAAIAAAAIAAgAAgAKAAEAAAAIAAkAAgAKAAEAAAAIAAoAAgAKAAIAAAAIAAsAAgAJAAEAAAAIAAwAAgAJAAEAAAAIAA0AAgAKAAIAAAAIAA4AAgAJAAIAAAAIAA8AAgAJAAEAAAAJAAUAAgAJAAEAAAAJAAYAAgAKAAEAAAAJAAcAAgAJAAIAAAAJAAgAAgAJAAEAAAAJAAkAAgAKAAIAAAAJAAoAAgAKAAIAAAAJAAsAAgAJAAIAAAAJAAwAAgAJAAEAAAAJAA0AAgAJAAEAAAAJAA4AAgAJAAEAAAAJAA8AAgAJAAEAAAAKAAUAAgAKAAEAAAAKAAYAAgAKAAIAAAAKAAcAAgAKAAEAAAAKAAgAAgAKAAIAAAAKAAkAAgAKAAIAAAAKAAoAAgAJAAIAAAAKAAsAAgAJAAIAAAAKAAwAAgAJAAIAAAAKAA0AAgAKAAEAAAAKAA4AAgAKAAEAAAAKAA8AAgAKAAIAAAALAAUAAgAJAAEAAAALAAYAAgAKAAIAAAALAAcAAgAKAAEAAAALAAgAAgAJAAEAAAALAAkAAgAKAAEAAAALAAoAAgAJAAIAAAALAAsAAgAJAAIAAAALAAwAAgAJAAIAAAALAA0AAgAKAAEAAAAMAAUAAgAKAAEAAAAMAAYAAgAJAAEAAAAMAAcAAgAKAAEAAAAMAAgAAgAKAAIAAAAMAAkAAgAKAAIAAAAMAAoAAgAJAAEAAAAMAAsAAgAKAAIAAAAMAAwAAgAKAAEAAAAMAA0AAgAJAAEAAAANAAUAAgAJAAEAAAANAAYAAgAJAAEAAAANAAcAAgAJAAIAAAANAAgAAgAKAAIAAAANAAkAAgAKAAEAAAANAAoAAgAKAAEAAAANAAsAAgAKAAEAAAANAAwAAgAKAAIAAAANAA0AAgAJAAIAAAD5/xAAAgAJAAIAAAD6/xAAAgAKAAIAAAD7/xAAAgAJAAEAAAD8/xAAAgAJAAIAAAD9/xAAAgAJAAEAAAD+/xAAAgAJAAIAAAD//xAAAgAKAAIAAAAAABAAAgAJAAIAAAABABAAAgAJAAIAAAACABAAAgAJAAEAAAADABAAAgAKAAIAAAAEABAAAgAKAAEAAAAFABAAAgAKAAIAAAAGABAAAgAKAAIAAAAHABAAAgAKAAIAAAAIABAAAgAKAAEAAAAJABAAAgAKAAIAAAAKABAAAgAKAAEAAAALABAAAgAJAAIAAAAMABAAAgAJAAEAAAANABAAAgAKAAIAAAAOABAAAgAKAAIAAAAPABAAAgAKAAEAAAAQABAAAgAKAAEAAAARABAAAgAKAAIAAAASABAAAgAKAAIAAAATABAAAgAKAAIAAAAUABAAAgAJAAIAAAAVABAAAgAJAAIAAAAWABAAAgAKAAIAAAAXABAAAgAJAAEAAAAYABAAAgAKAAEAAAAZABAAAgAJAAEAAAAaABAAAgAKAAIAAAAbABAAAgAKAAIAAAAcABAAAgAKAAIAAAAdABAAAgAJAAIAAAAeAPn/AgAJAAIAAAAeAPr/AgAJAAEAAAAeAPv/AgAKAAEAAAAeAPz/AgAKAAEAAAAeAP3/AgAJAAIAAAAeAP7/AgAJAAEAAAAeAP//AgAKAAEAAAAeAAAAAgAKAAIAAAAeAAEAAgAJAAEAAAAeAAIAAgAKAAIAAAAeAAMAAgAJAAEAAAAeAAQAAgAKAAIAAAAeAAUAAgAKAAIAAAAeAAYAAgAKAAEAAAAeAAcAAgAKAAEAAAAeAAgAAgAJAAEAAAAeAAkAAgAJAAIAAAAeAAoAAgAKAAIAAAAeAAsAAgAKAAEAAAAeAAwAAgAJAAEAAAAeAA0AAgAJAAEAAAAeAA4AAgAJAAIAAAAeAA8AAgAJAAIAAAAeABAAAgAKAAEAAAAfAPn/AgAKAAIAAAAfAPr/AgAKAAEAAAAfAPv/AgAJAAIAAAAfAPz/AgAKAAEAAAAfAP3/AgAJAAEAAAAfAP7/AgAJAAEAAAAfAP//AgAKAAEAAAAfAAAAAgAKAAIAAAAfAAEAAgAKAAIAAAAfAAIAAgAJAAEAAAAfAAMAAgAKAAEAAAAfAAQAAgAJAAIAAAAfAAUAAgAKAAIAAAAfAAYAAgAJAAIAAAAfAAcAAgAKAAEAAAAfAAgAAgAKAAIAAAAfAAkAAgAJAAIAAAAfAAoAAgAJAAEAAAAfAAsAAgAJAAIAAAAfAAwAAgAJAAEAAAAfAA0AAgAJAAEAAAAfAA4AAgAKAAEAAAAfAA8AAgAJAAEAAAAfABAAAgAJAAEAAAAgAPn/AgAJAAIAAAAgAPr/AgAKAAEAAAAgAPv/AgAKAAIAAAAgAPz/AgAKAAIAAAAgAP3/AgAKAAIAAAAgAP7/AgAJAAEAAAAgAP//AgAJAAEAAAAgAAAAAgAJAAIAAAAgAAEAAgAKAAIAAAAgAAIAAgAJAAIAAAAgAAMAAgAJAAEAAAAgAAQAAgAJAAIAAAAgAAUAAgAJAAIAAAAgAAYAAgAKAAEAAAAgAAcAAgAKAAIAAAAgAAgAAgAJAAEAAAAgAAkAAgAKAAEAAAAgAAoAAgAKAAIAAAAgAAsAAgAJAAIAAAAgAAwAAgAKAAEAAAAgAA0AAgAKAAIAAAAgAA4AAgAJAAEAAAAgAA8AAgAKAAEAAAAgABAAAgAJAAIAAAA=") +tile_set = ExtResource("3_3mb6h") + +[connection signal="pressed" from="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/GeneratePlants" to="." method="_on_generate_plants_pressed"] +[connection signal="value_changed" from="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/ZoomContainer/ZoomLevel" to="." method="_on_zoom_level_value_changed"] +[connection signal="pressed" from="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/ZoomContainer/ResetZoom" to="." method="_on_reset_zoom_pressed"] +[connection signal="value_changed" from="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/NPlantsContainer/NPlants" to="." method="_on_n_plants_value_changed"] +[connection signal="value_changed" from="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/NPlantsPerRowContainer/NPlantsPerRow" to="." method="_on_n_plants_per_row_value_changed"] +[connection signal="value_changed" from="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/NMutationsContainer/NMutationsPerPlant" to="." method="_on_n_mutations_per_plant_value_changed"] +[connection signal="toggled" from="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/RandomizePosContainer/RandomizePos" to="." method="_on_randomize_pos_toggled"] +[connection signal="value_changed" from="Camera2D/CanvasLayer/FoldableContainer/VBoxContainer/RandomizePosContainer/RandomizeOffset" to="." method="_on_randomize_offset_value_changed"] diff --git a/stages/cockpit/assets/3d/cockpit.blend.import b/stages/cockpit/assets/3d/cockpit.blend.import deleted file mode 100644 index 1991b5d..0000000 --- a/stages/cockpit/assets/3d/cockpit.blend.import +++ /dev/null @@ -1,78 +0,0 @@ -[remap] - -importer="scene" -importer_version=1 -type="PackedScene" -uid="uid://xsllr3c4yde1" -path="res://.godot/imported/cockpit.blend-043f73cf84b030cfc681bc4a789d77b2.scn" - -[deps] - -source_file="res://stages/cockpit/assets/3d/cockpit.blend" -dest_files=["res://.godot/imported/cockpit.blend-043f73cf84b030cfc681bc4a789d77b2.scn"] - -[params] - -nodes/root_type="" -nodes/root_name="" -nodes/root_script=null -nodes/apply_root_scale=true -nodes/root_scale=1.0 -nodes/import_as_skeleton_bones=false -nodes/use_name_suffixes=true -nodes/use_node_type_suffixes=true -meshes/ensure_tangents=true -meshes/generate_lods=true -meshes/create_shadow_meshes=true -meshes/light_baking=1 -meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false -skins/use_named_skins=true -animation/import=true -animation/fps=30 -animation/trimming=false -animation/remove_immutable_tracks=true -animation/import_rest_as_RESET=false -import_script/path="" -materials/extract=0 -materials/extract_format=0 -materials/extract_path="" -_subresources={ -"materials": { -"Holo": { -"use_external/enabled": true, -"use_external/fallback_path": "res://stages/cockpit/resources/materials/holo.tres", -"use_external/path": "uid://47j6hwb23gfs" -}, -"MetalLight": { -"use_external/enabled": true, -"use_external/fallback_path": "res://stages/cockpit/resources/materials/metal_light.tres", -"use_external/path": "uid://itgletxb2jgb" -}, -"Screen": { -"use_external/enabled": true, -"use_external/fallback_path": "res://stages/cockpit/resources/materials/screen.tres", -"use_external/path": "uid://d3vp57wyye6hw" -} -} -} -blender/nodes/visible=0 -blender/nodes/active_collection_only=false -blender/nodes/punctual_lights=true -blender/nodes/cameras=true -blender/nodes/custom_properties=true -blender/nodes/modifiers=1 -blender/meshes/colors=false -blender/meshes/uvs=true -blender/meshes/normals=true -blender/meshes/export_geometry_nodes_instances=false -blender/meshes/gpu_instances=false -blender/meshes/tangents=true -blender/meshes/skins=2 -blender/meshes/export_bones_deforming_mesh_only=false -blender/materials/unpack_enabled=true -blender/materials/export_materials=1 -blender/animation/limit_playback=true -blender/animation/always_sample=true -blender/animation/group_tracks=true -gltf/naming_version=2 diff --git a/stages/terrain/region/assets/textures/moss_biome/moss_contamination_atlas_texture_just_square.png b/stages/terrain/region/assets/textures/moss_biome/moss_contamination_atlas_texture_just_square.png new file mode 100644 index 0000000..4c06fc7 Binary files /dev/null and b/stages/terrain/region/assets/textures/moss_biome/moss_contamination_atlas_texture_just_square.png differ diff --git a/stages/terrain/region/assets/textures/moss_biome/moss_contamination_atlas_texture_just_square.png.import b/stages/terrain/region/assets/textures/moss_biome/moss_contamination_atlas_texture_just_square.png.import new file mode 100644 index 0000000..f75d764 --- /dev/null +++ b/stages/terrain/region/assets/textures/moss_biome/moss_contamination_atlas_texture_just_square.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ctpo1togykb1v" +path="res://.godot/imported/moss_contamination_atlas_texture_just_square.png-7302b2f544cfc7218fdcf9e5fde1bf41.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://stages/terrain/region/assets/textures/moss_biome/moss_contamination_atlas_texture_just_square.png" +dest_files=["res://.godot/imported/moss_contamination_atlas_texture_just_square.png-7302b2f544cfc7218fdcf9e5fde1bf41.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1