From d067b7d8a5fe25b500b4cead658b8b51b11c176e Mon Sep 17 00:00:00 2001
From: HoraK-FDF <HoraK-FDF@web.de>
Date: Sun, 17 Jan 2021 02:10:37 +0100
Subject: Fixed Item XMLs and corrected map bugs. (#413)

---
 items/equip-1hand/item5261_Launcher.xml     |  2 +-
 items/equip-ammo/item5260_Snowball.xml      |  2 +-
 items/equip-legs/_include.xml               |  1 +
 items/equip-legs/item731_AssassinPants.xml  | 13 +++++++++++++
 items/equip-torso/_include.xml              |  1 -
 items/equip-torso/item731_AssassinPants.xml | 13 -------------
 items/equip-torso/item755_AssassinShirt.xml |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 items/equip-legs/item731_AssassinPants.xml
 delete mode 100644 items/equip-torso/item731_AssassinPants.xml

(limited to 'items')

diff --git a/items/equip-1hand/item5261_Launcher.xml b/items/equip-1hand/item5261_Launcher.xml
index b0ff99b9..13ca52c1 100644
--- a/items/equip-1hand/item5261_Launcher.xml
+++ b/items/equip-1hand/item5261_Launcher.xml
@@ -6,7 +6,7 @@
     <its:translateRule selector="//item/@effect" translate="yes"/>
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
-  <item id="5261" image="equipment/weapon/xmas-slingshot-icon.png" name="Candy-Caned Anti-Grinch-Rifle 2020" description="The best way to shoot snowballs." type="equip-2hand" attack-action="attack_bow" attack="5" attack-range="3" weight="10" critical-hit-effect-id="55" missile-particle="graphics/particles/snowball.particle.xml">
+  <item id="5261" image="equipment/weapon/xmas-slingshot-icon.png" name="Candy-Caned Anti-Grinch-Rifle 2020" description="The best way to shoot snowballs." type="equip-2hand" attack-action="attack_bow" attack="20" attack-range="3" weight="10" critical-hit-effect-id="55" missile-particle="graphics/particles/snowball.particle.xml">
     <sprite gender="unisex">equipment/weapons/xmas-bow-slingshot.xml</sprite>
     <sprite gender="female">equipment/weapons/xmas-bow-slingshot.xml</sprite>
     <sound event="hit">weapons/projectiles/snowball/hit1.ogg</sound>
diff --git a/items/equip-ammo/item5260_Snowball.xml b/items/equip-ammo/item5260_Snowball.xml
index 6b77287e..d4fc5bbb 100644
--- a/items/equip-ammo/item5260_Snowball.xml
+++ b/items/equip-ammo/item5260_Snowball.xml
@@ -6,5 +6,5 @@
     <its:translateRule selector="//item/@effect" translate="yes"/>
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
-  <item id="5260" image="equipment/ammo/snowball.png" name="Snowball" description="It is Christmas time!" attack="5" type="equip-ammo" weight="1"/>
+  <item id="5260" image="equipment/ammo/snowball.png" name="Snowball" description="It is Christmas time!" attack="20" type="equip-ammo" weight="1"/>
 </items>
diff --git a/items/equip-legs/_include.xml b/items/equip-legs/_include.xml
index d4736e27..b74d809e 100644
--- a/items/equip-legs/_include.xml
+++ b/items/equip-legs/_include.xml
@@ -11,6 +11,7 @@
   <include name="items/equip-legs/item632_CottonSkirt.xml"/>
   <include name="items/equip-legs/item642_JeansChaps.xml"/>
   <include name="items/equip-legs/item648_CottonTrousers.xml"/>
+  <include name="items/equip-legs/item731_AssassinPants.xml"/>
   <include name="items/equip-legs/item768_TerraniteLegs.xml"/>
   <include name="items/equip-legs/item771_Miniskirt.xml"/>
   <include name="items/equip-legs/item796_BromenalLegs.xml"/>
diff --git a/items/equip-legs/item731_AssassinPants.xml b/items/equip-legs/item731_AssassinPants.xml
new file mode 100644
index 00000000..8e1b7de1
--- /dev/null
+++ b/items/equip-legs/item731_AssassinPants.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<items>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule selector="//item/@name" translate="yes"/>
+    <its:translateRule selector="//item/@description" translate="yes"/>
+    <its:translateRule selector="//item/@effect" translate="yes"/>
+    <its:translateRule selector="//*" translate="no"/>
+  </its:rules>
+  <item id="731" image="equipment/legs/assassinpants.png" name="Assassin Pants" description="Pants for a master assassin." mattack="-5" type="equip-torso" defense="4" agi="5" weight="20" sellProtected="true">
+    <sprite gender="unisex">equipment/legs/assassin.xml</sprite>
+    <sprite gender="female">equipment/legs/assassin-female.xml</sprite>
+  </item>
+</items>
diff --git a/items/equip-torso/_include.xml b/items/equip-torso/_include.xml
index 7573d549..d1144e31 100644
--- a/items/equip-torso/_include.xml
+++ b/items/equip-torso/_include.xml
@@ -24,7 +24,6 @@
   <include name="items/equip-torso/item689_ShortTankTop.xml"/>
   <include name="items/equip-torso/item720_SilkRobe.xml"/>
   <include name="items/equip-torso/item726_GMRobe.xml"/>
-  <include name="items/equip-torso/item731_AssassinPants.xml"/>
   <include name="items/equip-torso/item755_AssassinShirt.xml"/>
   <include name="items/equip-torso/item767_TerraniteChestArmor.xml"/>
   <include name="items/equip-torso/item782_ForestArmor.xml"/>
diff --git a/items/equip-torso/item731_AssassinPants.xml b/items/equip-torso/item731_AssassinPants.xml
deleted file mode 100644
index 8e1b7de1..00000000
--- a/items/equip-torso/item731_AssassinPants.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<items>
-  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-    <its:translateRule selector="//item/@name" translate="yes"/>
-    <its:translateRule selector="//item/@description" translate="yes"/>
-    <its:translateRule selector="//item/@effect" translate="yes"/>
-    <its:translateRule selector="//*" translate="no"/>
-  </its:rules>
-  <item id="731" image="equipment/legs/assassinpants.png" name="Assassin Pants" description="Pants for a master assassin." mattack="-5" type="equip-torso" defense="4" agi="5" weight="20" sellProtected="true">
-    <sprite gender="unisex">equipment/legs/assassin.xml</sprite>
-    <sprite gender="female">equipment/legs/assassin-female.xml</sprite>
-  </item>
-</items>
diff --git a/items/equip-torso/item755_AssassinShirt.xml b/items/equip-torso/item755_AssassinShirt.xml
index a9ad5549..3f22aba9 100644
--- a/items/equip-torso/item755_AssassinShirt.xml
+++ b/items/equip-torso/item755_AssassinShirt.xml
@@ -6,7 +6,7 @@
     <its:translateRule selector="//item/@effect" translate="yes"/>
     <its:translateRule selector="//*" translate="no"/>
   </its:rules>
-  <item id="755" image="equipment/chest/assassintop.png" name="Assassin Shirt" description="Shirt for a master assassin." effect="Walk Speed +10% / Hit Chance +20" mattack="-5" type="equip-torso" defense="15" agi="15" flee="20" maxhp="200" weight="15" sellProtected="true">
+  <item id="755" image="equipment/chest/assassintop.png" name="Assassin Shirt" description="Shirt for a master assassin." effect="Walk Speed +10% / Hit Chance +20" mattack="-5" type="equip-torso" defense="15" agi="15" flee="20" maxhp="200" level="90" weight="15" sellProtected="true">
     <sprite gender="unisex">equipment/chest/assassin.xml</sprite>
     <sprite gender="female">equipment/chest/assassin-female.xml</sprite>
   </item>
-- 
cgit v1.2.3-70-g09d2