Setzer

61 files changed, 93 insertions, 15 deletions

diff --git a/graphics/images/login_wallpaper.png b/graphics/images/login_wallpaper.png
index 4f8fec08..4af40bba 100644
--- a/graphics/images/login_wallpaper.png
+++ b/graphics/images/login_wallpaper.png
diff --git a/graphics/images/login_wallpaper_fall.png b/graphics/images/login_wallpaper_fall.png
index 36791fc7..ee52d0a7 100644
--- a/graphics/images/login_wallpaper_fall.png
+++ b/graphics/images/login_wallpaper_fall.png
diff --git a/graphics/images/login_wallpaper_spring.png b/graphics/images/login_wallpaper_spring.png
index 7379e778..7cf4b43a 100644
--- a/graphics/images/login_wallpaper_spring.png
+++ b/graphics/images/login_wallpaper_spring.png
diff --git a/graphics/images/login_wallpaper_summer.png b/graphics/images/login_wallpaper_summer.png
index a8c3b414..f27371f8 100644
--- a/graphics/images/login_wallpaper_summer.png
+++ b/graphics/images/login_wallpaper_summer.png
diff --git a/graphics/images/login_wallpaper_winter.png b/graphics/images/login_wallpaper_winter.png
index e8b3fa01..90995318 100644
--- a/graphics/images/login_wallpaper_winter.png
+++ b/graphics/images/login_wallpaper_winter.png
diff --git a/graphics/items/equipment/charms/assassin-amulet.png b/graphics/items/equipment/charms/assassin-amulet.png
index e0a496a0..bf7caae7 100644
--- a/graphics/items/equipment/charms/assassin-amulet.png
+++ b/graphics/items/equipment/charms/assassin-amulet.png
diff --git a/graphics/items/equipment/charms/manapearl.png b/graphics/items/equipment/charms/manapearl.png
index 2965777f..16dad06a 100644
--- a/graphics/items/equipment/charms/manapearl.png
+++ b/graphics/items/equipment/charms/manapearl.png
diff --git a/graphics/items/equipment/head/knit-cap.png b/graphics/items/equipment/head/knit-cap.png
index ceafba2e..ef0b8d21 100644
--- a/graphics/items/equipment/head/knit-cap.png
+++ b/graphics/items/equipment/head/knit-cap.png
diff --git a/graphics/items/equipment/rings/assassin-ring.png b/graphics/items/equipment/rings/assassin-ring.png
index 81ed5805..f47655f2 100644
--- a/graphics/items/equipment/rings/assassin-ring.png
+++ b/graphics/items/equipment/rings/assassin-ring.png
diff --git a/graphics/items/equipment/weapon/dagger-shortsword.png b/graphics/items/equipment/weapon/sword-shortsword.png
index 762ffa7f..762ffa7f 100644
--- a/graphics/items/equipment/weapon/dagger-shortsword.png
+++ b/graphics/items/equipment/weapon/sword-shortsword.png
diff --git a/graphics/particles/hex-facet-outline-50.png b/graphics/particles/hex-facet-outline-50.png
index 711f6828..b9567852 100644
--- a/graphics/particles/hex-facet-outline-50.png
+++ b/graphics/particles/hex-facet-outline-50.png
diff --git a/graphics/particles/hex-facet-outline.png b/graphics/particles/hex-facet-outline.png
index c68dd9e2..b5cf58fb 100644
--- a/graphics/particles/hex-facet-outline.png
+++ b/graphics/particles/hex-facet-outline.png
diff --git a/graphics/particles/snowflake-7x7.png b/graphics/particles/snowflake-7x7.png
index 221b4d08..839f6c93 100644
--- a/graphics/particles/snowflake-7x7.png
+++ b/graphics/particles/snowflake-7x7.png
diff --git a/graphics/sprites/equipment/head/assassin-mask.png b/graphics/sprites/equipment/head/assassin-mask.png
index d385c6ad..a0c92b7a 100644
--- a/graphics/sprites/equipment/head/assassin-mask.png
+++ b/graphics/sprites/equipment/head/assassin-mask.png
diff --git a/graphics/sprites/equipment/head/blue-wolf-helmet.png b/graphics/sprites/equipment/head/blue-wolf-helmet.png
index 7bf4bc9b..fde366b9 100644
--- a/graphics/sprites/equipment/head/blue-wolf-helmet.png
+++ b/graphics/sprites/equipment/head/blue-wolf-helmet.png
diff --git a/graphics/sprites/equipment/head/captain-hat.png b/graphics/sprites/equipment/head/captain-hat.png
index 6428de46..9116692e 100644
--- a/graphics/sprites/equipment/head/captain-hat.png
+++ b/graphics/sprites/equipment/head/captain-hat.png
diff --git a/graphics/sprites/equipment/weapons/dagger-setzer.png b/graphics/sprites/equipment/weapons/dagger-setzer.png
new file mode 100644
index 00000000..2e9120cc
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/dagger-setzer.png
diff --git a/graphics/sprites/equipment/weapons/dagger-setzer.xml b/graphics/sprites/equipment/weapons/dagger-setzer.xml
new file mode 100644
index 00000000..99da95d8
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/dagger-setzer.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" ?>
+<sprite>
+  <imageset name="sword" src="graphics/sprites/equipment/weapons/dagger-setzer.png" width="64" height="64" />
+  <action name="default" imageset="sword" />
+  <action name="stand" imageset="sword">
+    <animation direction="down">
+      <frame index="0" />
+    </animation>
+    <animation direction="left">
+      <frame index="18" />
+    </animation>
+    <animation direction="up">
+      <frame index="36" />
+    </animation>
+    <animation direction="right">
+      <frame index="54" />
+    </animation>
+  </action>
+  <action name="walk" imageset="sword">
+    <animation direction="down">
+      <sequence start="1" end="6" delay="75" />
+    </animation>
+    <animation direction="left">
+      <sequence start="19" end="24" delay="75" />
+    </animation>
+    <animation direction="up">
+      <sequence start="37" end="42" delay="75" />
+    </animation>
+    <animation direction="right">
+      <sequence start="55" end="60" delay="75" />
+    </animation>
+  </action>
+  <action name="sit" imageset="sword">
+    <animation direction="down">
+      <frame index="7" />
+    </animation>
+    <animation direction="left">
+      <frame index="25" />
+    </animation>
+    <animation direction="up">
+      <frame index="43" />
+    </animation>
+    <animation direction="right">
+      <frame index="61" />
+    </animation>
+  </action>
+  <action name="dead" imageset="sword">
+    <animation direction="down">
+      <frame index="8" offsetX="0" offsetY="32" />
+    </animation>
+    <animation direction="left">
+      <frame index="8" offsetX="0" offsetY="32" />
+    </animation>
+    <animation direction="up">
+      <frame index="8" offsetX="0" offsetY="32" />
+    </animation>
+    <animation direction="right">
+      <frame index="8" offsetX="0" offsetY="32" />
+    </animation>
+  </action>
+  <action name="attack" imageset="sword">
+    <animation direction="down">
+      <sequence start="9" end="12" delay="75" />
+      <end/>
+    </animation>
+    <animation direction="left">
+      <sequence start="27" end="30" delay="75" />
+      <end/>
+    </animation>
+    <animation direction="up">
+      <sequence start="45" end="48" delay="75" />
+      <end/>
+    </animation>
+    <animation direction="right">
+      <sequence start="63" end="66" delay="75" />
+      <end/>
+    </animation>
+  </action>
+</sprite>
diff --git a/graphics/sprites/equipment/weapons/dragon-sword.png b/graphics/sprites/equipment/weapons/dragon-sword.png
deleted file mode 100644
index 91a27abd..00000000
--- a/graphics/sprites/equipment/weapons/dragon-sword.png
+++ /dev/null
diff --git a/graphics/sprites/equipment/weapons/jackal.png b/graphics/sprites/equipment/weapons/jackal.png
deleted file mode 100644
index ee74ee54..00000000
--- a/graphics/sprites/equipment/weapons/jackal.png
+++ /dev/null
diff --git a/graphics/sprites/equipment/weapons/beheader.png b/graphics/sprites/equipment/weapons/sword-beheader.png
index ba576dbb..ba576dbb 100644
--- a/graphics/sprites/equipment/weapons/beheader.png
+++ b/graphics/sprites/equipment/weapons/sword-beheader.png
diff --git a/graphics/sprites/equipment/weapons/beheader.xml b/graphics/sprites/equipment/weapons/sword-beheader.xml
index 75fe84fd..ee887553 100644
--- a/graphics/sprites/equipment/weapons/beheader.xml
+++ b/graphics/sprites/equipment/weapons/sword-beheader.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="sword" src="graphics/sprites/equipment/weapons/beheader.png" width="64" height="64"/>
+  <imageset name="sword" src="graphics/sprites/equipment/weapons/sword-beheader.png" width="64" height="64"/>
   <action name="default" imageset="sword">
   </action>
   <action name="stand" imageset="sword">
diff --git a/graphics/sprites/equipment/weapons/sword-dragon.png b/graphics/sprites/equipment/weapons/sword-dragon.png
new file mode 100644
index 00000000..ccf40930
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-dragon.png
diff --git a/graphics/sprites/equipment/weapons/dragon-sword.xml b/graphics/sprites/equipment/weapons/sword-dragon.xml
index 1f980832..b46fda5c 100644
--- a/graphics/sprites/equipment/weapons/dragon-sword.xml
+++ b/graphics/sprites/equipment/weapons/sword-dragon.xml
@@ -3,9 +3,9 @@
 Copyright (C) 2020 Evol Online -->
 <sprite>
     <imageset name="base"
-              src="graphics/sprites/equipment/weapons/dragon-sword.png"
+              src="graphics/sprites/equipment/weapons/sword-dragon.png"
               width="128"
               height="128"/>
 
-    <include file="equipment/weapons/lidersword.xml"/>
+    <include file="equipment/weapons/sword-lider.xml"/>
 </sprite>
diff --git a/graphics/sprites/equipment/weapons/sword-jackal.png b/graphics/sprites/equipment/weapons/sword-jackal.png
new file mode 100644
index 00000000..0d578e2b
--- /dev/null
+++ b/graphics/sprites/equipment/weapons/sword-jackal.png
diff --git a/graphics/sprites/equipment/weapons/jackal.xml b/graphics/sprites/equipment/weapons/sword-jackal.xml
index d8cdf3f9..9360042d 100644
--- a/graphics/sprites/equipment/weapons/jackal.xml
+++ b/graphics/sprites/equipment/weapons/sword-jackal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- (C) The Mana World Brazil Team -->
 <sprite>
-  <imageset name="sword" src="graphics/sprites/equipment/weapons/jackal.png" width="128" height="128" />
+  <imageset name="sword" src="graphics/sprites/equipment/weapons/sword-jackal.png" width="128" height="128" />
 
   <action name="default" imageset="sword">
   </action>
diff --git a/graphics/sprites/equipment/weapons/lidersword.png b/graphics/sprites/equipment/weapons/sword-lider.png
index f3ca961c..f3ca961c 100644
--- a/graphics/sprites/equipment/weapons/lidersword.png
+++ b/graphics/sprites/equipment/weapons/sword-lider.png
diff --git a/graphics/sprites/equipment/weapons/lidersword.xml b/graphics/sprites/equipment/weapons/sword-lider.xml
index 2002cf58..7581c078 100644
--- a/graphics/sprites/equipment/weapons/lidersword.xml
+++ b/graphics/sprites/equipment/weapons/sword-lider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="lider" src="graphics/sprites/equipment/weapons/lidersword.png" width="128" height="128"/>
+  <imageset name="lider" src="graphics/sprites/equipment/weapons/sword-lider.png" width="128" height="128"/>
 
   <action name="default" imageset="lider">
   </action>
diff --git a/graphics/sprites/equipment/weapons/sandcutter.png b/graphics/sprites/equipment/weapons/sword-sandcutter.png
index fc1e909e..fc1e909e 100644
--- a/graphics/sprites/equipment/weapons/sandcutter.png
+++ b/graphics/sprites/equipment/weapons/sword-sandcutter.png
diff --git a/graphics/sprites/equipment/weapons/sandcutter.xml b/graphics/sprites/equipment/weapons/sword-sandcutter.xml
index b61cebda..d200855f 100644
--- a/graphics/sprites/equipment/weapons/sandcutter.xml
+++ b/graphics/sprites/equipment/weapons/sword-sandcutter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <sprite>
-  <imageset name="sword" src="graphics/sprites/equipment/weapons/sandcutter.png" width="64" height="64"/>
+  <imageset name="sword" src="graphics/sprites/equipment/weapons/sword-sandcutter.png" width="64" height="64"/>
   <action name="default" imageset="sword">
   </action>
   <action name="stand" imageset="sword">
diff --git a/graphics/sprites/icons/feather-outline.png b/graphics/sprites/icons/feather-outline.png
index 47eeb709..a67dc40c 100644
--- a/graphics/sprites/icons/feather-outline.png
+++ b/graphics/sprites/icons/feather-outline.png
diff --git a/graphics/sprites/icons/hidden-outline.png b/graphics/sprites/icons/hidden-outline.png
index f1011b7c..55ba2af2 100644
--- a/graphics/sprites/icons/hidden-outline.png
+++ b/graphics/sprites/icons/hidden-outline.png
diff --git a/graphics/sprites/icons/invisible-outline.png b/graphics/sprites/icons/invisible-outline.png
index f40f4b2c..b0f7e960 100644
--- a/graphics/sprites/icons/invisible-outline.png
+++ b/graphics/sprites/icons/invisible-outline.png
diff --git a/graphics/sprites/icons/spell-attack-generic-outline.png b/graphics/sprites/icons/spell-attack-generic-outline.png
index a6232f87..2ba150ac 100644
--- a/graphics/sprites/icons/spell-attack-generic-outline.png
+++ b/graphics/sprites/icons/spell-attack-generic-outline.png
diff --git a/graphics/sprites/icons/spell-cooldown-ar-outline.png b/graphics/sprites/icons/spell-cooldown-ar-outline.png
index 5441acd9..4114d66c 100644
--- a/graphics/sprites/icons/spell-cooldown-ar-outline.png
+++ b/graphics/sprites/icons/spell-cooldown-ar-outline.png
diff --git a/graphics/sprites/icons/spell-cooldown-ar.png b/graphics/sprites/icons/spell-cooldown-ar.png
index 04058e16..730ec630 100644
--- a/graphics/sprites/icons/spell-cooldown-ar.png
+++ b/graphics/sprites/icons/spell-cooldown-ar.png
diff --git a/graphics/sprites/icons/spell-cooldown-ench.png b/graphics/sprites/icons/spell-cooldown-ench.png
index 5950f38d..da364c59 100644
--- a/graphics/sprites/icons/spell-cooldown-ench.png
+++ b/graphics/sprites/icons/spell-cooldown-ench.png
diff --git a/graphics/sprites/icons/spell-cooldown-koy.png b/graphics/sprites/icons/spell-cooldown-koy.png
index 8efece99..cde985e6 100644
--- a/graphics/sprites/icons/spell-cooldown-koy.png
+++ b/graphics/sprites/icons/spell-cooldown-koy.png
diff --git a/graphics/sprites/icons/spell-cooldown-mg.png b/graphics/sprites/icons/spell-cooldown-mg.png
index 31e46a53..7777ac77 100644
--- a/graphics/sprites/icons/spell-cooldown-mg.png
+++ b/graphics/sprites/icons/spell-cooldown-mg.png
diff --git a/graphics/sprites/icons/spell-cooldown-mt.png b/graphics/sprites/icons/spell-cooldown-mt.png
index 84fe8322..215de45a 100644
--- a/graphics/sprites/icons/spell-cooldown-mt.png
+++ b/graphics/sprites/icons/spell-cooldown-mt.png
diff --git a/graphics/sprites/icons/spell-cooldown-outline.png b/graphics/sprites/icons/spell-cooldown-outline.png
index bc16cb7b..3b794b56 100644
--- a/graphics/sprites/icons/spell-cooldown-outline.png
+++ b/graphics/sprites/icons/spell-cooldown-outline.png
diff --git a/graphics/sprites/icons/spell-cooldown-r-outline.png b/graphics/sprites/icons/spell-cooldown-r-outline.png
index af56eda5..22d3cf1e 100644
--- a/graphics/sprites/icons/spell-cooldown-r-outline.png
+++ b/graphics/sprites/icons/spell-cooldown-r-outline.png
diff --git a/graphics/sprites/icons/spell-cooldown-r.png b/graphics/sprites/icons/spell-cooldown-r.png
index 67555ebf..d09821d2 100644
--- a/graphics/sprites/icons/spell-cooldown-r.png
+++ b/graphics/sprites/icons/spell-cooldown-r.png
diff --git a/graphics/sprites/icons/spell-cooldown-upmarmu.png b/graphics/sprites/icons/spell-cooldown-upmarmu.png
index 231e9599..8b87f1b8 100644
--- a/graphics/sprites/icons/spell-cooldown-upmarmu.png
+++ b/graphics/sprites/icons/spell-cooldown-upmarmu.png
diff --git a/graphics/sprites/icons/spell-cooldown.png b/graphics/sprites/icons/spell-cooldown.png
index c34d1669..3deda6d8 100644
--- a/graphics/sprites/icons/spell-cooldown.png
+++ b/graphics/sprites/icons/spell-cooldown.png
diff --git a/graphics/tiles/crypt1.png b/graphics/tiles/crypt1.png
index 6f94f827..7e52973a 100644
--- a/graphics/tiles/crypt1.png
+++ b/graphics/tiles/crypt1.png
diff --git a/graphics/tiles/mushrooms_x2.png b/graphics/tiles/mushrooms_x2.png
index 5ea36de5..1f6550eb 100644
--- a/graphics/tiles/mushrooms_x2.png
+++ b/graphics/tiles/mushrooms_x2.png
diff --git a/graphics/tiles/mushrooms_x3.png b/graphics/tiles/mushrooms_x3.png
index c6ed64bc..051cdeeb 100644
--- a/graphics/tiles/mushrooms_x3.png
+++ b/graphics/tiles/mushrooms_x3.png
diff --git a/graphics/tiles/woodland_ground2.png b/graphics/tiles/woodland_ground2.png
index 66a40507..0673ddf9 100644
--- a/graphics/tiles/woodland_ground2.png
+++ b/graphics/tiles/woodland_ground2.png
diff --git a/graphics/tiles/woodland_inn_1.png b/graphics/tiles/woodland_inn_1.png
index 7c3e01d9..7277c5e7 100644
--- a/graphics/tiles/woodland_inn_1.png
+++ b/graphics/tiles/woodland_inn_1.png
diff --git a/graphics/tiles/woodland_inn_2.png b/graphics/tiles/woodland_inn_2.png
index f1669dc9..b136a0cb 100644
--- a/graphics/tiles/woodland_inn_2.png
+++ b/graphics/tiles/woodland_inn_2.png
diff --git a/graphics/tiles/woodland_inn_x2.png b/graphics/tiles/woodland_inn_x2.png
index b7792e6c..664f3295 100644
--- a/graphics/tiles/woodland_inn_x2.png
+++ b/graphics/tiles/woodland_inn_x2.png
diff --git a/graphics/tiles/woodland_inn_x3.png b/graphics/tiles/woodland_inn_x3.png
index a6c54641..1983d0ec 100644
--- a/graphics/tiles/woodland_inn_x3.png
+++ b/graphics/tiles/woodland_inn_x3.png
diff --git a/graphics/tiles/woodland_inn_x4.png b/graphics/tiles/woodland_inn_x4.png
index ab42f34f..57002386 100644
--- a/graphics/tiles/woodland_inn_x4.png
+++ b/graphics/tiles/woodland_inn_x4.png
diff --git a/items/equip-1hand/item0536_ShortSword.xml b/items/equip-1hand/item0536_ShortSword.xml
index 7c858630..2cd48e94 100644
--- a/items/equip-1hand/item0536_ShortSword.xml
+++ b/items/equip-1hand/item0536_ShortSword.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <items>
-  <item id="536" image="equipment/weapon/dagger-shortsword.png" name="Short Sword" description="A small but sharp sword." effect="Weapon Level 1" type="equip-1hand" attack="110" attack-action="attack" attack-range="1" weight="1200" sellProtected="true">
+  <item id="536" image="equipment/weapon/sword-shortsword.png" name="Short Sword" description="A small but sharp sword." effect="Weapon Level 1" type="equip-1hand" attack="110" attack-action="attack" attack-range="1" weight="1200" sellProtected="true">
     <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
     <sound event="strike">weapons/knives/knife-miss1.ogg</sound>
diff --git a/items/equip-1hand/item0571_Setzer.xml b/items/equip-1hand/item0571_Setzer.xml
index 69b3e3e3..2f09171e 100644
--- a/items/equip-1hand/item0571_Setzer.xml
+++ b/items/equip-1hand/item0571_Setzer.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <items>
   <item id="571" image="equipment/weapon/dagger-setzer.png" name="Setzer" description="A sharp knife, named after a famous gambler." effect="Base Attack Delay -25 / Weapon Level 1" attack="100" type="equip-1hand" attack-action="attack" attack-range="1" weight="900" sellProtected="true">
-    <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
-    <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite>
+    <sprite gender="unisex">equipment/weapons/dagger-setzer.xml</sprite>
     <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound>
     <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound>
     <sound event="hit">weapons/knives/setzer/setzer-hit3.ogg</sound>
diff --git a/items/equip-1hand/item0576_Beheader.xml b/items/equip-1hand/item0576_Beheader.xml
index 14127ab4..b8ee7350 100644
--- a/items/equip-1hand/item0576_Beheader.xml
+++ b/items/equip-1hand/item0576_Beheader.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <items>
   <item id="576" image="equipment/weapon/sword-beheader.png" name="Beheader" description="The only sword capable of beheading a Terranite." effect="Double Damage +50% / No bow / Base Attack Delay +1150 / Weapon Level 1" req-int="0" criticalattack="-25" hit="-20" type="equip-1hand" attack="999" attack-action="attack" attack-range="1" weight="2000" sellProtected="true">
-    <sprite gender="unisex">equipment/weapons/beheader.xml</sprite>
+    <sprite gender="unisex">equipment/weapons/sword-beheader.xml</sprite>
     <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
     <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
     <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
diff --git a/items/equip-1hand/item0578_SandCutter.xml b/items/equip-1hand/item0578_SandCutter.xml
index fc38f90e..b93f6ae2 100644
--- a/items/equip-1hand/item0578_SandCutter.xml
+++ b/items/equip-1hand/item0578_SandCutter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <items>
   <item id="578" image="equipment/weapon/sword-sandcutter.png" name="Sand Cutter" description="An ancient longsword with moon-shaped blade, frequently used by desert night warriors." effect="Double Damage +5% / Accuracy +3% / Weapon Level 2" attack="160" level="80" type="equip-1hand" attack-action="attack" attack-range="1" weight="1500" sellProtected="true">
-    <sprite gender="unisex">equipment/weapons/sandcutter.xml</sprite>
+    <sprite gender="unisex">equipment/weapons/sword-sandcutter.xml</sprite>
     <sound event="hit">weapons/knives/rock/rock-hit1.ogg</sound>
     <sound event="hit">weapons/knives/rock/rock-hit2.ogg</sound>
     <sound event="miss">weapons/swords/sword-miss1.ogg</sound>
diff --git a/items/equip-1hand/item0584_Jackal.xml b/items/equip-1hand/item0584_Jackal.xml
index 5376dfa1..5ade59f2 100644
--- a/items/equip-1hand/item0584_Jackal.xml
+++ b/items/equip-1hand/item0584_Jackal.xml
@@ -17,7 +17,7 @@
 	critical-hit-effect-id="30"
 	weight="1000"
 	sellProtected="true">
-	<sprite>equipment/weapons/jackal.xml</sprite>
+	<sprite>equipment/weapons/sword-jackal.xml</sprite>
 	<sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
 	<sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound>
 	<sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound>
diff --git a/items/equip-1hand/item0590_DragonSword.xml b/items/equip-1hand/item0590_DragonSword.xml
index 699d228b..c47a37e3 100644
--- a/items/equip-1hand/item0590_DragonSword.xml
+++ b/items/equip-1hand/item0590_DragonSword.xml
@@ -20,7 +20,7 @@
 	critical-hit-effect-id="30"
 	weight="1000"
 	sellProtected="true">
-	<sprite>equipment/weapons/dragon-sword.xml</sprite>
+	<sprite>equipment/weapons/sword-dragon.xml</sprite>
 	<sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
 	<sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound>
 	<sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound>
diff --git a/license.md b/license.md
index 49078f0f..975987e9 100644
--- a/license.md
+++ b/license.md
@@ -709,13 +709,13 @@ File | Artists | Licenses
 `graphics/sprites/equipment/weapons/polearm-chop.png` | :grey_question:, Wombat, Wushin | GPLv2
 `graphics/sprites/equipment/weapons/polearm-spear.png` | :grey_question:, Wombat, Wushin | GPLv2
 `graphics/sprites/equipment/weapons/polearm-stab.png` | :grey_question:, Wombat, Wushin, Varuna | GPLv2
+`graphics/sprites/equipment/weapons/sword-beheader.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/sprites/equipment/weapons/sword-deadsword.png` | :grey_question:, Wombat, Wushin | GPLv2
 `graphics/sprites/equipment/weapons/sword-long.png` | ChefChelios, Wushin | GPLv2
+`graphics/sprites/equipment/weapons/sword-sandcutter.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/sprites/equipment/weapons/sword-short.png` | ChefChelios, Wushin | GPLv2, CC BY-SA 3.0
 `graphics/sprites/equipment/weapons/wand-deathshand.png` | :grey_question:, Wombat, Wushin | GPLv2
 `graphics/sprites/equipment/weapons/wand.png` | :grey_question:, Wushin | GPLv2
-`graphics/sprites/equipment/weapons/beheader.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/equipment/weapons/sandcutter.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0
 `graphics/sprites/equipment/weapons/gun.png` | Skipy, Jesusalva | GPLv2
 
 #### Chest