zacharie/seeding-planets
2
2
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Encore du dev pour la béta 1

Browse Source 
* Suppression de la mutation éphémère
* Ajout des modificateur de régions normaux Sableux et Toxique
* Ajout de modificateurs challenge (Rocheux, Radioactif et Contaminé)
* Ajout du modificateur de région bénéfique Résonnance
* Ajout d'un distributeur toutes les 3 régions
* Ajout des régions challenge
* Bouclage sur les couleurs des mutations après le niveau 4
* Ajout de deux nouveaux panneaux de tutoriel, un sur les informations de plantes et l'autre sur le vaisseau
This commit is contained in:
Zacharie Guet
2026-04-17 17:32:58 +02:00
parent 563e16eabf
commit 7ae362a3a5
78 changed files with 1674 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/game_data/scripts/game_data.gd
View File

@@ -25,6 +25,7 @@ signal current_region_data_updated(p : RegionData)
@export var ship_in_space = false
@export var tutorial_done = false
@export var ship_tutorial_done = false
@export var incubator_used = []
@@ -34,11 +35,8 @@ signal current_region_data_updated(p : RegionData)
func start_run() -> RunData:
player_data.clear_inventory()
player_data.update_with_artefacts([])
current_run = RunData.new()
current_run.artefacts_changed.connect(
func(artefacts : Array[Artefact]):
player_data._on_artefacts_updated(artefacts)
)
current_run.current_run_point_changed.connect(
func(rp : RunPoint):
start_region(rp.region_parameter)

1
common/game_data/scripts/progression_data.gd
View File

@@ -3,7 +3,6 @@ class_name ProgressionData
@export var available_mutations: Array[PlantMutation] = [
AncientMutation.new(),
EphemeralMutation.new(),
FertileMutation.new(),
GenerousMutation.new(),
HurriedMutation.new(),

55
common/game_data/scripts/run/run_data.gd
View File

@@ -5,6 +5,8 @@ enum State {STARTED, IN_PROGRESS, FINISHED}
const RUN_POINTS_NEXT_NUMBER : int = 2
const RUN_POINT_MAX_LEVEL = 5 # TODO
const VENDING_MACHINE_OCCURENCE = 3
const CHALLENGE_CHANCE = 0.25
signal current_run_point_changed(rp : RunPoint)
signal artefacts_changed(artefact : Array[Artefact])
@@ -51,10 +53,23 @@ func generate_next_run_points(level = 0) -> Array[RunPoint]:
func generate_next_run_point(level = 0) -> RunPoint:
var region_parameter = RegionParameter.new()
var is_challenge = randf() < CHALLENGE_CHANCE
if is_challenge:
region_parameter.modifiers = [
generate_challenge_modifiers().pick_random(),
generate_benefic_modifiers().pick_random()
] as Array[RegionModifier]
else:
region_parameter.modifiers = [
generate_normal_modifiers().pick_random()
] as Array[RegionModifier]
if level%VENDING_MACHINE_OCCURENCE == 0:
region_parameter.modifiers.append(VendingMachineModifier.new())
region_parameter.level = level
region_parameter.modifiers = get_bad_region_modifiers()
region_parameter.modifiers.append_array(get_good_region_modifiers())
return RunPoint.new(
level,
region_parameter
@@ -85,26 +100,34 @@ func choose_next_run_point(run_point : RunPoint) -> RunPoint:
last_used_modifier_name = current_run_point.region_parameter.modifiers[0].get_modifier_name()
return current_run_point
func get_good_region_modifiers() -> Array[RegionModifier]:
return [VendingMachineModifier.new(),VendingMachineModifier.new()]
#endregion
func get_bad_region_modifiers() -> Array[RegionModifier]:
var possible_modifiers : Array[RegionModifier] = [
#region ------------------ Modifiers ------------------
func generate_normal_modifiers() -> Array[RegionModifier]:
return [
AridModifier.new(),
HumidModifier.new(),
PoorModifier.new(),
HarshModifier.new()
HarshModifier.new(),
ToxicModifier.new(),
SandyModifier.new(),
]
possible_modifiers = possible_modifiers.filter(
func (m): return m.get_modifier_name() != last_used_modifier_name
)
func generate_benefic_modifiers() -> Array[RegionModifier]:
return [
VendingMachineModifier.new(),
ResonnanceModifier.new()
]
var choosen_modifier : RegionModifier = possible_modifiers.pick_random()
last_used_modifier_name = choosen_modifier.get_modifier_name()
return [choosen_modifier]
func generate_challenge_modifiers() -> Array[RegionModifier]:
return [
RockyModifier.new(),
RadioactiveModifier.new(),
ContaminatedModifier.new(),
]
#endregion
@@ -112,6 +135,6 @@ func get_bad_region_modifiers() -> Array[RegionModifier]:
func add_artefacts(a: Artefact):
artefacts.append(a)
artefacts_changed.emit(artefacts)
GameInfo.game_data.player_data.update_with_artefacts(artefacts)
#endregion

59
common/game_data/scripts/run/run_data_plant_info.gd
View File

@@ -3,13 +3,12 @@ class_name RunDataPlantInfo
signal updated
const DEFAULT_PLANT_AREA_RADIUS = 20
const DEFAULT_PLANT_INFLUENCE_RADIUS = 100
const DEFAULT_GROWING_TIME = 2
const DEFAULT_LIFETIME = 6
const DEFAULT_BASE_SCORE = 1
const DEFAULT_SEED_NUMBER = 2
const DEFAULT_SEED_RANDOM_LOOSE = 1
const DEFAULT_PLANT_INFLUENCE_RADIUS = 100
var run_data : RunData
@@ -19,25 +18,57 @@ func _init(
run_data = _run_data
var region_modifiers : Array[RegionModifier]
var artefacts : Array[Artefact] = []
func get_plant_area_radius() -> int:
return DEFAULT_PLANT_AREA_RADIUS
func get_plant_influence_radius() -> int:
return DEFAULT_PLANT_INFLUENCE_RADIUS
func get_growing_time() -> int:
return DEFAULT_GROWING_TIME
var growing_time = DEFAULT_GROWING_TIME
for rm in get_region_modifiers():
growing_time = rm.modify_plant_growing_time(growing_time)
return max(0, growing_time)
func get_lifetime() -> int:
return DEFAULT_LIFETIME
var lifetime = DEFAULT_LIFETIME
for rm in get_region_modifiers():
lifetime = rm.modify_plant_lifetime(lifetime)
return max(0, lifetime)
func get_base_score() -> int:
return DEFAULT_BASE_SCORE
var base_score = DEFAULT_BASE_SCORE
for rm in get_region_modifiers():
base_score = rm.modify_plant_base_score(base_score)
return max(0, base_score)
func get_seed_number() -> int:
return DEFAULT_SEED_NUMBER
var seed_number = DEFAULT_SEED_NUMBER
for rm in get_region_modifiers():
seed_number = rm.modify_plant_seed_number(seed_number)
return max(0, seed_number)
func get_seed_random_loose() -> int:
return DEFAULT_SEED_RANDOM_LOOSE
var seed_random_loose = DEFAULT_SEED_RANDOM_LOOSE
for rm in get_region_modifiers():
seed_random_loose = rm.modify_plant_seed_random_loose(seed_random_loose)
return min(max(0, seed_random_loose),get_seed_number())
func get_influence_radius() -> int:
var influence_radius = DEFAULT_PLANT_INFLUENCE_RADIUS
for rm in get_region_modifiers():
influence_radius = rm.modify_plant_influence_radius(influence_radius)
return max(0, influence_radius)
func get_region_modifiers() -> Array[RegionModifier]:
if run_data.current_run_point and run_data.current_run_point.region_parameter:
return run_data.current_run_point.region_parameter.modifiers
return []

1
common/icons/biohazard.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#ffffff" class="icon icon-tabler icons-tabler-filled icon-tabler-biohazard"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M16.41 2.072a6.25 6.25 0 0 1 1.514 6.387l-.051 .137l.223 .044q .325 .072 .645 .18l.318 .117l.25 .105c2.155 .97 3.572 3.067 3.681 5.483v.217a1.5 1.5 0 1 1 -3 -.003l.002 -.145a3.25 3.25 0 0 0 -4.412 -2.886l-.091 .037l.004 .038l.007 .217a3.5 3.5 0 0 1 -1.817 3.07l-.16 .082l.014 .11c.082 .511 .285 .997 .595 1.416l.14 .175a3.25 3.25 0 0 0 2.27 1.136l.203 .006a1.5 1.5 0 0 1 0 3a6.25 6.25 0 0 1 -4.575 -1.991l-.177 -.199l-.078 .092a6.3 6.3 0 0 1 -3.921 2.054l-.273 .028l-.259 .016h-.217a1.5 1.5 0 1 1 .003 -3l.145 .002a3.25 3.25 0 0 0 3.074 -2.82l.003 -.03l-.161 -.083a3.5 3.5 0 0 1 -1.804 -2.883l-.005 -.195l.006 -.191l.003 -.043l-.075 -.032a3.25 3.25 0 0 0 -2.398 .008l-.191 .084a3.25 3.25 0 0 0 -1.85 2.933a1.5 1.5 0 0 1 -3 0a6.25 6.25 0 0 1 5.036 -6.13l.077 -.014l-.05 -.143l-.08 -.26l-.066 -.25a6.27 6.27 0 0 1 1.47 -5.678l.163 -.172a1.5 1.5 0 1 1 2.171 2.07l-.137 .143a3.25 3.25 0 0 0 .386 4.723l.084 .062l.05 -.034a3.5 3.5 0 0 1 1.673 -.555l.228 -.007c.683 0 1.336 .197 1.894 .556l.048 .033l.067 -.048a3.25 3.25 0 0 0 1.111 -1.669l.05 -.2a3.25 3.25 0 0 0 -.74 -2.828l-.141 -.15a1.5 1.5 0 1 1 2.12 -2.122" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

43
common/icons/biohazard.svg.import Normal file
View File

@@ -0,0 +1,43 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://caljk5xauct42"
path="res://.godot/imported/biohazard.svg-6ba6923078e547162e6b4b8cb587956e.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://common/icons/biohazard.svg"
dest_files=["res://.godot/imported/biohazard.svg-6ba6923078e547162e6b4b8cb587956e.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
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/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
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
svg/scale=2.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false

1
common/icons/grain.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-grain"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M3.5 9.5a1 1 0 1 0 2 0a1 1 0 1 0 -2 0" /><path d="M8.5 4.5a1 1 0 1 0 2 0a1 1 0 1 0 -2 0" /><path d="M8.5 14.5a1 1 0 1 0 2 0a1 1 0 1 0 -2 0" /><path d="M3.5 19.5a1 1 0 1 0 2 0a1 1 0 1 0 -2 0" /><path d="M13.5 9.5a1 1 0 1 0 2 0a1 1 0 1 0 -2 0" /><path d="M18.5 4.5a1 1 0 1 0 2 0a1 1 0 1 0 -2 0" /><path d="M13.5 19.5a1 1 0 1 0 2 0a1 1 0 1 0 -2 0" /><path d="M18.5 14.5a1 1 0 1 0 2 0a1 1 0 1 0 -2 0" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 706 B

43
common/icons/grain.svg.import Normal file
View File

@@ -0,0 +1,43 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dm87fciksxunm"
path="res://.godot/imported/grain.svg-e272947e9d3765123e0cc00495d206dd.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://common/icons/grain.svg"
dest_files=["res://.godot/imported/grain.svg-e272947e9d3765123e0cc00495d206dd.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
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/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
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
svg/scale=2.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false

1
common/icons/mountain.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#ffffff" class="icon icon-tabler icons-tabler-filled icon-tabler-mountain"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M6.18 10.95l2.54 3.175l.084 .093a1 1 0 0 0 1.403 -.01l1.637 -1.638l1.324 1.985a1 1 0 0 0 1.457 .226l3.632 -2.906l3.647 7.697a1 1 0 0 1 -.904 1.428h-18a1 1 0 0 1 -.904 -1.428zm5.82 -7.878a3.3 3.3 0 0 1 2.983 1.888l2.394 5.057l-3.15 2.52l-1.395 -2.092l-.075 -.099a1 1 0 0 0 -1.464 -.053l-1.711 1.709l-1.301 -1.627l-1.151 -1.435l1.888 -3.98a3.3 3.3 0 0 1 2.982 -1.888" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 599 B

43
common/icons/mountain.svg.import Normal file
View File

@@ -0,0 +1,43 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://4o0itd0ofkcj"
path="res://.godot/imported/mountain.svg-73c6f0a7455c030d9081009331506dc0.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://common/icons/mountain.svg"
dest_files=["res://.godot/imported/mountain.svg-73c6f0a7455c030d9081009331506dc0.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
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/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
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
svg/scale=2.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false

1
common/icons/radioactive.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#ffffff" class="icon icon-tabler icons-tabler-filled icon-tabler-radioactive"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M21 11a1 1 0 0 1 1 1a10 10 0 0 1 -5 8.656a1 1 0 0 1 -1.302 -.268l-.064 -.098l-3 -5.19a.995 .995 0 0 1 -.133 -.542l.01 -.11l.023 -.106l.034 -.106l.046 -.1l.056 -.094l.067 -.089a.994 .994 0 0 1 .165 -.155l.098 -.064a2 2 0 0 0 .993 -1.57l.007 -.163a1 1 0 0 1 .883 -.994l.117 -.007h6z" /><path d="M7 3.344a10 10 0 0 1 10 0a1 1 0 0 1 .418 1.262l-.052 .104l-3 5.19l-.064 .098a.994 .994 0 0 1 -.155 .165l-.089 .067a1 1 0 0 1 -.195 .102l-.105 .034l-.107 .022a1.003 1.003 0 0 1 -.547 -.07l-.104 -.052a2 2 0 0 0 -1.842 -.082l-.158 .082a1 1 0 0 1 -1.302 -.268l-.064 -.098l-3 -5.19a1 1 0 0 1 .366 -1.366z" /><path d="M9 11a1 1 0 0 1 .993 .884l.007 .117a2 2 0 0 0 .861 1.645l.237 .152a.994 .994 0 0 1 .165 .155l.067 .089l.056 .095l.045 .099c.014 .036 .026 .07 .035 .106l.022 .107l.011 .11a.994 .994 0 0 1 -.08 .437l-.053 .104l-3 5.19a1 1 0 0 1 -1.366 .366a10 10 0 0 1 -5 -8.656a1 1 0 0 1 .883 -.993l.117 -.007h6z" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

43
common/icons/radioactive.svg.import Normal file
View File

@@ -0,0 +1,43 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://baughrx6x5sx2"
path="res://.godot/imported/radioactive.svg-826ebf1689bc47cf482da642b68adf02.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://common/icons/radioactive.svg"
dest_files=["res://.godot/imported/radioactive.svg-826ebf1689bc47cf482da642b68adf02.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
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/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
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
svg/scale=2.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false

1
common/icons/virus.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-virus"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M7 12a5 5 0 1 0 10 0a5 5 0 1 0 -10 0" /><path d="M12 7v-4" /><path d="M11 3h2" /><path d="M15.536 8.464l2.828 -2.828" /><path d="M17.657 4.929l1.414 1.414" /><path d="M17 12h4" /><path d="M21 11v2" /><path d="M15.535 15.536l2.829 2.828" /><path d="M19.071 17.657l-1.414 1.414" /><path d="M12 17v4" /><path d="M13 21h-2" /><path d="M8.465 15.536l-2.829 2.828" /><path d="M6.343 19.071l-1.413 -1.414" /><path d="M7 12h-4" /><path d="M3 13v-2" /><path d="M8.464 8.464l-2.828 -2.828" /><path d="M4.929 6.343l1.414 -1.413" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 827 B

43
common/icons/virus.svg.import Normal file
View File

@@ -0,0 +1,43 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cual1pde6keom"
path="res://.godot/imported/virus.svg-59f03f7d0b705bff456c355a03b2fd98.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://common/icons/virus.svg"
dest_files=["res://.godot/imported/virus.svg-59f03f7d0b705bff456c355a03b2fd98.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
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/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
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
svg/scale=2.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false

1
common/icons/wave-sine.svg Normal file
View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="#ffffff" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-wave-sine"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M21 12h-2c-.894 0 -1.662 -.857 -1.761 -2c-.296 -3.45 -.749 -6 -2.749 -6s-2.5 3.582 -2.5 8s-.5 8 -2.5 8s-2.452 -2.547 -2.749 -6c-.1 -1.147 -.867 -2 -1.763 -2h-2" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 474 B

43
common/icons/wave-sine.svg.import Normal file
View File

@@ -0,0 +1,43 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://c15ith3niu7sa"
path="res://.godot/imported/wave-sine.svg-af18e7f57640d33da7bef035e7276303.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://common/icons/wave-sine.svg"
dest_files=["res://.godot/imported/wave-sine.svg-af18e7f57640d33da7bef035e7276303.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
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/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
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
svg/scale=2.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false