- removed herbalism skill

- allowed rep.xbow to halflings

src/res/e2k9.xml

@@ -82,7 +82,6 @@
     <skill name="catapult" enable="true"/>
     <skill name="crossbow" enable="true"/>
     <skill name="forestry" enable="true"/>
-    <skill name="herbalism" enable="true"/>
     <skill name="magic" enable="true"/>
     <skill name="melee" enable="true"/>
     <skill name="mining" enable="true"/>
@@ -101,6 +100,7 @@
     <skill name="alchemy" enable="false"/>
     <skill name="entertainment" enable="false"/>
     <skill name="espionage" enable="false"/>
+    <skill name="herbalism" enable="false"/>
     <skill name="perception" enable="false"/>
     <skill name="stealth" enable="false"/>
     <skill name="taxation" enable="false"/>

src/res/e2k9/races.xml

@@ -37,7 +37,6 @@
     <skill name="catapult" speed="+5"/>
     <skill name="crossbow" speed="+5"/>
     <skill name="forestry" modifier="1"/>
-    <skill name="herbalism" modifier="-2"/>
     <skill name="melee" speed="+5"/>
     <skill name="mining" modifier="1"/>
     <skill name="polearm" speed="+5"/>
@@ -60,7 +59,6 @@
     <function name="itemdrop" value="defaultdrops"/>
     <param name="other_race" value="elf"/>
     <param name="other_cost" value="500"/>
-    <skill name="herbalism" modifier="-1"/>
     <skill name="riding" modifier="+2"/>
     <skill name="shipcraft" modifier="2"/>
     <skill name="sailing" modifier="2"/>
@@ -83,7 +81,6 @@
     <skill name="cartmaking" modifier="2"/>
     <skill name="catapult" modifier="-1"/>
     <skill name="crossbow" modifier="2"/>
-    <skill name="herbalism" modifier="2"/>
     <skill name="melee" modifier="-1"/>
     <skill name="mining" modifier="1"/>
     <skill name="polearm" modifier="-1"/>
@@ -91,7 +88,6 @@
     <skill name="roadwork" modifier="1"/>
     <skill name="sailing" modifier="-2"/>
     <skill name="shipcraft" modifier="-1"/>
-    <skill name="tactics" modifier="1"/>
     <skill name="training" modifier="-1"/>
     <skill name="magic" modifier="-99"/>
     <skill name="unarmed" modifier="-99"/>
@@ -107,7 +103,6 @@
     <function name="itemdrop" value="defaultdrops"/>
     <skill name="cartmaking" modifier="-2"/>
     <skill name="forestry" modifier="1"/>
-    <skill name="herbalism" modifier="-3"/>
     <skill name="magic" modifier="1"/>
     <skill name="melee" modifier="1"/>
     <skill name="polearm" modifier="1"/>
@@ -132,7 +127,6 @@
     <skill name="bow" modifier="2"/>
     <skill name="building" modifier="-1"/>
     <skill name="catapult" modifier="-2"/>
-    <skill name="herbalism" modifier="2"/>
     <skill name="magic" modifier="1"/>
     <skill name="mining" modifier="-2"/>
     <skill name="quarrying" modifier="-1"/>
@@ -154,7 +148,6 @@
     <skill name="bow" modifier="-2"/>
     <skill name="building" modifier="2"/>
     <skill name="catapult" modifier="2"/>
-    <skill name="herbalism" modifier="-1"/>
     <skill name="melee" modifier="1"/>
     <skill name="mining" modifier="1"/>
     <skill name="quarrying" modifier="2"/>
@@ -178,7 +171,6 @@
     <skill name="building" modifier="2"/>
     <skill name="catapult" modifier="2"/>
     <skill name="forestry" modifier="-1"/>
-    <skill name="herbalism" modifier="-2"/>
     <skill name="magic" modifier="-2"/>
     <skill name="melee" modifier="1"/>
     <skill name="mining" modifier="2"/>
@@ -187,6 +179,7 @@
     <skill name="roadwork" modifier="2"/>
     <skill name="sailing" modifier="-2"/>
     <skill name="shipcraft" modifier="-1"/>
+    <skill name="tactics" modifier="1"/>
     <skill name="training" modifier="-2"/>
     <skill name="weaponsmithing" modifier="2"/>
     <skill name="unarmed" modifier="-99"/>
@@ -206,7 +199,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
     <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>
     <skill name="armorer" modifier="-99"/>
@@ -234,7 +226,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
     <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>
     <skill name="armorer" modifier="-99"/>
@@ -257,7 +248,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>
     <skill name="armorer" modifier="-99"/>
@@ -280,7 +270,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>
     <skill name="armorer" modifier="-99"/>
@@ -305,7 +294,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>
     <skill name="armorer" modifier="-99"/>
@@ -330,7 +318,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>
     <skill name="armorer" modifier="-99"/>
@@ -358,7 +345,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="training" modifier="-99"/>
     <skill name="armorer" modifier="-99"/>
     <skill name="shipcraft" modifier="-99"/>
@@ -383,7 +369,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>
     <skill name="armorer" modifier="-99"/>
@@ -406,7 +391,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="magic" modifier="1"/>
     <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-1"/>
@@ -432,7 +416,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="magic" modifier="1"/>
     <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-2"/>
@@ -460,7 +443,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>
     <skill name="armorer" modifier="-99"/>
@@ -485,7 +467,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="magic" modifier="2"/>
     <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>
@@ -509,7 +490,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="4"/>
     <skill name="magic" modifier="1"/>
     <skill name="training" modifier="5"/>
     <skill name="riding" modifier="5"/>
@@ -534,7 +514,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="magic" modifier="1"/>
     <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>
@@ -563,7 +542,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>
     <skill name="armorer" modifier="-99"/>
@@ -588,7 +566,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>
     <skill name="armorer" modifier="-99"/>
@@ -612,7 +589,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="10"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>
     <skill name="armorer" modifier="-99"/>
@@ -638,7 +614,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="1"/>
     <skill name="training" modifier="1"/>
     <skill name="riding" modifier="-99"/>
     <skill name="armorer" modifier="-99"/>
@@ -678,7 +653,6 @@
     <skill name="building" modifier="-10"/>
     <skill name="forestry" modifier="-10"/>
     <skill name="catapult" modifier="-10"/>
-    <skill name="herbalism" modifier="-10"/>
     <skill name="magic" modifier="-10"/>
     <skill name="training" modifier="-10"/>
     <skill name="riding" modifier="-10"/>
@@ -703,7 +677,6 @@
     <skill name="building" modifier="-10"/>
     <skill name="forestry" modifier="-10"/>
     <skill name="catapult" modifier="-10"/>
-    <skill name="herbalism" modifier="-10"/>
     <skill name="magic" modifier="-10"/>
     <skill name="training" modifier="-10"/>
     <skill name="riding" modifier="-10"/>
@@ -841,7 +814,6 @@
     <skill name="building" modifier="-99"/>
     <skill name="forestry" modifier="-99"/>
     <skill name="catapult" modifier="-99"/>
-    <skill name="herbalism" modifier="-99"/>
      <skill name="magic" modifier="-99"/>
     <skill name="training" modifier="-99"/>
     <skill name="riding" modifier="-99"/>

src/scripts/e2k9/items.lua

@@ -1,22 +1,27 @@
 -- when appending to this, make sure the item has a canuse-function!
 local goblin_denied = " plate lance mallornlance greatbow axe greatsword halberd rustyaxe rustyhalberd towershield "
 function item_canuse(u, iname)
-  if u.race=="goblin" then
+  local race = u.race
+  if race=="goblin" then
     if string.find(goblin_denied, " " .. iname .. " ") then
       return false
     end
   end
-  if iname=="towershield" or iname=="rep_crossbow" then
+  if iname=="rep_crossbow" then
+    -- only dwarves and halflings allowed to use towershield
+    return race=="dwarf" or race=="halfling"
+  end
+  if iname=="towershield" then 
     -- only dwarves allowed to use towershield
-    return u.race=="dwarf"
+    return race=="dwarf"
   end
   if iname=="greatbow" then
     -- only elves use greatbow
-    return u.race=="elf"
+    return race=="elf"
   end
   if iname=="plate" then
     -- goblins cannot use plate
-    return u.race~="goblin"
+    return race~="goblin"
   end
   return true
 end