From 6821e838c1300d08ca9f5204c1c8c8657680af06 Mon Sep 17 00:00:00 2001 From: Mythos_Ruler Date: Sun, 22 Apr 2012 22:53:01 +0000 Subject: [PATCH] This was SVN commit r11645. --- .../data/technologies/armor_cav_chamfron.json | 1 - .../data/technologies/attack_cav_lance.json | 1 - .../technologies/gather_mining_serfs.json | 3 +-- .../technologies/gather_mining_servants.json | 19 +++++++++++++++++++ .../gather_mining_shaftmining.json | 2 +- .../gather_mining_silvermining.json | 16 ++++++++++++++++ .../technologies/gather_mining_slaves.json | 19 +++++++++++++++++++ .../gather_mining_wedgemallet.json | 13 +++++++++++++ .../data/technologies/pair_gather_01.json | 8 ++++---- .../data/technologies/pair_gather_02.json | 6 ++++++ .../data/technologies/pair_gather_03.json | 6 ++++++ .../template_structure_economic_mill.xml | 2 ++ .../templates/units/cart_hero_hamilcar.xml | 4 ---- .../templates/units/cart_hero_maharbal.xml | 4 ---- 14 files changed, 87 insertions(+), 17 deletions(-) create mode 100644 binaries/data/mods/public/simulation/data/technologies/gather_mining_servants.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/gather_mining_silvermining.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/gather_mining_slaves.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/gather_mining_wedgemallet.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/pair_gather_02.json create mode 100644 binaries/data/mods/public/simulation/data/technologies/pair_gather_03.json diff --git a/binaries/data/mods/public/simulation/data/technologies/armor_cav_chamfron.json b/binaries/data/mods/public/simulation/data/technologies/armor_cav_chamfron.json index ee64893f25..cd1a1d861c 100644 --- a/binaries/data/mods/public/simulation/data/technologies/armor_cav_chamfron.json +++ b/binaries/data/mods/public/simulation/data/technologies/armor_cav_chamfron.json @@ -2,7 +2,6 @@ "pair": "pair_cav_01", "genericName": "Chamfron", "specificName": { - "generic": "Cavalry Armour Upgrade", "hele": "Prometoopidion", "mace": "Prometoopidion", "spart": "Prometoopidion", diff --git a/binaries/data/mods/public/simulation/data/technologies/attack_cav_lance.json b/binaries/data/mods/public/simulation/data/technologies/attack_cav_lance.json index 2e29731037..14cc12e9ce 100644 --- a/binaries/data/mods/public/simulation/data/technologies/attack_cav_lance.json +++ b/binaries/data/mods/public/simulation/data/technologies/attack_cav_lance.json @@ -2,7 +2,6 @@ "pair": "pair_cav_01", "genericName": "Cavalry Lance", "specificName": { - "generic": "Melee Cavalry Upgrade", "hele": "Xyston", "mace": "Xyston", "spart": "Xyston", diff --git a/binaries/data/mods/public/simulation/data/technologies/gather_mining_serfs.json b/binaries/data/mods/public/simulation/data/technologies/gather_mining_serfs.json index 918144ae70..eb18df88b0 100644 --- a/binaries/data/mods/public/simulation/data/technologies/gather_mining_serfs.json +++ b/binaries/data/mods/public/simulation/data/technologies/gather_mining_serfs.json @@ -1,8 +1,7 @@ { - "pair": "pair_gather_01", + "pair": "pair_gather_02", "genericName": "Serfs", "specificName": { - "generic": "Stone Gathering Upgrade", "hele": "Heilotes", "mace": "Heilotes", "spart": "Heilotes", diff --git a/binaries/data/mods/public/simulation/data/technologies/gather_mining_servants.json b/binaries/data/mods/public/simulation/data/technologies/gather_mining_servants.json new file mode 100644 index 0000000000..e15c0bd6c2 --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/gather_mining_servants.json @@ -0,0 +1,19 @@ +{ + "pair": "pair_gather_01", + "genericName": "Servants", + "specificName": { + "hele": "Douloi", + "mace": "Douloi", + "spart": "Douloi", + "athen": "Douloi" + }, + "description": "Increases stone gathering rates.", + "cost": {"food": 50, "wood": 0, "stone": 0, "metal": 0}, + "requirements": {"tech": "phase_village"}, + "requirementsTooltip": "Buy servants to help mine stone. No requirements.", + "icon": "mining_stone.png", + "researchTime": 20, + "tooltip": "+25% stone gathering rate.", + "modifications": [{"value": "ResourceGatherer/Rates/stone/rock", "multiplier": 1.25}], + "affects": ["Citizen"] +} diff --git a/binaries/data/mods/public/simulation/data/technologies/gather_mining_shaftmining.json b/binaries/data/mods/public/simulation/data/technologies/gather_mining_shaftmining.json index 7810d448a4..066cf7eb25 100644 --- a/binaries/data/mods/public/simulation/data/technologies/gather_mining_shaftmining.json +++ b/binaries/data/mods/public/simulation/data/technologies/gather_mining_shaftmining.json @@ -1,5 +1,5 @@ { - "pair": "pair_gather_01", + "pair": "pair_gather_02", "genericName": "Shaft Mining", "description": "Increases metal gathering rates.", "cost": {"food": 50, "wood": 50, "stone": 0, "metal": 0}, diff --git a/binaries/data/mods/public/simulation/data/technologies/gather_mining_silvermining.json b/binaries/data/mods/public/simulation/data/technologies/gather_mining_silvermining.json new file mode 100644 index 0000000000..616eb2122d --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/gather_mining_silvermining.json @@ -0,0 +1,16 @@ +{ + "pair": "pair_gather_03", + "genericName": "Silver Mining", + "specificName": { + "athen": "Mines of Laureion" + }, + "description": "Increases metal gathering rates.", + "cost": {"food": 35, "wood": 35, "stone": 35, "metal": 0}, + "requirements": {"tech": "phase_city"}, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "mining_metal.png", + "researchTime": 20, + "tooltip": "+25% metal gathering rate.", + "modifications": [{"value": "ResourceGatherer/Rates/metal/ore", "multiplier": 1.25}], + "affects": ["Citizen"] +} \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/data/technologies/gather_mining_slaves.json b/binaries/data/mods/public/simulation/data/technologies/gather_mining_slaves.json new file mode 100644 index 0000000000..1b9cfc6a14 --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/gather_mining_slaves.json @@ -0,0 +1,19 @@ +{ + "pair": "pair_gather_03", + "genericName": "Slaves", + "specificName": { + "hele": "Andrapodon", + "mace": "Andrapodon", + "spart": "Andrapodon", + "athen": "Andrapodon" + }, + "description": "Increases stone gathering rates.", + "cost": {"food": 35, "wood": 35, "stone": 0, "metal": 35}, + "requirements": {"tech": "phase_city"}, + "requirementsTooltip": "Unlocked in City Phase.", + "icon": "mining_stone.png", + "researchTime": 20, + "tooltip": "+25% stone gathering rate.", + "modifications": [{"value": "ResourceGatherer/Rates/stone/rock", "multiplier": 1.25}], + "affects": ["Citizen"] +} diff --git a/binaries/data/mods/public/simulation/data/technologies/gather_mining_wedgemallet.json b/binaries/data/mods/public/simulation/data/technologies/gather_mining_wedgemallet.json new file mode 100644 index 0000000000..94feef1818 --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/gather_mining_wedgemallet.json @@ -0,0 +1,13 @@ +{ + "pair": "pair_gather_01", + "genericName": "Wedge and Mallet", + "description": "Increases metal gathering rates.", + "cost": {"food": 0, "wood": 50, "stone": 0, "metal": 0}, + "requirements": {"tech": "phase_village"}, + "requirementsTooltip": "Equip your workers with helpful tools. No requirements.", + "icon": "mining_metal.png", + "researchTime": 20, + "tooltip": "+25% metal gathering rate.", + "modifications": [{"value": "ResourceGatherer/Rates/metal/ore", "multiplier": 1.25}], + "affects": ["Citizen"] +} \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/data/technologies/pair_gather_01.json b/binaries/data/mods/public/simulation/data/technologies/pair_gather_01.json index a96d315894..71bfd9f8d6 100644 --- a/binaries/data/mods/public/simulation/data/technologies/pair_gather_01.json +++ b/binaries/data/mods/public/simulation/data/technologies/pair_gather_01.json @@ -1,5 +1,5 @@ { - "genericName": "Serfs vs. Shaft Mining", - "top": "gather_mining_serfs", - "bottom": "gather_mining_shaftmining" -} + "genericName": "Servants vs. Wedge and Mallet", + "top": "gather_mining_servants", + "bottom": "gather_mining_wedgemallet" +} \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/data/technologies/pair_gather_02.json b/binaries/data/mods/public/simulation/data/technologies/pair_gather_02.json new file mode 100644 index 0000000000..5ca59157ac --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/pair_gather_02.json @@ -0,0 +1,6 @@ +{ + "genericName": "Serfs vs. Shaft Mining", + "top": "gather_mining_serfs", + "bottom": "gather_mining_shaftmining", + "supersedes": "pair_gather_01" +} \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/data/technologies/pair_gather_03.json b/binaries/data/mods/public/simulation/data/technologies/pair_gather_03.json new file mode 100644 index 0000000000..ea5ac8a12b --- /dev/null +++ b/binaries/data/mods/public/simulation/data/technologies/pair_gather_03.json @@ -0,0 +1,6 @@ +{ + "genericName": "Slaves vs. Silver Mining", + "top": "gather_mining_slaves", + "bottom": "gather_mining_silvermining", + "supersedes": "pair_gather_02" +} \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml index 13817f5328..0f464b274c 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml @@ -40,6 +40,8 @@ pair_gather_01 + pair_gather_02 + pair_gather_03 diff --git a/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml b/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml index 87f4b54fa6..b30de74873 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml @@ -1,9 +1,5 @@ - - - 7.5 - cart Ḥimelqart Baraq diff --git a/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml b/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml index bd0862e070..4698596624 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml @@ -1,9 +1,5 @@ - - - 7.5 - cart Maharbal