ajout de la plante pili #55

entities/plants/assets/sprites/pili/growing.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://xw47qw12d3dv"
+path="res://.godot/imported/growing.png-7be6e2a77303b5664c0684cf483c0282.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://entities/plants/assets/sprites/pili/growing.png"
+dest_files=["res://.godot/imported/growing.png-7be6e2a77303b5664c0684cf483c0282.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

entities/plants/assets/sprites/pili/mature.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://4mh1w1f4q2sa"
+path="res://.godot/imported/mature.png-3ebeca7244c928b51a02f8a43277f4d4.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://entities/plants/assets/sprites/pili/mature.png"
+dest_files=["res://.godot/imported/mature.png-3ebeca7244c928b51a02f8a43277f4d4.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

entities/plants/plant_sprite.tscn

@@ -1,10 +1,11 @@
 [gd_scene load_steps=10 format=3 uid="uid://2hrg6yjk0yt0"]
 
 [ext_resource type="Script" uid="uid://bmjjpk4lvijws" path="res://entities/plants/scripts/plant_sprite.gd" id="1_pq8o7"]
-[ext_resource type="Texture2D" uid="uid://ba413oun7ry78" path="res://entities/plants/assets/sprites/chardi/planted.png" id="2_rbgiq"]
 [ext_resource type="Texture2D" uid="uid://pltmnkqd5ut2" path="res://entities/plants/assets/sprites/seeds/grille_seeds.png" id="3_j6jm5"]
 [ext_resource type="Texture2D" uid="uid://bu26h0iqutnky" path="res://entities/underground_loot/assets/sprites/underground_loot.svg" id="4_j6jm5"]
 
+[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_rbgiq"]
+
 [sub_resource type="AtlasTexture" id="AtlasTexture_wyuub"]
 atlas = ExtResource("3_j6jm5")
 region = Rect2(76, 75, 124, 135)
@@ -50,7 +51,7 @@ tracks/2/keys = {
 
 [sub_resource type="Animation" id="Animation_j6jm5"]
 resource_name = "bump"
-length = 0.5
+length = 0.3
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
@@ -58,7 +59,7 @@ tracks/0/path = NodePath("Sprite:scale")
 tracks/0/interp = 2
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.2, 0.5),
+"times": PackedFloat32Array(0, 0.1, 0.3),
 "transitions": PackedFloat32Array(1, 1, 1),
 "update": 0,
 "values": [Vector2(0.15, 0.15), Vector2(0.15, 0.075), Vector2(0.15, 0.15)]
@@ -105,7 +106,7 @@ script = ExtResource("1_pq8o7")
 [node name="Sprite" type="Sprite2D" parent="."]
 unique_name_in_owner = true
 scale = Vector2(0.15, 0.15)
-texture = ExtResource("2_rbgiq")
+texture = SubResource("CompressedTexture2D_rbgiq")
 
 [node name="PlantedSeed" type="Sprite2D" parent="Sprite"]
 unique_name_in_owner = true

entities/plants/resources/effects/decontaminate.tres

@@ -1,8 +0,0 @@
-[gd_resource type="Resource" script_class="DecontaminateTerrainEffect" load_steps=2 format=3 uid="uid://bdddlia6qxgf2"]
-
-[ext_resource type="Script" uid="uid://cgscbuxe4dawb" path="res://entities/plants/scripts/plant_effects/decontaminate_terrain_effect.gd" id="1_8l07v"]
-
-[resource]
-script = ExtResource("1_8l07v")
-impact_radius = 50
-metadata/_custom_type_script = "uid://cgscbuxe4dawb"

entities/plants/resources/plant_types/champ.tres

@@ -1,15 +1,14 @@
-[gd_resource type="Resource" script_class="PlantType" load_steps=9 format=3 uid="uid://cxrc5wchpqm18"]
+[gd_resource type="Resource" script_class="PlantType" load_steps=8 format=3 uid="uid://cxrc5wchpqm18"]
 
 [ext_resource type="Script" uid="uid://ceqx5va1ormau" path="res://entities/plants/scripts/plant_effects/produce_seeds.gd" id="1_cf34j"]
 [ext_resource type="Script" uid="uid://jnye5pe1bgqw" path="res://entities/plants/scripts/plant_type.gd" id="1_ipcpv"]
 [ext_resource type="Texture2D" uid="uid://dmsls8siudy1u" path="res://entities/plants/assets/sprites/champ/growing.png" id="2_l2hi3"]
 [ext_resource type="Texture2D" uid="uid://crc4aop6ajiau" path="res://entities/plants/assets/sprites/champ/mature.png" id="3_y8qve"]
-[ext_resource type="Texture2D" uid="uid://btkrinxvownj8" path="res://entities/plants/assets/sprites/champ/planted.png" id="4_w7pob"]
 [ext_resource type="Texture2D" uid="uid://pltmnkqd5ut2" path="res://entities/plants/assets/sprites/seeds/grille_seeds.png" id="6_liopn"]
 
 [sub_resource type="Resource" id="Resource_5hyy8"]
 script = ExtResource("1_cf34j")
-produce_types_path = Array[String](["uid://cxrc5wchpqm18", "uid://b04vho33bl52b", "uid://dsctivn1vrem2"])
+produce_types_path = Array[String](["uid://cxrc5wchpqm18", "uid://b04vho33bl52b", "uid://dsctivn1vrem2", "uid://b04vho33bl52b"])
 produce_number = Array[int]([1, 2])
 metadata/_custom_type_script = "uid://ceqx5va1ormau"
 
@@ -23,7 +22,6 @@ name = "Champ"
 description = "When mature, produce seeds every day."
 growing_time = 1
 seed_texture = SubResource("AtlasTexture_my6by")
-planted_texture = ExtResource("4_w7pob")
 growing_texture = ExtResource("2_l2hi3")
 mature_texture = ExtResource("3_y8qve")
 cyclic_effect = SubResource("Resource_5hyy8")

entities/plants/resources/plant_types/chardi.tres

@@ -1,15 +1,16 @@
-[gd_resource type="Resource" script_class="PlantType" load_steps=9 format=3 uid="uid://b04vho33bl52b"]
+[gd_resource type="Resource" script_class="PlantType" load_steps=8 format=3 uid="uid://b04vho33bl52b"]
 
 [ext_resource type="Script" uid="uid://jnye5pe1bgqw" path="res://entities/plants/scripts/plant_type.gd" id="1_moyj3"]
 [ext_resource type="Texture2D" uid="uid://c7mp7tkkkk6o5" path="res://entities/plants/assets/sprites/chardi/growing.png" id="1_prk5s"]
-[ext_resource type="Script" path="res://entities/plants/scripts/plant_effects/decontaminate_terrain_effect.gd" id="2_cky1j"]
+[ext_resource type="Script" uid="uid://cgscbuxe4dawb" path="res://entities/plants/scripts/plant_effects/decontaminate_terrain_effect.gd" id="2_cky1j"]
 [ext_resource type="Texture2D" uid="uid://bupl1y0cfj21q" path="res://entities/plants/assets/sprites/chardi/mature.png" id="3_40c3e"]
-[ext_resource type="Texture2D" uid="uid://ba413oun7ry78" path="res://entities/plants/assets/sprites/chardi/planted.png" id="4_ajihu"]
 [ext_resource type="Texture2D" uid="uid://pltmnkqd5ut2" path="res://entities/plants/assets/sprites/seeds/grille_seeds.png" id="6_cky1j"]
 
-[sub_resource type="Resource" id="Resource_q68uy"]
+[sub_resource type="Resource" id="Resource_c76qk"]
 script = ExtResource("2_cky1j")
 impact_radius = 150
+improve_by_lifetime = false
+improve_by_lifetime_value = 20
 metadata/_custom_type_script = "uid://cgscbuxe4dawb"
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_qt76e"]
@@ -22,10 +23,9 @@ name = "Chardi"
 description = "This plant remove a lot of contamination around when it becomes mature."
 growing_time = 1
 seed_texture = SubResource("AtlasTexture_qt76e")
-planted_texture = ExtResource("4_ajihu")
 growing_texture = ExtResource("1_prk5s")
 mature_texture = ExtResource("3_40c3e")
-mature_effect = SubResource("Resource_q68uy")
+mature_effect = SubResource("Resource_c76qk")
 harvest_types_path = Array[String]([])
 harvest_number = Array[int]([1, 2, 1])
 metadata/_custom_type_script = "uid://jnye5pe1bgqw"

entities/plants/resources/plant_types/maias.tres

@@ -1,15 +1,16 @@
-[gd_resource type="Resource" script_class="PlantType" load_steps=9 format=3 uid="uid://dsctivn1vrem2"]
+[gd_resource type="Resource" script_class="PlantType" load_steps=8 format=3 uid="uid://dsctivn1vrem2"]
 
 [ext_resource type="Script" uid="uid://jnye5pe1bgqw" path="res://entities/plants/scripts/plant_type.gd" id="1_eqtut"]
 [ext_resource type="Texture2D" uid="uid://dwr3c6r6piwaa" path="res://entities/plants/assets/sprites/maias/growing.png" id="1_vyplc"]
-[ext_resource type="Script" path="res://entities/plants/scripts/plant_effects/decontaminate_terrain_effect.gd" id="2_vyplc"]
+[ext_resource type="Script" uid="uid://cgscbuxe4dawb" path="res://entities/plants/scripts/plant_effects/decontaminate_terrain_effect.gd" id="2_vyplc"]
 [ext_resource type="Texture2D" uid="uid://d3apfwbqsg5ha" path="res://entities/plants/assets/sprites/maias/mature.png" id="3_pi4ie"]
-[ext_resource type="Texture2D" uid="uid://cpx7bkrvttasr" path="res://entities/plants/assets/sprites/maias/planted.png" id="4_iqcy2"]
 [ext_resource type="Texture2D" uid="uid://pltmnkqd5ut2" path="res://entities/plants/assets/sprites/seeds/grille_seeds.png" id="6_mwrj8"]
 
 [sub_resource type="Resource" id="Resource_q4pje"]
 script = ExtResource("2_vyplc")
 impact_radius = 20
+improve_by_lifetime = false
+improve_by_lifetime_value = 20
 metadata/_custom_type_script = "uid://cgscbuxe4dawb"
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_sri3b"]
@@ -19,10 +20,9 @@ region = Rect2(1697, 331, 125, 158)
 [resource]
 script = ExtResource("1_eqtut")
 name = "Maias"
-description = "This gorgeous flower produce a lot of seeds when harvested."
+description = "This gorgeous flower produce a lot of seeds of Maias and Chardi when harvested."
 growing_time = 1
 seed_texture = SubResource("AtlasTexture_sri3b")
-planted_texture = ExtResource("4_iqcy2")
 growing_texture = ExtResource("1_vyplc")
 mature_texture = ExtResource("3_pi4ie")
 mature_effect = SubResource("Resource_q4pje")

entities/plants/resources/plant_types/pili.tres

@@ -0,0 +1,31 @@
+[gd_resource type="Resource" script_class="PlantType" load_steps=8 format=3 uid="uid://c5oxxif3h5yxo"]
+
+[ext_resource type="Script" uid="uid://cgscbuxe4dawb" path="res://entities/plants/scripts/plant_effects/decontaminate_terrain_effect.gd" id="1_8wi4i"]
+[ext_resource type="Script" uid="uid://jnye5pe1bgqw" path="res://entities/plants/scripts/plant_type.gd" id="1_vn146"]
+[ext_resource type="Texture2D" uid="uid://xw47qw12d3dv" path="res://entities/plants/assets/sprites/pili/growing.png" id="2_k4b1k"]
+[ext_resource type="Texture2D" uid="uid://4mh1w1f4q2sa" path="res://entities/plants/assets/sprites/pili/mature.png" id="3_8fstu"]
+[ext_resource type="Texture2D" uid="uid://pltmnkqd5ut2" path="res://entities/plants/assets/sprites/seeds/grille_seeds.png" id="5_26e4l"]
+
+[sub_resource type="Resource" id="Resource_eytxu"]
+script = ExtResource("1_8wi4i")
+impact_radius = 0
+improve_by_lifetime = true
+improve_by_lifetime_value = 50
+metadata/_custom_type_script = "uid://cgscbuxe4dawb"
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_kidty"]
+atlas = ExtResource("5_26e4l")
+region = Rect2(1415, 91, 149, 102)
+
+[resource]
+script = ExtResource("1_vn146")
+name = "Pili"
+description = "Pili slowly decontaminate each day when mature."
+growing_time = 1
+seed_texture = SubResource("AtlasTexture_kidty")
+growing_texture = ExtResource("2_k4b1k")
+mature_texture = ExtResource("3_8fstu")
+cyclic_effect = SubResource("Resource_eytxu")
+harvest_types_path = Array[String](["uid://c5oxxif3h5yxo"])
+harvest_number = Array[int]([1, 2])
+metadata/_custom_type_script = "uid://jnye5pe1bgqw"

entities/plants/scripts/plant.gd

@@ -56,10 +56,11 @@ func generate_collision_shape() -> CollisionShape2D:
 # Méthode déclenchée par la classe planet
 func _pass_day():
 	await get_tree().create_timer(randf_range(0., RANDOM_MAX_GROW_INTERVAL)).timeout
-	day += 1
-
+	
 	if state == State.MATURE and plant_type.cyclic_effect:
 		plant_type.cyclic_effect.effect(self)
+	
+	day += 1
 
 func set_day(d):
 	day = d

entities/plants/scripts/plant_effects/decontaminate_terrain_effect.gd

@@ -1,10 +1,18 @@
 extends PlantEffect
 class_name DecontaminateTerrainEffect
 
-@export var impact_radius = 50
+@export var impact_radius = 100
+@export var improve_by_lifetime := false
+@export var improve_by_lifetime_value := 20
 
 func effect(plant):
+
+    var radius = impact_radius
+
+    if improve_by_lifetime:
+        radius += improve_by_lifetime_value * plant.day
+
     plant.planet.impact_contamination(
         plant.global_position,
-        impact_radius
+        radius
     )

game.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=24 format=3 uid="uid://d28cp7a21kwou"]
+[gd_scene load_steps=27 format=3 uid="uid://d28cp7a21kwou"]
 
 [ext_resource type="PackedScene" uid="uid://12nak7amd1uq" path="res://gui/game/game_gui.tscn" id="1_iotsf"]
 [ext_resource type="PackedScene" uid="uid://csiacsndm62ll" path="res://gui/game/pause/pause.tscn" id="2_215e1"]
@@ -16,6 +16,7 @@
 [ext_resource type="Resource" uid="uid://dsctivn1vrem2" path="res://entities/plants/resources/plant_types/maias.tres" id="11_x5p1p"]
 [ext_resource type="PackedScene" uid="uid://dj7gp3crtg2yt" path="res://entities/camera/camera.tscn" id="12_qhcbd"]
 [ext_resource type="Resource" uid="uid://cxrc5wchpqm18" path="res://entities/plants/resources/plant_types/champ.tres" id="15_80cx4"]
+[ext_resource type="Resource" uid="uid://c5oxxif3h5yxo" path="res://entities/plants/resources/plant_types/pili.tres" id="16_e8heu"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_qt76e"]
 atlas = ExtResource("8_boyg6")
@@ -69,6 +70,20 @@ use_zone_radius = 5
 use_energy = 1
 metadata/_custom_type_script = "uid://bypjcvlc15gsm"
 
+[sub_resource type="AtlasTexture" id="AtlasTexture_kidty"]
+atlas = ExtResource("8_boyg6")
+region = Rect2(1415, 91, 149, 102)
+
+[sub_resource type="Resource" id="Resource_boyg6"]
+script = ExtResource("10_hb5m1")
+plant_type = ExtResource("16_e8heu")
+name = "Pili"
+description = "Pili slowly decontaminate each day when mature."
+icon = SubResource("AtlasTexture_kidty")
+use_zone_radius = 5
+use_energy = 1
+metadata/_custom_type_script = "uid://bypjcvlc15gsm"
+
 [node name="Game" type="Node2D"]
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
@@ -105,7 +120,7 @@ metadata/_custom_type_script = "uid://dedg615xudpoq"
 position = Vector2(-1, -217)
 
 [node name="Planet" parent="." node_paths=PackedStringArray("import_entities_from_node") instance=ExtResource("6_e8heu")]
-loot_items = Array[ExtResource("7_rvswv")]([SubResource("Resource_7sc4i"), SubResource("Resource_80cx4"), SubResource("Resource_e8heu"), SubResource("Resource_rvswv")])
+loot_items = Array[ExtResource("7_rvswv")]([SubResource("Resource_7sc4i"), SubResource("Resource_80cx4"), SubResource("Resource_e8heu"), SubResource("Resource_rvswv"), SubResource("Resource_boyg6")])
 import_entities_from_node = NodePath("../Entities")
 
 [node name="Camera" parent="." node_paths=PackedStringArray("following") instance=ExtResource("12_qhcbd")]