diff --git a/gui/menu/settings/scripts/settings.gd b/gui/menu/settings/scripts/settings.gd index c8ee221..3f3e8d1 100644 --- a/gui/menu/settings/scripts/settings.gd +++ b/gui/menu/settings/scripts/settings.gd @@ -28,7 +28,7 @@ func _ready(): hide() func _process(_delta: float) -> void: - if settings: + if settings and is_node_ready(): var window_mode := DisplayServer.window_get_mode() if window_mode != settings.window_mode: settings.window_mode = window_mode diff --git a/stages/terrain/region/scripts/modifiers/region_modifier.gd b/stages/terrain/region/scripts/modifiers/region_modifier.gd index 7706687..d167d26 100644 --- a/stages/terrain/region/scripts/modifiers/region_modifier.gd +++ b/stages/terrain/region/scripts/modifiers/region_modifier.gd @@ -25,8 +25,11 @@ func get_icon() -> Texture: func get_card_section_color() -> Color: return DEFAULT_MODIFIER_COLOR +func get_possible_meteo_type() -> Array[Meteo.Type]: + return [Meteo.Type.CALM, Meteo.Type.RAINY, Meteo.Type.FOGGY, Meteo.Type.WINDY] + func region_ready(_region : Region) -> void: - pass + pass func modify_region_name(name : String) -> String: return name diff --git a/stages/terrain/region/scripts/modifiers/storm_modifier.gd b/stages/terrain/region/scripts/modifiers/storm_modifier.gd index 94cd9eb..69f0952 100644 --- a/stages/terrain/region/scripts/modifiers/storm_modifier.gd +++ b/stages/terrain/region/scripts/modifiers/storm_modifier.gd @@ -14,4 +14,7 @@ func get_card_section_color() -> Color: return Color("#FF006E") func modify_objective(objective : int) -> int: - return roundi(objective * 2) \ No newline at end of file + return roundi(objective * 2) + +func get_possible_meteo_type() -> Array[Meteo.Type]: + return [Meteo.Type.RAINY] diff --git a/stages/terrain/region/scripts/post_process/meteo.gd b/stages/terrain/region/scripts/post_process/meteo.gd index fa32e57..e1d2d07 100644 --- a/stages/terrain/region/scripts/post_process/meteo.gd +++ b/stages/terrain/region/scripts/post_process/meteo.gd @@ -31,7 +31,17 @@ func _init(meteo_seed : int = randi()): func(t : Type): return t != type ) - type = available_types[rng.randi_range(0, len(available_types) - 1)] + if (GameInfo.game_data + and GameInfo.game_data.current_region_data + ): + var possible_meteo : Array[Type] + for modifier in GameInfo.game_data.current_region_data.modifiers: + for possible_type in modifier.get_possible_meteo_type(): + if possible_meteo.find(possible_type) == -1: + possible_meteo.append(possible_type) + type = possible_meteo.pick_random() + else: + type = available_types[rng.randi_range(0, len(available_types) - 1)] func generate(): wind_direction = Vector2(1,0).rotated(rng.randf_range(PI, -PI)) diff --git a/stages/title_screen/title_screen.tscn b/stages/title_screen/title_screen.tscn index 8b1114b..980a8d1 100644 --- a/stages/title_screen/title_screen.tscn +++ b/stages/title_screen/title_screen.tscn @@ -560,7 +560,6 @@ autoplay = &"arrive" [node name="Settings" parent="." unique_id=1832300574 instance=ExtResource("18_lwj2x")] unique_name_in_owner = true -visible = false z_index = 100 mouse_filter = 2 diff --git a/translation/game/gui.csv b/translation/game/gui.csv index 214b5f1..579a99b 100644 --- a/translation/game/gui.csv +++ b/translation/game/gui.csv @@ -383,7 +383,7 @@ VENDING_MACHINES_MODIFIER_DESC_TEXT,A room with old vending machine is in the ar CRISTAL_CAVE_MODIFIER_DESC_TEXT,An cave full of Talion can be found in the region,Une caverne remplie de Talion peut être trouvée dans cette région RESONNANCE,Resonnance,Résonnance RESONNANCE_MODIFIER_DESC_TEXT,Mutation level from [b]Talion Veins[/b] seeds is increased,Le niveau de mutation des graines issues de [b]Veine de Talion[/b] est augmenté -INSTABLE,Instable,Instable +INSTABLE,Unstable,Instable INSTABLE_MODIFIER_DESC_TEXT,Increase the seed mutation probability,Augmente les chance de mutation des graines PASS_THE_MYSTERIOUS_DOOR,Go through the mysterious door,Franchissez la porte mystérieuse NEXT_STOP,Next Stop,Prochain arrêt