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/player/inventory/scripts/inventory.gd

@@ -0,0 +1,92 @@
+extends Resource
+class_name Inventory
+
+signal updated(inventory: Inventory)
+
+@export var items: Array[Item] = []
+@export var current_item_ind: int = 0
+
+func _init(inventory_size: int = 1):
+	items.resize(inventory_size)
+
+func get_best_available_slot_ind():
+	if items[current_item_ind] == null:
+		return current_item_ind
+	for i in items.size():
+		if items[i] == null:
+			return i
+	return current_item_ind
+
+func set_current_item(new_ind: int):
+	if new_ind >= items.size():
+		return
+
+	if new_ind != current_item_ind:
+		current_item_ind = new_ind
+		updated.emit(self)
+
+func change_current_item(ind_mod: int):
+	if items.size() == 0:
+		current_item_ind = 0
+		return
+	var new_ind: int = current_item_ind + ind_mod
+	new_ind = new_ind % items.size()
+	if new_ind < 0:
+		new_ind += items.size()
+	set_current_item(new_ind)
+
+func add_item(item: Item):
+	var best_ind = get_best_available_slot_ind()
+	if best_ind != current_item_ind:
+		set_item(item, best_ind)
+		updated.emit(self)
+		return true
+	else:
+		return false
+
+func set_item(item: Item, ind: int = 0) -> bool:
+	if ind < 0 || ind >= items.size():
+		return false
+	while len(items) <= ind:
+		items.append(null)
+	items[ind] = item
+	updated.emit(self)
+	return true
+
+func get_item(ind: int = current_item_ind) -> Item:
+	if ind < 0 || items.size() <= ind:
+		return null
+	return items[ind]
+
+func has_item(item: Item) -> bool:
+	return item in items
+
+func remove_item(item: Item):
+	var ind = items.find(item)
+	if ind >= 0:
+		items[ind] = null
+		updated.emit(self)
+
+func remove_item_at(ind: int = current_item_ind):
+	if items.size() <= ind:
+		return
+
+	items[ind] = null
+	updated.emit(self)
+
+func remove_current_item():
+	remove_item_at()
+
+func pop_item(ind: int = current_item_ind) -> Item:
+	if items.size() == 0:
+		return
+
+	var item_removed: Item = items[ind]
+	items[ind] = null
+	updated.emit(self)
+	return item_removed
+
+func is_full():
+	for i in items:
+		if i == null : return false
+	return true

entities/player/inventory/scripts/inventory.gd.uid

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

entities/player/inventory/scripts/item.gd

@@ -0,0 +1,81 @@
+extends Resource
+class_name Item
+
+const TYPE_ICON = preload("res://common/icons/backpack.svg")
+const ACTION_ICON = preload("res://common/icons/swipe-down.svg")
+const ENERGY_ICON = preload("res://common/icons/bolt.svg")
+const ONE_TIME_ICON = preload("res://common/icons/circle-number-1.svg")
+
+var name: String : get = get_item_name
+var description: String  : get = get_description
+var icon: Texture2D : get = get_icon
+var usage_zone_radius: int = 5 : get = get_usage_zone_radius
+var energy_usage : int = 1 : get = get_energy_used
+
+func get_item_name() -> String:
+	return name
+
+func get_description() -> String:
+	return description
+
+func get_icon() -> Texture2D:
+	return icon
+
+func get_energy_used() -> int:
+	return energy_usage
+
+func get_usage_zone_radius() -> int:
+	return usage_zone_radius
+
+func get_usage_object_affected(_i : InspectableEntity) -> bool:
+	return false
+
+func is_one_time_use():
+	return false
+
+func can_use(_player : Player, zone: Player.ActionZone) -> bool:
+	return false
+
+func use_text() -> String:
+	return ""
+
+func use(_player : Player, zone: Player.ActionZone):
+	return false
+
+func card_info() -> CardInfo:
+	var info = CardInfo.new(
+		get_item_name()
+	)
+	info.texture = icon
+	info.type_icon = TYPE_ICON
+
+	info.stats.append(
+		CardStatInfo.new(
+			"Cost %d energy" % energy_usage,
+			ENERGY_ICON
+		)
+	)
+
+	if is_one_time_use():
+		info.stats.append(
+			CardStatInfo.new(
+				"One time use",
+				ONE_TIME_ICON
+			)
+		)
+
+	var effect_section = CardSectionInfo.new(
+		"Effect",
+		get_description()
+	)
+	effect_section.title_icon = ACTION_ICON
+
+	if energy_usage > 0:
+		effect_section.title_icon = ENERGY_ICON
+	
+	info.sections.append(effect_section)
+
+	return info
+
+func get_particles() -> Array[Particles.Parameters]:
+	return []

entities/player/inventory/scripts/item.gd.uid

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

entities/player/inventory/scripts/items/blueprint.gd

@@ -0,0 +1,42 @@
+extends Item
+class_name Blueprint
+
+@export var machine_type: MachineType
+@export var machine_level: int = 1
+
+func _init(_machine_type : MachineType = null, _machine_level : int = 1):
+	machine_type = _machine_type
+	machine_level = _machine_level
+
+func get_item_name() -> String:
+	if machine_type:
+		return machine_type.name
+	return ""
+
+func get_description() -> String:
+	if machine_type:
+		return machine_type.description
+	return ""
+
+func get_icon() -> Texture2D:
+	return preload("res://common/icons/cube-3d-sphere.svg")
+
+func use_text() -> String:
+	if machine_type:
+		return "Build " + machine_type.name
+	return ""
+
+func is_one_time_use():
+	return true
+
+func can_use(player : Player, zone : Player.ActionZone) -> bool:
+	return player.terrain is Planet
+
+func use(player : Player, zone : Player.ActionZone) -> bool:
+	if machine_type and machine_level and player.planet:
+		player.planet.add_entity(
+			Machine.instantiate_machine(machine_type, machine_level),
+			zone.get_global_position()
+		)
+		return true
+	return false

entities/player/inventory/scripts/items/blueprint.gd.uid

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

entities/player/inventory/scripts/items/fork.gd

@@ -0,0 +1,44 @@
+extends Item
+class_name Fork
+
+const USE_INTERVAL = 0.15
+
+func get_item_name() -> String:
+	return "Fork"
+
+func get_description() -> String:
+	return "Use it to harvest mature plants."
+
+func get_icon() -> Texture2D:
+	return preload("res://common/icons/fork.svg")
+
+func get_energy_used() -> int:
+	return 1
+
+func get_usage_zone_radius() -> int:
+	return 50
+
+func get_usage_object_affected(i : InspectableEntity) -> bool:
+	return i is Plant
+
+func use_text() -> String:
+	return "Harvest"
+
+func can_use(_player : Player, zone : Player.ActionZone) -> bool:
+	var areas = zone.get_affected_areas()
+	for area in areas :
+		if area is Plant:
+			return true
+	return false
+
+func use(player : Player, zone : Player.ActionZone) -> bool:
+	for area in zone.get_affected_areas():
+		if area and area is Plant:
+			harvest(area, player)
+			await player.get_tree().create_timer(USE_INTERVAL).timeout
+
+	return true
+
+func harvest(p : Plant, player: Player):
+	player.play_sfx("harvest")
+	p.harvest()

entities/player/inventory/scripts/items/fork.gd.uid

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

entities/player/inventory/scripts/items/knife.gd

@@ -0,0 +1,19 @@
+extends Fork
+class_name Knife
+
+const KNIFE_ZONE_RADIUS = 10
+
+func get_item_name() -> String:
+	return "Knife"
+
+func get_description() -> String:
+	return "Use it to harvest mature plants. Do not cost energy."
+
+func get_energy_used() -> int:
+	return 0
+
+func get_icon() -> Texture2D:
+	return preload("res://common/icons/slice.svg")
+
+func get_usage_zone_radius() -> int:
+	return KNIFE_ZONE_RADIUS

entities/player/inventory/scripts/items/knife.gd.uid

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

entities/player/inventory/scripts/items/package.gd

@@ -0,0 +1,32 @@
+extends Item
+class_name Package
+
+@export var scene: PackedScene
+@export var package_name : String
+@export_multiline var package_description : String
+
+
+func _init(_scene : PackedScene = null):
+	scene = _scene
+
+func get_item_name() -> String:
+	return package_name
+
+func get_description() -> String:
+	return package_description
+
+func get_icon() -> Texture2D:
+	return preload("res://common/icons/package.svg")
+
+func use_text() -> String:
+	return "Open"
+
+func is_one_time_use():
+	return true
+
+func can_use(player : Player, zone : Player.ActionZone) -> bool:
+	return player.planet != null
+
+func use(player : Player, zone : Player.ActionZone) -> bool:
+	player.planet.instantiate_entity(scene, zone.get_global_position())
+	return true

entities/player/inventory/scripts/items/package.gd.uid

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

entities/player/inventory/scripts/items/seed.gd

@@ -0,0 +1,194 @@
+extends Item
+class_name Seed
+
+const MUTATION_PROBABILITY = 0.3
+
+const SHOVEL_ICON = preload("res://common/icons/shovel.svg")
+const GROWING_ICON = preload("res://common/icons/chevrons-up.svg")
+const SCORE_ICON = preload("res://common/icons/growth.svg")
+
+@export var plant_type: PlantType
+@export var plant_mutations: Array[PlantMutation]
+
+func get_item_name() -> String:
+	return "%s Seed" % plant_type.name
+
+func get_description() -> String:
+	return "Plant [b]%s[/b]. Must be used in decontamined zone." % plant_type.name
+
+func get_icon() -> Texture2D:
+	return plant_type.seed_texture
+
+func get_energy_used() -> int:
+	return 1
+
+func get_usage_zone_radius() -> int:
+	return 30
+
+func get_usage_object_affected(i : InspectableEntity) -> bool:
+	return i is Plant
+
+func _init(
+	_plant_type : PlantType = null,
+	_parent_mutation : Array[PlantMutation] = []
+):
+	plant_type = _plant_type
+	plant_mutations = Seed.mutate(_parent_mutation)
+
+func use_text() -> String:
+	return "Plant " + plant_type.name
+
+func is_one_time_use():
+	return true
+
+func can_use(player : Player, zone : Player.ActionZone) -> bool:
+	if (
+		player.planet == null 
+		or not player.planet.garden.is_in_garden(zone.get_global_position())
+	):
+		return false
+
+	var is_there_a_plant_here = false
+	for area in zone.get_affected_areas():
+		if area is Plant:
+			is_there_a_plant_here = true
+	
+	var is_there_contamination_in_zone = false
+	for point in zone.get_points_in_zone():
+		if player.planet.garden.is_there_contamination(point):
+			is_there_contamination_in_zone = true
+
+	return not is_there_a_plant_here and not is_there_contamination_in_zone
+
+func use(player : Player, zone : Player.ActionZone) -> bool:
+	if player.planet == null:
+		return false
+
+	player.play_sfx("dig")
+	return player.planet.plant(
+		plant_type,
+		zone.get_global_position(),
+		plant_mutations
+	)
+
+func card_info() -> CardInfo:
+	var info = CardInfo.new(
+		get_item_name()
+	)
+	info.texture = icon
+	info.type_icon = TYPE_ICON
+
+	info.stats.append(
+		CardStatInfo.new(
+			"Cost %d energy" % energy_usage,
+			ENERGY_ICON
+		)
+	)
+
+	if is_one_time_use():
+		info.stats.append(
+			CardStatInfo.new(
+				"One time use",
+				ONE_TIME_ICON
+			)
+		)
+
+	var effect_section = CardSectionInfo.new(
+		"Effect",
+		get_description()
+	)
+	effect_section.title_icon = ACTION_ICON
+
+	if energy_usage > 0:
+		effect_section.title_icon = ENERGY_ICON
+	
+	info.sections.append(effect_section)
+
+	if len(plant_mutations) != 0:
+		var rarest : int = plant_mutations.map(
+			func(m : PlantMutation) : return m.get_rarity()
+		).max()
+		info.bg_color = PlantMutation.get_rarity_color(rarest)
+		for m in plant_mutations:
+			info.sections.append(m.card_section())
+	
+	return info
+
+
+func get_particles() -> Array[Particles.Parameters]:
+	var param : Array[Particles.Parameters] = []
+
+	for m in plant_mutations:
+		param.append(
+			Particles.Parameters.new(
+				m.get_icon(),
+				PlantMutation.get_rarity_color(m.get_rarity())
+			)
+		)
+
+	return param
+
+static func mutate(parent_mutation : Array[PlantMutation] = []) -> Array[PlantMutation]:
+
+	if randf() > MUTATION_PROBABILITY:
+		return parent_mutation
+
+	var possible_mutations : Array[MutationPossibility] = [
+		AddMutation.new()
+	]
+
+	if len(parent_mutation):
+		possible_mutations.append_array( [
+			UpgradeMutation.new(),
+			RemoveMutation.new(),
+		])
+	
+	var chosen_mutation = possible_mutations.pick_random()
+
+	return chosen_mutation.mutate(parent_mutation)
+
+
+class MutationPossibility:
+	func mutate(_parent_mutation : Array[PlantMutation] = [])-> Array[PlantMutation]:
+		return []
+
+class DontMutate extends MutationPossibility:
+	func mutate(parent_mutation : Array[PlantMutation] = [])-> Array[PlantMutation]:
+		return parent_mutation
+
+class AddMutation extends MutationPossibility:
+	func mutate(parent_mutation : Array[PlantMutation] = [])-> Array[PlantMutation]:
+		var new_mutations = parent_mutation.duplicate_deep()
+		var mut = PlantMutation.random_mutation()
+
+		if mut:
+			var existing_mut_id = new_mutations.find_custom(func(m:PlantMutation): m.get_mutation_name() == mut.get_mutation_name())
+			
+			if existing_mut_id >= 0:
+				new_mutations[existing_mut_id].level += 1
+			else :
+				new_mutations.append(mut)
+
+		return new_mutations
+
+class UpgradeMutation extends MutationPossibility:
+	func mutate(
+		parent_mutation : Array[PlantMutation] = []
+	) -> Array[PlantMutation]:
+		var new_mutations = parent_mutation.duplicate_deep()
+
+		new_mutations.pick_random().level += 1
+
+		return new_mutations
+
+class RemoveMutation extends MutationPossibility:
+	func mutate(parent_mutation : Array[PlantMutation] = [])-> Array[PlantMutation]:
+		var new_mutations :Array[PlantMutation] = parent_mutation.duplicate_deep()
+
+		var mut_to_remove = new_mutations.pick_random()
+		if mut_to_remove.level > 1:
+			mut_to_remove.level -= 1
+		else:
+			new_mutations.remove_at(new_mutations.find(mut_to_remove))
+
+		return new_mutations

entities/player/inventory/scripts/items/seed.gd.uid

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

entities/player/inventory/scripts/items/shovel.gd

@@ -0,0 +1,44 @@
+extends Fork
+class_name Shovel
+
+const SHOVEL_ZONE_RADIUS = 50
+
+func get_item_name() -> String:
+	return "Shovel"
+
+func get_description() -> String:
+	return "Can dig up buried seeds and can be used to harvest mature plants."
+
+func get_icon() -> Texture2D:
+	return preload("res://common/icons/shovel.svg")
+
+func get_usage_zone_radius() -> int:
+	return SHOVEL_ZONE_RADIUS
+
+func get_usage_object_affected(i : InspectableEntity) -> bool:
+	return i is Plant or i is UndergroundLoot
+
+func use_text() -> String:
+	return "Dig"
+
+func can_use(_player : Player, zone : Player.ActionZone) -> bool:
+	var areas = zone.get_affected_areas()
+	for area in areas :
+		if area is Plant or area is UndergroundLoot:
+			return true
+	return false
+
+func use(player : Player, zone : Player.ActionZone) -> bool:
+	for area in zone.get_affected_areas():
+		if area and area is Plant:
+			harvest(area, player)
+			await player.get_tree().create_timer(USE_INTERVAL).timeout
+		if area and area is UndergroundLoot:
+			dig(area, player)
+			await player.get_tree().create_timer(USE_INTERVAL).timeout
+	
+	return true
+
+func dig(u: UndergroundLoot, player: Player):
+	player.play_sfx("dig")
+	u.dig()

entities/player/inventory/scripts/items/shovel.gd.uid

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

entities/player/inventory/scripts/items/trowel.gd

@@ -0,0 +1,21 @@
+extends Fork
+class_name Trowel
+
+const TROWEL_ZONE_RADIUS = 50
+
+func get_item_name() -> String:
+	return "Trowel"
+
+func get_description() -> String:
+	return "Use it to harvest mature plants, can get a [b]bonus seed[/b] from each plant."
+
+func get_icon() -> Texture2D:
+	return preload("res://common/icons/trowel.svg")
+
+func get_usage_zone_radius() -> int:
+	return TROWEL_ZONE_RADIUS
+
+func harvest(p : Plant, player: Player):
+	ProduceSeedsEffect.new(1).effect(p)
+	player.play_sfx("harvest")
+	p.harvest()

entities/player/inventory/scripts/items/trowel.gd.uid

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