From 8691b94b8846417d1d6768e40402221fc7bce115 Mon Sep 17 00:00:00 2001
From: Victor <v.robert.jaunet+gitea@gmail.com>
Date: Sun, 1 Sep 2024 22:38:10 +0200
Subject: [PATCH] rebase

---
 objects/Planter.tscn              |  7 ++--
 objects/plant_types/Neviusia.tres | 57 +++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 objects/plant_types/Neviusia.tres

diff --git a/objects/Planter.tscn b/objects/Planter.tscn
index c400624..d83b13e 100644
--- a/objects/Planter.tscn
+++ b/objects/Planter.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=15 format=3 uid="uid://qpdlnll5pihe"]
+[gd_scene load_steps=18 format=3 uid="uid://qpdlnll5pihe"]
 
 [ext_resource type="Script" path="res://scripts/planter.gd" id="1_l7lry"]
 [ext_resource type="Script" path="res://scripts/plant_type.gd" id="2_7h3ga"]
@@ -14,11 +14,14 @@
 [ext_resource type="Resource" uid="uid://d25s1eywvsyei" path="res://objects/plant_types/Oogut.tres" id="11_horsi"]
 [ext_resource type="Resource" uid="uid://c64hhkqk4tnas" path="res://objects/plant_types/Ungrake.tres" id="12_3gp5h"]
 [ext_resource type="Resource" uid="uid://cev7wbg0cfel3" path="res://objects/plant_types/Wyrran.tres" id="13_bk383"]
+[ext_resource type="Resource" uid="uid://cfbdjq14ouwra" path="res://objects/plant_types/Bonaluria.tres" id="14_kmmq3"]
+[ext_resource type="Resource" uid="uid://cbvlod5m6s5pk" path="res://objects/plant_types/Lithoniel.tres" id="15_2ou33"]
+[ext_resource type="Resource" uid="uid://bje2xwse2ilga" path="res://objects/plant_types/Neviusia.tres" id="16_oikee"]
 
 [node name="Planter" type="Node2D"]
 y_sort_enabled = true
 script = ExtResource("1_l7lry")
-plants = Array[ExtResource("2_7h3ga")]([ExtResource("3_p5nyf"), ExtResource("4_3dxep"), ExtResource("5_4of7l"), ExtResource("6_xiom8"), ExtResource("7_7i4v0"), ExtResource("8_i0wa5"), ExtResource("9_y8ss7"), ExtResource("10_sdupl"), ExtResource("11_horsi"), ExtResource("12_3gp5h"), ExtResource("13_bk383")])
+plants = Array[ExtResource("2_7h3ga")]([ExtResource("3_p5nyf"), ExtResource("4_3dxep"), ExtResource("5_4of7l"), ExtResource("6_xiom8"), ExtResource("7_7i4v0"), ExtResource("8_i0wa5"), ExtResource("9_y8ss7"), ExtResource("10_sdupl"), ExtResource("11_horsi"), ExtResource("12_3gp5h"), ExtResource("13_bk383"), ExtResource("14_kmmq3"), ExtResource("15_2ou33"), ExtResource("16_oikee")])
 
 [node name="Timer" type="Timer" parent="."]
 wait_time = 0.2
diff --git a/objects/plant_types/Neviusia.tres b/objects/plant_types/Neviusia.tres
new file mode 100644
index 0000000..d0734e8
--- /dev/null
+++ b/objects/plant_types/Neviusia.tres
@@ -0,0 +1,57 @@
+[gd_resource type="Resource" script_class="PlantType" load_steps=8 format=3 uid="uid://bje2xwse2ilga"]
+
+[ext_resource type="Script" path="res://scripts/plant_type.gd" id="1_8y2m5"]
+[ext_resource type="Texture2D" uid="uid://b3kjaw1hajc6s" path="res://assets/grille_seeds.png" id="2_0bswh"]
+[ext_resource type="Texture2D" uid="uid://di74g50h3oruf" path="res://assets/plants/plantes mortes/arbre_mort.png" id="3_pmix4"]
+[ext_resource type="Texture2D" uid="uid://cbj6fmw8pxnsb" path="res://assets/plants/arbre4.png" id="4_4j1rk"]
+[ext_resource type="Texture2D" uid="uid://bxw81k0af64wo" path="res://assets/plants/arbre4_bebe.png" id="5_0d7t0"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_e0ddp"]
+atlas = ExtResource("2_0bswh")
+region = Rect2(810, 270, 270, 270)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_qtm0k"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("3_pmix4")
+}],
+"loop": true,
+"name": &"DEAD",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("4_4j1rk")
+}],
+"loop": true,
+"name": &"GROWN",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": ExtResource("5_0d7t0")
+}],
+"loop": true,
+"name": &"SAPLING",
+"speed": 5.0
+}]
+
+[resource]
+script = ExtResource("1_8y2m5")
+type = "Neviusia"
+seed_sprite = SubResource("AtlasTexture_e0ddp")
+sprite_frames = SubResource("SpriteFrames_qtm0k")
+growing_time = 60.0
+offspring_per_lifetime = 0
+dying_time = 240.0
+dead_time = 120.0
+water_need = [0, 10]
+fertility_need = [0, 10]
+presence_need = [2, 20]
+water_prod = 4
+fertility_prod = 4
+presence_prod = 4
+dead_water_prod = 2
+dead_fertility_prod = 2
+distance_prod = 600