From 412b7addea18373d839fc713a82224a00668fcf8 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno@eressea.de>
Date: Mon, 22 Mar 2010 19:53:45 -0700
Subject: [PATCH] remove old orcs fix give-person test for new rules

---
 res/eressea/races.xml     | 4 ++--
 scripts/tests/eressea.lua | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/eressea/races.xml b/res/eressea/races.xml
index 3edfdad78..cf529821d 100644
--- a/res/eressea/races.xml
+++ b/res/eressea/races.xml
@@ -1212,7 +1212,7 @@
     <familiar race="demon"/>
   </race>
 
-  <race name="crazy_orc" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
+  <!-- race name="old_orc" magres="-0.050000" maxaura="1.000000" regaura="1.000000" recruitcost="50" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="24" damage="1d5" unarmedattack="-2" unarmeddefense="-2" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="itemdrop" value="defaultdrops"/>
     <skill name="alchemy" modifier="1"/>
@@ -1241,7 +1241,7 @@
     <familiar race="rat"/>
     <familiar race="wolf"/>
     <familiar race="demon"/>
-  </race>
+  </race -->
   <race name="elf" magres="0.100000" maxaura="1.000000" regaura="1.250000" recruitcost="130" maintenance="10" weight="1000" capacity="540" speed="1.000000" hp="18" damage="1d5" unarmedattack="-2" unarmeddefense="-2" playerrace="yes" walk="yes" giveitem="yes" giveperson="yes" giveunit="yes" getitem="yes" equipment="yes">
     <ai splitsize="10000" moverandom="yes" learn="yes"/>
     <function name="itemdrop" value="defaultdrops"/>
diff --git a/scripts/tests/eressea.lua b/scripts/tests/eressea.lua
index f4378f333..06e1fd701 100644
--- a/scripts/tests/eressea.lua
+++ b/scripts/tests/eressea.lua
@@ -132,6 +132,7 @@ function test_can_give_person()
   u2:add_order("GIB ".. itoa36(u1.id) .. " 1 PERSON")
   u2:add_order("HELFE ".. itoa36(f1.id) .. " GIB")
   u1:add_order("HELFE ".. itoa36(f2.id) .. " GIB")
+  u1:add_order("KONTAKTIERE ".. itoa36(u2.id))
   process_orders()
   assert_equal(9, u2.number)
   assert_equal(11, u1.number)