disabling the 1:1 GIVE changes until we have a final ruling.

src/res/e3a.xml

@@ -148,9 +148,9 @@
     <param name="rules.combat.herospeed" value="3"/>
     <param name="rules.combat.demon_vampire" value="5"/> <!-- regen 1 hp per X points of damage done -->
     <param name="rules.combat.skill_bonus" value="0"/>
-    <!--param name="rules.combat.loot" value="5"/--> <!-- only self + others - keeploot -->
+    <param name="rules.combat.loot" value="5"/> <!-- only self + others - keeploot -->
-    <param name="rules.items.loot_divisor" value="2"/> <!-- damage skims off 1/2 of goods transfers -->
+    <param name="rules.items.loot_divisor" value="4"/> <!-- damage skims off 3/4 of goods transfers -->
-    <!--param name="rules.items.give_divisor" value="3"/--> <!-- corruption skims off 2/3 of goods transfers -->
+    <param name="rules.items.give_divisor" value="3"/> <!-- corruption skims off 2/3 of goods transfers -->
     <param name="rules.move.owner_leave" value="1"/> <!-- owner must leave before moving -->
     <param name="rules.cavalry.skill" value="2"/>
     <param name="rules.cavalry.mode" value="1"/>
@@ -162,7 +162,7 @@
     <param name="rules.magic.common" value="tybied"/> <!-- tybied spells can be cast by anyone -->
     <param name="rules.magic.elfpower" value="1"/> <!-- elves get ring-of-power bonus in a forest -->
     <param name="rules.magic.playerschools" value="gwyrrd illaun draig cerddor"/>
-    <param name="rules.build.other_buildings" value="1"/>
+    <param name="rules.build.other_buildings" value="0"/>
     <param name="rules.economy.taxation" value="1"/>
     <param name="rules.economy.food" value="2"/>
     <param name="rules.economy.wages" value="1"/>

src/res/e3a/armor.xml

@@ -7,6 +7,5 @@
   <xi:include href="../armor/rustychainmail-2.xml"/>
   <xi:include href="../armor/rustyshield-2.xml"/>
   <xi:include href="../armor/shield-2.xml"/>
-  <xi:include href="../armor/scale.xml"/>
   <xi:include href="../armor/towershield.xml"/>
 </resources>

src/res/e3a/resources.xml

@@ -2,10 +2,8 @@
 <resources xmlns:xi="http://www.w3.org/2001/XInclude">
   <!-- this file contains resources that can be mined in some way (anything with a resourcelimit) -->
 
-  <!--xi:include href="../resources/iron.xml"/-->
+  <xi:include href="../resources/iron.xml"/>
-  <!--xi:include href="../resources/stone-2.xml"/-->
+  <xi:include href="../resources/stone-2.xml"/>
-  <xi:include href="../resources/iron-nobonus.xml"/>
-  <xi:include href="../resources/stone-nobonus.xml"/>
   <xi:include href="../resources/laen.xml"/>
   <xi:include href="../resources/horse.xml"/>
   <xi:include href="../resources/mallorn.xml"/>

src/scripts/tests/common.lua

@@ -545,24 +545,3 @@ function test_storage()
   assert(u)
   assert(u:get_item("money") == u.number * 100)
 end
-
-function test_building_other()
-  local r = region.create(0,0, "plain")
-  local f1 = faction.create("noreply@eressea.de", "human", "de")
-  local f2 = faction.create("noreply@eressea.de", "human", "de")
-  local b = building.create(r, "castle")
-  b.size = 10
-  local u1 = unit.create(f1, r, 3)
-  u1.building = b
-  u1:add_item("money", 100)
-
-  local u2 = unit.create(f2, r, 3)
-  u2:set_skill("building", 10)
-  u2:add_item("money", 100)
-  u2:add_item("stone", 100)
-  u2:clear_orders()
-  u2:add_order("MACHEN BURG " .. itoa36(b.id))
-  update_owners()
-  process_orders()
-  assert_not_equal(10, b.size)
-end

src/scripts/tests/e3a.lua

@@ -375,7 +375,7 @@ function test_canoe_passes_through_land()
   assert_equal(u2.region.id, dst.id, "canoe could not leave coast")
 end
 
-function pull_give_only_a_third_of_items()
+function test_give_only_a_third_of_items()
   free_game()
   local u1, u2 = two_units(region.create(0, 0, "plain"), two_factions())
   local r = u2.region
@@ -404,33 +404,3 @@ function pull_give_only_a_third_of_items()
   assert_equal(m1-332-10*u1.number, u1:get_item("money"))
   assert_equal(m2+110-10*u2.number, u2:get_item("money"))
 end
-
-function test_give_100_percent_of_items()
-  free_game()
-  local u1, u2 = two_units(region.create(0, 0, "plain"), two_factions())
-  local r = u2.region
-  u1.faction.age = 10
-  u2.faction.age = 10
-  u1:add_item("money", 500)
-  local m1, m2 = u1:get_item("money"), u2:get_item("money")
-  u1:clear_orders()
-  u1:add_order("GIB " .. itoa36(u2.id) .. " 332 Silber")
-  u2:clear_orders()
-  u2:add_order("LERNEN Hiebwaffen")
-  process_orders()
-  assert(u1:get_item("money")==m1-10*u1.number)
-  assert(u2:get_item("money")==m2-10*u2.number)
-
-  m1, m2 = u1:get_item("money"), u2:get_item("money")
-  u1:clear_orders()
-  u1:add_order("GIB " .. itoa36(u2.id) .. " 332 Silber")
-  u2:clear_orders()
-  u2:add_order("HELFE " .. itoa36(u1.faction.id) .. " GIB")
-  u2:add_item("horse", 100)
-  u2:add_order("GIB 0 ALLES PFERD")
-  local h = r:get_resource("horse")
-  process_orders()
-  assert(r:get_resource("horse")>=h+100)
-  assert_equal(m1-332-10*u1.number, u1:get_item("money"))
-  assert_equal(m2+332-10*u2.number, u2:get_item("money"))
-end