Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/trade_convoys_armor.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/trade_convoys_armor.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/trade_convoys_armor.json @@ -1,19 +0,0 @@ -{ - "genericName": "Trade Convoys", - "description": "Increases defensive capability of traders.", - "cost": { - "metal": 200 - }, - "requirements": { "tech": "phase_city" }, - "requirementsTooltip": "Unlocked in City Phase.", - "supersedes": "trade_convoys_speed", - "icon": "wheel.png", - "researchTime": 40, - "tooltip": "Traders +2 hack and pierce resistance.", - "modifications": [ - { "value": "Resistance/Entity/Damage/Hack", "add": 2 }, - { "value": "Resistance/Entity/Damage/Pierce", "add": 2 } - ], - "affects": ["Trader"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/trade_convoys_speed.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/trade_convoys_speed.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/trade_convoys_speed.json @@ -1,17 +0,0 @@ -{ - "genericName": "Trade Convoys", - "description": "Increases movement rate of traders in order to increase trade income.", - "cost": { - "metal": 200 - }, - "requirements": { "tech": "phase_town" }, - "requirementsTooltip": "Unlocked in Town Phase.", - "icon": "wheel.png", - "researchTime": 40, - "tooltip": "Traders +25% movement speed.", - "modifications": [ - { "value": "UnitMotion/WalkSpeed", "multiply": 1.25 } - ], - "affects": ["Trader"], - "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/trade_gain_01.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/trade_gain_01.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/trade_gain_01.json @@ -7,11 +7,11 @@ }, "requirements": { "tech": "phase_town" }, "requirementsTooltip": "Unlocked in Town Phase.", - "icon": "metal_pot.png", + "icon": "amphore.png", "researchTime": 40, - "tooltip": "Traders +10% trade gain.", + "tooltip": "Traders +15% trade gain.", "modifications": [ - { "value": "Trader/GainMultiplier", "multiply": 1.1 } + { "value": "Trader/GainMultiplier", "multiply": 1.15 } ], "affects": ["Trader"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/trader_health.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/trader_health.json +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/trader_health.json @@ -0,0 +1,17 @@ +{ + "genericName": "Trade Caravan", + "description": "Traders traveling together in caravans are less vulnerable.", + "cost": { + "food": 300 + }, + "requirements": { "tech": "phase_town" }, + "requirementsTooltip": "Unlocked in Town Phase.", + "icon": "wheel.png", + "researchTime": 40, + "tooltip": "Land Traders +50% health.", + "modifications": [ + { "value": "Health/Max", "multiply": 1.5 } + ], + "affects": ["Trader !Ship"], + "soundComplete": "interface/alarm/alarm_upgradearmory.xml" +} Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/desert_trading_post.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/desert_trading_post.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/desert_trading_post.xml @@ -19,8 +19,7 @@ - -trade_convoys_speed - -trade_convoys_armor + -trader_health -trade_gain_01 -trade_gain_02 -trade_commercial_treaty Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml @@ -42,8 +42,7 @@ 0.7 - trade_convoys_speed - trade_convoys_armor + trader_health trade_gain_01 trade_gain_02 trade_commercial_treaty