From 4a8e14004cb45bff394294069af7674c89ece4f6 Mon Sep 17 00:00:00 2001
From: quantumstate <quantumstate@wildfiregames.com>
Date: Sun, 21 Oct 2012 20:59:54 +0000
Subject: [PATCH] Make markets and traders non conquest critical (from
 alkazar).

This was SVN commit r12775.
---
 .../simulation/templates/template_structure_economic_market.xml | 2 +-
 .../simulation/templates/template_unit_support_trader.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
index 828f57661e..409b67830b 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
@@ -30,7 +30,7 @@
   <Identity>
     <GenericName>Market</GenericName>
     <Tooltip>Create trade units to trade between other markets. Barter resources.</Tooltip>
-    <Classes datatype="tokens">Town Market BarterMarket</Classes>
+    <Classes datatype="tokens">Town Market BarterMarket -ConquestCritical</Classes>
     <Icon>structures/market.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
index face1c9008..7d5667fe61 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
@@ -15,7 +15,7 @@
     <Max>100</Max>
   </Health>
   <Identity>
-    <Classes datatype="tokens">Trader</Classes>
+    <Classes datatype="tokens">Trader -ConquestCritical</Classes>
     <GenericName>Trader</GenericName>
     <History>Trade was a very important part of ancient civilisation - effective trading and control of trade routes equaled wealth. Trade took place by many forms from foot to caravans to merchant ships. One of the most notorious examples of the power of trade was the Silk Road.</History>
     <Tooltip>Trade resources between your own markets and those of your allies.</Tooltip>