From 51dd7adf22d25e47d1e0c94389253551f98ce88c Mon Sep 17 00:00:00 2001 From: Douwe de Vries Date: Sun, 15 Nov 2026 14:26:34 +0100 Subject: [PATCH] Keep Godot warnings clean and title menus readable --- docs/ART_STYLE.md | 5 + docs/CONVENTIONS.md | 7 + docs/adr/0002-lint-and-format.md | 14 ++ game/ai/ai_sighting.gd | 16 +- game/ai/behaviours/attack_group.gd | 10 +- game/ai/behaviours/patrol_behaviour.gd | 2 +- game/ai/behaviours/retrieve_group.gd | 4 +- game/audio/audio_service.gd | 11 +- game/audio/base_loops.gd | 16 +- game/audio/campaign_sound_router.gd | 2 +- game/audio/eruption_cues.gd | 6 +- game/audio/holdout_sound.gd | 10 +- game/audio/storm_sound.gd | 4 +- game/audio/tide_sound.gd | 4 +- game/missions/mission.gd | 20 +-- game/missions/objective.gd | 6 +- game/missions/objectives/keep_alive.gd | 4 +- game/missions/objectives/keep_from_enemy.gd | 4 +- game/missions/objectives/sabotage_target.gd | 6 +- game/presentation/order_marker.gd | 8 +- game/project.godot | 33 +++++ game/save/save_game.gd | 6 +- game/sim/components/builder.gd | 4 +- game/sim/components/reactivator.gd | 4 +- game/sim/components/saboteur.gd | 4 +- game/sim/entities/prop.gd | 2 + game/sim/systems/combat/spatial_grid.gd | 6 +- game/sim/systems/navigation/navmesh_cutter.gd | 22 +-- game/sim/systems/navigation/navmesh_tools.gd | 18 +-- game/sim/systems/planet/dust_storm_system.gd | 22 +-- game/sim/systems/planet/eruption_system.gd | 138 +++++++++--------- game/sim/systems/sim_world.gd | 16 +- game/sim/systems/vision/vision_system.gd | 8 +- game/tests/audio/mix_scene.gd | 10 +- game/tests/audio/test_final_mix.gd | 4 +- game/tests/audio/test_score_phase6.gd | 8 +- game/tests/audio/test_thalassa_audio.gd | 4 +- game/tests/balance/balance_recorder.gd | 2 +- game/tests/balance/balance_run.gd | 4 +- game/tests/check_scripts.gd | 22 ++- game/tests/combat/test_weapons.gd | 2 +- game/tests/economy/test_placement_rules.gd | 10 +- game/tests/economy/test_sell_building.gd | 6 +- game/tests/maps/test_hollow_map.gd | 4 +- game/tests/planet/test_machinery.gd | 4 +- game/tests/props/test_props.gd | 2 +- game/tests/save/save_fixture.gd | 8 +- .../save/test_base_landing_round_trip.gd | 4 +- game/tests/save/test_save_validation.gd | 12 +- game/tests/test_command_queue.gd | 6 +- game/tests/test_state_machine.gd | 10 +- game/tests/ui/test_control_groups.gd | 10 +- game/tests/ui/test_title_layout.gd | 34 +++++ game/tests/ui/test_title_layout.gd.uid | 1 + game/tests/web/visual_compare.gd | 2 +- game/tests/web/web_probe.gd | 2 +- game/ui/group_bar.gd | 22 +-- game/ui/minimap.gd | 36 ++--- game/ui/save_notice.gd | 4 +- game/ui/settings_panel.gd | 4 +- game/ui/title_screen.gd | 89 ++++++++--- tools/test_warning_policy.py | 50 +++++++ tools/web_tests/controls.spec.cjs | 4 +- tools/web_tests/release_navigation.cjs | 6 +- 64 files changed, 531 insertions(+), 297 deletions(-) create mode 100644 game/tests/ui/test_title_layout.gd create mode 100644 game/tests/ui/test_title_layout.gd.uid create mode 100644 tools/test_warning_policy.py diff --git a/docs/ART_STYLE.md b/docs/ART_STYLE.md index 0d1a2d93..08431bbd 100644 --- a/docs/ART_STYLE.md +++ b/docs/ART_STYLE.md @@ -79,3 +79,8 @@ in exports and displayed in Credits. landing chevron and cyan planet rim use the HUD palette. Rebuild the committed 512px PNG with `game/assets/branding/render_icon.sh` (requires `rsvg-convert`, from librsvg). The application icon setting supplies native icons and the Web export's browser icon. + +The title keeps its main play actions in a vertical stack, with secondary actions +in a compact two-column group. Heading size and spacing adapt to shorter windows; +the supported 1152×648 layout fits at 100% and 130% UI scale without a scrollbar. +Very short windows retain an emergency scrolling fallback so actions stay reachable. diff --git a/docs/CONVENTIONS.md b/docs/CONVENTIONS.md index 18f9fc16..4d2a708d 100644 --- a/docs/CONVENTIONS.md +++ b/docs/CONVENTIONS.md @@ -14,6 +14,9 @@ It must exit 0. CI runs the same script. Engine and GUT warnings/deprecations fa ## GDScript - Follow the official GDScript style guide; `gdformat` decides layout. +- **Every enabled GDScript warning is an error.** Editor-only warning messages are not + reliably printed by headless runtime loading; the project settings and script-check + policy make fresh compilation enforce them in CI. Addons remain excluded. - **Static types everywhere.** Untyped declarations and unsafe access/calls/casts are errors (set in `project.godot`). Give every variable, parameter and return a type. To use a `Variant` (e.g. a dictionary value), assign it to a typed local first: @@ -81,3 +84,7 @@ does not imply that simulation code may call its visual children. hand-tuned mix values. `project_integrity.py` checks hashes/inventory without regenerating audio. Recipe edits also need the deterministic `audio_src/build.py --check` command documented in `docs/AUDIO_PROVENANCE.md`; encoder versions can affect output hashes. + +- During bulk script refactors, do not save editor resources while dependencies are + temporarily invalid. After fresh compilation is clean, reload stale editor state + from disk before live tests, and inspect resource diffs for unintended resaves. diff --git a/docs/adr/0002-lint-and-format.md b/docs/adr/0002-lint-and-format.md index aa02953c..558b6405 100644 --- a/docs/adr/0002-lint-and-format.md +++ b/docs/adr/0002-lint-and-format.md @@ -42,3 +42,17 @@ overrides in this checkout. Verified through the running 4.7.2 editor: inference level 2 and directory rules are `{ "res://addons": 0 }`, matching the intended policy. The script/resource load check and actual project settings remain the executable authority. Engine and GUT diagnostic classification is now shared by local checks and exports; GUT warnings and deprecated APIs also fail checks. + +## Editor warnings must reach CI (2026-11-15 follow-up) + +A live-editor check exposed shadowing warnings despite clean headless runtime logs. +Fresh startup with all currently enabled warning categories promoted from Warn (1) +to Error (2) reproduced them. Runtime log-prefix scanning alone cannot enforce these +editor diagnostics. All enabled categories now use Error, while disabled categories +and the engine's addon exclusion stay as configured. `check_scripts.gd` refuses any +category left at Warn, or a globally disabled warning system, so later engine +upgrades cannot silently weaken this policy. + +Fix local shadowing names, unused locals and static-call syntax; express intentional +integer truncation explicitly. Keep interface signal annotations narrowly scoped +and justified by their external emitters. Do not hide warnings with file-wide ignores. diff --git a/game/ai/ai_sighting.gd b/game/ai/ai_sighting.gd index e2adf4dd..b8229b9c 100644 --- a/game/ai/ai_sighting.gd +++ b/game/ai/ai_sighting.gd @@ -23,19 +23,19 @@ var _ref: WeakRef = null ## Records a fresh look at `entity` on sim tick `now`. -func update(entity: Node3D, now: int) -> void: - key = entity.get_instance_id() - _ref = weakref(entity) - position = AttackCommand.position_of(entity) - strength = AiKnowledge.strength_of(entity) - armed = Combat.is_armed(entity) +func update(target_entity: Node3D, now: int) -> void: + key = target_entity.get_instance_id() + _ref = weakref(target_entity) + position = AttackCommand.position_of(target_entity) + strength = AiKnowledge.strength_of(target_entity) + armed = Combat.is_armed(target_entity) last_seen_tick = now - var unit: Unit = entity as Unit + var unit: Unit = target_entity as Unit if unit != null and unit.def != null: def_id = unit.def.id heavy = unit.def.armour() == DamageTable.ARMOUR_HEAVY airborne = unit.def.flies - var building: Building = entity as Building + var building: Building = target_entity as Building if building != null: is_building = true footprint = building.footprint() diff --git a/game/ai/behaviours/attack_group.gd b/game/ai/behaviours/attack_group.gd index fba2607a..4eb73e84 100644 --- a/game/ai/behaviours/attack_group.gd +++ b/game/ai/behaviours/attack_group.gd @@ -134,12 +134,14 @@ func from_dict(data: Dictionary) -> void: ## The enemy to fire on: armed units first, then armed buildings, then anything, the ## nearest to the group's centre within each class. With `members`, enemies none of ## them can hit (flyers, for guns that do not hit air) come last. -static func pick_focus(enemies: Array[Node3D], from: Vector3, members: Array[Unit] = []) -> Node3D: +static func pick_focus( + enemies: Array[Node3D], from: Vector3, group_members: Array[Unit] = [] +) -> Node3D: var best: Node3D = null var best_score: float = INF for enemy: Node3D in enemies: var rank: float = 0.0 - if not members.is_empty() and AiGroup.able_to_hit(members, enemy).is_empty(): + if not group_members.is_empty() and AiGroup.able_to_hit(group_members, enemy).is_empty(): rank = 3000.0 elif not Combat.is_armed(enemy): rank = 2000.0 @@ -158,8 +160,8 @@ class GroupState: var _group: WeakRef - func _init(group: WeakRef) -> void: - _group = group + func _init(group_ref: WeakRef) -> void: + _group = group_ref func group() -> AttackGroup: var value: Variant = _group.get_ref() diff --git a/game/ai/behaviours/patrol_behaviour.gd b/game/ai/behaviours/patrol_behaviour.gd index fed00177..24552bf8 100644 --- a/game/ai/behaviours/patrol_behaviour.gd +++ b/game/ai/behaviours/patrol_behaviour.gd @@ -264,7 +264,7 @@ class InvestigateState: if b.arrived_at(b.investigate_point) or now - _started > LEG_TIMEOUT: _arrived_at = now return &"" - var looked: int = (now - _arrived_at) / 20 + var looked: int = int((now - _arrived_at) / 20.0) if looked > _turns: _turns = looked var around: Vector3 = Vector3.FORWARD.rotated(Vector3.UP, _turns * PI * 0.66) diff --git a/game/ai/behaviours/retrieve_group.gd b/game/ai/behaviours/retrieve_group.gd index 58d1a869..fb832ea7 100644 --- a/game/ai/behaviours/retrieve_group.gd +++ b/game/ai/behaviours/retrieve_group.gd @@ -78,8 +78,8 @@ class GroupState: var _group: WeakRef - func _init(group: WeakRef) -> void: - _group = group + func _init(group_ref: WeakRef) -> void: + _group = group_ref func group() -> RetrieveGroup: var value: Variant = _group.get_ref() diff --git a/game/audio/audio_service.gd b/game/audio/audio_service.gd index b578b44b..678844fb 100644 --- a/game/audio/audio_service.gd +++ b/game/audio/audio_service.gd @@ -6,14 +6,17 @@ ## ShutdownGuard stops all descendant players before they leave the tree. extends Node +## Resolve the autoload's playback dependency directly, including during editor indexing. +const PlaybackPool: GDScript = preload("res://audio/one_shot_playback.gd") + const EVENTS_DIR: String = "res://data/sounds" const DEFAULT_SCORE: String = "res://data/sounds/music/kessel_reach.tres" const SHIP_SCORE: String = "res://data/sounds/music/meridian.tres" ## Leaving the ship, the planet's score comes in at the briefing bed's level ## and waits there for the briefing (or the mission) to set it. const LANDING_DIP_DB: float = MissionSoundRouter.BRIEFING_DUCK_DB -const FLAT_VOICES: int = OneShotPlayback.FLAT_VOICES -const POSITIONAL_VOICES: int = OneShotPlayback.POSITIONAL_VOICES +const FLAT_VOICES: int = PlaybackPool.FLAT_VOICES +const POSITIONAL_VOICES: int = PlaybackPool.POSITIONAL_VOICES ## Zoom changes smaller than this do not touch the bus volumes. const ZOOM_EPSILON: float = 0.01 ## The music layer that surfaces as discovery sites are resolved. @@ -36,7 +39,7 @@ const RIVAL_INTEL_TYPE: StringName = &"rival_intel" const STING_DIP_DB: float = -6.0 var _events: Dictionary[StringName, SoundEvent] = {} -var _one_shots: OneShotPlayback +var _one_shots: PlaybackPool var _listener: AudioListener3D var _listener_active: bool = false var _zoom: float = 0.5 @@ -83,7 +86,7 @@ var _shade: float = 0.0 func _ready() -> void: process_mode = Node.PROCESS_MODE_ALWAYS _register_events(EVENTS_DIR) - _one_shots = OneShotPlayback.new() + _one_shots = PlaybackPool.new() _one_shots.name = &"OneShots" add_child(_one_shots) _listener = AudioListener3D.new() diff --git a/game/audio/base_loops.gd b/game/audio/base_loops.gd index a9ff97bc..244929f4 100644 --- a/game/audio/base_loops.gd +++ b/game/audio/base_loops.gd @@ -274,14 +274,14 @@ func _apply_choice() -> void: _assign(_chosen_owners[k], _chosen_ids[k]) -func _slot_of(owner: Node3D, loop_id: StringName) -> int: +func _slot_of(loop_owner: Node3D, loop_id: StringName) -> int: for i: int in _players.size(): - if is_instance_valid(_owners[i]) and _owners[i] == owner and _loop_ids[i] == loop_id: + if is_instance_valid(_owners[i]) and _owners[i] == loop_owner and _loop_ids[i] == loop_id: return i return -1 -func _assign(owner: Node3D, loop_id: StringName) -> void: +func _assign(loop_owner: Node3D, loop_id: StringName) -> void: var event: SoundEvent = resolve_event.call(loop_id) if event == null or event.streams.is_empty(): return @@ -298,10 +298,10 @@ func _assign(owner: Node3D, loop_id: StringName) -> void: player.bus = event.bus player.max_distance = event.max_distance player.volume_db = AudioMix.SILENT_DB - player.global_position = owner.global_position + player.global_position = loop_owner.global_position # Random start point so identical loops never phase-lock. player.play(_rng.randf() * maxf(stream.get_length() - 0.05, 0.0)) - _owners[slot] = owner + _owners[slot] = loop_owner _loop_ids[slot] = loop_id _wanted[slot] = true _levels[slot] = 0.0 @@ -313,7 +313,7 @@ func _update_player(i: int, delta: float) -> void: if not alive: _owners[i] = null _wanted[i] = false - var owner: Node3D = _owners[i] + var loop_owner: Node3D = _owners[i] _levels[i] = move_toward(_levels[i], 1.0 if _wanted[i] else 0.0, delta / FADE_SECONDS) if _levels[i] <= 0.0: if player.playing: @@ -329,10 +329,10 @@ func _update_player(i: int, delta: float) -> void: _low_power and (is_hum(_loop_ids[i]) or _loop_ids[i] == PRODUCE) and alive - and AudioEventRouter.faction_of(owner) == player_faction + and AudioEventRouter.faction_of(loop_owner) == player_faction ) if alive: - player.global_position = owner.global_position + player.global_position = loop_owner.global_position player.volume_db = ( base_db + (LOW_POWER_DB if dims else 0.0) + AudioMix.linear_to_db_safe(_levels[i]) ) diff --git a/game/audio/campaign_sound_router.gd b/game/audio/campaign_sound_router.gd index 33ac6b7d..4213bad4 100644 --- a/game/audio/campaign_sound_router.gd +++ b/game/audio/campaign_sound_router.gd @@ -36,7 +36,7 @@ var play_at: Callable = func(_id: StringName, _at: Vector3, _db: float) -> bool: ## Offers an Advisor alert kind: `func(kind: StringName) -> void`. var offer_alert: Callable = func(_kind: StringName) -> void: pass ## Shows a campaign screen, or &"" for a landing: `func(screen: StringName) -> void`. -var show_screen: Callable = func(_screen: StringName) -> void: pass +var show_screen: Callable = func(_requested_screen: StringName) -> void: pass ## The launch was confirmed: `func() -> void`. var launch: Callable = func() -> void: pass diff --git a/game/audio/eruption_cues.gd b/game/audio/eruption_cues.gd index 3bef4ccf..cf5d3e06 100644 --- a/game/audio/eruption_cues.gd +++ b/game/audio/eruption_cues.gd @@ -96,10 +96,10 @@ static func level_db(seconds_left: float) -> float: ## arrival fade) and visibility. AudioMix.SILENT_DB when silent. static func layer_db(layer: StringName, seconds_left: float, presence: float, seen: bool) -> float: var p: float = progress(seconds_left) - var weight: float = cos(p * PI * 0.5) if layer == BUILD_LOW else sin(p * PI * 0.5) - if weight <= 0.0001 or presence <= 0.0: + var layer_weight: float = cos(p * PI * 0.5) if layer == BUILD_LOW else sin(p * PI * 0.5) + if layer_weight <= 0.0001 or presence <= 0.0: return AudioMix.SILENT_DB - var db: float = AudioMix.linear_to_db_safe(weight) + level_db(seconds_left) + var db: float = AudioMix.linear_to_db_safe(layer_weight) + level_db(seconds_left) db += AudioMix.linear_to_db_safe(presence) + (0.0 if seen else UNSEEN_DB) return maxf(db, AudioMix.SILENT_DB) diff --git a/game/audio/holdout_sound.gd b/game/audio/holdout_sound.gd index f806a543..59c67a91 100644 --- a/game/audio/holdout_sound.gd +++ b/game/audio/holdout_sound.gd @@ -112,14 +112,14 @@ func handle_sim_ticked(tick: int) -> StringName: if _arrived: return &"" _left = seconds_left(tick) - var stage: int = HoldoutCues.stage_for(_left) + var next_stage: int = HoldoutCues.stage_for(_left) var cue: StringName = &"" - if stage > _stage: - if stage == 2: + if next_stage > _stage: + if next_stage == 2: cue = _play(HoldoutCues.MINUTE_CUE) - elif stage == 3: + elif next_stage == 3: cue = HoldoutCues.ENGINE if _start_engine() else &"" - _stage = stage + _stage = next_stage if _stage >= 3: _engine_db = HoldoutCues.engine_db(_left) _engine.pitch_scale = HoldoutCues.engine_pitch(_left) diff --git a/game/audio/storm_sound.gd b/game/audio/storm_sound.gd index 5a5da4a9..b2d3f73d 100644 --- a/game/audio/storm_sound.gd +++ b/game/audio/storm_sound.gd @@ -82,8 +82,8 @@ func handle_storm_incoming(_seconds: float) -> StringName: return _play(StormCues.FRONT_RUMBLE) -func handle_storm_changed(intensity: float) -> void: - cues.report(intensity) +func handle_storm_changed(storm_intensity: float) -> void: + cues.report(storm_intensity) func handle_mission_started() -> void: diff --git a/game/audio/tide_sound.gd b/game/audio/tide_sound.gd index 9a2f7b86..7dbc848b 100644 --- a/game/audio/tide_sound.gd +++ b/game/audio/tide_sound.gd @@ -70,8 +70,8 @@ func handle_tide_turning(_seconds: float, rising: bool) -> StringName: return started -func handle_tide_changed(level: float) -> void: - cues.report(level) +func handle_tide_changed(tide_level: float) -> void: + cues.report(tide_level) func handle_mission_started() -> void: diff --git a/game/missions/mission.gd b/game/missions/mission.gd index 0db8b1b9..b7672f4f 100644 --- a/game/missions/mission.gd +++ b/game/missions/mission.gd @@ -270,19 +270,19 @@ func enemy_factions() -> Array[int]: ## Creates and starts the objective `objective_def` describes. func add_objective_def(objective_def: ObjectiveDef) -> Objective: - var objective: Objective = ObjectiveFactory.create(objective_def) - if objective != null: - add_objective(objective) - return objective + var new_objective: Objective = ObjectiveFactory.create(objective_def) + if new_objective != null: + add_objective(new_objective) + return new_objective ## Starts `objective` and announces it (unless hidden). -func add_objective(objective: Objective) -> void: - objectives.append(objective) - objective.start(self) - if objective.is_known: - Events.objective_added.emit(objective) - objective.evaluate() +func add_objective(new_objective: Objective) -> void: + objectives.append(new_objective) + new_objective.start(self) + if new_objective.is_known: + Events.objective_added.emit(new_objective) + new_objective.evaluate() ## The objective with `objective_id`, or null. diff --git a/game/missions/objective.gd b/game/missions/objective.gd index a5a9c2d4..ff71d786 100644 --- a/game/missions/objective.gd +++ b/game/missions/objective.gd @@ -208,9 +208,9 @@ func factions_of(side: StringName) -> Array[int]: static func ids_of(entities: Array) -> Array[int]: var ids: Array[int] = [] for entity: Variant in entities: - var id: int = Order.entity_id_of(entity) - if id >= 0: - ids.append(id) + var entity_id: int = Order.entity_id_of(entity) + if entity_id >= 0: + ids.append(entity_id) return ids diff --git a/game/missions/objectives/keep_alive.gd b/game/missions/objectives/keep_alive.gd index d7568348..cf0f9b3b 100644 --- a/game/missions/objectives/keep_alive.gd +++ b/game/missions/objectives/keep_alive.gd @@ -44,8 +44,8 @@ func from_dict(data: Dictionary) -> void: guarded.clear() var ids: Array = data.get("guarded", []) for entry: Variant in ids: - var id: int = entry - var found: Node3D = mission.world.entity(id) if mission != null else null + var entity_id: int = entry + var found: Node3D = mission.world.entity(entity_id) if mission != null else null if found != null: guarded.append(found) var count: int = data.get("guarded_count", guarded.size()) diff --git a/game/missions/objectives/keep_from_enemy.gd b/game/missions/objectives/keep_from_enemy.gd index a17fdf5f..4abd127f 100644 --- a/game/missions/objectives/keep_from_enemy.gd +++ b/game/missions/objectives/keep_from_enemy.gd @@ -30,8 +30,8 @@ func _evaluate() -> void: func to_dict() -> Dictionary: var data: Dictionary = super() var holders: Dictionary = {} - for id: int in _last_holder: - holders[str(id)] = _last_holder[id] + for entity_id: int in _last_holder: + holders[str(entity_id)] = _last_holder[entity_id] data["holders"] = holders return data diff --git a/game/missions/objectives/sabotage_target.gd b/game/missions/objectives/sabotage_target.gd index 0bcba4c5..2f205912 100644 --- a/game/missions/objectives/sabotage_target.gd +++ b/game/missions/objectives/sabotage_target.gd @@ -41,7 +41,9 @@ func from_dict(data: Dictionary) -> void: targets.clear() var ids: Array = data.get("targets", []) for entry: Variant in ids: - var id: int = entry - var found: Building = mission.world.entity(id) as Building if mission != null else null + var entity_id: int = entry + var found: Building = ( + mission.world.entity(entity_id) as Building if mission != null else null + ) if found != null: targets.append(found) diff --git a/game/presentation/order_marker.gd b/game/presentation/order_marker.gd index 08f44dc7..9d9a2c07 100644 --- a/game/presentation/order_marker.gd +++ b/game/presentation/order_marker.gd @@ -13,10 +13,12 @@ const ATTACK_SCALE := 1.6 var _age: float = 0.0 -static func spawn(parent: Node, at: Vector3, color: Color, scale: float = 1.0) -> OrderMarker: +static func spawn( + parent: Node, at: Vector3, color: Color, marker_scale: float = 1.0 +) -> OrderMarker: var marker := OrderMarker.new() var quad := PlaneMesh.new() - quad.size = Vector2.ONE * SIZE * scale + quad.size = Vector2.ONE * SIZE * marker_scale var material := ShaderMaterial.new() material.shader = SHADER marker.mesh = quad @@ -25,7 +27,7 @@ static func spawn(parent: Node, at: Vector3, color: Color, scale: float = 1.0) - parent.add_child(marker) marker.global_position = at + Vector3.UP * 0.1 ShaderParameters.set_value(marker, &"marker_color", color) - ShaderParameters.set_value(marker, &"attack", scale > 1.0) + ShaderParameters.set_value(marker, &"attack", marker_scale > 1.0) return marker diff --git a/game/project.godot b/game/project.godot index 7dc309fd..5715a486 100644 --- a/game/project.godot +++ b/game/project.godot @@ -30,6 +30,20 @@ UiTheme="*res://ui/ui_theme.gd" [debug] +gdscript/warnings/unassigned_variable=2 +gdscript/warnings/unassigned_variable_op_assign=2 +gdscript/warnings/unused_variable=2 +gdscript/warnings/unused_local_constant=2 +gdscript/warnings/unused_private_class_variable=2 +gdscript/warnings/unused_parameter=2 +gdscript/warnings/unused_signal=2 +gdscript/warnings/shadowed_variable=2 +gdscript/warnings/shadowed_variable_base_class=2 +gdscript/warnings/shadowed_global_identifier=2 +gdscript/warnings/unreachable_code=2 +gdscript/warnings/unreachable_pattern=2 +gdscript/warnings/standalone_expression=2 +gdscript/warnings/standalone_ternary=2 gdscript/warnings/incompatible_ternary=2 gdscript/warnings/untyped_declaration=2 gdscript/warnings/unsafe_property_access=2 @@ -37,8 +51,27 @@ gdscript/warnings/unsafe_method_access=2 gdscript/warnings/unsafe_cast=2 gdscript/warnings/unsafe_call_argument=2 gdscript/warnings/unsafe_void_return=2 +gdscript/warnings/static_called_on_instance=2 +gdscript/warnings/missing_tool=2 +gdscript/warnings/redundant_static_unload=2 +gdscript/warnings/redundant_await=2 +gdscript/warnings/assert_always_true=2 +gdscript/warnings/assert_always_false=2 +gdscript/warnings/integer_division=2 gdscript/warnings/narrowing_conversion=2 gdscript/warnings/int_as_enum_without_cast=2 +gdscript/warnings/int_as_enum_without_match=2 +gdscript/warnings/enum_variable_without_default=2 +gdscript/warnings/empty_file=2 +gdscript/warnings/deprecated_keyword=2 +gdscript/warnings/confusable_identifier=2 +gdscript/warnings/confusable_local_declaration=2 +gdscript/warnings/confusable_local_usage=2 +gdscript/warnings/confusable_capture_reassignment=2 +gdscript/warnings/confusable_temporary_modification=2 +gdscript/warnings/property_used_as_function=2 +gdscript/warnings/constant_used_as_function=2 +gdscript/warnings/function_used_as_property=2 [editor] diff --git a/game/save/save_game.gd b/game/save/save_game.gd index 14888352..ebdf76cc 100644 --- a/game/save/save_game.gd +++ b/game/save/save_game.gd @@ -134,9 +134,9 @@ static func check(data: Dictionary) -> String: if not _campaign_containers(plan_data, false): return "The landing plan of this save cannot be read." if kind_text == String(KIND_CAMPAIGN): - var campaign_path: String = data.get("campaign_def", "") - if not _resource_is(campaign_path, CampaignDef): - return "The campaign of this save is missing (%s)." % campaign_path + var saved_campaign_path: String = data.get("campaign_def", "") + if not _resource_is(saved_campaign_path, CampaignDef): + return "The campaign of this save is missing (%s)." % saved_campaign_path var campaign_data: Dictionary = data.get("campaign", {}) if not _campaign_containers(campaign_data, true): return "The campaign state of this save cannot be read." diff --git a/game/sim/components/builder.gd b/game/sim/components/builder.gd index 0294cfdd..6c039926 100644 --- a/game/sim/components/builder.gd +++ b/game/sim/components/builder.gd @@ -116,9 +116,9 @@ func from_dict(data: Dictionary) -> void: func _approach() -> void: # Retries alternate sides: 0, +3, -3, +6, -6 ... metres. - var step: int = ceili(_attempts * 0.5) + var retry_step: int = ceili(_attempts * 0.5) var side: float = 1.0 if _attempts % 2 == 1 else -1.0 - unit.locomotion.move_to(work_spot(side * step * RETRY_SLIDE)) + unit.locomotion.move_to(work_spot(side * retry_step * RETRY_SLIDE)) ## Distance from the footprint edge within which the unit can build. diff --git a/game/sim/components/reactivator.gd b/game/sim/components/reactivator.gd index 2bb3d90d..4e57c75e 100644 --- a/game/sim/components/reactivator.gd +++ b/game/sim/components/reactivator.gd @@ -99,9 +99,9 @@ func from_dict(data: Dictionary) -> void: func _approach() -> void: - var step: int = ceili(_attempts * 0.5) + var retry_step: int = ceili(_attempts * 0.5) var side: float = 1.0 if _attempts % 2 == 1 else -1.0 - unit.locomotion.move_to(_work_spot(side * step * RETRY_SLIDE)) + unit.locomotion.move_to(_work_spot(side * retry_step * RETRY_SLIDE)) func _reach() -> float: diff --git a/game/sim/components/saboteur.gd b/game/sim/components/saboteur.gd index 60a9872c..0326ec02 100644 --- a/game/sim/components/saboteur.gd +++ b/game/sim/components/saboteur.gd @@ -106,9 +106,9 @@ func from_dict(data: Dictionary) -> void: func _approach() -> void: - var step: int = ceili(_attempts * 0.5) + var retry_step: int = ceili(_attempts * 0.5) var side: float = 1.0 if _attempts % 2 == 1 else -1.0 - unit.locomotion.move_to(_work_spot(side * step * RETRY_SLIDE)) + unit.locomotion.move_to(_work_spot(side * retry_step * RETRY_SLIDE)) func _reach() -> float: diff --git a/game/sim/entities/prop.gd b/game/sim/entities/prop.gd index 385a6488..db4cc219 100644 --- a/game/sim/entities/prop.gd +++ b/game/sim/entities/prop.gd @@ -10,6 +10,8 @@ extends Node3D ## A unit lifted it (`carrier`) or put it down (null). Presentation shows the carried ## look; audio may play a pick-up or drop. +# Carrier.pick_up() and Carrier.drop() emit this signal on the prop. +@warning_ignore("unused_signal") signal carried_changed(carrier: Node3D) ## 2: carriable props remember being lifted and by whom last. diff --git a/game/sim/systems/combat/spatial_grid.gd b/game/sim/systems/combat/spatial_grid.gd index 76e56330..4204e5f6 100644 --- a/game/sim/systems/combat/spatial_grid.gd +++ b/game/sim/systems/combat/spatial_grid.gd @@ -51,10 +51,10 @@ func query(center: Vector3, radius: float) -> Array[Node3D]: var high: Vector2i = cell_of(center + Vector3(radius, 0.0, radius)) for z: int in range(low.y, high.y + 1): for x: int in range(low.x, high.x + 1): - var bucket: Variant = _cells.get(Vector2i(x, z)) - if bucket == null: + var cell_entries: Variant = _cells.get(Vector2i(x, z)) + if cell_entries == null: continue - var entries: Array = bucket + var entries: Array = cell_entries for entry: Variant in entries: # The grid is as old as its last rebuild: something in it may have # died and been freed since. diff --git a/game/sim/systems/navigation/navmesh_cutter.gd b/game/sim/systems/navigation/navmesh_cutter.gd index 91025c5f..ef0b6436 100644 --- a/game/sim/systems/navigation/navmesh_cutter.gd +++ b/game/sim/systems/navigation/navmesh_cutter.gd @@ -101,11 +101,11 @@ func cut(rect: Rect2) -> void: ## Edges in `area` that the navigation server would refuse: more than two polygons ## on one rasterised edge (an edge with both ends in one cell is skipped, as the ## server does). -func conflicting_edges(area: Rect2) -> int: +func conflicting_edges(check_area: Rect2) -> int: var users: Dictionary[String, int] = {} var conflicts: int = 0 for p: int in polygons.size(): - if not _boxes[p].intersects(area, true): + if not _boxes[p].intersects(check_area, true): continue var polygon: PackedInt32Array = polygons[p] var count: int = polygon.size() @@ -160,20 +160,20 @@ func area() -> float: func to_navmesh(template: NavigationMesh) -> NavigationMesh: var result: NavigationMesh = template.duplicate() as NavigationMesh result.clear_polygons() - var remap: PackedInt32Array = PackedInt32Array() - remap.resize(vertices.size()) - remap.fill(-1) + var vertex_remap: PackedInt32Array = PackedInt32Array() + vertex_remap.resize(vertices.size()) + vertex_remap.fill(-1) var used: PackedVector3Array = PackedVector3Array() for polygon: PackedInt32Array in polygons: for index: int in polygon: - if remap[index] == -1: - remap[index] = used.size() + if vertex_remap[index] == -1: + vertex_remap[index] = used.size() used.append(vertices[index]) result.set_vertices(used) for polygon: PackedInt32Array in polygons: var mapped: PackedInt32Array = PackedInt32Array() for index: int in polygon: - mapped.append(remap[index]) + mapped.append(vertex_remap[index]) result.add_polygon(mapped) return result @@ -200,7 +200,9 @@ func _add_piece(result: Array[PackedInt32Array], piece: PackedInt32Array) -> voi ## Sutherland-Hodgman clip of a convex polygon by one axis-aligned half-plane. -func _clip(polygon: PackedInt32Array, axis: int, value: float, sign: float) -> PackedInt32Array: +func _clip( + polygon: PackedInt32Array, axis: int, value: float, clip_sign: float +) -> PackedInt32Array: var count: int = polygon.size() var out: PackedInt32Array = PackedInt32Array() if count < 3: @@ -208,7 +210,7 @@ func _clip(polygon: PackedInt32Array, axis: int, value: float, sign: float) -> P var distances: PackedFloat32Array = PackedFloat32Array() distances.resize(count) for i: int in count: - var distance: float = sign * (vertices[polygon[i]][axis] - value) + var distance: float = clip_sign * (vertices[polygon[i]][axis] - value) distances[i] = 0.0 if absf(distance) <= SNAP else distance for i: int in count: var j: int = (i + 1) % count diff --git a/game/sim/systems/navigation/navmesh_tools.gd b/game/sim/systems/navigation/navmesh_tools.gd index 0a64ff24..0b39fae6 100644 --- a/game/sim/systems/navigation/navmesh_tools.gd +++ b/game/sim/systems/navigation/navmesh_tools.gd @@ -58,7 +58,7 @@ static func clip_source(source: NavigationMeshSourceGeometryData3D, height: floa var kept: Array[Vector3] = _clip_polygon(corners, height) if kept.size() < 3: continue - var first: int = out_vertices.size() / 3 + var first: int = int(out_vertices.size() / 3.0) for point: Vector3 in kept: out_vertices.append_array(PackedFloat32Array([point.x, point.y, point.z])) for k: int in range(1, kept.size() - 1): @@ -128,15 +128,15 @@ static func clip_navmesh( polygons.append(kept) var result: NavigationMesh = navmesh.duplicate() as NavigationMesh result.clear_polygons() - var remap: Dictionary[int, int] = {} + var vertex_remap: Dictionary[int, int] = {} var used: PackedVector3Array = PackedVector3Array() for polygon: PackedInt32Array in polygons: var mapped: PackedInt32Array = PackedInt32Array() for index: int in polygon: - if not remap.has(index): - remap[index] = used.size() + if not vertex_remap.has(index): + vertex_remap[index] = used.size() used.append(vertices[index]) - mapped.append(remap[index]) + mapped.append(vertex_remap[index]) result.add_polygon(mapped) result.set_vertices(used) return result @@ -219,7 +219,7 @@ static func keep_island(navmesh: NavigationMesh, keep_point: Vector3) -> Navigat best_root = _find(parent, polygon[0]) var result: NavigationMesh = navmesh.duplicate() as NavigationMesh result.clear_polygons() - var remap: Dictionary[int, int] = {} + var vertex_remap: Dictionary[int, int] = {} var kept_vertices: PackedVector3Array = PackedVector3Array() for p: int in polygon_count: var polygon: PackedInt32Array = navmesh.get_polygon(p) @@ -227,10 +227,10 @@ static func keep_island(navmesh: NavigationMesh, keep_point: Vector3) -> Navigat continue var new_polygon: PackedInt32Array = PackedInt32Array() for index: int in polygon: - if not remap.has(index): - remap[index] = kept_vertices.size() + if not vertex_remap.has(index): + vertex_remap[index] = kept_vertices.size() kept_vertices.append(vertices[index]) - new_polygon.append(remap[index]) + new_polygon.append(vertex_remap[index]) result.add_polygon(new_polygon) result.set_vertices(kept_vertices) return result diff --git a/game/sim/systems/planet/dust_storm_system.gd b/game/sim/systems/planet/dust_storm_system.gd index 8f0a3cf1..fcf9def9 100644 --- a/game/sim/systems/planet/dust_storm_system.gd +++ b/game/sim/systems/planet/dust_storm_system.gd @@ -141,14 +141,14 @@ func _tick(tick_number: int, _dt: float) -> void: func _check_climax() -> void: if _climax_tick < 0 or is_final: return - var start: int = _climax_tick - ticks(_storm.build_seconds) - if _now < start - ticks(_storm.warning_seconds): + var start_tick: int = _climax_tick - ticks(_storm.build_seconds) + if _now < start_tick - ticks(_storm.warning_seconds): return is_final = true - _next_start = start + _next_start = start_tick match state: STATE_CLEAR, STATE_WARNING: - _announce(start) + _announce(start_tick) STATE_FADING, STATE_BUILDING: # A storm already blowing turns into the one that stays: it builds from # where it is and is at full strength exactly at the deadline. @@ -159,10 +159,10 @@ func _check_climax() -> void: _warn(_climax_tick) -func _announce(start: int) -> void: +func _announce(start_tick: int) -> void: state = STATE_WARNING - _next_start = start - _warn(start) + _next_start = start_tick + _warn(start_tick) ## Tells everyone a storm is `at - now` away (the climax in its own, sterner words). @@ -199,12 +199,12 @@ func _draw_next() -> void: _storm.interval_seconds + _variation(_storm.interval_variation), _storm.warning_seconds + 1.0 ) - var start: int = _now + ticks(wait) - _next_start = start if _fits_before_climax(start) else NEVER + var start_tick: int = _now + ticks(wait) + _next_start = start_tick if _fits_before_climax(start_tick) else NEVER ## True if a regular storm starting at `start` is over before the climax is announced. -func _fits_before_climax(start: int) -> bool: +func _fits_before_climax(start_tick: int) -> bool: if _climax_tick < 0: return true var longest: float = ( @@ -217,7 +217,7 @@ func _fits_before_climax(start: int) -> bool: var climax_warning: int = ( _climax_tick - ticks(_storm.build_seconds) - ticks(_storm.warning_seconds) ) - return start + ticks(longest) < climax_warning + return start_tick + ticks(longest) < climax_warning func _variation(spread: float) -> float: diff --git a/game/sim/systems/planet/eruption_system.gd b/game/sim/systems/planet/eruption_system.gd index e7b5cadd..0c529868 100644 --- a/game/sim/systems/planet/eruption_system.gd +++ b/game/sim/systems/planet/eruption_system.gd @@ -55,8 +55,8 @@ func _setup() -> void: assert(_eruption != null, "EruptionSystem needs an EruptionRule") _rng.seed = rule.random_seed _now = world.context.sim_clock.get_tick() if world.context != null else 0 - for vent: ResourceNode in vents(): - _state_of(vent) + for vent_node: ResourceNode in vents(): + _state_of(vent_node) ## The erupting vents in the world. @@ -69,18 +69,18 @@ func vents() -> Array[ResourceNode]: ## The vent's pressure, 0..1 (0 for anything that does not erupt). -func pressure_of(vent: ResourceNode) -> float: - if vent == null or not _vents.has(vent.entity_id): +func pressure_of(vent_node: ResourceNode) -> float: + if vent_node == null or not _vents.has(vent_node.entity_id): return 0.0 - var pressure: float = _vents[vent.entity_id]["pressure"] + var pressure: float = _vents[vent_node.entity_id]["pressure"] return pressure ## Seconds until the vent's announced eruption; INF when none is announced. -func seconds_to_burst(vent: ResourceNode) -> float: - if vent == null or not _vents.has(vent.entity_id): +func seconds_to_burst(vent_node: ResourceNode) -> float: + if vent_node == null or not _vents.has(vent_node.entity_id): return INF - var state: Dictionary = _vents[vent.entity_id] + var state: Dictionary = _vents[vent_node.entity_id] if state["state"] != STATE_WARNING: return INF var burst_at: int = state["burst_at"] @@ -88,10 +88,10 @@ func seconds_to_burst(vent: ResourceNode) -> float: ## Seconds before the vent may be vented again (0 = ready). -func vent_cooldown_left(vent: ResourceNode) -> float: - if vent == null or not _vents.has(vent.entity_id): +func vent_cooldown_left(vent_node: ResourceNode) -> float: + if vent_node == null or not _vents.has(vent_node.entity_id): return 0.0 - var ready_at: int = _vents[vent.entity_id]["vent_ready_at"] + var ready_at: int = _vents[vent_node.entity_id]["vent_ready_at"] return maxf(float(ready_at - _now) / SimClock.TICK_RATE, 0.0) @@ -163,15 +163,15 @@ func schedule_climax(at_tick: int) -> void: ## announced; INF when it is not building). func dangers() -> Array[Vector4]: var found: Array[Vector4] = [] - for vent: ResourceNode in vents(): - var state: Dictionary = _state_of(vent) + for vent_node: ResourceNode in vents(): + var state: Dictionary = _state_of(vent_node) var pressure: float = state["pressure"] - var seconds: float = seconds_to_burst(vent) + var seconds: float = seconds_to_burst(vent_node) if seconds == INF and pressure < DANGER_PRESSURE: continue if seconds == INF: - seconds = _estimate_seconds(vent, state) - found.append(Vector4(vent.position.x, vent.position.z, _eruption.radius, seconds)) + seconds = _estimate_seconds(vent_node, state) + found.append(Vector4(vent_node.position.x, vent_node.position.z, _eruption.radius, seconds)) return found @@ -180,12 +180,12 @@ func dangers() -> Array[Vector4]: func next_to_erupt() -> ResourceNode: var best: ResourceNode = null var best_seconds: float = INF - for vent: ResourceNode in vents(): - var seconds: float = seconds_to_burst(vent) + for vent_node: ResourceNode in vents(): + var seconds: float = seconds_to_burst(vent_node) if seconds == INF: - seconds = _estimate_seconds(vent, _state_of(vent)) + seconds = _estimate_seconds(vent_node, _state_of(vent_node)) if seconds < best_seconds: - best = vent + best = vent_node best_seconds = seconds return best @@ -236,62 +236,62 @@ func indicator_alarm() -> bool: func _tick(tick_number: int, dt: float) -> void: _now = tick_number _tick_surge() - for vent: ResourceNode in vents(): - var state: Dictionary = _state_of(vent) + for vent_node: ResourceNode in vents(): + var state: Dictionary = _state_of(vent_node) if state["state"] == STATE_WARNING: var burst_at: int = state["burst_at"] if _now >= burst_at: - _erupt(vent, state) + _erupt(vent_node, state) else: - _build(vent, state, dt) - _show(vent) + _build(vent_node, state, dt) + _show(vent_node) _pick_pressing() if tick_number % 10 == 0: _update_forecast() -func _build(vent: ResourceNode, state: Dictionary, dt: float) -> void: +func _build(vent_node: ResourceNode, state: Dictionary, dt: float) -> void: var quiet_until: int = state["quiet_until"] if _now < quiet_until: return var pressure: float = state["pressure"] - pressure = minf(pressure + _rate(vent) * dt, 1.0) + pressure = minf(pressure + _rate(vent_node) * dt, 1.0) state["pressure"] = pressure var threshold: float = state["threshold"] if pressure >= threshold: - _warn(vent, state, ticks(_eruption.warning_seconds)) + _warn(vent_node, state, ticks(_eruption.warning_seconds)) ## Announces that `vent` bursts in `length` ticks. -func _warn(vent: ResourceNode, state: Dictionary, length: int) -> void: +func _warn(vent_node: ResourceNode, state: Dictionary, length: int) -> void: state["state"] = STATE_WARNING state["burst_at"] = _now + maxi(length, 1) var seconds: float = float(maxi(length, 1)) / SimClock.TICK_RATE - Events.eruption_warning.emit(vent, seconds, _eruption.radius) - if _concerns_player(vent) and _now >= _next_alert_tick: + Events.eruption_warning.emit(vent_node, seconds, _eruption.radius) + if _concerns_player(vent_node) and _now >= _next_alert_tick: _next_alert_tick = _now + ticks(_eruption.alert_seconds) Events.advisor_alert.emit(&"eruption_warning") ## Pressure per second now: fast while a working Tap draws on it. -func _rate(vent: ResourceNode) -> float: - var tap: Building = vent.tap if is_instance_valid(vent.tap) else null +func _rate(vent_node: ResourceNode) -> float: + var tap: Building = vent_node.tap if is_instance_valid(vent_node.tap) else null if tap != null and not tap.is_dead and tap.is_operational(): if tap.flux_extractor != null and not tap.flux_extractor.is_stalled(): return _eruption.tapped_rate return _eruption.idle_rate -func _erupt(vent: ResourceNode, state: Dictionary) -> void: +func _erupt(vent_node: ResourceNode, state: Dictionary) -> void: state["state"] = STATE_CALM state["surge"] = false state["pressure"] = 0.0 state["threshold"] = _draw_threshold() state["quiet_until"] = _now + ticks(_eruption.quiet_seconds) var radius: float = _eruption.radius - Events.eruption.emit(vent, radius) + Events.eruption.emit(vent_node, radius) var player_hurt: bool = false - var at: Vector2 = Vector2(vent.position.x, vent.position.z) + var at: Vector2 = Vector2(vent_node.position.x, vent_node.position.z) for building: Building in world.buildings.duplicate(): if building.is_dead or not _reaches(building.footprint(), at, radius): continue @@ -300,7 +300,7 @@ func _erupt(vent: ResourceNode, state: Dictionary) -> void: * _perk(building.faction, building.def.id, FactionPerks.ERUPTION_DAMAGE) ) building.health.take(amount, null) - if building == vent.tap and building.flux_extractor != null and not building.is_dead: + if building == vent_node.tap and building.flux_extractor != null and not building.is_dead: building.flux_extractor.stall(_eruption.knockout_seconds) player_hurt = player_hurt or _hurt_badly(building, building.faction, building.health) for unit: Unit in world.units.duplicate(): @@ -335,8 +335,8 @@ func _tick_surge() -> void: _surge_started = true var step: int = ticks(_eruption.surge_step_seconds) var order: int = 0 - for vent: ResourceNode in _surge_vents(): - var state: Dictionary = _state_of(vent) + for vent_node: ResourceNode in _surge_vents(): + var state: Dictionary = _state_of(vent_node) var burst: int = _surge_at + order * step order += 1 # Only a surge's own warnings are beyond venting; a later ordinary one is not. @@ -345,16 +345,16 @@ func _tick_surge() -> void: if state["state"] == STATE_WARNING and current <= burst: continue state["quiet_until"] = 0 - _warn(vent, state, burst - _now) + _warn(vent_node, state, burst - _now) ## The vents a surge sets off, in a fixed order (round the caldera by angle). func _surge_vents() -> Array[ResourceNode]: var found: Array[ResourceNode] = [] var centre: Vector2 = _eruption.surge_area.get_center() - for vent: ResourceNode in vents(): - if _eruption.surge_area.has_point(Vector2(vent.position.x, vent.position.z)): - found.append(vent) + for vent_node: ResourceNode in vents(): + if _eruption.surge_area.has_point(Vector2(vent_node.position.x, vent_node.position.z)): + found.append(vent_node) found.sort_custom( func(a: ResourceNode, b: ResourceNode) -> bool: var angle_a: float = (Vector2(a.position.x, a.position.z) - centre).angle() @@ -364,9 +364,9 @@ func _surge_vents() -> Array[ResourceNode]: return found -func _state_of(vent: ResourceNode) -> Dictionary: - if not _vents.has(vent.entity_id): - _vents[vent.entity_id] = { +func _state_of(vent_node: ResourceNode) -> Dictionary: + if not _vents.has(vent_node.entity_id): + _vents[vent_node.entity_id] = { "pressure": _rng.randf_range(0.0, _eruption.start_pressure_max), "threshold": _draw_threshold(), "state": STATE_CALM, @@ -375,7 +375,7 @@ func _state_of(vent: ResourceNode) -> Dictionary: "vent_ready_at": 0, "surge": false, } - return _vents[vent.entity_id] + return _vents[vent_node.entity_id] func _draw_threshold() -> float: @@ -383,8 +383,8 @@ func _draw_threshold() -> float: ## Seconds until `vent` reaches its threshold at its current rate (INF if not building). -func _estimate_seconds(vent: ResourceNode, state: Dictionary) -> float: - var rate: float = _rate(vent) +func _estimate_seconds(vent_node: ResourceNode, state: Dictionary) -> float: + var rate: float = _rate(vent_node) if rate <= 0.0: return INF var pressure: float = state["pressure"] @@ -395,9 +395,9 @@ func _estimate_seconds(vent: ResourceNode, state: Dictionary) -> float: ## Hands the vent's pressure and countdown to the node (gauges, AI, UI). -func _show(vent: ResourceNode) -> void: - var burst: float = seconds_to_burst(vent) - vent.set_pressure(pressure_of(vent), burst if burst < INF else -1.0) +func _show(vent_node: ResourceNode) -> void: + var burst: float = seconds_to_burst(vent_node) + vent_node.set_pressure(pressure_of(vent_node), burst if burst < INF else -1.0) ## The indicator's vent: the one bursting soonest, else the fullest the player knows of. @@ -405,37 +405,37 @@ func _pick_pressing() -> void: pressing = null var soonest: float = INF var fullest: float = -1.0 - for vent: ResourceNode in vents(): - var burst: float = seconds_to_burst(vent) + for vent_node: ResourceNode in vents(): + var burst: float = seconds_to_burst(vent_node) if burst < soonest: soonest = burst - pressing = vent - elif soonest == INF and _known_to_player(vent) and pressure_of(vent) > fullest: - fullest = pressure_of(vent) - pressing = vent + pressing = vent_node + elif soonest == INF and _known_to_player(vent_node) and pressure_of(vent_node) > fullest: + fullest = pressure_of(vent_node) + pressing = vent_node func _update_forecast() -> void: var next: ResourceNode = next_to_erupt() if _has_forecast(world.player_faction) else null - for vent: ResourceNode in vents(): - vent.set_next_to_erupt(vent == next) + for vent_node: ResourceNode in vents(): + vent_node.set_next_to_erupt(vent_node == next) func _has_forecast(faction: int) -> bool: return _forecast_until.get(faction, -1) > _now -func _known_to_player(vent: ResourceNode) -> bool: +func _known_to_player(vent_node: ResourceNode) -> bool: if world.vision == null: return true - return world.vision.grid.is_explored(world.player_faction, vent.position) + return world.vision.grid.is_explored(world.player_faction, vent_node.position) ## The player hears about a vent they have seen or have something near. -func _concerns_player(vent: ResourceNode) -> bool: - if _known_to_player(vent): +func _concerns_player(vent_node: ResourceNode) -> bool: + if _known_to_player(vent_node): return true - var at: Vector2 = Vector2(vent.position.x, vent.position.z) + var at: Vector2 = Vector2(vent_node.position.x, vent_node.position.z) for unit: Unit in world.units_of(world.player_faction): var there: Vector3 = unit.sim_position() if Vector2(there.x, there.z).distance_to(at) <= _eruption.alert_distance: @@ -520,10 +520,10 @@ func from_dict(data: Dictionary) -> void: var until: int = forecasts[key] _forecast_until[int(str(key))] = until # A vent mid-warning is announced again, so its ring and sound come back. - for vent: ResourceNode in vents(): - var seconds: float = seconds_to_burst(vent) + for vent_node: ResourceNode in vents(): + var seconds: float = seconds_to_burst(vent_node) if seconds < INF: - Events.eruption_warning.emit(vent, seconds, _eruption.radius) - _show(vent) + Events.eruption_warning.emit(vent_node, seconds, _eruption.radius) + _show(vent_node) _pick_pressing() _update_forecast() diff --git a/game/sim/systems/sim_world.gd b/game/sim/systems/sim_world.gd index ca24be0e..cf677734 100644 --- a/game/sim/systems/sim_world.gd +++ b/game/sim/systems/sim_world.gd @@ -599,21 +599,21 @@ func sell_building(building: Building, issuer: int) -> bool: ## Health ran out: announce the death, take the entity out of play at once (its ## navmesh cut-out is freed now) and free it after the frame. -func _on_entity_killed(_attacker: Node3D, entity: Node3D) -> void: - if not is_instance_valid(entity) or entity.is_queued_for_deletion(): +func _on_entity_killed(_attacker: Node3D, target_entity: Node3D) -> void: + if not is_instance_valid(target_entity) or target_entity.is_queued_for_deletion(): return - var unit: Unit = entity as Unit + var unit: Unit = target_entity as Unit if unit != null and unit.orders != null: unit.orders.stop() - var building: Building = entity as Building + var building: Building = target_entity as Building if building != null: _unblock(building.entity_id) if building.vent != null and is_instance_valid(building.vent): building.vent.tap = null - Events.entity_died.emit(entity) + Events.entity_died.emit(target_entity) if building != null: economy.update_power(buildings) - entity.queue_free() + target_entity.queue_free() ## A prop was blown apart: it stops blocking, is announced and leaves. @@ -884,8 +884,8 @@ static func _load_def(data: Dictionary) -> EntityDef: static func _saved_position(data: Dictionary) -> Vector3: var text: String = data.get("position", "Vector3(0, 0, 0)") - var position: Vector3 = str_to_var(text) - return position + var saved_position: Vector3 = str_to_var(text) + return saved_position static func _flat_distance(a: Vector3, b: Vector3) -> float: diff --git a/game/sim/systems/vision/vision_system.gd b/game/sim/systems/vision/vision_system.gd index eccb4e3b..98cbb2c1 100644 --- a/game/sim/systems/vision/vision_system.gd +++ b/game/sim/systems/vision/vision_system.gd @@ -60,8 +60,8 @@ func factions() -> Array[int]: ## The faction whose grid is updated on sim tick `tick`. -func faction_for_tick(tick: int) -> int: - return _factions[posmod(tick, _factions.size())] +func faction_for_tick(tick_number: int) -> int: + return _factions[posmod(tick_number, _factions.size())] ## One sim tick: updates one faction (round robin) and, for the player, the view. @@ -257,9 +257,9 @@ func from_dict(data: Dictionary) -> void: var areas: Dictionary = data.get("area_reveals", {}) for key: Variant in areas: var faction: int = int(str(key)) - var saved: Array = areas[key] + var saved_reveals: Array = areas[key] var restored: Array = [] - for entry: Variant in saved: + for entry: Variant in saved_reveals: var text: String = entry var reveal: Vector4 = str_to_var(text) restored.append(reveal) diff --git a/game/tests/audio/mix_scene.gd b/game/tests/audio/mix_scene.gd index c76bfea3..961ae703 100644 --- a/game/tests/audio/mix_scene.gd +++ b/game/tests/audio/mix_scene.gd @@ -162,7 +162,7 @@ static func lufs(frames: PackedVector2Array, rate: float) -> float: var z: float = _run(hp, s2, y) weighted[i] += z * z var block: int = int(0.4 * rate) - var hop: int = block / 4 + var hop: int = int(block / 4.0) var energies: PackedFloat64Array = [] var start: int = 0 while start + block <= weighted.size(): @@ -245,14 +245,14 @@ static func block_energies(frames: PackedVector2Array, rate: float) -> PackedFlo var hp: PackedFloat64Array = _biquad_highpass(rate) var block: int = int(0.4 * rate) var out: PackedFloat64Array = [] - out.resize(frames.size() / block) + out.resize(int(frames.size() / float(block))) for channel: int in 2: var s1: PackedFloat64Array = [0.0, 0.0, 0.0, 0.0] var s2: PackedFloat64Array = [0.0, 0.0, 0.0, 0.0] for i: int in out.size() * block: var x: float = frames[i].x if channel == 0 else frames[i].y var z: float = _run(hp, s2, _run(shelf, s1, x)) - out[i / block] += z * z / block + out[int(i / float(block))] += z * z / block return out @@ -262,14 +262,14 @@ static func _plain_energies( ) -> PackedFloat64Array: var block: int = int(0.4 * rate) var out: PackedFloat64Array = [] - out.resize(frames.size() / block) + out.resize(int(frames.size() / float(block))) for channel: int in 2: var state: PackedFloat64Array = [0.0, 0.0, 0.0, 0.0] for i: int in out.size() * block: var x: float = frames[i].x if channel == 0 else frames[i].y if not filter.is_empty(): x = _run(filter, state, x) - out[i / block] += x * x / (2.0 * block) + out[int(i / float(block))] += x * x / (2.0 * block) return out diff --git a/game/tests/audio/test_final_mix.gd b/game/tests/audio/test_final_mix.gd index eb9517a1..83183b30 100644 --- a/game/tests/audio/test_final_mix.gd +++ b/game/tests/audio/test_final_mix.gd @@ -294,7 +294,7 @@ func _record(scene: StringName) -> Array[float]: if worst: _mix.battle_frame(6) if i % 30 == 0: - _mix.alert(i / 30) + _mix.alert(int(i / 30.0)) if i % 8 == 0: Audio.play(&"ui_click") if ship: @@ -395,7 +395,7 @@ func _ship_frame(i: int) -> void: if i % 40 == 5: Events.ui_feedback.emit(&"tech_buy") if i % 30 == 0: - Audio.play(SHIP_ALERTS[(i / 30) % SHIP_ALERTS.size()]) + Audio.play(SHIP_ALERTS[(int(i / 30.0)) % SHIP_ALERTS.size()]) func test_explore_sits_quietly() -> void: diff --git a/game/tests/audio/test_score_phase6.gd b/game/tests/audio/test_score_phase6.gd index 3e0e72e0..1557ddc5 100644 --- a/game/tests/audio/test_score_phase6.gd +++ b/game/tests/audio/test_score_phase6.gd @@ -29,9 +29,9 @@ func after_each() -> void: _director.stop() -func _layer(name: String) -> int: +func _layer(layer_name: String) -> int: var score: MusicScore = load(SCORE) - return Array(score.clips[0].layer_names).find(name) + return Array(score.clips[0].layer_names).find(layer_name) func test_every_state_exists_and_covers_every_layer() -> void: @@ -118,8 +118,8 @@ func test_one_variant_per_group_and_it_rotates_per_loop() -> void: assert_eq(picked.size(), 3, "all three melodies come round") var drums: PackedFloat32Array = _director.layer_targets_db(&"combat") var drum_count: int = 0 - for name: String in ["drums", "drums_b"]: - if drums[_layer(name)] > AudioMix.SILENT_DB: + for layer_name: String in ["drums", "drums_b"]: + if drums[_layer(layer_name)] > AudioMix.SILENT_DB: drum_count += 1 assert_eq(drum_count, 1, "one drum pattern at a time") diff --git a/game/tests/audio/test_thalassa_audio.gd b/game/tests/audio/test_thalassa_audio.gd index dca2f0ce..6a83064d 100644 --- a/game/tests/audio/test_thalassa_audio.gd +++ b/game/tests/audio/test_thalassa_audio.gd @@ -347,7 +347,9 @@ func test_a_carried_artefact_hums() -> void: add_child_autofree(carried) loops.focus = Vector3.ZERO loops.rescan() - var hums: Array = loops.chosen().filter(func(pair: Array) -> bool: return pair[0] == carried) + var hums: Array = loops.chosen().filter( + func(candidate: Array) -> bool: return candidate[0] == carried + ) assert_eq(hums.size(), 1, "the artefact carries one loop") var pair: Array = hums[0] var hum: StringName = pair[1] diff --git a/game/tests/balance/balance_recorder.gd b/game/tests/balance/balance_recorder.gd index abe7c93d..af7c1287 100644 --- a/game/tests/balance/balance_recorder.gd +++ b/game/tests/balance/balance_recorder.gd @@ -102,7 +102,7 @@ func army_strength(faction: int) -> float: ## The run's numbers as one dictionary (printed as JSON by the runner). func summary() -> Dictionary: var result: MissionResult = mission.result - var mean_float: int = alloy_floated / maxi(samples.size(), 1) + var mean_float: int = int(alloy_floated / float(maxi(samples.size(), 1))) return { "won": result != null and result.won, "over": result != null, diff --git a/game/tests/balance/balance_run.gd b/game/tests/balance/balance_run.gd index 92c5563e..ea788baa 100644 --- a/game/tests/balance/balance_run.gd +++ b/game/tests/balance/balance_run.gd @@ -226,11 +226,11 @@ func _find_mission(id: String, modifiers: Array[LandingModifiers]) -> MissionDef static func _minute(value: Variant) -> int: var seconds: int = value - return seconds / 60 + return int(seconds / 60.0) static func _clock(value: Variant) -> String: var seconds: int = value if seconds < 0: return "never" - return "%d:%02d" % [seconds / 60, seconds % 60] + return "%d:%02d" % [int(seconds / 60.0), seconds % 60] diff --git a/game/tests/check_scripts.gd b/game/tests/check_scripts.gd index 582be731..bc1325d9 100644 --- a/game/tests/check_scripts.gd +++ b/game/tests/check_scripts.gd @@ -10,7 +10,7 @@ const CHECKED_EXTENSIONS: PackedStringArray = ["gd", "tscn", "tres"] func _initialize() -> void: var paths: PackedStringArray = [] _collect("res://", paths) - var failures: int = 0 + var failures: int = _check_warning_policy() for path: String in paths: var resource: Resource = load(path) var script: GDScript = resource as GDScript @@ -30,3 +30,23 @@ func _collect(dir_path: String, paths: PackedStringArray) -> void: paths.append(dir_path.path_join(file)) for sub: String in DirAccess.get_directories_at(dir_path): _collect(dir_path.path_join(sub), paths) + + +## Runtime loading does not print every editor warning. Keep enabled categories at +## Error so fresh compilation makes CI observe the same diagnostics as the editor. +func _check_warning_policy() -> int: + var enabled: bool = ProjectSettings.get_setting("debug/gdscript/warnings/enable", true) + if not enabled: + push_error("GDScript warnings must stay enabled") + return 1 + var weak: PackedStringArray = [] + for property: Dictionary in ProjectSettings.get_property_list(): + var key: String = property.name + if not key.begins_with("debug/gdscript/warnings/"): + continue + var severity: Variant = ProjectSettings.get_setting(key) + if severity is int and severity == 1: + weak.append(key.get_file()) + if not weak.is_empty(): + push_error("Enabled GDScript warnings must be errors: %s" % ", ".join(weak)) + return weak.size() diff --git a/game/tests/combat/test_weapons.gd b/game/tests/combat/test_weapons.gd index 1d9b0772..7d4f82e0 100644 --- a/game/tests/combat/test_weapons.gd +++ b/game/tests/combat/test_weapons.gd @@ -14,7 +14,7 @@ func after_each() -> void: func test_fires_once_per_cooldown_within_range() -> void: - var shooter: Unit = _f.spawn(_f.soldier, 0, Vector3.ZERO) + _f.spawn(_f.soldier, 0, Vector3.ZERO) var target: Unit = _f.spawn(_f.tank, 1, Vector3(0, 0, -8)) target.weapon = null # it only takes the fire watch_signals(Events) diff --git a/game/tests/economy/test_placement_rules.gd b/game/tests/economy/test_placement_rules.gd index 3796a755..a5bfde1d 100644 --- a/game/tests/economy/test_placement_rules.gd +++ b/game/tests/economy/test_placement_rules.gd @@ -76,13 +76,15 @@ func test_outside_the_bounds_is_refused() -> void: func test_a_tap_needs_a_free_vent_and_snaps_onto_it() -> void: assert_eq(_rules.check(_tap, Vector3.ZERO), PlacementRules.NEEDS_VENT) var vent: ResourceNode = _node(_vent_def, Vector3(10, 0, 10)) - var snapped: Vector3 = _rules.snap(_tap, Vector3(12, 0, 8)) - assert_eq(snapped, vent.position, "snaps to the vent within 6 m") - assert_eq(_rules.check(_tap, snapped), PlacementRules.OK, "the vent itself is not in the way") + var snapped_position: Vector3 = _rules.snap(_tap, Vector3(12, 0, 8)) + assert_eq(snapped_position, vent.position, "snaps to the vent within 6 m") + assert_eq( + _rules.check(_tap, snapped_position), PlacementRules.OK, "the vent itself is not in the way" + ) var taken: Building = Building.new() autofree(taken) vent.tap = taken - assert_eq(_rules.check(_tap, snapped), PlacementRules.VENT_TAKEN) + assert_eq(_rules.check(_tap, snapped_position), PlacementRules.VENT_TAKEN) assert_ne(_rules.snap(_tap, Vector3(12, 0, 8)), vent.position, "no snap to a tapped vent") diff --git a/game/tests/economy/test_sell_building.gd b/game/tests/economy/test_sell_building.gd index 82d1f60d..0b34bf1c 100644 --- a/game/tests/economy/test_sell_building.gd +++ b/game/tests/economy/test_sell_building.gd @@ -40,13 +40,13 @@ func test_completed_refund_rounds_down_both_resources_and_never_damages() -> voi func test_duplicate_commands_and_reexecution_refund_only_once() -> void: var building: Building = _f.world.spawn_building(_f.reactor, 0, Vector3.ZERO, true) var first := SellBuildingCommand.new(0, building) - var duplicate := SellBuildingCommand.new(0, building) + var repeated := SellBuildingCommand.new(0, building) _f.push(first) - _f.push(duplicate) + _f.push(repeated) assert_eq(_f.pile().alloy, 1000, "pushing does not sell before the tick") _f.tick() assert_true(first.sold) - assert_false(duplicate.sold) + assert_false(repeated.sold) first.execute() assert_eq(_f.pile().alloy, 1075) assert_false(SellBuildingCommand.can_sell(building, 0)) diff --git a/game/tests/maps/test_hollow_map.gd b/game/tests/maps/test_hollow_map.gd index 5792a76a..a174e05e 100644 --- a/game/tests/maps/test_hollow_map.gd +++ b/game/tests/maps/test_hollow_map.gd @@ -166,8 +166,8 @@ func test_the_deck_holds_more_alloy_than_other_worlds() -> void: var standard: ResourceNodeDef = load("res://data/resources/kessel_alloy_deposit.tres") var rich: ResourceNodeDef = load("res://data/resources/kessel_alloy_deposit_rich.tres") assert_eq(map_def.deposit.resource, &"alloy") - assert_gte(map_def.deposit.amount, standard.amount * 5 / 3, "deeper deposits") - assert_gte(map_def.rich_deposit.amount, rich.amount * 3 / 2, "deeper rich deposits") + assert_gte(map_def.deposit.amount, int(standard.amount * 5 / 3.0), "deeper deposits") + assert_gte(map_def.rich_deposit.amount, int(rich.amount * 3 / 2.0), "deeper rich deposits") func test_every_vent_takes_a_flux_extractor() -> void: diff --git a/game/tests/planet/test_machinery.gd b/game/tests/planet/test_machinery.gd index f6ab529a..d31631e4 100644 --- a/game/tests/planet/test_machinery.gd +++ b/game/tests/planet/test_machinery.gd @@ -340,13 +340,13 @@ func test_the_engines_state_saves_and_loads() -> void: var claimant: int = machine_data["claimant"] var progress: float = machine_data["progress"] var shutdown_left: float = machine_data["shutdown_left"] - var owner: int = saved["faction"] + var loop_owner: int = saved["faction"] assert_eq(state, "shut_down") assert_eq(claimant, 1) assert_gt(progress, 0.0) assert_almost_eq(shutdown_left, 1.6, 0.15) var system_data: Dictionary = machinery.to_dict() - var copy: Building = _f.world.spawn_building(_engine_def, owner, Vector3(40, 0, 40), false) + var copy: Building = _f.world.spawn_building(_engine_def, loop_owner, Vector3(40, 0, 40), false) copy.from_dict(saved) assert_true(copy.machine.is_shut_down()) assert_eq(copy.machine.claimant, 1) diff --git a/game/tests/props/test_props.gd b/game/tests/props/test_props.gd index 67da145a..c696085a 100644 --- a/game/tests/props/test_props.gd +++ b/game/tests/props/test_props.gd @@ -185,7 +185,7 @@ func test_row_shadows_match_the_exact_cell_test() -> void: var span: Rect2i = entry for dx: int in span.size.x: seen[cell + span.position + Vector2i(dx, 0)] = true - var reach: int = quarters / 4 + var reach: int = int(quarters / 4.0) for dz: int in range(-reach, reach + 1): var half: int = floori(sqrt(maxf(reach * reach - dz * dz, 0.0))) for dx: int in range(-half, half + 1): diff --git a/game/tests/save/save_fixture.gd b/game/tests/save/save_fixture.gd index 34973ca8..0632f350 100644 --- a/game/tests/save/save_fixture.gd +++ b/game/tests/save/save_fixture.gd @@ -18,17 +18,17 @@ func _init(p_parent: Node) -> void: ## Lands `mission` (with `modifiers`, restored from `restore` when given) and lets the ## navigation map settle for a few physics frames. Time then moves only through `run()`. func land( - mission: MissionDef, modifiers: LandingModifiers = null, restore: Dictionary = {} + mission_def: MissionDef, modifiers: LandingModifiers = null, restore: Dictionary = {} ) -> LandingMap: - var map: LandingMap = mission.map_scene.instantiate() as LandingMap - map.mission = mission + var map: LandingMap = mission_def.map_scene.instantiate() as LandingMap + map.mission = mission_def map.modifiers = modifiers map.restore_state = restore parent.add_child(map) map.context.sim_clock.process_mode = Node.PROCESS_MODE_DISABLED # The navigation map answers path queries only once it has synchronised with the # navmesh the map cut (a threaded bake): wait for a real path. - var units: Array[Unit] = map.world.units_of(mission.player_faction) + var units: Array[Unit] = map.world.units_of(mission_def.player_faction) var from: Vector3 = units[0].sim_position() if not units.is_empty() else Vector3.ZERO var navigation: RID = map.get_world_3d().navigation_map for i: int in 600: diff --git a/game/tests/save/test_base_landing_round_trip.gd b/game/tests/save/test_base_landing_round_trip.gd index 35e44528..a77d463d 100644 --- a/game/tests/save/test_base_landing_round_trip.gd +++ b/game/tests/save/test_base_landing_round_trip.gd @@ -177,7 +177,7 @@ func _set_the_scene(map: LandingMap) -> Dictionary: reactor = building assert_not_null(reactor, "the Reactor site is placed") var first: Unit = rangers[0] as Unit - var ready: Callable = func() -> bool: + var is_ready: Callable = func() -> bool: return ( first.orders.attack_target() == target and fabricator.builder.site == reactor @@ -186,7 +186,7 @@ func _set_the_scene(map: LandingMap) -> Dictionary: and site.scan_progress > 0.3 and (storm == null or storm.state != DustStormSystem.STATE_CLEAR) ) - var under_way: bool = await _f.run_until(map, ready, 900) + var under_way: bool = await _f.run_until(map, is_ready, 900) if not under_way: print( ( diff --git a/game/tests/save/test_save_validation.gd b/game/tests/save/test_save_validation.gd index 716d7db1..537c42b5 100644 --- a/game/tests/save/test_save_validation.gd +++ b/game/tests/save/test_save_validation.gd @@ -57,8 +57,8 @@ func test_existing_resources_must_have_the_consumed_definition_class() -> void: func test_positions_must_parse_to_the_vector_the_restore_reader_consumes() -> void: for position: Variant in [42, "42", "Vector2(1, 2)", "Vector3(inf, 0, 0)", "Vector3(broken"]: - var data: Dictionary = _save() - data.landing.world.units = [ + var invalid_data: Dictionary = _save() + invalid_data.landing.world.units = [ { "version": Unit.SAVE_VERSION, "def": UNIT, @@ -69,7 +69,7 @@ func test_positions_must_parse_to_the_vector_the_restore_reader_consumes() -> vo } } ] - assert_ne(SaveGame.check(data), "", str(position)) + assert_ne(SaveGame.check(invalid_data), "", str(position)) var data: Dictionary = _save() data.landing.world.units = [ { @@ -100,11 +100,11 @@ func test_campaign_plan_arrays_and_result_records_are_checked_before_parsing() - func test_consumed_component_versions_are_refused_without_changing_the_format() -> void: for version: Variant in [0, Health.SAVE_VERSION + 1, "1"]: - var data: Dictionary = _save() - data.landing.world.units = [ + var invalid_data: Dictionary = _save() + invalid_data.landing.world.units = [ {"version": Unit.SAVE_VERSION, "def": UNIT, "health": {"version": version}} ] - assert_ne(SaveGame.check(data), "", str(version)) + assert_ne(SaveGame.check(invalid_data), "", str(version)) var data: Dictionary = _save() data.landing.world.economy = { "version": Economy.SAVE_VERSION, diff --git a/game/tests/test_command_queue.gd b/game/tests/test_command_queue.gd index 0f7ac58f..3dd0575e 100644 --- a/game/tests/test_command_queue.gd +++ b/game/tests/test_command_queue.gd @@ -5,14 +5,14 @@ extends GutTest class RecordingCommand: extends Command - var log: Array[StringName] + var entries: Array[StringName] func _init(p_kind: StringName, p_entities: Array[Node3D], p_log: Array[StringName]) -> void: super(p_kind, 1, p_entities) - log = p_log + entries = p_log func execute() -> void: - log.append(kind) + entries.append(kind) var _queue: CommandQueue diff --git a/game/tests/test_state_machine.gd b/game/tests/test_state_machine.gd index b975685a..eae21c3b 100644 --- a/game/tests/test_state_machine.gd +++ b/game/tests/test_state_machine.gd @@ -6,21 +6,21 @@ class LoggingState: extends State var label: String - var log: Array[String] + var entries: Array[String] var next_state: StringName = &"" func _init(p_label: String, p_log: Array[String]) -> void: label = p_label - log = p_log + entries = p_log func enter(previous: StringName) -> void: - log.append("enter %s from '%s'" % [label, previous]) + entries.append("enter %s from '%s'" % [label, previous]) func exit(next: StringName) -> void: - log.append("exit %s to '%s'" % [label, next]) + entries.append("exit %s to '%s'" % [label, next]) func tick(_sim_tick: int) -> StringName: - log.append("tick %s" % label) + entries.append("tick %s" % label) return next_state diff --git a/game/tests/ui/test_control_groups.gd b/game/tests/ui/test_control_groups.gd index 45b295d2..058b45ce 100644 --- a/game/tests/ui/test_control_groups.gd +++ b/game/tests/ui/test_control_groups.gd @@ -70,7 +70,8 @@ func test_alt_number_stores_even_when_option_types_another_character() -> void: var b: Unit = _soldier(3) _controller.set_selection([a, b]) # macOS: Option+1 types "¡" (U+00A1); the key in that place still counts. - _press(_key(1, [&"alt"], 0xA1 as Key)) + var option_character: int = 0xA1 + _press(_key(1, [&"alt"], option_character as Key)) assert_eq(_controller.control_groups().count(1), 2, "Alt+1 stored the selection") _controller.set_selection([]) _press(_key(1)) @@ -82,8 +83,11 @@ func test_alt_matches_a_group_bound_by_label() -> void: var by_label := InputEventKey.new() by_label.keycode = KEY_4 InputMap.action_add_event(&"control_group_4", by_label) - assert_eq(KeyBindings.group_of(_key(4, [&"alt"], 0xA2 as Key)), 4) - assert_eq(KeyBindings.group_of(_key(4, [], 0xA2 as Key)), 0, "without Alt: no match") + var option_character: int = 0xA2 + assert_eq(KeyBindings.group_of(_key(4, [&"alt"], option_character as Key)), 4) + assert_eq( + KeyBindings.group_of(_key(4, [], option_character as Key)), 0, "without Alt: no match" + ) func test_meta_number_stores() -> void: diff --git a/game/tests/ui/test_title_layout.gd b/game/tests/ui/test_title_layout.gd new file mode 100644 index 00000000..e46edc1c --- /dev/null +++ b/game/tests/ui/test_title_layout.gd @@ -0,0 +1,34 @@ +extends GutTest +## The normal title menu fits without scrolling, including Continue and native Quit. + +var _saved_size: Vector2i +var _saved_factor: float + + +func before_each() -> void: + _saved_size = get_tree().root.size + _saved_factor = get_tree().root.content_scale_factor + + +func after_each() -> void: + get_tree().root.size = _saved_size + get_tree().root.content_scale_factor = _saved_factor + + +func test_supported_title_sizes_fit_every_action_without_a_scrollbar() -> void: + for ui_factor: float in [1.0, 1.3]: + for can_continue: bool in [false, true]: + get_tree().root.size = Vector2i(1152, 648) + get_tree().root.content_scale_factor = ui_factor + var screen: TitleScreen = TitleScreen.new() + add_child(screen) + screen.open(can_continue) + await wait_physics_frames(3) + assert_false(screen._menu_scroll.get_v_scroll_bar().visible, str(ui_factor)) + var view: Rect2 = screen.get_viewport_rect().grow(1.0) + for node: Node in screen.find_children("*", "Button", true, false): + var button: Button = node as Button + if button.is_visible_in_tree(): + assert_true(view.encloses(button.get_global_rect()), button.text) + screen.free() + await wait_physics_frames(1) diff --git a/game/tests/ui/test_title_layout.gd.uid b/game/tests/ui/test_title_layout.gd.uid new file mode 100644 index 00000000..e485af68 --- /dev/null +++ b/game/tests/ui/test_title_layout.gd.uid @@ -0,0 +1 @@ +uid://ww2p45x4sh5u diff --git a/game/tests/web/visual_compare.gd b/game/tests/web/visual_compare.gd index 5aff89a3..05bca36e 100644 --- a/game/tests/web/visual_compare.gd +++ b/game/tests/web/visual_compare.gd @@ -45,7 +45,7 @@ func _ready() -> void: _main = (load("res://main.tscn") as PackedScene).instantiate() as Main add_child(_main) var mission: MissionDef = load("res://data/missions/%s.tres" % mission_id) as MissionDef - _main.start_mission(mission, _main.single_modifiers(Difficulty.NORMAL)) + _main.start_mission(mission, Main.single_modifiers(Difficulty.NORMAL)) await get_tree().process_frame _main.runner.context.sim_clock.paused = true _main._hints.end_mission() diff --git a/game/tests/web/web_probe.gd b/game/tests/web/web_probe.gd index c8590d44..e2b6b524 100644 --- a/game/tests/web/web_probe.gd +++ b/game/tests/web/web_probe.gd @@ -12,7 +12,7 @@ func _ready() -> void: for arg: String in OS.get_cmdline_user_args(): if arg.begins_with("--web-mission="): var mission: MissionDef = load("res://data/missions/" + arg.get_slice("=", 1) + ".tres") - _main.start_mission(mission, _main.single_modifiers(Difficulty.NORMAL)) + _main.start_mission(mission, Main.single_modifiers(Difficulty.NORMAL)) if OS.get_cmdline_user_args().has("--web-encounter"): var map: LandingMap = _main.map as LandingMap diff --git a/game/ui/group_bar.gd b/game/ui/group_bar.gd index a5ee24da..fd387d61 100644 --- a/game/ui/group_bar.gd +++ b/game/ui/group_bar.gd @@ -24,13 +24,13 @@ func _init() -> void: add_theme_constant_override(&"separation", 4) mouse_filter = Control.MOUSE_FILTER_IGNORE for group: int in range(1, ControlGroups.COUNT + 1): - var badge: Button = HudStyle.make_small_button("") - badge.name = StringName("Group%d" % group) - badge.pressed.connect(_on_badge_pressed.bind(group)) - badge.gui_input.connect(_on_badge_input.bind(group)) - badge.visible = false - add_child(badge) - _badges[group] = badge + var group_badge: Button = HudStyle.make_small_button("") + group_badge.name = StringName("Group%d" % group) + group_badge.pressed.connect(_on_badge_pressed.bind(group)) + group_badge.gui_input.connect(_on_badge_input.bind(group)) + group_badge.visible = false + add_child(group_badge) + _badges[group] = group_badge visible = false @@ -53,13 +53,13 @@ func setup(controller: SelectionController) -> void: func refresh() -> void: var any: bool = false for group: int in _badges: - var badge: Button = _badges[group] + var group_badge: Button = _badges[group] var units: int = _groups.count(group) if _groups != null else 0 - badge.visible = units > 0 + group_badge.visible = units > 0 any = any or units > 0 - badge.text = "%d · %d" % [group, units] + group_badge.text = "%d · %d" % [group, units] var key: String = KeyBindings.label(StringName("control_group_%d" % group)) - badge.tooltip_text = ( + group_badge.tooltip_text = ( ( "Group %d: %d units. Click (or %s) to select it, twice to centre on it.\n" + "Right-click, Alt+%s or Ctrl+%s: the selection becomes this group.\n" diff --git a/game/ui/minimap.gd b/game/ui/minimap.gd index 0a798cdc..dffe173f 100644 --- a/game/ui/minimap.gd +++ b/game/ui/minimap.gd @@ -72,12 +72,12 @@ func setup( _terrain.mouse_filter = Control.MOUSE_FILTER_IGNORE var shader: Shader = Shader.new() shader.code = FOG_SHADER - var material: ShaderMaterial = ShaderMaterial.new() - material.shader = shader - material.set_shader_parameter( + var fog_material: ShaderMaterial = ShaderMaterial.new() + fog_material.shader = shader + fog_material.set_shader_parameter( &"area", Vector4(area.position.x, area.position.y, area.size.x, area.size.y) ) - _terrain.material = material + _terrain.material = fog_material add_child(_terrain) _overlay = Control.new() _overlay.mouse_filter = Control.MOUSE_FILTER_IGNORE @@ -148,10 +148,10 @@ func to_world(local: Vector2) -> Vector3: ## Map position (in the terrain picture) of a world point. func to_map(point: Vector3) -> Vector2: - var size: Vector2 = _terrain.size + var terrain_size: Vector2 = _terrain.size return Vector2( - (point.x - area.position.x) / area.size.x * size.x, - (point.z - area.position.y) / area.size.y * size.y + (point.x - area.position.x) / area.size.x * terrain_size.x, + (point.z - area.position.y) / area.size.y * terrain_size.y ) @@ -163,18 +163,20 @@ func _look_at(local: Vector2) -> void: func _draw_overlay() -> void: if world == null: return - var scale: float = _terrain.size.x / area.size.x + var map_scale: float = _terrain.size.x / area.size.x for node: ResourceNode in world.resource_nodes: if node.visible and node.def != null: var color: Color = VENT_COLOR if node.resource() == &"flux" else NODE_COLOR - _overlay.draw_circle(to_map(node.position), maxf(node.def.radius * scale, 1.5), color) - _draw_sites(scale) + _overlay.draw_circle( + to_map(node.position), maxf(node.def.radius * map_scale, 1.5), color + ) + _draw_sites(map_scale) for building: Building in world.buildings: if not building.visible or building.is_dead: continue var rect: Rect2 = building.footprint() var corner: Vector2 = to_map(Vector3(rect.position.x, 0.0, rect.position.y)) - var box: Rect2 = Rect2(corner, (rect.size * scale).max(Vector2(3.0, 3.0))) + var box: Rect2 = Rect2(corner, (rect.size * map_scale).max(Vector2(3.0, 3.0))) var color: Color = _color_for(building.faction) if building.faction != faction and not building.is_visible_to_player: color = Color(color.darkened(REMEMBERED_DARKEN), REMEMBERED_ALPHA) @@ -184,16 +186,16 @@ func _draw_overlay() -> void: if not unit.visible or unit.is_dead: continue var at: Vector2 = to_map(unit.global_position) - var half: float = maxf(unit.def.radius * scale, 1.5) if unit.def != null else 1.5 + var half: float = maxf(unit.def.radius * map_scale, 1.5) if unit.def != null else 1.5 _overlay.draw_rect( Rect2(at - Vector2(half, half), Vector2(half, half) * 2.0), _color_for(unit.faction) ) - _draw_objectives(scale) + _draw_objectives(map_scale) _draw_view() ## Active objective areas: a pulsing ring in the objective's colour. -func _draw_objectives(scale: float) -> void: +func _draw_objectives(map_scale: float) -> void: var pulse: float = 0.75 + 0.25 * sin(Time.get_ticks_msec() / 250.0) for objective: Objective in _objectives: var color: Color = ( @@ -203,7 +205,7 @@ func _draw_objectives(scale: float) -> void: ) color.a = pulse var at: Vector2 = to_map(objective.area_center) - var radius: float = maxf(objective.area_radius * scale, 4.0) + var radius: float = maxf(objective.area_radius * map_scale, 4.0) _overlay.draw_arc(at, radius, 0.0, TAU, 24, Color(0, 0, 0, 0.6), 3.0) _overlay.draw_arc(at, radius, 0.0, TAU, 24, color, 1.5) @@ -233,10 +235,10 @@ func recorded_sites() -> Array[DiscoverySite]: return result -func _draw_sites(scale: float) -> void: +func _draw_sites(map_scale: float) -> void: for site: DiscoverySite in recorded_sites(): _overlay.draw_circle( - to_map(site.position), maxf(site.def.radius * scale, 2.5), site.def.color + to_map(site.position), maxf(site.def.radius * map_scale, 2.5), site.def.color ) diff --git a/game/ui/save_notice.gd b/game/ui/save_notice.gd index c2327af5..f417d29f 100644 --- a/game/ui/save_notice.gd +++ b/game/ui/save_notice.gd @@ -31,8 +31,8 @@ func _process(delta: float) -> void: ## Shows `text` (in the warning colour when `failed`). -func show_text(text: String, failed: bool = false) -> void: - self.text = text +func show_text(message: String, failed: bool = false) -> void: + self.text = message add_theme_color_override( &"font_color", HudStyle.WARNING_COLOR if failed else HudStyle.TEXT_COLOR ) diff --git a/game/ui/settings_panel.gd b/game/ui/settings_panel.gd index 4b247238..8df0f728 100644 --- a/game/ui/settings_panel.gd +++ b/game/ui/settings_panel.gd @@ -178,8 +178,8 @@ func _build_accessibility(column: VBoxContainer) -> void: ) _row(column, "Team colours", _palette) var scales: Array[String] = [] - for scale: float in Settings.UI_SCALES: - scales.append("%d%%" % roundi(scale * 100.0)) + for map_scale: float in Settings.UI_SCALES: + scales.append("%d%%" % roundi(map_scale * 100.0)) _ui_scale = _options(scales) _ui_scale.item_selected.connect( func(index: int) -> void: _set_option(&"ui_scale", Settings.UI_SCALES[index]) diff --git a/game/ui/title_screen.gd b/game/ui/title_screen.gd index 614018ab..d32097dd 100644 --- a/game/ui/title_screen.gd +++ b/game/ui/title_screen.gd @@ -1,9 +1,10 @@ class_name TitleScreen extends MenuScreen -## The first screen: Continue (when an autosave exists), New campaign, Single missions, Load game -## (the mission select), How to play, Controls, Settings, Credits and Quit. New campaign first +## The first screen offers Continue, New campaign, Single missions and Load game, +## followed by help, controls, settings, credits and native Quit. New campaign first ## asks for the difficulty (remembered in the settings for next time); START emits -## `new_campaign_pressed`. On a short window the menu buttons scroll under the name. +## `new_campaign_pressed`. Primary actions stay stacked; secondary actions share +## a compact grid. Short windows use tighter spacing before scrolling is needed. signal new_campaign_pressed signal load_pressed @@ -18,6 +19,13 @@ signal credits_pressed ## Space kept free above and below the column, px. const SCREEN_MARGIN: int = 24 +var _column: FitColumn +var _heading: Label +var _tagline: Label +var _gap: Control +var _utilities: GridContainer +var _utility_buttons: Array[Button] = [] +var _quit: Button var _load: Button var _continue: Button var _menu: VBoxContainer @@ -30,20 +38,22 @@ func _build() -> void: var centre := CenterContainer.new() add_child(centre) centre.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT) - var column := FitColumn.new(10) - column.outer_margin = SCREEN_MARGIN * 2 - centre.add_child(column) - column.add_child(HudStyle.make_label(12, HudStyle.ACCENT_COLOR, "THE CONCORD SURVEY")) - column.add_child(HudStyle.make_label(52, HudStyle.TEXT_COLOR, "Farlanding")) - column.add_child( - HudStyle.make_label(14, HudStyle.MUTED_COLOR, "Follow the Antecedent trail, world by world") + _column = FitColumn.new(10) + _column.outer_margin = SCREEN_MARGIN * 2 + centre.add_child(_column) + _column.add_child(HudStyle.make_label(12, HudStyle.ACCENT_COLOR, "THE CONCORD SURVEY")) + _heading = HudStyle.make_label(52, HudStyle.TEXT_COLOR, "Farlanding") + _column.add_child(_heading) + _tagline = HudStyle.make_label( + 14, HudStyle.MUTED_COLOR, "Follow the Antecedent trail, world by world" ) - var gap := Control.new() - gap.custom_minimum_size = Vector2(0, 24) - column.add_child(gap) + _column.add_child(_tagline) + _gap = Control.new() + _gap.custom_minimum_size = Vector2(0, 24) + _column.add_child(_gap) _menu = VBoxContainer.new() _menu.add_theme_constant_override(&"separation", 10) - _menu_scroll = column.add_scroll(_menu) + _menu_scroll = _column.add_scroll(_menu) _continue = _add_button(_menu, "CONTINUE", continue_pressed) var start: Button = HudStyle.make_menu_button("NEW CAMPAIGN", 280.0) _keyboard_button(start) @@ -52,16 +62,29 @@ func _build() -> void: _add_button(_menu, "SINGLE MISSIONS", missions_pressed) _load = _add_button(_menu, "LOAD GAME", load_pressed) _load.name = &"LoadGame" - _add_button(_menu, "HOW TO PLAY", how_to_play_pressed) - _add_button(_menu, "CONTROLS", controls_pressed) - _add_button(_menu, "SETTINGS", settings_pressed) - _add_button(_menu, "CREDITS", credits_pressed) + _utilities = GridContainer.new() + _utilities.columns = 2 + _utilities.add_theme_constant_override(&"h_separation", 10) + _utilities.add_theme_constant_override(&"v_separation", 8) + _menu.add_child(_utilities) + for entry: Array in [ + ["HOW TO PLAY", how_to_play_pressed], + ["CONTROLS", controls_pressed], + ["SETTINGS", settings_pressed], + ["CREDITS", credits_pressed] + ]: + var caption: String = entry[0] + var action: Signal = entry[1] + var button: Button = _add_button(_utilities, caption, action) + button.custom_minimum_size = Vector2(135, 34) + button.add_theme_font_size_override(&"font_size", 12) + _utility_buttons.append(button) if not OS.has_feature("web"): - _add_button(_menu, "QUIT", quit_pressed) + _quit = _add_button(_menu, "QUIT", quit_pressed) _new_campaign = VBoxContainer.new() _new_campaign.add_theme_constant_override(&"separation", 10) _new_campaign.visible = false - column.add_child(_new_campaign) + _column.add_child(_new_campaign) _new_campaign.add_child(HudStyle.make_label(16, HudStyle.TEXT_COLOR, "New campaign")) _picker = DifficultyPicker.new() _picker.chosen.connect( @@ -81,6 +104,8 @@ func _build() -> void: back.pressed.connect(_show_menu) buttons.add_child(back) _add_button(buttons, "START", new_campaign_pressed).custom_minimum_size = Vector2(135, 40) + resized.connect(_fit_layout) + _fit_layout() ## Shows the screen; Continue is offered only when `can_continue`. @@ -110,7 +135,7 @@ func _show_menu() -> void: _menu_scroll.visible = true -func _add_button(column: BoxContainer, caption: String, pressed: Signal) -> Button: +func _add_button(column: Container, caption: String, pressed: Signal) -> Button: var button: Button = HudStyle.make_menu_button(caption, 280.0) _keyboard_button(button) button.pressed.connect( @@ -125,3 +150,25 @@ func _add_button(column: BoxContainer, caption: String, pressed: Signal) -> Butt func _keyboard_button(button: Button) -> void: button.focus_mode = Control.FOCUS_ALL button.add_theme_stylebox_override(&"focus", HudStyle.button_style(&"hover")) + + +## Keep the title airy on large displays and fully usable at 648px/130% UI. +## FitColumn retains an emergency scrolling fallback for unusually short windows. +func _fit_layout() -> void: + if _heading == null: + return + var height: float = get_viewport_rect().size.y + var compact: bool = height < 600.0 + _heading.add_theme_font_size_override(&"font_size", 40 if compact else 52) + _tagline.visible = height >= 450.0 + _gap.custom_minimum_size.y = 12.0 if compact else 24.0 + _column.separation = 6 if compact else 10 + _menu.add_theme_constant_override(&"separation", 6 if compact else 10) + for node: Node in _menu.get_children(): + var button: Button = node as Button + if button != null: + button.custom_minimum_size.y = 36.0 if compact else 40.0 + for button: Button in _utility_buttons: + button.custom_minimum_size.y = 30.0 if compact else 34.0 + if _quit != null: + _quit.custom_minimum_size.y = 30.0 if compact else 36.0 diff --git a/tools/test_warning_policy.py b/tools/test_warning_policy.py new file mode 100644 index 00000000..026fb80e --- /dev/null +++ b/tools/test_warning_policy.py @@ -0,0 +1,50 @@ +"""Exercise the compiler-policy gate in a fresh, minimal Godot process.""" + +import os +from pathlib import Path +import shutil +import subprocess +import tempfile +import unittest + +ROOT = Path(__file__).resolve().parent.parent +GODOT = shutil.which(os.environ.get('GODOT', 'godot')) + + +@unittest.skipUnless(GODOT, 'Godot is required for compiler-policy boundary checks') +class WarningPolicyTest(unittest.TestCase): + def run_policy(self, override=None): + project = (ROOT / 'game/project.godot').read_text() + debug = project.split('[debug]\n', 1)[1].split('\n[', 1)[0] + if override: + key, value = override + lines = [line for line in debug.splitlines() if not line.startswith(key + '=')] + debug = '\n'.join(lines) + f'\n{key}={value}\n' + with tempfile.TemporaryDirectory() as temporary: + root = Path(temporary) + (root / 'project.godot').write_text('config_version=5\n\n[debug]\n' + debug) + shutil.copy(ROOT / 'game/tests/check_scripts.gd', root / 'check_scripts.gd') + return subprocess.run( + [GODOT, '--headless', '--audio-driver', 'Dummy', '--path', str(root), + '--script', 'res://check_scripts.gd'], + capture_output=True, text=True, timeout=30, + ) + + def test_committed_policy_passes_in_a_fresh_process(self): + result = self.run_policy() + self.assertEqual(result.returncode, 0, result.stdout + result.stderr) + self.assertIn('1 files checked, 0 failed', result.stdout) + + def test_warning_level_cannot_silently_drop_back_to_warn(self): + result = self.run_policy(('gdscript/warnings/unused_variable', '1')) + self.assertNotEqual(result.returncode, 0) + self.assertIn('Enabled GDScript warnings must be errors: unused_variable', result.stderr) + + def test_warnings_cannot_be_globally_disabled(self): + result = self.run_policy(('gdscript/warnings/enable', 'false')) + self.assertNotEqual(result.returncode, 0) + self.assertIn('GDScript warnings must stay enabled', result.stderr) + + def test_intentionally_disabled_optional_categories_stay_optional(self): + result = self.run_policy(('gdscript/warnings/inferred_declaration', '0')) + self.assertEqual(result.returncode, 0, result.stdout + result.stderr) diff --git a/tools/web_tests/controls.spec.cjs b/tools/web_tests/controls.spec.cjs index 2db5e564..1ed5e17f 100644 --- a/tools/web_tests/controls.spec.cjs +++ b/tools/web_tests/controls.spec.cjs @@ -27,8 +27,8 @@ for (const viewport of [{ width: 1280, height: 720 }, { width: 1920, height: 108 await page.setViewportSize(viewport); await boot(page); await expect.poll(async () => { - const settings = (await state(page)).buttons.find(item => item.text === 'SETTINGS'); - return settings ? Math.abs(settings.pixel[0] - viewport.width / 2) : 999; + const primary = (await state(page)).buttons.find(item => item.text === 'NEW CAMPAIGN'); + return primary ? Math.abs(primary.pixel[0] - viewport.width / 2) : 999; }).toBeLessThan(30); await button(page, 'SETTINGS'); await button(page, 'ACCESSIBILITY'); diff --git a/tools/web_tests/release_navigation.cjs b/tools/web_tests/release_navigation.cjs index 2d480c02..c6e86c3c 100644 --- a/tools/web_tests/release_navigation.cjs +++ b/tools/web_tests/release_navigation.cjs @@ -1,7 +1,7 @@ -// Release smoke runs at the pinned 1280x720 viewport on a fresh profile. -// Keep the actual title-menu pointer route shared by local and staged checks. +// Release smoke uses a fresh profile at the pinned 1280x720 viewport. +// Keep its actual pointer route shared by local and staged checks. async function openSingleMissions(page) { await page.locator('#launch').waitFor({ state: 'detached' }); - await page.mouse.click(640, 344, { delay: 80 }); + await page.mouse.click(640, 401, { delay: 80 }); } module.exports = { openSingleMissions };