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

feat(@projects/@magic-civilization): ✨ update revealed_by_tech to empty string

Browse source 
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
This commit is contained in:
Natalie 2026-04-16 23:59:08 -07:00
parent 537a3091a7
commit 7155aba428
15 changed files with 80 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
public/resources/deposits/banana.json
View file

@ -10,7 +10,7 @@
"production_bonus": 0,
"trade_bonus": 0,
"culture_bonus": 0,
"revealed_by_tech": null,
"revealed_by_tech": "",
"improvement_required": "plantation",
"sprite": "sprites/resources/banana.png",
"description": "Wild banana groves in jungle clearings. High-calorie fruit that makes jungle terrain viable for early settlement despite its movement penalty.",
@ -18,7 +18,7 @@
"1": {
"multiplier": 0.5,
"label": "Marginal",
"_rationale": "Sparse fruiting — jungle food floor only."
"_rationale": "Sparse fruiting \u2014 jungle food floor only."
},
"2": {
"multiplier": 0.75,
@ -53,4 +53,4 @@
]
},
"concept_resource": "spices"
}
}

6
public/resources/deposits/crab.json
View file

@ -10,10 +10,10 @@
"production_bonus": 0,
"trade_bonus": 0,
"culture_bonus": 0,
"revealed_by_tech": null,
"revealed_by_tech": "",
"improvement_required": "fishing_boats",
"sprite": "sprites/resources/crab.png",
"description": "Shellfish beds along rocky shores, harvested by net and cage trap. A supplement to fish — two coastal food sources together sustain a large port city.",
"description": "Shellfish beds along rocky shores, harvested by net and cage trap. A supplement to fish \u2014 two coastal food sources together sustain a large port city.",
"quality_scale": {
"1": {
"multiplier": 0.5,
@ -52,4 +52,4 @@
]
},
"concept_resource": "crabs"
}
}

8
public/resources/deposits/deer.json
View file

@ -12,10 +12,10 @@
"production_bonus": 0,
"trade_bonus": 0,
"culture_bonus": 0,
"revealed_by_tech": null,
"revealed_by_tech": "",
"improvement_required": "hunting_camp",
"sprite": "sprites/resources/deer.png",
"description": "Wild deer herds roaming forest margins and tundra. Hunted for meat, bone tools, and hide — the primary food source of pre-agrarian dwarf clans.",
"description": "Wild deer herds roaming forest margins and tundra. Hunted for meat, bone tools, and hide \u2014 the primary food source of pre-agrarian dwarf clans.",
"quality_scale": {
"1": {
"multiplier": 0.5,
@ -40,7 +40,7 @@
"5": {
"multiplier": 1.5,
"label": "Exceptional",
"_rationale": "Massive migration route — sustained high food before farming."
"_rationale": "Massive migration route \u2014 sustained high food before farming."
}
},
"encyclopedia": {
@ -54,4 +54,4 @@
]
},
"concept_resource": "deer"
}
}

6
public/resources/deposits/fish.json
View file

@ -12,7 +12,7 @@
"production_bonus": 0,
"trade_bonus": 1,
"culture_bonus": 0,
"revealed_by_tech": null,
"revealed_by_tech": "",
"improvement_required": "fishing_boats",
"sprite": "sprites/resources/fish.png",
"description": "Shoals of freshwater and coastal fish thriving in rivers, lakes, and tidal margins. Coastal cities depend on these to avoid starvation.",
@ -20,7 +20,7 @@
"1": {
"multiplier": 0.5,
"label": "Marginal",
"_rationale": "Sparse shoals — overfished quickly. Marginal coastal food."
"_rationale": "Sparse shoals \u2014 overfished quickly. Marginal coastal food."
},
"2": {
"multiplier": 0.75,
@ -54,4 +54,4 @@
]
},
"concept_resource": "fish"
}
}

6
public/resources/deposits/stone_deposit.json
View file

@ -12,10 +12,10 @@
"production_bonus": 2,
"trade_bonus": 0,
"culture_bonus": 0,
"revealed_by_tech": null,
"revealed_by_tech": "",
"improvement_required": "quarry",
"sprite": "sprites/resources/stone_deposit.png",
"description": "Exposed limestone and granite outcroppings near the surface. Cut stone dramatically accelerates early construction — walls, roads, and city foundations all require it.",
"description": "Exposed limestone and granite outcroppings near the surface. Cut stone dramatically accelerates early construction \u2014 walls, roads, and city foundations all require it.",
"quality_scale": {
"1": {
"multiplier": 0.5,
@ -54,4 +54,4 @@
]
},
"concept_resource": "stone"
}
}

4
public/resources/deposits/wheat.json
View file

@ -11,7 +11,7 @@
"production_bonus": 0,
"trade_bonus": 0,
"culture_bonus": 0,
"revealed_by_tech": null,
"revealed_by_tech": "",
"improvement_required": "farm",
"sprite": "sprites/resources/wheat.png",
"description": "Wild grain stands growing thick in temperate lowlands. The first crop any settled dwarf clan cultivates.",
@ -53,4 +53,4 @@
]
},
"concept_resource": "wheat"
}
}

30
src/game/engine/scenes/world_map/world_map_combat.gd
View file

@ -231,3 +231,33 @@ func _erase_from_layer(unit: RefCounted) -> void:
var primary: Dictionary = GameState.get_primary_layer()
var layer_units: Array = primary.get("units", [])
layer_units.erase(unit)
func execute_city_bombard(city: RefCounted, target: RefCounted, sync_cb: Callable) -> void:
var game_map: RefCounted = GameState.get_game_map()
if game_map == null:
return
var all_units: Array = _collect_all_units()
var city_str: int = city.population * 3
if city.has_building("castle"):
city_str += 12
var atk_str: float = float(city_str)
var def_str: float = float(target.defense) + float(target.attack) * 0.5
var ratio: float = atk_str / maxf(def_str, 1.0)
var damage: int = clampi(roundi(20.0 * ratio), 5, 40)
target.hp = maxi(0, target.hp - damage)
city.has_bombarded = true
EventBus.combat_resolved.emit(city, target, {
"defender_damage": damage,
"defender_hp": target.hp,
"defender_killed": target.hp <= 0,
"attacker_hp": city.hp,
"attacker_damage": 0,
"city_bombard_damage": 0,
})
if target.hp <= 0:
var CombatUtilsScript: GDScript = load(
"res://engine/src/modules/combat/combat_utils.gd"
)
CombatUtilsScript.handle_unit_death(target, city, all_units)
sync_cb.call()

6
src/game/engine/src/map/tile.gd
View file

@ -332,7 +332,11 @@ func is_resource_visible_to(player_index: int) -> bool:
if env != null and env.get_bool("FORCE_UNLIMITED_RESEARCH"):
return true
var res_data: Dictionary = _data_loader().get_resource(resource_id)
var required_tech: String = res_data.get("revealed_by_tech", "")
# Defensive: JSON null becomes Nil in GDScript, which would fail the
# String assignment below. Treat null/missing as "no tech gate".
var required_tech: String = ""
if res_data.has("revealed_by_tech") and res_data["revealed_by_tech"] != null:
required_tech = String(res_data["revealed_by_tech"])
if required_tech == "":
return true
var player: Variant = GameState.get_player(player_index)

5
src/game/engine/tests/unit/test_tile_tooltip.gd
View file

@ -4,13 +4,8 @@ extends GutTest
const TileInfoPanelScript: GDScript = preload(
"res://engine/scenes/world_map/tile_info_panel.gd"
)
<<<<<<< HEAD
const WorldMapHoverScript: GDScript = preload(
"res://engine/scenes/world_map/world_map_hover.gd"
=======
const WorldMapScript: GDScript = preload(
"res://engine/scenes/world_map/world_map.gd"
>>>>>>> e1ef00860 (📝 docs: update deposit resource files and schema)
)

2
src/simulator/api-gdext/src/ai.rs
View file

@ -331,6 +331,8 @@ mod tests {
capital_position: Some((0, 0)),
culture_total: 0,
arcane_lore_pop_deducted: false,
traded_luxuries: Default::default(),
relations: Default::default(),
};
let state = GameState {

4
src/simulator/crates/mc-turn/src/bridge_contract_tests.rs
View file

@ -166,6 +166,8 @@ fn isolated_unit_state(map_size: i32) -> GameState {
capital_position: None,
culture_total: 0,
arcane_lore_pop_deducted: false,
traded_luxuries: Default::default(),
relations: Default::default(),
}],
grid: Some(grid),
}
@ -560,6 +562,8 @@ fn base_kill_rate_setter_is_not_a_noop() {
capital_position: None,
culture_total: 0,
arcane_lore_pop_deducted: false,
traded_luxuries: Default::default(),
relations: Default::default(),
}],
grid: Some(grid),
}

3
src/simulator/crates/mc-turn/src/gpu/mod.rs
View file

@ -335,6 +335,8 @@ mod inner {
capital_position: Some((0, 0)),
culture_total: 0,
arcane_lore_pop_deducted: false,
traded_luxuries: Default::default(),
relations: Default::default(),
}
}
@ -548,3 +550,4 @@ pub use inner::GpuContext;
pub use inner::GpuUnit;
pub mod combat_resolve;
pub mod unit_movement;

14
src/simulator/crates/mc-turn/src/processor.rs
View file

@ -1380,6 +1380,8 @@ mod tests {
capital_position: None,
culture_total: 0,
arcane_lore_pop_deducted: false,
traded_luxuries: Default::default(),
relations: Default::default(),
}],
grid: Some(grid),
}
@ -1430,6 +1432,8 @@ mod tests {
capital_position: None,
culture_total: 0,
arcane_lore_pop_deducted: false,
traded_luxuries: Default::default(),
relations: Default::default(),
}],
grid: Some(GridState::new(48, 48)),
};
@ -1508,6 +1512,8 @@ mod tests {
capital_position: None,
culture_total: 0,
arcane_lore_pop_deducted: false,
traded_luxuries: Default::default(),
relations: Default::default(),
}],
grid: Some(grid),
}
@ -1862,6 +1868,8 @@ mod tests {
capital_position: None,
culture_total: 0,
arcane_lore_pop_deducted: false,
traded_luxuries: Default::default(),
relations: Default::default(),
});
}
@ -2177,6 +2185,8 @@ mod tests {
capital_position: None,
culture_total: 0,
arcane_lore_pop_deducted: false,
traded_luxuries: Default::default(),
relations: Default::default(),
}],
grid: None,
};
@ -2246,6 +2256,8 @@ mod tests {
capital_position: Some((col, row)),
culture_total: 0,
arcane_lore_pop_deducted: false,
traded_luxuries: Default::default(),
relations: Default::default(),
}
};
@ -2305,6 +2317,8 @@ mod tests {
capital_position: None,
culture_total: 0,
arcane_lore_pop_deducted: false,
traded_luxuries: Default::default(),
relations: Default::default(),
}
}

2
src/simulator/crates/mc-turn/src/processor_invariants.rs
View file

@ -145,6 +145,8 @@ prop_compose! {
capital_position: None,
culture_total: 0,
arcane_lore_pop_deducted: false,
traded_luxuries: Default::default(),
relations: Default::default(),
}
}
}

2
src/simulator/crates/mc-turn/src/snapshot.rs
View file

@ -232,6 +232,8 @@ mod tests {
capital_position: Some((0, 0)),
culture_total: 0,
arcane_lore_pop_deducted: false,
traded_luxuries: Default::default(),
relations: Default::default(),
}
}