diff --git a/binaries/data/mods/public/simulation/data/technologies/armor_ship_hullsheathing.json b/binaries/data/mods/public/simulation/data/technologies/armor_ship_hullsheathing.json deleted file mode 100644 index 4afb1ed14f..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/armor_ship_hullsheathing.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "genericName": "Lead hull sheathing", - "description": "Lead sheathing protects ship hulls.", - "cost": { "food": 0, "wood": 0, "stone": 0, "metal": 350 }, - "requirements": { "tech": "phase_city" }, - "requirementsTooltip": "Unlocked in City Phase.", - "supersedes": "armor_ship_hypozomata", - "icon": "armor_ship_gold.png", - "researchTime": 40, - "tooltip": "Ships +2 armor.", - "modifications": [ - { "value": "Resistance/Entity/Damage/Hack", "add": 2 }, - { "value": "Resistance/Entity/Damage/Pierce", "add": 2 }, - { "value": "Resistance/Entity/Damage/Crush", "add": 2 } - ], - "affects": ["Ship"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/armor_ship_hypozomata.json b/binaries/data/mods/public/simulation/data/technologies/armor_ship_hypozomata.json deleted file mode 100644 index 0e6c2cfb0a..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/armor_ship_hypozomata.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "genericName": "Hypozomata undergirding", - "description": "The hypozomata braces the structure of a ship.", - "cost": { "food": 0, "wood": 150, "stone": 0, "metal": 150 }, - "requirements": { "tech": "phase_town" }, - "requirementsTooltip": "Unlocked in Town Phase.", - "supersedes": "armor_ship_reinforcedhull", - "icon": "armor_ship_silver.png", - "researchTime": 40, - "tooltip": "Ships +2 armor.", - "modifications": [ - { "value": "Resistance/Entity/Damage/Hack", "add": 2 }, - { "value": "Resistance/Entity/Damage/Pierce", "add": 2 }, - { "value": "Resistance/Entity/Damage/Crush", "add": 2 } - ], - "affects": ["Ship"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/armor_ship_reinforcedhull.json b/binaries/data/mods/public/simulation/data/technologies/armor_ship_reinforcedhull.json deleted file mode 100644 index c48279bfc2..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/armor_ship_reinforcedhull.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "genericName": "Reinforced hull", - "description": "Wooden reinforcement beams for ship hulls.", - "cost": { "food": 0, "wood": 250, "stone": 0, "metal": 0 }, - "requirements": { "tech": "phase_village" }, - "requirementsTooltip": "Unlocked in Village Phase.", - "icon": "armor_ship_bronze.png", - "researchTime": 40, - "tooltip": "Ships +2 armor.", - "modifications": [ - { "value": "Resistance/Entity/Damage/Hack", "add": 2 }, - { "value": "Resistance/Entity/Damage/Pierce", "add": 2 }, - { "value": "Resistance/Entity/Damage/Crush", "add": 2 } - ], - "affects": ["Ship"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/carthaginians/training_phoenician_naval_architects.json b/binaries/data/mods/public/simulation/data/technologies/carthaginians/training_phoenician_naval_architects.json deleted file mode 100644 index 6936764474..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/carthaginians/training_phoenician_naval_architects.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "genericName": "Phoenician Naval Architects", - "description": "Significantly increase build speed of batches of ships at the Shipyard.", - "cost": { "food": 200, "wood": 200, "stone": 0, "metal": 0 }, - "requirements": { "all": [{ "tech": "phase_city" }, { "civ": "cart" }] }, - "requirementsTooltip": "Unlocked in City Phase.", - "icon": "calipers.png", - "researchTime": 40, - "tooltip": "Shipyard increased batch construction speed bonus.", - "modifications": [ - { "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 } - ], - "affects": ["Shipyard"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} diff --git a/binaries/data/mods/public/simulation/data/technologies/gather_capacity_fishing.json b/binaries/data/mods/public/simulation/data/technologies/fishing_boat_gather_capacity.json similarity index 80% rename from binaries/data/mods/public/simulation/data/technologies/gather_capacity_fishing.json rename to binaries/data/mods/public/simulation/data/technologies/fishing_boat_gather_capacity.json index f7dc47953b..6b9bfbe065 100644 --- a/binaries/data/mods/public/simulation/data/technologies/gather_capacity_fishing.json +++ b/binaries/data/mods/public/simulation/data/technologies/fishing_boat_gather_capacity.json @@ -3,8 +3,8 @@ "description": "Salting allows to preserve fish longer.", "cost": { "food": 200, "wood": 100, "stone": 0, "metal": 0 }, "requirements": { "tech": "phase_town" }, - "requirementsTooltip": "Unlocked in Town Phase. Requires Fishing Net.", - "supersedes": "gather_fishing_net", + "requirementsTooltip": "Unlocked in Town Phase.", + "supersedes": "fishing_boat_gather_rate", "icon": "fish.png", "researchTime": 50, "tooltip": "Fishing Boats +20 food capacity.", diff --git a/binaries/data/mods/public/simulation/data/technologies/gather_fishing_net.json b/binaries/data/mods/public/simulation/data/technologies/fishing_boat_gather_rate.json similarity index 100% rename from binaries/data/mods/public/simulation/data/technologies/gather_fishing_net.json rename to binaries/data/mods/public/simulation/data/technologies/fishing_boat_gather_rate.json diff --git a/binaries/data/mods/public/simulation/data/technologies/ship_cost_time.json b/binaries/data/mods/public/simulation/data/technologies/ship_cost_time.json new file mode 100644 index 0000000000..ccae486590 --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/ship_cost_time.json @@ -0,0 +1,15 @@ +{ + "genericName": "Naval Architects", + "description": "Employ skilled shipwrights with specialized tools to speed up ship construction.", + "cost": { "food": 200, "wood": 200, "stone": 0, "metal": 0 }, + "requirements": { "tech": "phase_city" }, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "calipers.png", + "researchTime": 60, + "tooltip": "Ships −20% construction time.", + "modifications": [ + { "value": "Cost/BuildTime", "multiply": 0.8 } + ], + "affects": ["Ship"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/ship_health.json b/binaries/data/mods/public/simulation/data/technologies/ship_health.json new file mode 100644 index 0000000000..3b0b8402c1 --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/ship_health.json @@ -0,0 +1,15 @@ +{ + "genericName": "Reinforced hull", + "description": "Wooden reinforcement beams for ship hulls.", + "cost": { "food": 0, "wood": 600, "stone": 0, "metal": 200 }, + "requirements": { "tech": "phase_city" }, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "armor_ship_bronze.png", + "researchTime": 60, + "tooltip": "Ships +25% health.", + "modifications": [ + { "value": "Health/Max", "multiply": 1.25 } + ], + "affects": ["Ship"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/ship_movement_speed.json b/binaries/data/mods/public/simulation/data/technologies/ship_movement_speed.json new file mode 100644 index 0000000000..aa0d8aadcb --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/ship_movement_speed.json @@ -0,0 +1,15 @@ +{ + "genericName": "Experienced Crews", + "description": "Train your oarsmen and sailors to move more efficiently and speed up your ships.", + "cost": { "food": 500, "wood": 0, "stone": 0, "metal": 0 }, + "requirements": { "tech": "phase_city" }, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "armor_ship_silver.png", + "researchTime": 60, + "tooltip": "Ships +10% movement speed.", + "modifications": [ + { "value": "UnitMotion/WalkSpeed", "multiply": 1.1 } + ], + "affects": ["Ship"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} diff --git a/binaries/data/mods/public/simulation/data/technologies/training_naval_architects.json b/binaries/data/mods/public/simulation/data/technologies/training_naval_architects.json deleted file mode 100644 index 40241f26b7..0000000000 --- a/binaries/data/mods/public/simulation/data/technologies/training_naval_architects.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "genericName": "Naval Architects", - "description": "Significantly increase build speed of batches of ships at the Dock.", - "cost": { "food": 200, "wood": 200, "stone": 0, "metal": 0 }, - "requirements": { "all": [{ "tech": "phase_city" }, { "notciv": "cart" }] }, - "requirementsTooltip": "Unlocked in City Phase.", - "icon": "calipers.png", - "researchTime": 40, - "tooltip": "Docks increased batch construction speed bonus.", - "modifications": [ - { "value": "ProductionQueue/BatchTimeModifier", "add": -0.1 } - ], - "affects": ["Dock"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} diff --git a/binaries/data/mods/public/simulation/templates/structures/cart/dock.xml b/binaries/data/mods/public/simulation/templates/structures/cart/dock.xml index ace024fc27..171b71c955 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart/dock.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart/dock.xml @@ -16,7 +16,6 @@ cart Commercial Port Namel - Construct fishing boats to gather meat and merchant ships to trade with other docks. 30 @@ -27,11 +26,6 @@ - - - -training_naval_architects - - structures/carthaginians/dock.xml structures/fndn_6x4_dock.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/iber/dock.xml b/binaries/data/mods/public/simulation/templates/structures/iber/dock.xml index 3964554cb8..b33acdc668 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber/dock.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber/dock.xml @@ -14,11 +14,6 @@ - - - units/{civ}/ship_fire - - structures/iberians/dock.xml structures/fndn_dock_iber.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/kush/dock.xml b/binaries/data/mods/public/simulation/templates/structures/kush/dock.xml index e5f074167a..2aabc2576c 100644 --- a/binaries/data/mods/public/simulation/templates/structures/kush/dock.xml +++ b/binaries/data/mods/public/simulation/templates/structures/kush/dock.xml @@ -11,11 +11,6 @@ - - - -armor_ship_hullsheathing - - structures/kushites/dock.xml structures/fndn_6x4_dock.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/dock.xml b/binaries/data/mods/public/simulation/templates/structures/pers/dock.xml index 1e08bdcb5c..19d2993780 100644 --- a/binaries/data/mods/public/simulation/templates/structures/pers/dock.xml +++ b/binaries/data/mods/public/simulation/templates/structures/pers/dock.xml @@ -14,11 +14,6 @@ - - - persians/special_equine_transports - - structures/persians/dock.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol/dock.xml b/binaries/data/mods/public/simulation/templates/structures/ptol/dock.xml index 9de743859e..cf50b552cd 100644 --- a/binaries/data/mods/public/simulation/templates/structures/ptol/dock.xml +++ b/binaries/data/mods/public/simulation/templates/structures/ptol/dock.xml @@ -13,7 +13,6 @@ - units/{civ}/ship_quinquereme units/{civ}/champion_juggernaut diff --git a/binaries/data/mods/public/simulation/templates/structures/rome/dock.xml b/binaries/data/mods/public/simulation/templates/structures/rome/dock.xml index beff99695c..6f5169e965 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome/dock.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome/dock.xml @@ -14,11 +14,6 @@ - - - units/{civ}/ship_quinquereme - - structures/romans/dock.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/sele/dock.xml b/binaries/data/mods/public/simulation/templates/structures/sele/dock.xml index 0c50a82793..6ccc0b010a 100644 --- a/binaries/data/mods/public/simulation/templates/structures/sele/dock.xml +++ b/binaries/data/mods/public/simulation/templates/structures/sele/dock.xml @@ -11,11 +11,6 @@ - - - units/{civ}/ship_quinquereme - - structures/seleucids/dock.xml structures/fndn_6x4_dock.xml diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml index 69dcd60118..fca65e5cd6 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml @@ -51,14 +51,16 @@ units/{civ}/ship_merchant units/{civ}/ship_bireme units/{civ}/ship_trireme + units/{civ}/ship_quinquereme + units/{civ}/ship_fire - gather_capacity_fishing - gather_fishing_net - training_naval_architects - armor_ship_reinforcedhull - armor_ship_hypozomata - armor_ship_hullsheathing + fishing_boat_gather_rate + fishing_boat_gather_capacity + ship_cost_time + ship_health + ship_movement_speed + persians/special_equine_transports