Merge branch 'legion' into 'master'

Legion

See merge request evol/clientdata!122

12 files changed, 107 insertions, 8 deletions

diff --git a/LICENSE b/LICENSE
index f05853c1..1c9af990 100644
--- a/LICENSE
+++ b/LICENSE
@@ -53,6 +53,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/equipment/chest/forestarmor.png (Goku)                   (CC BY-SA 3.0)        (Micksha)
     graphics/items/equipment/chest/finedress.png (LEGACY)                   (CC BY-SA 3.0)        (Micksha)
     graphics/items/equipment/chest/forestarmor.png (Goku)                   (GPLv2, CC BY-SA 3.0) (Micksha, Saphy)
+    graphics/items/equipment/chest/legionarmor.png (Reid, VxD)              (CC BY-SA 3.0)        (Micksha)
     graphics/items/equipment/chest/sailorshirt.png (VxD)                    (CC BY-SA 3.0)        (Reid)
     graphics/items/equipment/chest/silkrobe.png (LEGACY)                    (CC BY-SA 3.0)        (Micksha)
     graphics/items/equipment/chest/tanktop.png (VxD)                        (CC BY-SA 3.0)        (Reid)
@@ -114,6 +115,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/equipment/weapons/chopstick.png (Micksha)                (CC BY-SA 3.0)        (-)
     graphics/items/equipment/weapons/dagger.png (LEGACY)                    (GPLv2)               (-)
     graphics/items/equipment/weapons/forestbow.png (LEGACY)                 (CC BY-SA 3.0,GPLv2)  (Micksha)
+    graphics/items/equipment/weapons/halberd.png (Micksha)                  (CC BY-SA 3.0)        (-)
     graphics/items/equipment/weapons/knife.png (EJlol)                      (CC BY-SA 3.0)        (Reid)
     graphics/items/equipment/weapons/piouslayer.png (Reid)                  (CC BY-SA 3.0)        (Enchilado)
     graphics/items/equipment/weapons/scythe.png (Micksha)                   (CC BY-SA 3.0)        (-)
@@ -393,11 +395,13 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/sprites/equipment/chest/copperarmor-female.png (Reid)          (CC BY-SA 3.0)        (Saphy)
     graphics/sprites/equipment/chest/copperarmor-male.png (Reid)            (CC BY-SA 3.0)        (Saphy)
     graphics/sprites/equipment/chest/cottonshirt-female.png (Modanung)      (CC BY-SA 3.0)        (Reid)
+    graphics/sprites/equipment/chest/cottonshirt-male.png (Modanung)        (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/chest/finedress-male.png (LEGACY)            (CC BY-SA 3.0)        (Micksha)
     graphics/sprites/equipment/chest/finedress-female.png (LEGACY)          (CC BY-SA 3.0)        (Micksha)
     graphics/sprites/equipment/chest/forestarmor-male.png (LEGACY)          (CC BY-SA 3.0)        (Micksha)
     graphics/sprites/equipment/chest/forestarmor-female.png (LEGACY)        (CC BY-SA 3.0)        (Micksha)
-    graphics/sprites/equipment/chest/cottonshirt-male.png (Modanung)        (CC BY-SA 3.0)        (-)
+    graphics/sprites/equipment/chest/legionarmor-female.png (Reid)          (CC BY-SA 3.0)        (Micksha, Saphy)
+    graphics/sprites/equipment/chest/legionarmor-male.png (Reid)            (CC BY-SA 3.0)        (Micksha, Saphy)
     graphics/sprites/equipment/chest/shirt-female.png (Modanung)            (CC BY-SA 3.0)        (Reid)
     graphics/sprites/equipment/chest/shirt-male.png (Modanung)              (CC BY-SA 3.0)        (Reid)
     graphics/sprites/equipment/chest/silkrobe-male.png (LEGACY)             (CC BY-SA 3.0)        (Micksha)
@@ -468,6 +472,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/sprites/equipment/weapons/axe.png (Micksha)                    (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/weapons/backsword.png (Alige, Reid)          (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/weapons/chopstick.png (Micksha)              (CC BY-SA 3.0)        (-)
+    graphics/sprites/equipment/weapons/halberd.png (Micksha)                (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/weapons/knife.png (Alige)                    (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/weapons/pickaxe.png (Micksha)                (CC BY-SA 3.0)        (-)
     graphics/sprites/equipment/weapons/piouslayer.png (Alige, Reid)         (CC BY-SA 3.0)        (-)
diff --git a/graphics/items/equipment/chest/legionarmor.png b/graphics/items/equipment/chest/legionarmor.png
new file mode 100644
index 00000000..e6026708
--- /dev/null
+++ b/graphics/items/equipment/chest/legionarmor.png
diff --git a/graphics/items/equipment/weapons/halberd.png b/graphics/items/equipment/weapons/halberd.png
new file mode 100644
index 00000000..e21b2586
--- /dev/null
+++ b/graphics/items/equipment/weapons/halberd.png
diff --git a/graphics/sprites/equipment/chest/legionarmor-female.png b/graphics/sprites/equipment/chest/legionarmor-female.png
new file mode 100644
index 00000000..b8662bbf
--- /dev/null
+++ b/graphics/sprites/equipment/chest/legionarmor-female.png
diff --git a/graphics/sprites/equipment/chest/legionarmor-female.xml b/graphics/sprites/equipment/chest/legionarmor-female.xml
new file mode 100644
index 00000000..9a64589f
--- /dev/null
+++ b/graphics/sprites/equipment/chest/legionarmor-female.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha, Reid
+Copyright (C) 2015 - 2019 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/chest/legionarmor-female.png|W;R"
+              width="64"
+              height="64"/>
+
+    <include file="races/human-male.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/chest/legionarmor-male.png b/graphics/sprites/equipment/chest/legionarmor-male.png
new file mode 100644
index 00000000..94f151ff
--- /dev/null
+++ b/graphics/sprites/equipment/chest/legionarmor-male.png
diff --git a/graphics/sprites/equipment/chest/legionarmor-male.xml b/graphics/sprites/equipment/chest/legionarmor-male.xml
new file mode 100644
index 00000000..0ea2919f
--- /dev/null
+++ b/graphics/sprites/equipment/chest/legionarmor-male.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha, Reid
+Copyright (C) 2015 - 2019 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/chest/legionarmor-male.png|W;R"
+              width="64"
+              height="64"/>
+
+    <include file="races/human-male.xml"/>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/halberd.png b/graphics/sprites/equipment/weapons/halberd.png
new file mode 100644
index 00000000..14815f8b
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/halberd.png
diff --git a/graphics/sprites/equipment/weapons/halberd.xml b/graphics/sprites/equipment/weapons/halberd.xml
new file mode 100644
index 00000000..27c5725d
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/halberd.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Micksha
+Copyright (C) 2019 Evol Online -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/weapons/halberd.png"
+              width="64"
+              height="64"/>
+
+    <include file="equipment/weapons/knife.xml"/>
+</sprite>
diff --git a/itemcolors.xml b/itemcolors.xml
index 165b1cb3..a263e341 100644
--- a/itemcolors.xml
+++ b/itemcolors.xml
@@ -93,7 +93,7 @@ Copyright (C) 2010-2015 Evol Online -->
         <color id="4" name="Mint" value="#2e4c4b,59a886,bbe4bb"/>
     </list>
 
-    <!-- Colors For gem-based item sprite and icon-->
+    <!-- Colors For mineral-based item sprite and icon-->
     <list name="gem">
         <color id="1" name="Simple" value="#ce8b5b,764938"/>
         <color id="2" name="Diamond" value="#315a67,a4a4ae,dce5d6,ffffff"/>
@@ -102,5 +102,8 @@ Copyright (C) 2010-2015 Evol Online -->
         <color id="5" name="Sapphire" value="#4b4bbd,888af4"/>
         <color id="6" name="Topaz" value="#ccb534,f1ea8e,ffffaa"/>
         <color id="7" name="Amethyst" value="#530a7c,b362e1,ca87ef"/>
+        <color id="8" name="Copper" value="#402e33,5e3434,824d39,995b44,c47f4e,e0af81"/>
+        <color id="9" name="Iron" value="#2f382e,48504f,5b6c6b,7d8d8a,929d9d,b6bac2,ced2d1"/>
+        <color id="10" name="Gold" value="#4e431e,87681f,b48221,ce9c3d,f9c466,f1d7a4,fffef1"/>
     </list>
 </colors>
diff --git a/items.xml b/items.xml
index da8bfe14..d6f345ac 100644
--- a/items.xml
+++ b/items.xml
@@ -1190,15 +1190,15 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         <sprite gender="female">equipment/chest/trainingshirt-female.xml</sprite>
     </item>
     <item id="1305"
-        image="equipment/chest/copperarmor.png"
+        image="equipment/chest/legionarmor.png|W:#531e15,8f3b1e,b14417,d8822b,ee9352,fdbd8c,fce9b0;R:#4b6167,698089,89a1a7,8ebdbf,d2f2e1"
         name="Legion's Copper Armor"
         description="This armor provides great protection. It is worn by those with authority."
         defense="400"
         level="15"
         type="equip-torso"
         weight="340">
-        <sprite gender="unisex">equipment/chest/copperarmor-male.xml</sprite>
-        <sprite gender="female">equipment/chest/copperarmor-female.xml</sprite>
+        <sprite gender="unisex">equipment/chest/legionarmor-male.xml|#531e15,8f3b1e,b14417,d8822b,ee9352,fdbd8c,fce9b0;#4b6167,698089,89a1a7,8ebdbf,d2f2e1</sprite>
+        <sprite gender="female">equipment/chest/legionarmor-female.xml|#531e15,8f3b1e,b14417,d8822b,ee9352,fdbd8c,fce9b0;#4b6167,698089,89a1a7,8ebdbf,d2f2e1</sprite>
     </item>
     <item id="1306"
         image="equipment/chest/forestarmor.png"
@@ -1249,6 +1249,17 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         <sprite gender="unisex">equipment/chest/warlordplate-male.xml</sprite>
         <sprite gender="female">equipment/chest/warlordplate-female.xml</sprite>
     </item>
+    <item id="1310"
+        image="equipment/chest/legionarmor.png|W:#2f382e,48504f,5b6c6b,7d8d8a,929d9d,b6bac2,ced2d1;R:#4e431e,87681f,b48221,ce9c3d,f9c466,f1d7a4,fffef1"
+        name="Legion's Iron Armor"
+        description="This armor provides even greater protection. It is worn by those with even more authority."
+        defense="550"
+        level="25"
+        type="equip-torso"
+        weight="680">
+        <sprite gender="unisex">equipment/chest/legionarmor-male.xml|#2f382e,48504f,5b6c6b,7d8d8a,929d9d,b6bac2,ced2d1;#4e431e,87681f,b48221,ce9c3d,f9c466,f1d7a4,fffef1</sprite>
+        <sprite gender="female">equipment/chest/legionarmor-female.xml|#2f382e,48504f,5b6c6b,7d8d8a,929d9d,b6bac2,ced2d1;#4e431e,87681f,b48221,ce9c3d,f9c466,f1d7a4,fffef1</sprite>
+    </item>
     <!-- Boots -->
     <item id="1800"
         image="equipment/feet/boots.png|S:#3c3c3c,40332d,4d4d4d,5e4a3d,686868,705740,919191,a1825d,b6b6b6,b59767,dfdfdf,dbbf88"
@@ -1289,7 +1300,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
     </item>
     <item id="1803"
         image="equipment/feet/banditboots.png"
-        name="Fur Boots"
+        name="Bandit Boots"
         description="A pair of light, sneaky boots. Good to sneak without being noisy."
         defense="27"
         level="20"
@@ -1880,7 +1891,7 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         image="equipment/weapons/scythe.png"
         name="Scythe"
         description="A farmer's scythe, not new but still deadly."
-        attack="500"
+        attack="600"
         attack-range="2"
         level="15"
         type="equip-2hand"
@@ -1966,6 +1977,18 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         weight="800">
         <sprite>equipment/weapons/chopstick.xml</sprite>
     </item>
+    <item id="3514"
+        image="equipment/weapons/halberd.png"
+        name="Halberd"
+        description="A halberd, commonly used by knights. Sharp and dangerous."
+        attack="600"
+        attack-range="2"
+        level="20"
+        type="equip-2hand"
+        attack-action="attack_chop_long"
+        weight="1200">
+        <sprite>equipment/weapons/halberd.xml</sprite>
+    </item>
 
 
     <!-- Pets -->
diff --git a/monsters.xml b/monsters.xml
index 1a8c2488..9365248b 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -353,7 +353,7 @@ event=""         Links the sfx to an action, like die, hit, hurt, miss, move or
     <sprite>equipment/chest/forestarmor-male.xml</sprite>
     <sound event="hit">weapons/piouslayer/hit1.ogg</sound>
     <sound event="miss">weapons/piouslayer/miss1.ogg</sound>
-    <attack id="1" missile-particle="graphics/particles/training-arrow.xml" action="attack"/>
+    <attack id="1" missile-particle="graphics/particles/training-arrow.xml" action="attack_bow"/>
   </monster>
   <monster id="1065" name="Bandit Lord">
     <sprite>races/orc-male.xml</sprite>
@@ -367,6 +367,41 @@ event=""         Links the sfx to an action, like die, hit, hurt, miss, move or
     <sound event="hit">weapons/piouslayer/hit1.ogg</sound>
     <sound event="miss">weapons/piouslayer/miss1.ogg</sound>
   </monster>
+  <monster id="1066" name="Legion Swordswoman">
+    <sprite>races/human-female-medium.xml</sprite>
+    <sprite>equipment/legs/trousers-female.xml</sprite>
+    <sprite>equipment/feet/boots-female.xml|#40332d,5e4a3d,705740,a1825d,b59767,dbbf88</sprite>
+    <sprite>equipment/hands/cottongloves-female.xml|#4e2e18,c8752f</sprite>
+    <sprite>equipment/head/infantryhelmet.xml</sprite>
+    <sprite>equipment/weapons/traininggladius.xml</sprite>
+    <sprite>equipment/chest/legionarmor-female.xml|#402e33,5e3434,824d39,995b44,c47f4e,e0af81;#4b6167,698089,89a1a7,8ebdbf,d2f2e1</sprite>
+    <sound event="hit">weapons/piouslayer/hit1.ogg</sound>
+    <sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+  </monster>
+  <monster id="1067" name="Legion Halberdier">
+    <sprite>races/human-female-dark.xml</sprite>
+    <sprite>equipment/legs/trousers-female.xml</sprite>
+    <sprite>equipment/feet/boots-female.xml|#40332d,5e4a3d,705740,a1825d,b59767,dbbf88</sprite>
+    <sprite>equipment/hands/armbands-female.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b</sprite>
+    <sprite>equipment/head/infantryhelmet.xml</sprite>
+    <sprite>equipment/chest/legionarmor-female.xml|#402e33,5e3434,824d39,995b44,c47f4e,e0af81;#4b6167,698089,89a1a7,8ebdbf,d2f2e1</sprite>
+    <sprite>equipment/weapons/halberd.xml</sprite>
+    <sound event="hit">weapons/piouslayer/hit1.ogg</sound>
+    <sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+    <attack id="1" action="attack_chop_long"/>
+  </monster>
+  <monster id="1068" name="Legion Lieutenant">
+    <sprite>races/raijin-male.xml</sprite>
+    <sprite>equipment/legs/trousers-male.xml</sprite>
+    <sprite>equipment/feet/boots-male.xml|#40332d,5e4a3d,705740,a1825d,b59767,dbbf88</sprite>
+    <sprite>equipment/hands/armbands-male.xml|#663d38,4b6167,8f5c52,708892,ad7c65,a5bebf,d9c9b2,a5bebf</sprite>
+    <sprite>equipment/head/warlordhelmet.xml</sprite>
+    <sprite>equipment/chest/legionarmor-male.xml|#4b6167,698089,89a1a7,8ebdbf,d2f2e1;#4e431e,87681f,b48221,ce9c3d,f9c466,f1d7a4,fffef1</sprite>
+    <sprite>equipment/weapons/axe.xml</sprite>
+    <sound event="hit">weapons/piouslayer/hit1.ogg</sound>
+    <sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+    <attack id="1" action="attack_chop"/>
+  </monster>
     <monster id="1100" name="Poison Skull" walkType="fly" targetCursor="small">
         <sprite>monsters/skull-poison.xml</sprite>
     </monster>