From bb125e6c0866ed24af0db4044e03e6c35cddf331 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Sat, 19 Dec 2009 23:16:12 +0000
Subject: [PATCH] christmas 2009

---
 src/common/kernel.vcproj  |  4 ----
 src/eressea.vcproj        |  8 ++++++++
 src/res/e3a/items.xml     |  9 ++++++++-
 src/res/e3a/strings.xml   |  3 ++-
 src/scripts/init-e3a.lua  |  1 +
 src/scripts/run-e3a.lua   |  3 +++
 src/scripts/tests/e3a.lua | 21 +++++++++++++++++++++
 7 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/src/common/kernel.vcproj b/src/common/kernel.vcproj
index 7ab5fc7c6..93e7d2ea8 100644
--- a/src/common/kernel.vcproj
+++ b/src/common/kernel.vcproj
@@ -352,10 +352,6 @@
 				RelativePath=".\kernel\karma.h"
 				>
 			</File>
-			<File
-				RelativePath="..\external\lunit\lunit.lua"
-				>
-			</File>
 			<File
 				RelativePath=".\kernel\magic.c"
 				>
diff --git a/src/eressea.vcproj b/src/eressea.vcproj
index ee0a17f1f..d059173c0 100644
--- a/src/eressea.vcproj
+++ b/src/eressea.vcproj
@@ -277,6 +277,14 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\scripts\init-e3a.lua"
+				>
+			</File>
+			<File
+				RelativePath=".\external\lunit\lunit.lua"
+				>
+			</File>
 			<File
 				RelativePath=".\scripts\run-e3a.lua"
 				>
diff --git a/src/res/e3a/items.xml b/src/res/e3a/items.xml
index be9ba7c87..35f0dbe1a 100644
--- a/src/res/e3a/items.xml
+++ b/src/res/e3a/items.xml
@@ -80,4 +80,11 @@
     </item>
   </resource>
 
-  </resources>
+  <!-- xmas 2009
+  <resource name="xmastree">
+    <item weight="0">
+      <function name="use" value="lua_useitem"/>
+    </item>
+  </resource> -->
+
+</resources>
diff --git a/src/res/e3a/strings.xml b/src/res/e3a/strings.xml
index e933e4da9..3e4c3e9d1 100644
--- a/src/res/e3a/strings.xml
+++ b/src/res/e3a/strings.xml
@@ -5,7 +5,8 @@
     _p: plural (13 /Trolle/)
     _x: preposition (15 /Troll/schwerter)
     _a: including article (ein Troll, a troll)
-   -->
+  -->
+
   <!--Fort-Ausbaustufen -->
   <string name="calendar::thirdage">
     <text locale="de">des dritten Zeitalters</text>
diff --git a/src/scripts/init-e3a.lua b/src/scripts/init-e3a.lua
index 071ca4a17..08963035e 100644
--- a/src/scripts/init-e3a.lua
+++ b/src/scripts/init-e3a.lua
@@ -1,3 +1,4 @@
+require "e3a.xmas2009"
 require "e3a.rules"
 require "e3a.multi"
 require "default"
diff --git a/src/scripts/run-e3a.lua b/src/scripts/run-e3a.lua
index 8b2eda48b..4879817d8 100644
--- a/src/scripts/run-e3a.lua
+++ b/src/scripts/run-e3a.lua
@@ -166,6 +166,9 @@ function process(orders, confirmed_multis, suspected_multis, locales)
   print (nmrs .. " Factions with 1 NMR")
 
   process_orders()
+  if xmas2009~=nil then
+    xmas2009()
+  end
 
   -- create new monsters:
   spawn_dragons()
diff --git a/src/scripts/tests/e3a.lua b/src/scripts/tests/e3a.lua
index 63248ff4a..ef82d4f39 100644
--- a/src/scripts/tests/e3a.lua
+++ b/src/scripts/tests/e3a.lua
@@ -6,6 +6,27 @@ function setup()
     free_game()
 end
 
+local function use_tree(terrain)
+  local r = region.create(0,0, terrain)
+  local f = faction.create("noreply@eressea.de", "human", "de")
+  local u1 = unit.create(f, r, 5)
+  r:set_resource("tree", 0)
+  u1:add_item("xmastree", 1)
+  u1:clear_orders()
+  u1:add_order("BENUTZEN 1 Weihnachtsbaum")
+  process_orders()
+  return r
+end
+
+function test_xmastree()
+  local r
+  r = use_tree("ocean")
+  assert_equal(0, r:get_resource("tree"))
+  free_game()
+  r = use_tree("plain")
+  assert_equal(10, r:get_resource("tree"))
+end
+
 function test_capacity()
     local r = region.create(0,0, "ocean")
     region.create(1,0, "ocean")