Merge pull request 'feat/arbre' (#2) from feat/arbre into master

Reviewed-on: #2
This commit was merged in pull request #2.
This commit is contained in:
2024-08-31 14:25:24 +00:00
9 changed files with 255 additions and 4 deletions

82
objects/plant.tscn Normal file
View File

@@ -0,0 +1,82 @@
[gd_scene load_steps=4 format=3 uid="uid://c4doyvo3mqgvl"]
[ext_resource type="Texture2D" uid="uid://biekl11dvnhgw" path="res://Victor_carre.jpg" id="1_x6d3i"]
[sub_resource type="GDScript" id="GDScript_x3g5o"]
script/source = "class_name Plant
extends Node2D
enum PlantState { SAPLING, GROWN, DEAD}
signal grown
signal died
@onready var growing_timer: Timer = $Growing
@onready var sprite_node: AnimatedSprite2D = $AnimatedSprite2D
var parameter: PlantType
var state := PlantState.SAPLING
func init(plant_parameter: PlantType):
parameter = plant_parameter
sprite_node.sprite_frames = parameter.sprite_frames
func _on_growing_timeout() -> void:
match state:
PlantState.SAPLING:
grow()
PlantState.GROWN:
die()
PlantState.DEAD:
push_error(\"Already dead\")
func plant(new_position: Vector2):
position = new_position
state = PlantState.SAPLING
growing_timer.start(parameter.growing_time)
sprite_node.play(\"SAPLING\")
func grow():
if state != PlantState.SAPLING:
push_error(\"Tried to grow \" + parameter.type + \", but was not at sapling state\")
return
state = PlantState.GROWN
growing_timer.start(parameter.dying_time)
grown.emit()
sprite_node.play(\"GROWN\")
func die():
state = PlantState.DEAD
died.emit()
sprite_node.play(\"DEAD\")
"
[sub_resource type="SpriteFrames" id="SpriteFrames_667un"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": ExtResource("1_x6d3i")
}],
"loop": true,
"name": &"SEED",
"speed": 5.0
}]
[node name="Plant" type="Node2D"]
script = SubResource("GDScript_x3g5o")
[node name="Growing" type="Timer" parent="."]
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
scale = Vector2(0.0378561, 0.0378561)
sprite_frames = SubResource("SpriteFrames_667un")
animation = &"SEED"
[connection signal="timeout" from="Growing" to="." method="_on_growing_timeout"]

View File

@@ -0,0 +1,43 @@
[gd_resource type="Resource" script_class="PlantType" load_steps=4 format=3 uid="uid://bgi2lo7kb3d2v"]
[ext_resource type="Script" path="res://scripts/plant_type.gd" id="1_i8xe4"]
[ext_resource type="Texture2D" uid="uid://b11jyrkhw7ebp" path="res://icon.svg" id="1_t42om"]
[sub_resource type="SpriteFrames" id="SpriteFrames_fxtnk"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": ExtResource("1_t42om")
}],
"loop": true,
"name": &"DEAD",
"speed": 5.0
}, {
"frames": [],
"loop": true,
"name": &"GROWN",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": ExtResource("1_t42om")
}],
"loop": true,
"name": &"SAPLING",
"speed": 5.0
}]
[resource]
script = ExtResource("1_i8xe4")
type = "Chardon"
sprite_frames = SubResource("SpriteFrames_fxtnk")
growing_time = 0.5
dying_time = 10.0
water_need = 5
soil_need = 0
distance_needed = 0.1
water_prod = 0
soil_prod = 0
dead_water_prod = 0
dead_soil_prod = 1
distance_prod = 0.1

View File

@@ -0,0 +1,40 @@
[gd_resource type="Resource" script_class="PlantType" load_steps=4 format=3 uid="uid://b6ufxuqdcgwmx"]
[ext_resource type="Script" path="res://scripts/plant_type.gd" id="1_meppe"]
[ext_resource type="Texture2D" uid="uid://b11jyrkhw7ebp" path="res://icon.svg" id="3_14y3x"]
[sub_resource type="SpriteFrames" id="SpriteFrames_shufc"]
animations = [{
"frames": [],
"loop": true,
"name": &"DEAD",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": ExtResource("3_14y3x")
}],
"loop": true,
"name": &"GROWN",
"speed": 5.0
}, {
"frames": [],
"loop": true,
"name": &"SAPLING",
"speed": 5.0
}]
[resource]
script = ExtResource("1_meppe")
type = "Chene"
sprite_frames = SubResource("SpriteFrames_shufc")
growing_time = 50.0
dying_time = 100.0
water_need = 1
soil_need = 1
distance_needed = 0.1
water_prod = 1
soil_prod = 1
dead_water_prod = 0
dead_soil_prod = 1
distance_prod = 0.1

View File

@@ -0,0 +1,40 @@
[gd_resource type="Resource" script_class="PlantType" load_steps=4 format=3 uid="uid://dnahox31xqy6l"]
[ext_resource type="Texture2D" uid="uid://b11jyrkhw7ebp" path="res://icon.svg" id="1_b2cb6"]
[ext_resource type="Script" path="res://scripts/plant_type.gd" id="1_mhtmv"]
[sub_resource type="SpriteFrames" id="SpriteFrames_d15np"]
animations = [{
"frames": [],
"loop": true,
"name": &"DEAD",
"speed": 5.0
}, {
"frames": [],
"loop": true,
"name": &"GROWN",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": ExtResource("1_b2cb6")
}],
"loop": true,
"name": &"SAPLING",
"speed": 5.0
}]
[resource]
script = ExtResource("1_mhtmv")
type = "Peuplier"
sprite_frames = SubResource("SpriteFrames_d15np")
growing_time = 2.0
dying_time = 2.0
water_need = 0
soil_need = 0
distance_needed = 0.1
water_prod = 0
soil_prod = 0
dead_water_prod = 0
dead_soil_prod = 1
distance_prod = 0.1