gros dev pre proto

* Changement de l'UI, ajouts de l'inspecteur par carte et changement de police
* Ajout d'un semblant d'exploration
* Ajout de la sauvegarde des entités
* Restructuration mineure de l'arborescence
* Fix divers et réécriture des textes

entities/interactables/machines/scripts/machine.gd

@@ -4,30 +4,24 @@ class_name Machine
 const MAX_MACHINE_LEVEL = 3
 
 var level : int = 1
-var machine_name : String = ""
-var machine_desc : String = ""
-
-func setup_machine_info(machine_type : MachineType, _level : int = 1):
-	level = _level
-	machine_name = machine_type.name
-	machine_desc = machine_type.description
-	setup_machine_sprite()
-
-func setup_machine_sprite():
-	pass
+var type : MachineType
 
 func pointer_text() -> String:
-	return machine_name
-
-func inspector_info() -> Inspector.Info:
-	return Inspector.Info.new(
-		pointer_text(),
-		machine_desc
-	)
+	return type.name
 
 static func get_level_color(l : int) -> Color:
 	match l:
 		1: return Color("4ed38a")
 		2: return Color("4ec6ee")
 		3: return Color("bd70e2")
-		_: return Color("bd70e2")
+		_: return Color("bd70e2")
+
+static func instantiate_machine(machine_type : MachineType, machine_level = 1) -> Machine:
+	var new_machine : Machine = machine_type.scene.instantiate() as Machine
+	new_machine.level = machine_level
+	new_machine.type = machine_type
+
+	return new_machine
+
+func save() -> EntityData:
+	return MachineData.new(self)

entities/interactables/machines/scripts/machine_data.gd

@@ -0,0 +1,13 @@
+extends EntityData
+class_name MachineData
+
+@export var level : int
+@export var type : MachineType
+
+func _init(m : Machine):
+    position = m.global_position
+    level = m.level
+    type = m.type
+
+func load() -> Entity:
+    return Machine.instantiate_machine(type, level)

entities/interactables/machines/scripts/machine_data.gd.uid

@@ -0,0 +1 @@
+uid://b24o2jgqvfact

entities/interactables/machines/scripts/machine_info.gd.uid

@@ -1 +0,0 @@
-uid://bhncww816fjsb

entities/interactables/machines/scripts/machine_type.gd.uid

@@ -0,0 +1 @@
+uid://bepx311a3f0o

entities/interactables/machines/solar_pannel/scripts/solar_pannel.gd

@@ -1,7 +1,7 @@
 extends Machine
 class_name SolarPanel
 
-var charged : bool = false : set = set_charged
+var charged : bool = false
 var recharge_days : int = 0
 
 func get_days_to_recharge(l : int = level) -> int:
@@ -25,13 +25,18 @@ func _pass_day():
 		if recharge_days >= get_days_to_recharge():
 			set_charged(true)
 
-func set_charged(_charged = true):
+func set_charged(_charged = true, with_anim : bool = true):
 	charged = _charged
 	recharge_days = 0
-	if charged:
-		%AnimationPlayer.play("charged")
-	else :
-		%AnimationPlayer.play_backwards("charged")
+	if with_anim:
+		if charged:
+			%AnimationPlayer.play("charged")
+		else :
+			%AnimationPlayer.play_backwards("charged")
+		await %AnimationPlayer.animation_finished
+	%Flair.modulate = Color.WHITE if charged else Color.TRANSPARENT
+	%Pannels.modulate = Color.WHITE if charged else Color("6c6c6c")
+
 
 func setup_machine_sprite():
 	# %Base.self_modulate = Machine.get_level_color(level)
@@ -47,3 +52,6 @@ func interact(p : Player) -> bool:
 	p.recharge(get_energy_production())
 	set_charged(false)
 	return true
+
+func save() -> EntityData:
+	return SolarPanelData.new(self)

entities/interactables/machines/solar_pannel/scripts/solar_pannel_data.gd

@@ -0,0 +1,19 @@
+extends MachineData
+class_name SolarPanelData
+
+@export var charged : bool = false
+@export var recharge_days : int = 0
+
+func _init(m : SolarPanel):
+    position = m.global_position
+    level = m.level
+    type = m.type
+    charged = m.charged
+    recharge_days = m.recharge_days
+
+func load() -> Entity:
+    var sp = Machine.instantiate_machine(type, level) as SolarPanel
+    sp.set_charged(charged, false)
+    sp.recharge_days = recharge_days
+
+    return sp

entities/interactables/machines/solar_pannel/scripts/solar_pannel_data.gd.uid

@@ -0,0 +1 @@
+uid://dv1tok0civrpp

entities/interactables/machines/solar_pannel/solar_pannel.tres

@@ -1,11 +1,11 @@
 [gd_resource type="Resource" script_class="MachineType" load_steps=3 format=3 uid="uid://dew3p4fffjryo"]
 
-[ext_resource type="Script" uid="uid://bhncww816fjsb" path="res://entities/interactables/machines/scripts/machine_info.gd" id="1_ctita"]
+[ext_resource type="Script" uid="uid://bepx311a3f0o" path="res://entities/interactables/machines/scripts/machine_type.gd" id="1_ctita"]
 [ext_resource type="PackedScene" uid="uid://gwq2oos6ljyp" path="res://entities/interactables/machines/solar_pannel/solar_pannel.tscn" id="1_naexs"]
 
 [resource]
 script = ExtResource("1_ctita")
 name = "Solar Pannel"
 scene = ExtResource("1_naexs")
-description = "Produce energy every 2 days. When charged, can be used to recharge energy."
-metadata/_custom_type_script = "uid://bhncww816fjsb"
+description = "Charge every 2 days. When charged, can be used to recharge player energy."
+metadata/_custom_type_script = "uid://bepx311a3f0o"

entities/interactables/machines/solar_pannel/solar_pannel.tscn

@@ -8,33 +8,6 @@
 [sub_resource type="CircleShape2D" id="CircleShape2D_6utw7"]
 radius = 48.0
 
-[sub_resource type="Animation" id="Animation_gal8b"]
-resource_name = "charged"
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath("Sprites/Pannels:modulate")
-tracks/0/interp = 2
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0.033333335, 1),
-"transitions": PackedFloat32Array(1, 1),
-"update": 0,
-"values": [Color(0.42365062, 0.42365065, 0.42365062, 1), Color(1, 1, 1, 1)]
-}
-tracks/1/type = "value"
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/path = NodePath("Sprites/Flair:modulate")
-tracks/1/interp = 2
-tracks/1/loop_wrap = true
-tracks/1/keys = {
-"times": PackedFloat32Array(0, 1),
-"transitions": PackedFloat32Array(1, 1),
-"update": 0,
-"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)]
-}
-
 [sub_resource type="Animation" id="Animation_77hon"]
 length = 0.001
 tracks/0/type = "value"
@@ -62,6 +35,33 @@ tracks/1/keys = {
 "values": [Color(1, 1, 1, 0)]
 }
 
+[sub_resource type="Animation" id="Animation_gal8b"]
+resource_name = "charged"
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Sprites/Pannels:modulate")
+tracks/0/interp = 2
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0.033333335, 1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Color(0.42365062, 0.42365065, 0.42365062, 1), Color(1, 1, 1, 1)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("Sprites/Flair:modulate")
+tracks/1/interp = 2
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0, 1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1)]
+}
+
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_5vw1f"]
 _data = {
 &"RESET": SubResource("Animation_77hon"),
@@ -77,6 +77,7 @@ position = Vector2(15.999999, -16.999998)
 scale = Vector2(0.09, 0.09)
 
 [node name="Pannels" type="Sprite2D" parent="Sprites"]
+unique_name_in_owner = true
 modulate = Color(0.42352942, 0.42352942, 0.42352942, 1)
 texture = ExtResource("2_ny3sb")
 
@@ -85,6 +86,7 @@ unique_name_in_owner = true
 texture = ExtResource("3_bml32")
 
 [node name="Flair" type="Sprite2D" parent="Sprites"]
+unique_name_in_owner = true
 modulate = Color(1, 1, 1, 0)
 texture = ExtResource("4_ob8kj")