From 5c25b6f6445512992ce29e1ace0ebf4859cabb05 Mon Sep 17 00:00:00 2001 From: Feldfeld Date: Mon, 30 Dec 2024 22:13:35 +0100 Subject: [PATCH] Uniformize dock trainable entities Docks are generic and have all ship entities. This comes to play notably when they are captured. This is currently not the case for special docks (Crannog and Cothon). For consistency they are given ship entities that are trainable by other civilizations. Also, the Crannog was not updated with the naval overhaul and still had the trireme and bireme entities. They are now removed. Fixes #7426 --- .../mods/public/maps/scenarios/pickup_test_map_triggers.js | 2 +- .../simulation/templates/structures/brit/crannog.xml | 7 +++++-- .../simulation/templates/structures/cart/super_dock.xml | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/binaries/data/mods/public/maps/scenarios/pickup_test_map_triggers.js b/binaries/data/mods/public/maps/scenarios/pickup_test_map_triggers.js index a3e8b67e38..b549b53149 100644 --- a/binaries/data/mods/public/maps/scenarios/pickup_test_map_triggers.js +++ b/binaries/data/mods/public/maps/scenarios/pickup_test_map_triggers.js @@ -1,5 +1,5 @@ const UNIT_TEMPLATE = "units/athen/infantry_marine_archer_b"; -const SHIP_TEMPLATE = "units/athen/ship_trireme"; +const SHIP_TEMPLATE = "units/athen/ship_arrow"; const RAM_TEMPLATE = "units/brit/siege_ram"; const point_plaza_nw = 14; // Center plaza #1 (NW) diff --git a/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml b/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml index c18df18848..0eb6768bc6 100644 --- a/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml +++ b/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml @@ -43,8 +43,11 @@ units/{civ}/cavalry_javelineer_b units/{civ}/ship_fishing units/{civ}/ship_merchant - units/{civ}/ship_bireme - units/{civ}/ship_trireme + units/{civ}/ship_scout + units/{civ}/ship_arrow + units/{civ}/ship_ram + units/{civ}/ship_fire + units/{civ}/ship_siege diff --git a/binaries/data/mods/public/simulation/templates/structures/cart/super_dock.xml b/binaries/data/mods/public/simulation/templates/structures/cart/super_dock.xml index 1b52e20dad..c7f6e9a6c6 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart/super_dock.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart/super_dock.xml @@ -97,6 +97,7 @@ units/{civ}/ship_scout units/{civ}/ship_arrow units/{civ}/ship_ram + units/{civ}/ship_fire units/{civ}/ship_siege