From 775426347a822282ca8106e131e2dd7250aaf8e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@legacyworlds.com>
Date: Tue, 24 Jan 2012 14:49:23 +0100
Subject: [PATCH] Resource definitions

* Added a few resource definitions and the corresponding strings. While
the descriptions are blank, and resource definitions themselves are
incomplete (relations to e.g. technologies are missing), this should
allow easier testing of the rest of the resources system.
---
 legacyworlds-server-main/data/i18n-text.xml | 99 +++++++++++++++++++++
 legacyworlds-server-main/data/resources.xml | 43 +++++++--
 2 files changed, 134 insertions(+), 8 deletions(-)

diff --git a/legacyworlds-server-main/data/i18n-text.xml b/legacyworlds-server-main/data/i18n-text.xml
index aaf18ca..0e54e2e 100644
--- a/legacyworlds-server-main/data/i18n-text.xml
+++ b/legacyworlds-server-main/data/i18n-text.xml
@@ -519,6 +519,56 @@ It was disbanded.</value>
 		<inline-string id="imBugReportUpdateEmpire">
 			<value>Bug report ${bug} has been updated by the owner of empire ${submitter}.</value>
 		</inline-string>
+		
+		
+		<!-- Resource categories -->
+		<inline-string id="rcMinerals">
+			<value>Mineral resources</value>
+		</inline-string>
+		
+		<!-- Resource names and descriptions -->
+
+		<inline-string id="rnMoney">
+			<value>Money</value>
+		</inline-string>
+		<inline-string id="rdMoney">
+			<value>(Get Doug or Rendesh to write this)</value>
+		</inline-string>
+
+		<inline-string id="rnTitanium">
+			<value>Titanium</value>
+		</inline-string>
+		<inline-string id="rdTitanium">
+			<value>(Get Doug or Rendesh to write this)</value>
+		</inline-string>
+
+		<inline-string id="rnCopper">
+			<value>Copper</value>
+		</inline-string>
+		<inline-string id="rdCopper">
+			<value>(Get Doug or Rendesh to write this)</value>
+		</inline-string>
+
+		<inline-string id="rnStrentium">
+			<value>Strentium</value>
+		</inline-string>
+		<inline-string id="rdStrentium">
+			<value>(Get Doug or Rendesh to write this)</value>
+		</inline-string>
+
+		<inline-string id="rnDororhium">
+			<value>Dororhium</value>
+		</inline-string>
+		<inline-string id="rdDororhium">
+			<value>(Get Doug or Rendesh to write this)</value>
+		</inline-string>
+
+		<inline-string id="rnNothentium">
+			<value>Nothentium</value>
+		</inline-string>
+		<inline-string id="rdNothentium">
+			<value>(Get Doug or Rendesh to write this)</value>
+		</inline-string>
 
 	</language>
 
@@ -1039,6 +1089,55 @@ Elle a été dissoute.</value>
 		<inline-string id="imBugReportUpdateEmpire">
 			<value>Le rapport de bug ${bug} a été mis à jour par le propriétaire de l'empire ${submitter}.</value>
 		</inline-string>
+		
+		<!-- Resource categories -->
+		<inline-string id="rcMinerals">
+			<value>Minéraux</value>
+		</inline-string>
+		
+		<!-- Resource names and descriptions -->
+
+		<inline-string id="rnMoney">
+			<value>Monaie</value>
+		</inline-string>
+		<inline-string id="rdMoney">
+			<value>(À traduire quand il y aura une version anglaise)</value>
+		</inline-string>
+
+		<inline-string id="rnTitanium">
+			<value>Titane</value>
+		</inline-string>
+		<inline-string id="rdTitanium">
+			<value>(À traduire quand il y aura une version anglaise)</value>
+		</inline-string>
+
+		<inline-string id="rnCopper">
+			<value>Cuivre</value>
+		</inline-string>
+		<inline-string id="rdCopper">
+			<value>(À traduire quand il y aura une version anglaise)</value>
+		</inline-string>
+
+		<inline-string id="rnStrentium">
+			<value>Strentium</value>
+		</inline-string>
+		<inline-string id="rdStrentium">
+			<value>(À traduire quand il y aura une version anglaise)</value>
+		</inline-string>
+
+		<inline-string id="rnDororhium">
+			<value>Dororhium</value>
+		</inline-string>
+		<inline-string id="rdDororhium">
+			<value>(À traduire quand il y aura une version anglaise)</value>
+		</inline-string>
+
+		<inline-string id="rnNothentium">
+			<value>Nothentium</value>
+		</inline-string>
+		<inline-string id="rdNothentium">
+			<value>(À traduire quand il y aura une version anglaise)</value>
+		</inline-string>
 
 	</language>
 
diff --git a/legacyworlds-server-main/data/resources.xml b/legacyworlds-server-main/data/resources.xml
index 77a3e62..6f4646e 100644
--- a/legacyworlds-server-main/data/resources.xml
+++ b/legacyworlds-server-main/data/resources.xml
@@ -1,17 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lw-resources xmlns="http://www.deepclone.com/lw/b6/m2/resources"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.deepclone.com/lw/b6/m2/resources
-resources.xsd">
+	xsi:schemaLocation="http://www.deepclone.com/lw/b6/m2/resources resources.xsd">
 
-	<basic-resource name="money" description="moneyDescription"
-		weight="0" /> <!-- This could have a category="" as well -->
+	<basic-resource name="rnMoney" description="rdMoney"
+		weight="1" />
 
-	<natural-resource name="titanium" description="titaniumDescription"
-		category="minerals" weight="1" presence-probability="0.8">
-		<quantity average="5000" deviation="1500" />
+	<natural-resource name="rnTitanium" description="rdTitanium"
+		category="rcMinerals" weight="1" presence-probability="0.5">
+		<quantity average="50000" deviation="5000" />
 		<difficulty average="0.1" deviation="0.05" />
-		<recovery average="0.4" deviation="0.05" />
+		<recovery average="0.2" deviation="0.05" />
+	</natural-resource>
+
+	<natural-resource name="rnCopper" description="rdCopper"
+			category="rcMinerals" weight="2" presence-probability="0.6">
+		<quantity average="75000" deviation="7500" />
+		<difficulty average="0.15" deviation="0.075" />
+		<recovery average="0.2" deviation="0.05" />
+	</natural-resource>
+
+	<natural-resource name="rnStrentium" description="rdStrentium"
+			category="rcMinerals" weight="3" presence-probability="0.3">
+		<quantity average="30000" deviation="5000" />
+		<difficulty average="0.4" deviation="0.1" />
+		<recovery average="0.15" deviation="0.05" />
+	</natural-resource>
+
+	<natural-resource name="rnDororhium" description="rdDororhium"
+			category="rcMinerals" weight="4" presence-probability="0.1">
+		<quantity average="15000" deviation="2500" />
+		<difficulty average="0.7" deviation="0.15" />
+		<recovery average="0.15" deviation="0.05" />
+	</natural-resource>
+
+	<natural-resource name="rnNothentium" description="rdNothentium"
+			category="rcMinerals" weight="5" presence-probability="0.05">
+		<quantity average="10000" deviation="2500" />
+		<difficulty average="0.85" deviation="0.15" />
+		<recovery average="0.1" deviation="0.05" />
 	</natural-resource>
 
 </lw-resources>
\ No newline at end of file