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	(revision 24689)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/trade_convoys_speed.json	(nonexistent)
@@ -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"
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/trade_convoys_speed.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/json
\ No newline at end of property
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	(revision 24689)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/trade_convoys_armor.json	(nonexistent)
@@ -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"
-}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/trade_convoys_armor.json
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/json
\ No newline at end of property
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	(revision 24689)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/trade_gain_01.json	(revision 24690)
@@ -1,18 +1,18 @@
 {
 	"genericName": "Handicraft",
 	"description": "The progress in handicraft improves the trading profit.",
 	"cost": {
 		"wood": 150,
 		"metal": 150
 	},
 	"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	(nonexistent)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/trader_health.json	(revision 24690)
@@ -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"
+}

Property changes on: ps/trunk/binaries/data/mods/public/simulation/data/technologies/trader_health.json
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/json
\ No newline at end of property
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	(revision 24689)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/desert_trading_post.xml	(revision 24690)
@@ -1,35 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_market">
   <Capturable>
     <CapturePoints>500</CapturePoints>
   </Capturable>
   <Footprint>
     <Square width="26.0" depth="26.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <SpawnEntityOnDeath>rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Desert Trading Post</GenericName>
     <SpecificName>Ardatašta</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="24.0"/>
   </Obstruction>
   <ProductionQueue>
     <Technologies datatype="tokens">
-      -trade_convoys_speed
-      -trade_convoys_armor
+      -trader_health
       -trade_gain_01
       -trade_gain_02
       -trade_commercial_treaty
     </Technologies>
   </ProductionQueue>
   <TerritoryDecay disable=""/>
   <TerritoryInfluence disable=""/>
   <VisualActor>
     <Actor>structures/persians/market.xml</Actor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
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	(revision 24689)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml	(revision 24690)
@@ -1,74 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic">
   <AlertRaiser>
     <List datatype="tokens">Trader+!Ship</List>
     <RaiseAlertRange>-1</RaiseAlertRange>
     <EndOfAlertRange>-1</EndOfAlertRange>
     <SearchRange>100</SearchRange>
   </AlertRaiser>
   <Cost>
     <BuildTime>150</BuildTime>
     <Resources>
       <wood>300</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="33.0" depth="29.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>1500</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Market</GenericName>
     <SelectionGroupName>template_structure_economic_market</SelectionGroupName>
     <Tooltip>Barter resources. Establish trade routes. Train Traders and research trade and barter technologies.</Tooltip>
     <Classes datatype="tokens">Barter</Classes>
     <VisibleClasses datatype="tokens">Trade Town Market</VisibleClasses>
     <Icon>structures/market.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>60</wood>
   </Loot>
   <Market>
     <TradeType>land</TradeType>
     <InternationalBonus>0.2</InternationalBonus>
   </Market>
   <Obstruction>
     <Static width="30.0" depth="26.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Technologies datatype="tokens">
-      trade_convoys_speed
-      trade_convoys_armor
+      trader_health
       trade_gain_01
       trade_gain_02
       trade_commercial_treaty
     </Technologies>
     <Entities datatype="tokens">
       units/{civ}/support_trader
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_market.xml</select>
       <constructed>interface/complete/building/complete_market.xml</constructed>
       <alert_raise>interface/alarm/alarm_alert_0.xml</alert_raise>
       <alert_end>interface/alarm/alarm_alert_1.xml</alert_end>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>40</Radius>
     <Weight>30000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>32</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
   </VisualActor>
 </Entity>