Index: binaries/data/mods/public/simulation/data/technologies/civil_engineering_01.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/civil_engineering_01.json +++ binaries/data/mods/public/simulation/data/technologies/civil_engineering_01.json @@ -1,11 +1,11 @@ { - "genericName": "Civil Engineering − Level 1", + "genericName": "Improved Construction", "specificName": { "han": "Gōngchéng" }, "description": "", "cost": { "food": 0, - "wood": 250, - "stone": 250, + "wood": 300, + "stone": 300, "metal": 0 }, "requirements": { @@ -15,16 +15,15 @@ ] }, "requirementsTooltip": "Unlocked in Town Phase.", - "icon": "chinese_engineering_01.png", + "icon": "work.png", "researchTime": 40, - "tooltip": "All structures −15% build time, +10% health and −5% cost.", + "tooltip": "All structures -10% build time and −10% cost.", "modifications": [ - { "value": "Cost/BuildTime","multiply": 0.85 }, - { "value": "Health/Max","multiply": 1.1 }, - { "value": "Cost/Resources/food", "multiply": 0.95 }, - { "value": "Cost/Resources/wood", "multiply": 0.95 }, - { "value": "Cost/Resources/stone", "multiply": 0.95 }, - { "value": "Cost/Resources/metal", "multiply": 0.95 } + { "value": "Cost/BuildTime","multiply": 0.9 }, + { "value": "Cost/Resources/food", "multiply": 0.9 }, + { "value": "Cost/Resources/wood", "multiply": 0.9 }, + { "value": "Cost/Resources/stone", "multiply": 0.9 }, + { "value": "Cost/Resources/metal", "multiply": 0.9 } ], "affects": ["Structure"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" Index: binaries/data/mods/public/simulation/data/technologies/civil_engineering_02.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/civil_engineering_02.json +++ binaries/data/mods/public/simulation/data/technologies/civil_engineering_02.json @@ -1,31 +1,25 @@ { - "genericName": "Civil Engineering − Level 2", + "genericName": "Robust Architecture", "specificName": { "han": "Gōngchéng" }, - "supersedes": "civil_engineering_01", "description": "", "cost": { "food": 0, - "wood": 500, - "stone": 500, + "wood": 300, + "stone": 300, "metal": 0 }, "requirements": { "all": [ - { "tech": "phase_city" }, + { "tech": "phase_town" }, { "civ": "han" } ] }, "requirementsTooltip": "Unlocked in City Phase.", - "icon": "chinese_engineering_02.png", + "icon": "blocks_three.png", "researchTime": 40, - "tooltip": "All structures −25% build time, +20% health and −5% cost.", + "tooltip": "All structures +20% health.", "modifications": [ - { "value": "Cost/BuildTime", "multiply": 0.75 }, - { "value": "Health/Max", "multiply": 1.2 }, - { "value": "Cost/Resources/food", "multiply": 0.95 }, - { "value": "Cost/Resources/wood", "multiply": 0.95 }, - { "value": "Cost/Resources/stone", "multiply": 0.95 }, - { "value": "Cost/Resources/metal", "multiply": 0.95 } + { "value": "Health/Max", "multiply": 1.2 } ], "affects": ["Structure"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" Index: binaries/data/mods/public/simulation/data/technologies/civil_service_01.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/civil_service_01.json +++ binaries/data/mods/public/simulation/data/technologies/civil_service_01.json @@ -1,10 +1,10 @@ { - "genericName": "Civil Service − Level 1", + "genericName": "Effecient Bureaucracy", "specificName": { "han": "Guānliáo" }, "description": "", "cost": { - "food": 250, - "wood": 250, + "food": 200, + "wood": 200, "stone": 0, "metal": 0 }, @@ -15,16 +15,12 @@ ] }, "requirementsTooltip": "Unlocked in Town Phase.", - "icon": "chinese_bureaucracy_01.png", + "icon": "sibylline_books.png", "researchTime": 40, - "tooltip": "Technologies at all buildings, except the Forge, −15% cost and −15% research time.", + "tooltip": "Ministers -50% train time.", "modifications": [ - { "value": "Researcher/TechCostMultiplier/time", "multiply": 0.85 }, - { "value": "Researcher/TechCostMultiplier/wood", "multiply": 0.85 }, - { "value": "Researcher/TechCostMultiplier/food", "multiply": 0.85 }, - { "value": "Researcher/TechCostMultiplier/metal", "multiply": 0.85 }, - { "value": "Researcher/TechCostMultiplier/stone", "multiply": 0.85 } + { "value": "Cost/BuildTime", "multiply": 0.5 } ], - "affects": ["Structure !Forge"], + "affects": ["Minister"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: binaries/data/mods/public/simulation/data/technologies/civil_service_02.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/civil_service_02.json +++ binaries/data/mods/public/simulation/data/technologies/civil_service_02.json @@ -1,31 +1,26 @@ { - "genericName": "Civil Service − Level 2", + "genericName": "Intensive Training", "specificName": { "han": "Guānliáo" }, - "supersedes": "civil_service_01", "description": "", "cost": { "food": 200, "wood": 200, - "stone": 200, - "metal": 400 + "stone": 0, + "metal": 0 }, "requirements": { "all": [ - { "tech": "phase_city" }, + { "tech": "phase_town" }, { "civ": "han" } ] }, "requirementsTooltip": "Unlocked in City Phase.", - "icon": "chinese_bureaucracy_02.png", + "icon": "hospital.png", "researchTime": 40, - "tooltip": "Technologies at all buildings, except the Forge, −15% cost and −15% research time.", + "tooltip": "Ministers +50% health.", "modifications": [ - { "value": "Researcher/TechCostMultiplier/time", "multiply": 0.85 }, - { "value": "Researcher/TechCostMultiplier/wood", "multiply": 0.85 }, - { "value": "Researcher/TechCostMultiplier/food", "multiply": 0.85 }, - { "value": "Researcher/TechCostMultiplier/metal", "multiply": 0.85 }, - { "value": "Researcher/TechCostMultiplier/stone", "multiply": 0.85 } + { "value": "Health/Max", "multiply": 1.5 } ], - "affects": ["Structure !Forge"], + "affects": ["Minister"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: binaries/data/mods/public/simulation/data/technologies/pair_unlock_civil_engineering_han.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/pair_unlock_civil_engineering_han.json +++ binaries/data/mods/public/simulation/data/technologies/pair_unlock_civil_engineering_han.json @@ -0,0 +1,6 @@ +{ + "genericName": "Civil Engineering", + "top": "civil_engineering_01", + "bottom": "civil_engineering_02", + "requirements": { "civ": "han" } +} Index: binaries/data/mods/public/simulation/data/technologies/pair_unlock_civil_service_han.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/pair_unlock_civil_service_han.json +++ binaries/data/mods/public/simulation/data/technologies/pair_unlock_civil_service_han.json @@ -0,0 +1,6 @@ +{ + "genericName": "Civil Service", + "top": "civil_service_01", + "bottom": "civil_service_02", + "requirements": { "civ": "han" } +} Index: binaries/data/mods/public/simulation/templates/structures/han/ministry.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/han/ministry.xml +++ binaries/data/mods/public/simulation/templates/structures/han/ministry.xml @@ -55,10 +55,8 @@ - civil_service_01 - civil_service_02 - civil_engineering_01 - civil_engineering_02 + pair_unlock_civil_engineering_han + pair_unlock_civil_service_han unlock_spies spy_counter