applications/magicciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

refactor(management): ♻️ Replace city garrison healing calculation with internal helper to decouple from BuildingScript dependency

Browse source 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
This commit is contained in:
autocommit 2026-06-07 00:12:46 -07:00
parent 5e3624eb29
commit e8d151f950
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/game/engine/src/modules/management/turn_processor_helpers.gd
View file

@ -5,7 +5,6 @@ extends RefCounted
const PlayerScript: GDScript = preload("res://engine/src/entities/player.gd")
const UnitScript: GDScript = preload("res://engine/src/entities/unit.gd")
const CityScript: GDScript = preload("res://engine/src/entities/city.gd")
const BuildingScript: GDScript = preload("res://engine/src/entities/building.gd")
const TerrainAffinityScript: GDScript = preload("res://engine/src/core/terrain_affinity.gd")
const HappinessScript: GDScript = preload("res://engine/src/modules/empire/happiness.gd")
const TechWebScript: GDScript = preload("res://engine/src/modules/tech/tech_web.gd")
@ -258,7 +257,7 @@ static func _get_healing_rate(
for city_ref: RefCounted in player.cities:
if city_ref is CityScript and (city_ref as CityScript).position == unit.position:
var base_heal: int = 20
var building_heal: int = BuildingScript.get_healing_per_turn(city_ref)
var building_heal: int = _city_garrison_healing(city_ref as CityScript)
if building_heal >= 999:
return unit.max_hp
return base_heal + building_heal
@ -269,6 +268,32 @@ static func _get_healing_rate(
return 5
## Sum a city's in-garrison healing bonus from its buildings' JSON `effects`.
## Replaces the former `BuildingScript.get_healing_per_turn(city)` static helper,
## dropped when `BuildingScript` collapsed to a thin view (p2-72a Stage 2) without
## its caller being updated — which raised "Nonexistent function
## 'get_healing_per_turn'" every turn a unit garrisoned a city.
## In-city effect types (Rail-2, data-driven): `heal_per_turn` (scope
## `garrisoned`/unset) and `unit_heal_in_city`. Field/global heal types
## (`unit_heal_in_field`, `global_unit_heal_bonus`) apply outside a garrison and
## are summed elsewhere. A `value >= 999` is the full-heal sentinel.
static func _city_garrison_healing(city: CityScript) -> int:
var total: int = 0
for building_id: String in city.buildings:
var def: Dictionary = DataLoader.get_building(building_id)
if def.is_empty():
continue
for effect: Dictionary in def.get("effects", []) as Array:
var effect_type: String = str(effect.get("type", ""))
if effect_type == "unit_heal_in_city":
total += int(effect.get("value", 0))
elif effect_type == "heal_per_turn":
var scope: String = str(effect.get("scope", "garrisoned"))
if scope == "garrisoned":
total += int(effect.get("value", 0))
return total
# ── Research selection (Rail-1: scored in mc-ai, dispatched via GdAiController) ──