Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

BUG 2392: remove minskill attribute from any weapons.

Browse source
This commit is contained in:
Enno Rehling 2017-12-17 10:19:07 +01:00
parent e2f954b7f6
commit 714e44cd71
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/core/weapons/firesword.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<resource name="firesword"> <resource name="firesword">
<item weight="100"> <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"/> <function name="attack" value="attack_firesword"/>
<damage type="rider" value="3d6+10"/> <damage type="rider" value="3d6+10"/>
<damage type="footman" value="3d6+10"/> <damage type="footman" value="3d6+10"/>

2
res/core/weapons/mallornlance.xml
View file

@ -4,7 +4,7 @@
<construction skill="weaponsmithing" minskill="5"> <construction skill="weaponsmithing" minskill="5">
<requirement type="mallorn" quantity="2"/> <requirement type="mallorn" quantity="2"/>
</construction> </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="footman" value="1d5+1"/>
<damage type="rider" value="2d6+6"/> <damage type="rider" value="2d6+6"/>
</weapon> </weapon>

2
res/core/weapons/mallornspear.xml
View file

@ -4,7 +4,7 @@
<construction skill="weaponsmithing" minskill="5"> <construction skill="weaponsmithing" minskill="5">
<requirement type="mallorn" quantity="1"/> <requirement type="mallorn" quantity="1"/>
</construction> </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="footman" value="1d10+1"/>
<damage type="rider" value="1d12+3"/> <damage type="rider" value="1d12+3"/>
<modifier type="skill" value="1" riding="true" against_riding="true" against_walking="true" offensive="true"/> <modifier type="skill" value="1" riding="true" against_riding="true" against_walking="true" offensive="true"/>

2
res/core/weapons/runesword.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<resource name="runesword"> <resource name="runesword">
<item weight="100" score="2000"> <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"/> <function name="attack" value="attack_firesword"/>
<damage type="rider" value="3d10+10"/> <damage type="rider" value="3d10+10"/>
<damage type="footman" value="3d10+10"/> <damage type="footman" value="3d10+10"/>

2
res/e3a/weapons/mallornlance.xml
View file

@ -4,7 +4,7 @@
<construction skill="weaponsmithing" minskill="5"> <construction skill="weaponsmithing" minskill="5">
<requirement type="mallorn" quantity="2"/> <requirement type="mallorn" quantity="2"/>
</construction> </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="footman" value="1d5+2"/>
<damage type="rider" value="2d6+7"/> <damage type="rider" value="2d6+7"/>
</weapon> </weapon>

2
scripts/tests/e3/rules.lua
View file

@ -1015,7 +1015,7 @@ function test_demons_using_mallornlance()
local f = faction.create('goblin') local f = faction.create('goblin')
local u = unit.create(f, r, 1, 'demon') local u = unit.create(f, r, 1, 'demon')
u:set_skill('taxation', 1) 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_item('mallornlance', 1)
u:add_order('BEWACHE') u:add_order('BEWACHE')
process_orders() process_orders()