From 714e44cd71ad6e7d15e8046e2d85a99ff1fd67f5 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 17 Dec 2017 10:19:07 +0100
Subject: [PATCH] BUG 2392: remove minskill attribute from any weapons.

---
 res/core/weapons/firesword.xml    | 2 +-
 res/core/weapons/mallornlance.xml | 2 +-
 res/core/weapons/mallornspear.xml | 2 +-
 res/core/weapons/runesword.xml    | 2 +-
 res/e3a/weapons/mallornlance.xml  | 2 +-
 scripts/tests/e3/rules.lua        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/core/weapons/firesword.xml b/res/core/weapons/firesword.xml
index 9e8284fe6..d716e6013 100644
--- a/res/core/weapons/firesword.xml
+++ b/res/core/weapons/firesword.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="firesword">
   <item weight="100">
-    <weapon minskill="7" magres="0.3" cut="true" skill="melee" offmod="1" defmod="1">
+    <weapon magres="0.3" cut="true" skill="melee" offmod="1" defmod="1">
       <function name="attack" value="attack_firesword"/>
       <damage type="rider" value="3d6+10"/>
       <damage type="footman" value="3d6+10"/>
diff --git a/res/core/weapons/mallornlance.xml b/res/core/weapons/mallornlance.xml
index c67390d52..4024d4578 100644
--- a/res/core/weapons/mallornlance.xml
+++ b/res/core/weapons/mallornlance.xml
@@ -4,7 +4,7 @@
     <construction skill="weaponsmithing" minskill="5">
       <requirement type="mallorn" quantity="2"/>
     </construction>
-    <weapon pierce="true" skill="polearm" minskill="5" offmod="0" defmod="0" magres="0.15">
+    <weapon pierce="true" skill="polearm" offmod="0" defmod="0" magres="0.15">
       <damage type="footman" value="1d5+1"/>
       <damage type="rider" value="2d6+6"/>
     </weapon>
diff --git a/res/core/weapons/mallornspear.xml b/res/core/weapons/mallornspear.xml
index 66d41a943..516f59540 100644
--- a/res/core/weapons/mallornspear.xml
+++ b/res/core/weapons/mallornspear.xml
@@ -4,7 +4,7 @@
     <construction skill="weaponsmithing" minskill="5">
       <requirement type="mallorn" quantity="1"/>
     </construction>
-    <weapon pierce="true" skill="polearm" minskill="5" offmod="0" defmod="0" magres="0.15">
+    <weapon pierce="true" skill="polearm" offmod="0" defmod="0" magres="0.15">
       <damage type="footman" value="1d10+1"/>
       <damage type="rider" value="1d12+3"/>
       <modifier type="skill" value="1" riding="true" against_riding="true" against_walking="true" offensive="true"/>
diff --git a/res/core/weapons/runesword.xml b/res/core/weapons/runesword.xml
index 566fe1589..1bfae2544 100644
--- a/res/core/weapons/runesword.xml
+++ b/res/core/weapons/runesword.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <resource name="runesword">
   <item weight="100" score="2000">
-    <weapon minskill="7" cut="true" magical="yes" skill="melee" offmod="2" defmod="2">
+    <weapon cut="true" magical="yes" skill="melee" offmod="2" defmod="2">
       <function name="attack" value="attack_firesword"/>
       <damage type="rider" value="3d10+10"/>
       <damage type="footman" value="3d10+10"/>
diff --git a/res/e3a/weapons/mallornlance.xml b/res/e3a/weapons/mallornlance.xml
index 8eb25ceb4..0c50d125a 100644
--- a/res/e3a/weapons/mallornlance.xml
+++ b/res/e3a/weapons/mallornlance.xml
@@ -4,7 +4,7 @@
     <construction skill="weaponsmithing" minskill="5">
       <requirement type="mallorn" quantity="2"/>
     </construction>
-    <weapon pierce="true" skill="polearm" minskill="5" offmod="0" defmod="0" magres="0.15">
+    <weapon pierce="true" skill="polearm" offmod="0" defmod="0" magres="0.15">
       <damage type="footman" value="1d5+2"/>
       <damage type="rider" value="2d6+7"/>
     </weapon>
diff --git a/scripts/tests/e3/rules.lua b/scripts/tests/e3/rules.lua
index 8669dc465..8d599462d 100644
--- a/scripts/tests/e3/rules.lua
+++ b/scripts/tests/e3/rules.lua
@@ -1015,7 +1015,7 @@ function test_demons_using_mallornlance()
     local f = faction.create('goblin')
     local u = unit.create(f, r, 1, 'demon')
     u:set_skill('taxation', 1)
-    u:set_skill('polearm', 4) -- demon has +1
+    u:set_skill('polearm', 1)
     u:add_item('mallornlance', 1)
     u:add_order('BEWACHE')
     process_orders()