diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index d65f8759..00000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.tiled-session
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b003594a..29c34a4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
stages:
- test
-image: debian:bullseye
+image: debian:buster
before_script:
- uname -a
@@ -17,26 +17,11 @@ imagemagiccheck:
- ./.tools/imagemagiccheck.sh
allow_failure: true
-manaverse:
+manaplus:
stage: test
- image: ubuntu:20.04
- variables:
- GIT_SUBMODULE_STRATEGY: recursive
script:
- - ./.tools/manaplus.sh master deb_pkg manaverse.log
- artifacts:
- paths:
- - shared
- when: always
- expire_in: 3 week
-
-old_manaplus:
- stage: test
- image: ubuntu:20.04
- variables:
- GIT_SUBMODULE_STRATEGY: recursive
- script:
- - ./.tools/manaplus.sh master4old deb_pkg_old manaplus.log
+ - ./.tools/manaplus.sh
+ image: debian:stable
artifacts:
paths:
- shared
@@ -69,6 +54,8 @@ licensecheck:
testxml:
stage: test
image: ubuntu:18.04
+ tags:
+ - glados
script:
- ./.tools/testxml.sh
- pwd
diff --git a/.gitmodules b/.gitmodules
index de9d5ec1..6da1e30c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule "music"]
path = music
- url = https://git.themanaworld.org/tmw/music.git
-[submodule "mods"]
- path = mods
- url = https://git.themanaworld.org/tmw/mods.git
+ url = https://git.themanaworld.org/legacy/music.git
diff --git a/.tools/contributors.sh b/.tools/contributors.sh
index 8b85eeea..cbfadf1b 100755
--- a/.tools/contributors.sh
+++ b/.tools/contributors.sh
@@ -5,8 +5,7 @@ source ./.tools/init.sh
clientdata_init
aptget_update
-aptget_install git-core make xsltproc
-
+aptget_install git-core gcc ca-certificates libxml2-utils make xsltproc
rm -rf tools
gitclone https://git.themanaworld.org/evolved tools.git tools
diff --git a/.tools/deploy.sh b/.tools/deploy.sh
new file mode 100755
index 00000000..82b8c292
--- /dev/null
+++ b/.tools/deploy.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+source ./.tools/init.sh
+
+clientdata_init
+
+aptget_update
+aptget_install git-core zip gcc zlib1g-dev ca-certificates libxml2-utils python
+rm -rf tools
+gitclone https://git.themanaworld.org/evolved tools.git tools
+
+cd clientdata
+rm -rf public
+mkdir public
+
+cd ..
+
+# FIXME
+#rm -rf music
+#gitclone https://git.themanaworld.org/evolved music.git music
+
+cd tools/update
+
+# FIXME
+./createnew.sh
+check_error $?
+#./create_music.sh
+#check_error $?
+
+cp -r upload/* ../../clientdata/public
+cd ../../clientdata
+gitclone https://git.themanaworld.org/mana pagesindexgen.git pagesindexgen
+cd pagesindexgen
+./pagesindexgen.py ../public
+check_error $?
+ls ../public
diff --git a/.tools/downloadlib.sh b/.tools/downloadlib.sh
new file mode 100755
index 00000000..c1aff5a4
--- /dev/null
+++ b/.tools/downloadlib.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+export zipname="lib.zip"
+export libname="$1_$2"
+
+mkdir libdownload
+cd libdownload
+rm "${zipname}"
+../client-data/.tools/retry.sh wget -O "${zipname}" "https://git.themanaworld.org/mana/spm/builds/artifacts/$1/download?job=${libname}"
+unzip "${zipname}"
+cp -r "bin/${libname}" ..
+cd ..
+
+rm -rf /usr/local/spm/bin/${libname}
+mkdir -p /usr/local/spm/bin
+
+cp -r libdownload/bin/${libname} /usr/local/spm/bin/
+ls /usr/local/spm/bin/${libname}
+if [ "$?" != 0 ]; then
+ echo "Library $1 $2 unpack failed"
+ exit 1
+fi
diff --git a/.tools/imagemagiccheck.sh b/.tools/imagemagiccheck.sh
index a7e8e481..34621cdd 100755
--- a/.tools/imagemagiccheck.sh
+++ b/.tools/imagemagiccheck.sh
@@ -5,8 +5,7 @@ source ./.tools/init.sh
clientdata_init
aptget_update
-aptget_install git-core imagemagick
-
+aptget_install git-core gcc ca-certificates imagemagick
rm -rf tools
gitclone https://git.themanaworld.org/evolved tools.git tools
diff --git a/.tools/init.sh b/.tools/init.sh
index 15f096d9..4fe533ef 100755
--- a/.tools/init.sh
+++ b/.tools/init.sh
@@ -7,30 +7,6 @@ function check_error {
fi
}
-retry_with_increasing_wait()
-{
- local wait_time=1
-
- while true; do
- "$@"
- local retval=$?
-
- if [[ $retval -eq 0 || $wait_time -gt 16 ]]; then
- break
- fi
-
- printf "command %s failed (exit code %d), waiting %d seconds until next try.\n"\
- "$*" "$retval" "$wait_time"
-
- sleep "$wait_time"
- # 1, 2, 4, 8, 16...
- (( wait_time = 2 * wait_time ))
- done
-
- return "$retval"
-}
-
-
function gitclone1 {
echo git clone $2 $3
git clone $2 $3
@@ -47,7 +23,19 @@ function gitclone {
export name2=${CI_BUILD_REPO##*@}
export name2=https://${name2%/*}/$2
- retry_with_increasing_wait gitclone1 "$name1" "$name2" "$3"
+ gitclone1 "$name1" "$name2" $3
+ if [ "$?" != 0 ]; then
+ sleep 1s
+ gitclone1 "$name1" "$name2" $3
+ if [ "$?" != 0 ]; then
+ sleep 3s
+ gitclone1 "$name1" "$name2" $3
+ if [ "$?" != 0 ]; then
+ sleep 5s
+ gitclone1 "$name1" "$name2" $3
+ fi
+ fi
+ fi
check_error $?
}
@@ -69,20 +57,34 @@ function update_repos {
function aptget_update {
update_repos
- retry_with_increasing_wait apt-get -y -qq update
+ apt-get update
+ if [ "$?" != 0 ]; then
+ sleep 1s
+ apt-get update
+ if [ "$?" != 0 ]; then
+ sleep 1s
+ apt-get update
+ fi
+ fi
check_error $?
}
function aptget_install {
- retry_with_increasing_wait apt-get -y -qq install $*
+ apt-get -y -qq install $*
+ if [ "$?" != 0 ]; then
+ sleep 1s
+ apt-get -y -qq install $*
+ if [ "$?" != 0 ]; then
+ sleep 2s
+ apt-get -y -qq install $*
+ fi
+ fi
check_error $?
}
function clientdata_init {
mkdir shared
- if [[ "${PWD##*/}" != clientdata && ! -L ../clientdata ]]; then
- ln -s "$PWD" ../clientdata
- check_error $?
- fi
cd ..
+ ln -s clientdata client-data
+ check_error $?
}
diff --git a/.tools/licensecheck.sh b/.tools/licensecheck.sh
index 412b4def..ba2be45f 100755
--- a/.tools/licensecheck.sh
+++ b/.tools/licensecheck.sh
@@ -5,8 +5,7 @@ source ./.tools/init.sh
clientdata_init
aptget_update
-aptget_install git-core grep
-
+aptget_install git-core gcc ca-certificates grep
rm -rf tools
gitclone https://git.themanaworld.org/evolved tools.git tools
diff --git a/.tools/manaplus.sh b/.tools/manaplus.sh
index d7ffc469..aeb39a86 100755
--- a/.tools/manaplus.sh
+++ b/.tools/manaplus.sh
@@ -1,62 +1,33 @@
#!/bin/bash
-client_branch="$1"
-client_job_name="$2"
-logfile="$3"
-
-set -e
-
source ./.tools/init.sh
clientdata_init
-# Stop tzdata from asking to pick a location, hanging the pipeline
-export DEBIAN_FRONTEND=noninteractive
-
aptget_update
-# Evidently libcurl3-gnutls ships libcurl4-gnutls.so.4
-aptget_install \
- x11-utils xdg-utils xsel \
- ttf-dejavu-core fonts-liberation \
- libcurl3-gnutls \
- libsdl-gfx1.2 libsdl-image1.2 libsdl-mixer1.2 libsdl-net1.2 libsdl-ttf2.0 \
+aptget_install gcc g++ \
+ make autoconf automake autopoint gettext \
+ libxml2-dev libcurl4-gnutls-dev libpng-dev \
+ libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev \
wget unzip
pwd
-ls -la
+ls
-# --retry-on-host-error unknown option?
-wget --retry-connrefused --tries=10 --waitretry=5 \
- --progress=dot:mega \
- -O "$client_job_name.zip" \
- "https://git.themanaworld.org/mana/appimg-builder/-/jobs/artifacts/$client_branch/download?job=$client_job_name"
+./clientdata/.tools/downloadlib.sh manaplus master || exit 1
-# Docker will cache the unpacked files, so make unzip only extract
-# if the archive contains newer ones. The same filesystem will
-# most likely contain exctracted MV/M+ from both CI jobs.
-unzip -o -u "$client_job_name.zip" -d "$client_job_name"
-pushd "$client_job_name"
-# Print package sums to troubleshoot docker caching
-printf "Using debian packages with the following checksums:\n"
-cat deb-sha256checksum.txt
-dpkg -i "manaplus-data_latest_all.deb"
-dpkg -i "manaplus_latest_amd64.deb"
-dpkg -i "manaplus-dbg_latest_amd64.deb"
-popd
+export HOME=`pwd`/clientdata/shared
-PATH="$PATH:/usr/games"
+cd manaplus_master || exit 1
export SDL_VIDEODRIVER=dummy
-manaplus --version || exit 1
-manaplus --validate -u -d clientdata || exit 1
+./bin/manaplus --validate -u -d ../clientdata || exit 1
-log_path="$HOME/.local/share/mana/$logfile"
-if [[ ! -f "$log_path" ]]; then
- printf "Error: logfile %s not found\n" "$log_path"
+ls "${HOME}/.local/share/mana/manaplus.log" || exit 1
+grep -A 10 "Assert:" "${HOME}/.local/share/mana/manaplus.log"
+
+if [ "$?" == 0 ]; then
+ echo "Asserts found"
exit 1
fi
-# grep exits 0 (OK) if it found matches, this condition inverts it
-if grep -A 10 "Assert:" "$log_path"; then
- echo "Error: Asserts found"
- exit 1
-fi
+cd ..
diff --git a/.tools/retry.sh b/.tools/retry.sh
new file mode 100755
index 00000000..aaa50e98
--- /dev/null
+++ b/.tools/retry.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+n=0
+
+while true; do
+ $*
+ if [ "$?" == 0 ]; then
+ exit 0
+ fi
+ if [[ $n -ge 10 ]]; then
+ exit -1
+ fi
+ sleep 5s
+ n=$((n+1))
+done
diff --git a/.tools/testxml.sh b/.tools/testxml.sh
index 458d7b85..a0dc16b3 100755
--- a/.tools/testxml.sh
+++ b/.tools/testxml.sh
@@ -5,8 +5,7 @@ source ./.tools/init.sh
clientdata_init
aptget_update
-aptget_install git-core libxml2-utils python python-pil python-pyvorbis
-
+aptget_install git-core zip gcc zlib1g-dev ca-certificates libxml2-utils python python-pyvorbis python-ogg python-pil
rm -rf tools
gitclone https://git.themanaworld.org/evolved tools.git tools
@@ -17,7 +16,7 @@ check_error $?
export RES=$(cat errors.txt)
if [[ -n "${RES}" ]]; then
echo "xml check failed" >../../../clientdata/shared/error.log
- cat errors.txt >>../../../clientdata/shared/error.log
+ echo ${RES} >>../../../clientdata/shared/error.log
cat ../../../clientdata/shared/error.log
exit 1
fi
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..ed5c991f
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,18 @@
+# Contributing
+*This repository is* ***feature-frozen****. Anything that adds new content will NOT be merged.*
+
+Only patches for the following will be accepted:
+
+
+## High priority patches
+- Missing sprites for already-released content [(green Error boxes)](https://github.com/themanaworld/tmwa-client-data/blob/master/graphics/sprites/error.png).
+- XML errors.
+
+## Low priority patches
+- Typos.
+- Missing or incorrect item stats.
+- Missing or incorrect translation information in XML files.
+- Mapping errors (tiles on the wrong layer).
+- Quest log modifications.
+- Missing frames in sprites.
+- Misc visual improvements (avatars, icons, ...).
diff --git a/charcreation.xml b/charcreation.xml
index b6e0bd52..9c48f015 100644
--- a/charcreation.xml
+++ b/charcreation.xml
@@ -1,13 +1,13 @@
-
+
-
+
-
-
+
+
diff --git a/effects.xml b/effects.xml
index 332c54f9..4a095a57 100644
--- a/effects.xml
+++ b/effects.xml
@@ -54,10 +54,9 @@
-
-
+
@@ -78,8 +77,8 @@
-
-
+
+
@@ -90,18 +89,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -119,11 +107,6 @@
-
-
-
-
-
@@ -233,54 +216,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/emotes.xml b/emotes.xml
index 67ae3b0f..6d5606c5 100644
--- a/emotes.xml
+++ b/emotes.xml
@@ -1,133 +1,45 @@
-
+
emote.xml
-
+
emote.xml
-
+
emote.xml
-
+
emote.xml
-
+
emote.xml
-
+
emote.xml
-
+
emote.xml
-
+
emote.xml
-
+
emote.xml
-
+
emote.xml
-
+
emote.xml
-
+
emote.xml
-
+
emote.xml
-
+
emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
-
- emote.xml
-
diff --git a/graphics/emotes/afraid.png b/graphics/emotes/afraid.png
deleted file mode 100644
index c01a1316..00000000
Binary files a/graphics/emotes/afraid.png and /dev/null differ
diff --git a/graphics/emotes/afraid.xml b/graphics/emotes/afraid.xml
deleted file mode 100644
index 004f8ee7..00000000
--- a/graphics/emotes/afraid.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/alien.png b/graphics/emotes/alien.png
deleted file mode 100644
index 7e69b7b7..00000000
Binary files a/graphics/emotes/alien.png and /dev/null differ
diff --git a/graphics/emotes/alien.xml b/graphics/emotes/alien.xml
deleted file mode 100644
index 3ce5e859..00000000
--- a/graphics/emotes/alien.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/angel.png b/graphics/emotes/angel.png
deleted file mode 100644
index f2409ae6..00000000
Binary files a/graphics/emotes/angel.png and /dev/null differ
diff --git a/graphics/emotes/angel.xml b/graphics/emotes/angel.xml
deleted file mode 100644
index 142e0569..00000000
--- a/graphics/emotes/angel.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/angry.png b/graphics/emotes/angry.png
deleted file mode 100644
index 642eab68..00000000
Binary files a/graphics/emotes/angry.png and /dev/null differ
diff --git a/graphics/emotes/angry.xml b/graphics/emotes/angry.xml
deleted file mode 100644
index 69d730fe..00000000
--- a/graphics/emotes/angry.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/blah.png b/graphics/emotes/blah.png
deleted file mode 100644
index 28d7b34d..00000000
Binary files a/graphics/emotes/blah.png and /dev/null differ
diff --git a/graphics/emotes/blah.xml b/graphics/emotes/blah.xml
deleted file mode 100644
index fb3142c4..00000000
--- a/graphics/emotes/blah.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/blush.png b/graphics/emotes/blush.png
deleted file mode 100644
index 9163aa72..00000000
Binary files a/graphics/emotes/blush.png and /dev/null differ
diff --git a/graphics/emotes/blush.xml b/graphics/emotes/blush.xml
deleted file mode 100644
index 4c5c89f4..00000000
--- a/graphics/emotes/blush.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/bored.png b/graphics/emotes/bored.png
deleted file mode 100644
index bb5b4a23..00000000
Binary files a/graphics/emotes/bored.png and /dev/null differ
diff --git a/graphics/emotes/bored.xml b/graphics/emotes/bored.xml
deleted file mode 100644
index a86735f6..00000000
--- a/graphics/emotes/bored.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/bothered.png b/graphics/emotes/bothered.png
deleted file mode 100644
index 95fa406c..00000000
Binary files a/graphics/emotes/bothered.png and /dev/null differ
diff --git a/graphics/emotes/bothered.xml b/graphics/emotes/bothered.xml
deleted file mode 100644
index bcbb2dbc..00000000
--- a/graphics/emotes/bothered.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/cheerful.png b/graphics/emotes/cheerful.png
deleted file mode 100644
index e3af4ad0..00000000
Binary files a/graphics/emotes/cheerful.png and /dev/null differ
diff --git a/graphics/emotes/cheerful.xml b/graphics/emotes/cheerful.xml
deleted file mode 100644
index 4bbaf847..00000000
--- a/graphics/emotes/cheerful.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/clever.png b/graphics/emotes/clever.png
deleted file mode 100644
index eec6c93f..00000000
Binary files a/graphics/emotes/clever.png and /dev/null differ
diff --git a/graphics/emotes/clever.xml b/graphics/emotes/clever.xml
deleted file mode 100644
index 8ec120a0..00000000
--- a/graphics/emotes/clever.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/curious.png b/graphics/emotes/curious.png
deleted file mode 100644
index e4f7d01a..00000000
Binary files a/graphics/emotes/curious.png and /dev/null differ
diff --git a/graphics/emotes/curious.xml b/graphics/emotes/curious.xml
deleted file mode 100644
index 9abb2e70..00000000
--- a/graphics/emotes/curious.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/dead.png b/graphics/emotes/dead.png
deleted file mode 100644
index c7d705df..00000000
Binary files a/graphics/emotes/dead.png and /dev/null differ
diff --git a/graphics/emotes/dead.xml b/graphics/emotes/dead.xml
deleted file mode 100644
index eb90ec45..00000000
--- a/graphics/emotes/dead.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/disgust.png b/graphics/emotes/disgust.png
deleted file mode 100644
index a8f0e53b..00000000
Binary files a/graphics/emotes/disgust.png and /dev/null differ
diff --git a/graphics/emotes/disgust.xml b/graphics/emotes/disgust.xml
deleted file mode 100644
index 420c4b30..00000000
--- a/graphics/emotes/disgust.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/empty.png b/graphics/emotes/empty.png
deleted file mode 100644
index dd927891..00000000
Binary files a/graphics/emotes/empty.png and /dev/null differ
diff --git a/graphics/emotes/empty.xml b/graphics/emotes/empty.xml
deleted file mode 100644
index 7b5d6abb..00000000
--- a/graphics/emotes/empty.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/evil.png b/graphics/emotes/evil.png
deleted file mode 100644
index 140d28e3..00000000
Binary files a/graphics/emotes/evil.png and /dev/null differ
diff --git a/graphics/emotes/evil.xml b/graphics/emotes/evil.xml
deleted file mode 100644
index 40fe50e5..00000000
--- a/graphics/emotes/evil.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/facepalm.png b/graphics/emotes/facepalm.png
deleted file mode 100644
index 8fabb004..00000000
Binary files a/graphics/emotes/facepalm.png and /dev/null differ
diff --git a/graphics/emotes/facepalm.xml b/graphics/emotes/facepalm.xml
deleted file mode 100644
index d1951633..00000000
--- a/graphics/emotes/facepalm.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/grin.png b/graphics/emotes/grin.png
deleted file mode 100644
index b0854b35..00000000
Binary files a/graphics/emotes/grin.png and /dev/null differ
diff --git a/graphics/emotes/grin.xml b/graphics/emotes/grin.xml
deleted file mode 100644
index 70765acc..00000000
--- a/graphics/emotes/grin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/halloween.png b/graphics/emotes/halloween.png
deleted file mode 100644
index e3f4a8c3..00000000
Binary files a/graphics/emotes/halloween.png and /dev/null differ
diff --git a/graphics/emotes/halloween.xml b/graphics/emotes/halloween.xml
deleted file mode 100644
index 215548da..00000000
--- a/graphics/emotes/halloween.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/happy.png b/graphics/emotes/happy.png
deleted file mode 100644
index c06fc721..00000000
Binary files a/graphics/emotes/happy.png and /dev/null differ
diff --git a/graphics/emotes/happy.xml b/graphics/emotes/happy.xml
deleted file mode 100644
index 07dd24cf..00000000
--- a/graphics/emotes/happy.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/headache.png b/graphics/emotes/headache.png
deleted file mode 100644
index a776a96c..00000000
Binary files a/graphics/emotes/headache.png and /dev/null differ
diff --git a/graphics/emotes/headache.xml b/graphics/emotes/headache.xml
deleted file mode 100644
index 7eb7f8ac..00000000
--- a/graphics/emotes/headache.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/heart.png b/graphics/emotes/heart.png
deleted file mode 100644
index 286fe48d..00000000
Binary files a/graphics/emotes/heart.png and /dev/null differ
diff --git a/graphics/emotes/heart.xml b/graphics/emotes/heart.xml
deleted file mode 100644
index 019e3b19..00000000
--- a/graphics/emotes/heart.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/joyful.png b/graphics/emotes/joyful.png
deleted file mode 100644
index a4842919..00000000
Binary files a/graphics/emotes/joyful.png and /dev/null differ
diff --git a/graphics/emotes/joyful.xml b/graphics/emotes/joyful.xml
deleted file mode 100644
index ee06fe45..00000000
--- a/graphics/emotes/joyful.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/laugh.png b/graphics/emotes/laugh.png
deleted file mode 100644
index fc749edf..00000000
Binary files a/graphics/emotes/laugh.png and /dev/null differ
diff --git a/graphics/emotes/laugh.xml b/graphics/emotes/laugh.xml
deleted file mode 100644
index a670966b..00000000
--- a/graphics/emotes/laugh.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/love.png b/graphics/emotes/love.png
deleted file mode 100644
index 8d685d27..00000000
Binary files a/graphics/emotes/love.png and /dev/null differ
diff --git a/graphics/emotes/love.xml b/graphics/emotes/love.xml
deleted file mode 100644
index 2cb5ff49..00000000
--- a/graphics/emotes/love.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/melancholy.png b/graphics/emotes/melancholy.png
deleted file mode 100644
index e629a748..00000000
Binary files a/graphics/emotes/melancholy.png and /dev/null differ
diff --git a/graphics/emotes/melancholy.xml b/graphics/emotes/melancholy.xml
deleted file mode 100644
index b86b06b4..00000000
--- a/graphics/emotes/melancholy.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/meow.png b/graphics/emotes/meow.png
deleted file mode 100644
index 54ae72bc..00000000
Binary files a/graphics/emotes/meow.png and /dev/null differ
diff --git a/graphics/emotes/meow.xml b/graphics/emotes/meow.xml
deleted file mode 100644
index 0327464f..00000000
--- a/graphics/emotes/meow.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/money.png b/graphics/emotes/money.png
deleted file mode 100644
index 9a9ae3f3..00000000
Binary files a/graphics/emotes/money.png and /dev/null differ
diff --git a/graphics/emotes/money.xml b/graphics/emotes/money.xml
deleted file mode 100644
index 7773b4c9..00000000
--- a/graphics/emotes/money.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/pain.png b/graphics/emotes/pain.png
deleted file mode 100644
index c5af18ab..00000000
Binary files a/graphics/emotes/pain.png and /dev/null differ
diff --git a/graphics/emotes/pain.xml b/graphics/emotes/pain.xml
deleted file mode 100644
index c20710be..00000000
--- a/graphics/emotes/pain.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/perturbed.png b/graphics/emotes/perturbed.png
deleted file mode 100644
index 736893fe..00000000
Binary files a/graphics/emotes/perturbed.png and /dev/null differ
diff --git a/graphics/emotes/perturbed.xml b/graphics/emotes/perturbed.xml
deleted file mode 100644
index 3b72327b..00000000
--- a/graphics/emotes/perturbed.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/rest.png b/graphics/emotes/rest.png
deleted file mode 100644
index 106aa1c8..00000000
Binary files a/graphics/emotes/rest.png and /dev/null differ
diff --git a/graphics/emotes/rest.xml b/graphics/emotes/rest.xml
deleted file mode 100644
index 6198c87b..00000000
--- a/graphics/emotes/rest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/sad.png b/graphics/emotes/sad.png
deleted file mode 100644
index b68eefbf..00000000
Binary files a/graphics/emotes/sad.png and /dev/null differ
diff --git a/graphics/emotes/sad.xml b/graphics/emotes/sad.xml
deleted file mode 100644
index 10bb6b3c..00000000
--- a/graphics/emotes/sad.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/shy.png b/graphics/emotes/shy.png
deleted file mode 100644
index c81ebc27..00000000
Binary files a/graphics/emotes/shy.png and /dev/null differ
diff --git a/graphics/emotes/shy.xml b/graphics/emotes/shy.xml
deleted file mode 100644
index dcd5e94e..00000000
--- a/graphics/emotes/shy.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/sleep.png b/graphics/emotes/sleep.png
deleted file mode 100644
index 16a18d5d..00000000
Binary files a/graphics/emotes/sleep.png and /dev/null differ
diff --git a/graphics/emotes/sleep.xml b/graphics/emotes/sleep.xml
deleted file mode 100644
index 8892e0de..00000000
--- a/graphics/emotes/sleep.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/speech.png b/graphics/emotes/speech.png
deleted file mode 100644
index bc726d6c..00000000
Binary files a/graphics/emotes/speech.png and /dev/null differ
diff --git a/graphics/emotes/speech.xml b/graphics/emotes/speech.xml
deleted file mode 100644
index eeff9ccd..00000000
--- a/graphics/emotes/speech.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/surprise.png b/graphics/emotes/surprise.png
deleted file mode 100644
index e841463f..00000000
Binary files a/graphics/emotes/surprise.png and /dev/null differ
diff --git a/graphics/emotes/surprise.xml b/graphics/emotes/surprise.xml
deleted file mode 100644
index 4829b53f..00000000
--- a/graphics/emotes/surprise.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/suspicious.png b/graphics/emotes/suspicious.png
deleted file mode 100644
index 27e72e7c..00000000
Binary files a/graphics/emotes/suspicious.png and /dev/null differ
diff --git a/graphics/emotes/suspicious.xml b/graphics/emotes/suspicious.xml
deleted file mode 100644
index 9d40f892..00000000
--- a/graphics/emotes/suspicious.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/swear.png b/graphics/emotes/swear.png
deleted file mode 100644
index 3b6fcc74..00000000
Binary files a/graphics/emotes/swear.png and /dev/null differ
diff --git a/graphics/emotes/swear.xml b/graphics/emotes/swear.xml
deleted file mode 100644
index 66eeab6c..00000000
--- a/graphics/emotes/swear.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/tears.png b/graphics/emotes/tears.png
deleted file mode 100644
index 806d37c4..00000000
Binary files a/graphics/emotes/tears.png and /dev/null differ
diff --git a/graphics/emotes/tears.xml b/graphics/emotes/tears.xml
deleted file mode 100644
index 5aeb1eff..00000000
--- a/graphics/emotes/tears.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/tongue.png b/graphics/emotes/tongue.png
deleted file mode 100644
index 46da670d..00000000
Binary files a/graphics/emotes/tongue.png and /dev/null differ
diff --git a/graphics/emotes/tongue.xml b/graphics/emotes/tongue.xml
deleted file mode 100644
index 9993fd73..00000000
--- a/graphics/emotes/tongue.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/troll.png b/graphics/emotes/troll.png
deleted file mode 100644
index bb27e8e2..00000000
Binary files a/graphics/emotes/troll.png and /dev/null differ
diff --git a/graphics/emotes/troll.xml b/graphics/emotes/troll.xml
deleted file mode 100644
index 6147619d..00000000
--- a/graphics/emotes/troll.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/upset.png b/graphics/emotes/upset.png
deleted file mode 100644
index 674fc1da..00000000
Binary files a/graphics/emotes/upset.png and /dev/null differ
diff --git a/graphics/emotes/upset.xml b/graphics/emotes/upset.xml
deleted file mode 100644
index 74d820c1..00000000
--- a/graphics/emotes/upset.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/vicious.png b/graphics/emotes/vicious.png
deleted file mode 100644
index 1ee6fe29..00000000
Binary files a/graphics/emotes/vicious.png and /dev/null differ
diff --git a/graphics/emotes/vicious.xml b/graphics/emotes/vicious.xml
deleted file mode 100644
index bbc0e32b..00000000
--- a/graphics/emotes/vicious.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/emotes/wink.png b/graphics/emotes/wink.png
deleted file mode 100644
index 01037683..00000000
Binary files a/graphics/emotes/wink.png and /dev/null differ
diff --git a/graphics/emotes/wink.xml b/graphics/emotes/wink.xml
deleted file mode 100644
index bd56b912..00000000
--- a/graphics/emotes/wink.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/images/ambient/aethyr.jpg b/graphics/images/ambient/aethyr.jpg
deleted file mode 100644
index 359c0535..00000000
Binary files a/graphics/images/ambient/aethyr.jpg and /dev/null differ
diff --git a/graphics/images/ambient/cloud.png b/graphics/images/ambient/cloud.png
deleted file mode 100644
index c914b466..00000000
Binary files a/graphics/images/ambient/cloud.png and /dev/null differ
diff --git a/graphics/images/ambient/darkness1.png b/graphics/images/ambient/darkness1.png
deleted file mode 100644
index 5e9bc724..00000000
Binary files a/graphics/images/ambient/darkness1.png and /dev/null differ
diff --git a/graphics/images/ambient/darkness2.png b/graphics/images/ambient/darkness2.png
deleted file mode 100644
index dba9b9c6..00000000
Binary files a/graphics/images/ambient/darkness2.png and /dev/null differ
diff --git a/graphics/images/ambient/desertclouds.png b/graphics/images/ambient/desertclouds.png
deleted file mode 100644
index b95ad6c4..00000000
Binary files a/graphics/images/ambient/desertclouds.png and /dev/null differ
diff --git a/graphics/images/login_wallpaper.png b/graphics/images/login_wallpaper.png
index 4af40bba..4f8fec08 100644
Binary files a/graphics/images/login_wallpaper.png and b/graphics/images/login_wallpaper.png differ
diff --git a/graphics/images/login_wallpaper_fall.png b/graphics/images/login_wallpaper_fall.png
index ee52d0a7..36791fc7 100644
Binary files a/graphics/images/login_wallpaper_fall.png and b/graphics/images/login_wallpaper_fall.png differ
diff --git a/graphics/images/login_wallpaper_spring.png b/graphics/images/login_wallpaper_spring.png
index 7cf4b43a..7379e778 100644
Binary files a/graphics/images/login_wallpaper_spring.png and b/graphics/images/login_wallpaper_spring.png differ
diff --git a/graphics/images/login_wallpaper_summer.png b/graphics/images/login_wallpaper_summer.png
index f27371f8..a8c3b414 100644
Binary files a/graphics/images/login_wallpaper_summer.png and b/graphics/images/login_wallpaper_summer.png differ
diff --git a/graphics/images/login_wallpaper_winter.png b/graphics/images/login_wallpaper_winter.png
index 90995318..e8b3fa01 100644
Binary files a/graphics/images/login_wallpaper_winter.png and b/graphics/images/login_wallpaper_winter.png differ
diff --git a/graphics/items/equipment/amulets/angel-wings.png b/graphics/items/equipment/amulets/angel-wings.png
deleted file mode 100644
index 17a5b710..00000000
Binary files a/graphics/items/equipment/amulets/angel-wings.png and /dev/null differ
diff --git a/graphics/items/equipment/amulets/assassin-amulet.png b/graphics/items/equipment/amulets/assassin-amulet.png
deleted file mode 100644
index bf7caae7..00000000
Binary files a/graphics/items/equipment/amulets/assassin-amulet.png and /dev/null differ
diff --git a/graphics/items/equipment/amulets/gmamulet.png b/graphics/items/equipment/amulets/gmamulet.png
deleted file mode 100644
index 0724945b..00000000
Binary files a/graphics/items/equipment/amulets/gmamulet.png and /dev/null differ
diff --git a/graphics/items/equipment/amulets/manapearl.png b/graphics/items/equipment/amulets/manapearl.png
deleted file mode 100644
index 16dad06a..00000000
Binary files a/graphics/items/equipment/amulets/manapearl.png and /dev/null differ
diff --git a/graphics/items/equipment/charms/assassin-amulet.png b/graphics/items/equipment/charms/assassin-amulet.png
new file mode 100644
index 00000000..e0a496a0
Binary files /dev/null and b/graphics/items/equipment/charms/assassin-amulet.png differ
diff --git a/graphics/items/equipment/amulets/enchanter.png b/graphics/items/equipment/charms/enchanter.png
similarity index 100%
rename from graphics/items/equipment/amulets/enchanter.png
rename to graphics/items/equipment/charms/enchanter.png
diff --git a/graphics/items/equipment/amulets/fourleaf-amulet.png b/graphics/items/equipment/charms/fourleaf-amulet.png
similarity index 100%
rename from graphics/items/equipment/amulets/fourleaf-amulet.png
rename to graphics/items/equipment/charms/fourleaf-amulet.png
diff --git a/graphics/items/equipment/charms/manapearl.png b/graphics/items/equipment/charms/manapearl.png
new file mode 100644
index 00000000..2965777f
Binary files /dev/null and b/graphics/items/equipment/charms/manapearl.png differ
diff --git a/graphics/items/equipment/head/assassin-mask.png b/graphics/items/equipment/head/assassin-mask.png
index 16b76617..e2ed73b2 100644
Binary files a/graphics/items/equipment/head/assassin-mask.png and b/graphics/items/equipment/head/assassin-mask.png differ
diff --git a/graphics/items/equipment/head/headslime.png b/graphics/items/equipment/head/headslime.png
deleted file mode 100644
index 71ec7e10..00000000
Binary files a/graphics/items/equipment/head/headslime.png and /dev/null differ
diff --git a/graphics/items/equipment/head/knighthelm-dyable.png b/graphics/items/equipment/head/knighthelm-dyable.png
deleted file mode 100644
index 1c5db321..00000000
Binary files a/graphics/items/equipment/head/knighthelm-dyable.png and /dev/null differ
diff --git a/graphics/items/equipment/head/knit-cap.png b/graphics/items/equipment/head/knit-cap.png
index ef0b8d21..ceafba2e 100644
Binary files a/graphics/items/equipment/head/knit-cap.png and b/graphics/items/equipment/head/knit-cap.png differ
diff --git a/graphics/items/equipment/head/leprechaunhead.png b/graphics/items/equipment/head/leprechaunhead.png
deleted file mode 100644
index 64d8ccc3..00000000
Binary files a/graphics/items/equipment/head/leprechaunhead.png and /dev/null differ
diff --git a/graphics/items/equipment/head/rainshroomhat.png b/graphics/items/equipment/head/rainshroomhat.png
deleted file mode 100644
index 69c462e0..00000000
Binary files a/graphics/items/equipment/head/rainshroomhat.png and /dev/null differ
diff --git a/graphics/items/equipment/head/skullmask-dyable.png b/graphics/items/equipment/head/skullmask-dyable.png
deleted file mode 100644
index 13c6adfd..00000000
Binary files a/graphics/items/equipment/head/skullmask-dyable.png and /dev/null differ
diff --git a/graphics/items/equipment/head/snowshroomhat.png b/graphics/items/equipment/head/snowshroomhat.png
deleted file mode 100644
index 6799dc36..00000000
Binary files a/graphics/items/equipment/head/snowshroomhat.png and /dev/null differ
diff --git a/graphics/items/equipment/head/sunshroomhat.png b/graphics/items/equipment/head/sunshroomhat.png
deleted file mode 100644
index 4166ed53..00000000
Binary files a/graphics/items/equipment/head/sunshroomhat.png and /dev/null differ
diff --git a/graphics/items/equipment/head/wickedmushroomhat.png b/graphics/items/equipment/head/wickedmushroomhat.png
deleted file mode 100644
index e22c057d..00000000
Binary files a/graphics/items/equipment/head/wickedmushroomhat.png and /dev/null differ
diff --git a/graphics/items/equipment/head/witch-doctor-mask.png b/graphics/items/equipment/head/witch-doctor-mask.png
index fd3ea418..f2a641d1 100644
Binary files a/graphics/items/equipment/head/witch-doctor-mask.png and b/graphics/items/equipment/head/witch-doctor-mask.png differ
diff --git a/graphics/items/equipment/rings/assassin-ring.png b/graphics/items/equipment/rings/assassin-ring.png
index f47655f2..81ed5805 100644
Binary files a/graphics/items/equipment/rings/assassin-ring.png and b/graphics/items/equipment/rings/assassin-ring.png differ
diff --git a/graphics/items/equipment/shield/steel-dyable.png b/graphics/items/equipment/shield/steel-dyable.png
deleted file mode 100644
index 6cbd8efa..00000000
Binary files a/graphics/items/equipment/shield/steel-dyable.png and /dev/null differ
diff --git a/graphics/items/equipment/weapon/sword-shortsword.png b/graphics/items/equipment/weapon/dagger-shortsword.png
similarity index 100%
rename from graphics/items/equipment/weapon/sword-shortsword.png
rename to graphics/items/equipment/weapon/dagger-shortsword.png
diff --git a/graphics/items/equipment/weapon/floydbook.png b/graphics/items/equipment/weapon/floydbook.png
index 46e9f40f..68a3e9c8 100644
Binary files a/graphics/items/equipment/weapon/floydbook.png and b/graphics/items/equipment/weapon/floydbook.png differ
diff --git a/graphics/items/equipment/weapon/rainerang.png b/graphics/items/equipment/weapon/rainerang.png
deleted file mode 100644
index 385951e4..00000000
Binary files a/graphics/items/equipment/weapon/rainerang.png and /dev/null differ
diff --git a/graphics/items/equipment/weapon/flintlock.png b/graphics/items/equipment/weapon/revolver.png
similarity index 100%
rename from graphics/items/equipment/weapon/flintlock.png
rename to graphics/items/equipment/weapon/revolver.png
diff --git a/graphics/items/generic/beeswax.png b/graphics/items/generic/beeswax.png
deleted file mode 100644
index ffa9763c..00000000
Binary files a/graphics/items/generic/beeswax.png and /dev/null differ
diff --git a/graphics/items/generic/blackscorpionclaw.png b/graphics/items/generic/blackscorpionclaw.png
deleted file mode 100644
index 889bf332..00000000
Binary files a/graphics/items/generic/blackscorpionclaw.png and /dev/null differ
diff --git a/graphics/items/generic/blossom-wonderwoodling.png b/graphics/items/generic/blossom-wonderwoodling.png
deleted file mode 100644
index 3bfd6ac0..00000000
Binary files a/graphics/items/generic/blossom-wonderwoodling.png and /dev/null differ
diff --git a/graphics/items/generic/bottle-moon.png b/graphics/items/generic/bottle-moon.png
deleted file mode 100644
index 4f8efe6f..00000000
Binary files a/graphics/items/generic/bottle-moon.png and /dev/null differ
diff --git a/graphics/items/generic/brick-a.png b/graphics/items/generic/brick-a.png
deleted file mode 100644
index c84377ec..00000000
Binary files a/graphics/items/generic/brick-a.png and /dev/null differ
diff --git a/graphics/items/generic/bromenal-droplet.png b/graphics/items/generic/bromenal-droplet.png
deleted file mode 100644
index 74955530..00000000
Binary files a/graphics/items/generic/bromenal-droplet.png and /dev/null differ
diff --git a/graphics/items/generic/butterfly.png b/graphics/items/generic/butterfly.png
deleted file mode 100644
index e429af26..00000000
Binary files a/graphics/items/generic/butterfly.png and /dev/null differ
diff --git a/graphics/items/generic/carrot-legendary.png b/graphics/items/generic/carrot-legendary.png
deleted file mode 100644
index dd054770..00000000
Binary files a/graphics/items/generic/carrot-legendary.png and /dev/null differ
diff --git a/graphics/items/generic/carrot.png b/graphics/items/generic/carrot.png
new file mode 100644
index 00000000..c61f58f7
Binary files /dev/null and b/graphics/items/generic/carrot.png differ
diff --git a/graphics/items/generic/charcoal.png b/graphics/items/generic/charcoal.png
deleted file mode 100644
index 87819322..00000000
Binary files a/graphics/items/generic/charcoal.png and /dev/null differ
diff --git a/graphics/items/generic/clover-drawing.png b/graphics/items/generic/clover-drawing.png
deleted file mode 100644
index dbff7d5e..00000000
Binary files a/graphics/items/generic/clover-drawing.png and /dev/null differ
diff --git a/graphics/items/generic/crocclaw.png b/graphics/items/generic/crocclaw.png
deleted file mode 100644
index c44eebb4..00000000
Binary files a/graphics/items/generic/crocclaw.png and /dev/null differ
diff --git a/graphics/items/generic/crystal-black-quartz.png b/graphics/items/generic/crystal-black-quartz.png
deleted file mode 100644
index 4fe58a5d..00000000
Binary files a/graphics/items/generic/crystal-black-quartz.png and /dev/null differ
diff --git a/graphics/items/generic/crystal-crozenite.png b/graphics/items/generic/crystal-crozenite.png
deleted file mode 100644
index bfde775a..00000000
Binary files a/graphics/items/generic/crystal-crozenite.png and /dev/null differ
diff --git a/graphics/items/generic/crystal-mountain.png b/graphics/items/generic/crystal-mountain.png
deleted file mode 100644
index 810f5f1a..00000000
Binary files a/graphics/items/generic/crystal-mountain.png and /dev/null differ
diff --git a/graphics/items/generic/crystal-pink-quartz.png b/graphics/items/generic/crystal-pink-quartz.png
deleted file mode 100644
index 623e401f..00000000
Binary files a/graphics/items/generic/crystal-pink-quartz.png and /dev/null differ
diff --git a/graphics/items/generic/crystalized-dragon-blood.png b/graphics/items/generic/crystalized-dragon-blood.png
deleted file mode 100644
index 355dbf22..00000000
Binary files a/graphics/items/generic/crystalized-dragon-blood.png and /dev/null differ
diff --git a/graphics/items/generic/dragon-horn.png b/graphics/items/generic/dragon-horn.png
deleted file mode 100644
index 1ca80fbe..00000000
Binary files a/graphics/items/generic/dragon-horn.png and /dev/null differ
diff --git a/graphics/items/generic/dragonscales.png b/graphics/items/generic/dragonscales.png
deleted file mode 100644
index 272a6edc..00000000
Binary files a/graphics/items/generic/dragonscales.png and /dev/null differ
diff --git a/graphics/items/generic/duckfeather.png b/graphics/items/generic/duckfeather.png
deleted file mode 100644
index c1a88413..00000000
Binary files a/graphics/items/generic/duckfeather.png and /dev/null differ
diff --git a/graphics/items/generic/feather-a.png b/graphics/items/generic/feather-a.png
deleted file mode 100644
index b758d23f..00000000
Binary files a/graphics/items/generic/feather-a.png and /dev/null differ
diff --git a/graphics/items/generic/flour.png b/graphics/items/generic/flour.png
deleted file mode 100644
index 4b19f5e8..00000000
Binary files a/graphics/items/generic/flour.png and /dev/null differ
diff --git a/graphics/items/generic/glass-shards.png b/graphics/items/generic/glass-shards.png
deleted file mode 100644
index e749aaff..00000000
Binary files a/graphics/items/generic/glass-shards.png and /dev/null differ
diff --git a/graphics/items/generic/golden-tooth.png b/graphics/items/generic/golden-tooth.png
deleted file mode 100644
index e02d3ba9..00000000
Binary files a/graphics/items/generic/golden-tooth.png and /dev/null differ
diff --git a/graphics/items/generic/hay.png b/graphics/items/generic/hay.png
deleted file mode 100644
index 40d6cf8a..00000000
Binary files a/graphics/items/generic/hay.png and /dev/null differ
diff --git a/graphics/items/generic/honeycomb.png b/graphics/items/generic/honeycomb.png
deleted file mode 100644
index 14cb77e7..00000000
Binary files a/graphics/items/generic/honeycomb.png and /dev/null differ
diff --git a/graphics/items/generic/mushroomspores.png b/graphics/items/generic/mushroomspores.png
deleted file mode 100644
index 9e034349..00000000
Binary files a/graphics/items/generic/mushroomspores.png and /dev/null differ
diff --git a/graphics/items/generic/pink-flower-seed.png b/graphics/items/generic/pink-flower-seed.png
deleted file mode 100644
index 6f2c0d44..00000000
Binary files a/graphics/items/generic/pink-flower-seed.png and /dev/null differ
diff --git a/graphics/items/generic/raindrop.png b/graphics/items/generic/raindrop.png
deleted file mode 100644
index 19f6a0d4..00000000
Binary files a/graphics/items/generic/raindrop.png and /dev/null differ
diff --git a/graphics/items/generic/rattotail.png b/graphics/items/generic/rattotail.png
deleted file mode 100644
index d0ca02ce..00000000
Binary files a/graphics/items/generic/rattotail.png and /dev/null differ
diff --git a/graphics/items/generic/rattoteeth.png b/graphics/items/generic/rattoteeth.png
deleted file mode 100644
index 73ffbfb4..00000000
Binary files a/graphics/items/generic/rattoteeth.png and /dev/null differ
diff --git a/graphics/items/generic/redscorpionclaw.png b/graphics/items/generic/redscorpionclaw.png
deleted file mode 100644
index 2ca06384..00000000
Binary files a/graphics/items/generic/redscorpionclaw.png and /dev/null differ
diff --git a/graphics/items/generic/scorpionclaw.png b/graphics/items/generic/scorpionclaw.png
deleted file mode 100644
index ce6ace6c..00000000
Binary files a/graphics/items/generic/scorpionclaw.png and /dev/null differ
diff --git a/graphics/items/generic/seed-wonderwoodling.png b/graphics/items/generic/seed-wonderwoodling.png
deleted file mode 100644
index 0f99dfad..00000000
Binary files a/graphics/items/generic/seed-wonderwoodling.png and /dev/null differ
diff --git a/graphics/items/generic/seeds-dyable.png b/graphics/items/generic/seeds-dyable.png
deleted file mode 100644
index b0a05d32..00000000
Binary files a/graphics/items/generic/seeds-dyable.png and /dev/null differ
diff --git a/graphics/items/generic/shipkey.png b/graphics/items/generic/shipkey.png
deleted file mode 100644
index 1e2a85ef..00000000
Binary files a/graphics/items/generic/shipkey.png and /dev/null differ
diff --git a/graphics/items/generic/snowflake.png b/graphics/items/generic/snowflake.png
deleted file mode 100644
index f4b47ffc..00000000
Binary files a/graphics/items/generic/snowflake.png and /dev/null differ
diff --git a/graphics/items/generic/squichyclaws.png b/graphics/items/generic/squichyclaws.png
deleted file mode 100644
index 89dfe049..00000000
Binary files a/graphics/items/generic/squichyclaws.png and /dev/null differ
diff --git a/graphics/items/generic/stone-a.png b/graphics/items/generic/stone-a.png
deleted file mode 100644
index 18bc06d1..00000000
Binary files a/graphics/items/generic/stone-a.png and /dev/null differ
diff --git a/graphics/items/generic/straw.png b/graphics/items/generic/straw.png
deleted file mode 100644
index ec8aed19..00000000
Binary files a/graphics/items/generic/straw.png and /dev/null differ
diff --git a/graphics/items/generic/tortugashell.png b/graphics/items/generic/tortugashell.png
deleted file mode 100644
index faca1a07..00000000
Binary files a/graphics/items/generic/tortugashell.png and /dev/null differ
diff --git a/graphics/items/generic/tortugashellfragment.png b/graphics/items/generic/tortugashellfragment.png
deleted file mode 100644
index db713772..00000000
Binary files a/graphics/items/generic/tortugashellfragment.png and /dev/null differ
diff --git a/graphics/items/generic/wonder-wood.png b/graphics/items/generic/wonder-wood.png
deleted file mode 100644
index 7092bf59..00000000
Binary files a/graphics/items/generic/wonder-wood.png and /dev/null differ
diff --git a/graphics/items/use/food/bird-big-egg-a.png b/graphics/items/use/food/bird-big-egg-a.png
deleted file mode 100644
index f40293ce..00000000
Binary files a/graphics/items/use/food/bird-big-egg-a.png and /dev/null differ
diff --git a/graphics/items/use/food/bird-egg-a.png b/graphics/items/use/food/bird-egg-a.png
deleted file mode 100644
index cca44dcf..00000000
Binary files a/graphics/items/use/food/bird-egg-a.png and /dev/null differ
diff --git a/graphics/items/use/food/bread.png b/graphics/items/use/food/bread.png
deleted file mode 100644
index cb203d05..00000000
Binary files a/graphics/items/use/food/bread.png and /dev/null differ
diff --git a/graphics/items/use/food/carrot.png b/graphics/items/use/food/carrot.png
deleted file mode 100644
index e0208f61..00000000
Binary files a/graphics/items/use/food/carrot.png and /dev/null differ
diff --git a/graphics/items/use/food/cheese.png b/graphics/items/use/food/cheese.png
deleted file mode 100644
index 1ee2c01a..00000000
Binary files a/graphics/items/use/food/cheese.png and /dev/null differ
diff --git a/graphics/items/use/food/chocolatebiscuit.png b/graphics/items/use/food/chocolatebiscuit.png
deleted file mode 100644
index 14eb803a..00000000
Binary files a/graphics/items/use/food/chocolatebiscuit.png and /dev/null differ
diff --git a/graphics/items/use/food/chocolatebunny.png b/graphics/items/use/food/chocolatebunny.png
deleted file mode 100644
index 79faf6f6..00000000
Binary files a/graphics/items/use/food/chocolatebunny.png and /dev/null differ
diff --git a/graphics/items/use/food/deliciouscookie.png b/graphics/items/use/food/deliciouscookie.png
deleted file mode 100644
index 6f5e78a8..00000000
Binary files a/graphics/items/use/food/deliciouscookie.png and /dev/null differ
diff --git a/graphics/items/use/food/dragonfruit.png b/graphics/items/use/food/dragonfruit.png
deleted file mode 100644
index e54bd672..00000000
Binary files a/graphics/items/use/food/dragonfruit.png and /dev/null differ
diff --git a/graphics/items/use/food/duckegg.png b/graphics/items/use/food/duckegg.png
deleted file mode 100644
index 1ef788be..00000000
Binary files a/graphics/items/use/food/duckegg.png and /dev/null differ
diff --git a/graphics/items/use/food/fruit-salad.png b/graphics/items/use/food/fruit-salad.png
deleted file mode 100644
index ab8f3f04..00000000
Binary files a/graphics/items/use/food/fruit-salad.png and /dev/null differ
diff --git a/graphics/items/use/food/fungus.png b/graphics/items/use/food/fungus.png
deleted file mode 100644
index 18b8fb5f..00000000
Binary files a/graphics/items/use/food/fungus.png and /dev/null differ
diff --git a/graphics/items/use/food/halfcroconut.png b/graphics/items/use/food/halfcroconut.png
deleted file mode 100644
index 85364e26..00000000
Binary files a/graphics/items/use/food/halfcroconut.png and /dev/null differ
diff --git a/graphics/items/use/food/lettuceleaf.png b/graphics/items/use/food/lettuceleaf.png
deleted file mode 100644
index 09ae053d..00000000
Binary files a/graphics/items/use/food/lettuceleaf.png and /dev/null differ
diff --git a/graphics/items/use/food/manana.png b/graphics/items/use/food/manana.png
deleted file mode 100644
index 3da632fe..00000000
Binary files a/graphics/items/use/food/manana.png and /dev/null differ
diff --git a/graphics/items/use/food/piberries.png b/graphics/items/use/food/piberries.png
deleted file mode 100644
index c34f4e85..00000000
Binary files a/graphics/items/use/food/piberries.png and /dev/null differ
diff --git a/graphics/items/use/food/potatoz.png b/graphics/items/use/food/potatoz.png
deleted file mode 100644
index bcb12631..00000000
Binary files a/graphics/items/use/food/potatoz.png and /dev/null differ
diff --git a/graphics/items/use/food/pumpkin.png b/graphics/items/use/food/pumpkin.png
deleted file mode 100644
index 3df097cd..00000000
Binary files a/graphics/items/use/food/pumpkin.png and /dev/null differ
diff --git a/graphics/items/use/food/pumpkinjuice.png b/graphics/items/use/food/pumpkinjuice.png
deleted file mode 100644
index d0f7a15c..00000000
Binary files a/graphics/items/use/food/pumpkinjuice.png and /dev/null differ
diff --git a/graphics/items/use/food/rum.png b/graphics/items/use/food/rum.png
deleted file mode 100644
index c6087107..00000000
Binary files a/graphics/items/use/food/rum.png and /dev/null differ
diff --git a/graphics/items/use/food/sauerkraut.png b/graphics/items/use/food/sauerkraut.png
deleted file mode 100644
index 3d4028d2..00000000
Binary files a/graphics/items/use/food/sauerkraut.png and /dev/null differ
diff --git a/graphics/items/use/others/anchor-stone-anchored.png b/graphics/items/use/others/anchor-stone-anchored.png
deleted file mode 100644
index ec0626a0..00000000
Binary files a/graphics/items/use/others/anchor-stone-anchored.png and /dev/null differ
diff --git a/graphics/items/use/others/anchor-stone.png b/graphics/items/use/others/anchor-stone.png
deleted file mode 100644
index ee9c4d4e..00000000
Binary files a/graphics/items/use/others/anchor-stone.png and /dev/null differ
diff --git a/graphics/items/use/others/arrow_bundle.png b/graphics/items/use/others/arrow_bundle.png
deleted file mode 100644
index 86583716..00000000
Binary files a/graphics/items/use/others/arrow_bundle.png and /dev/null differ
diff --git a/graphics/items/use/others/croconut.png b/graphics/items/use/others/croconut.png
deleted file mode 100644
index f939589a..00000000
Binary files a/graphics/items/use/others/croconut.png and /dev/null differ
diff --git a/graphics/items/use/others/lightning-orb.png b/graphics/items/use/others/lightning-orb.png
deleted file mode 100644
index 639527fe..00000000
Binary files a/graphics/items/use/others/lightning-orb.png and /dev/null differ
diff --git a/graphics/items/use/others/rubberducky.png b/graphics/items/use/others/rubberducky.png
deleted file mode 100644
index d490627f..00000000
Binary files a/graphics/items/use/others/rubberducky.png and /dev/null differ
diff --git a/graphics/items/use/others/shovel-legendary.png b/graphics/items/use/others/shovel-legendary.png
deleted file mode 100644
index 3c63ecf4..00000000
Binary files a/graphics/items/use/others/shovel-legendary.png and /dev/null differ
diff --git a/graphics/items/use/others/shovel.png b/graphics/items/use/others/shovel.png
deleted file mode 100644
index 4edf3a5e..00000000
Binary files a/graphics/items/use/others/shovel.png and /dev/null differ
diff --git a/graphics/items/use/others/treasuremap-legendary.png b/graphics/items/use/others/treasuremap-legendary.png
deleted file mode 100644
index 04c54567..00000000
Binary files a/graphics/items/use/others/treasuremap-legendary.png and /dev/null differ
diff --git a/graphics/items/use/others/treasuremap.png b/graphics/items/use/others/treasuremap.png
deleted file mode 100644
index 6c65dd81..00000000
Binary files a/graphics/items/use/others/treasuremap.png and /dev/null differ
diff --git a/graphics/items/use/others/treasuremap2.png b/graphics/items/use/others/treasuremap2.png
deleted file mode 100644
index d303244d..00000000
Binary files a/graphics/items/use/others/treasuremap2.png and /dev/null differ
diff --git a/graphics/items/use/potions/g.png b/graphics/items/use/potions/g.png
deleted file mode 100644
index 1fb4f883..00000000
Binary files a/graphics/items/use/potions/g.png and /dev/null differ
diff --git a/graphics/items/use/scrolls/scroll-shadow.png b/graphics/items/use/scrolls/scroll-shadow.png
deleted file mode 100644
index 9e2ede2c..00000000
Binary files a/graphics/items/use/scrolls/scroll-shadow.png and /dev/null differ
diff --git a/graphics/minimaps/001-2.png b/graphics/minimaps/001-2.png
index 06ed9fca..4fbc5ef4 100644
Binary files a/graphics/minimaps/001-2.png and b/graphics/minimaps/001-2.png differ
diff --git a/graphics/minimaps/002-1.png b/graphics/minimaps/002-1.png
index c2da82ad..882ab481 100644
Binary files a/graphics/minimaps/002-1.png and b/graphics/minimaps/002-1.png differ
diff --git a/graphics/minimaps/004-1.png b/graphics/minimaps/004-1.png
index f380134d..70e5337a 100644
Binary files a/graphics/minimaps/004-1.png and b/graphics/minimaps/004-1.png differ
diff --git a/graphics/minimaps/008-1.png b/graphics/minimaps/008-1.png
index 05538347..7bd3fe0a 100644
Binary files a/graphics/minimaps/008-1.png and b/graphics/minimaps/008-1.png differ
diff --git a/graphics/minimaps/009-1.png b/graphics/minimaps/009-1.png
index a9515387..2df74ddb 100644
Binary files a/graphics/minimaps/009-1.png and b/graphics/minimaps/009-1.png differ
diff --git a/graphics/minimaps/012-1.png b/graphics/minimaps/012-1.png
index 05bcc1c6..aaa9c1dc 100644
Binary files a/graphics/minimaps/012-1.png and b/graphics/minimaps/012-1.png differ
diff --git a/graphics/minimaps/015-1.png b/graphics/minimaps/015-1.png
index 2a45a009..eeefbc93 100644
Binary files a/graphics/minimaps/015-1.png and b/graphics/minimaps/015-1.png differ
diff --git a/graphics/minimaps/017-3.png b/graphics/minimaps/017-3.png
index 7572ce46..40dcd329 100644
Binary files a/graphics/minimaps/017-3.png and b/graphics/minimaps/017-3.png differ
diff --git a/graphics/minimaps/018-1.png b/graphics/minimaps/018-1.png
index f5db0731..9551395a 100644
Binary files a/graphics/minimaps/018-1.png and b/graphics/minimaps/018-1.png differ
diff --git a/graphics/minimaps/027-5.png b/graphics/minimaps/027-5.png
index 5cfeb70c..2d1699ff 100644
Binary files a/graphics/minimaps/027-5.png and b/graphics/minimaps/027-5.png differ
diff --git a/graphics/minimaps/028-3.png b/graphics/minimaps/028-3.png
index c662e3c3..8f80787c 100644
Binary files a/graphics/minimaps/028-3.png and b/graphics/minimaps/028-3.png differ
diff --git a/graphics/minimaps/030-4.png b/graphics/minimaps/030-4.png
index c63cb470..4adc15c7 100644
Binary files a/graphics/minimaps/030-4.png and b/graphics/minimaps/030-4.png differ
diff --git a/graphics/minimaps/041-1.png b/graphics/minimaps/041-1.png
index e718db72..72f89efd 100644
Binary files a/graphics/minimaps/041-1.png and b/graphics/minimaps/041-1.png differ
diff --git a/graphics/minimaps/042-1.png b/graphics/minimaps/042-1.png
index 7063ef44..b96f7443 100644
Binary files a/graphics/minimaps/042-1.png and b/graphics/minimaps/042-1.png differ
diff --git a/graphics/minimaps/047-1.png b/graphics/minimaps/047-1.png
index c1a4015e..2e778ba5 100644
Binary files a/graphics/minimaps/047-1.png and b/graphics/minimaps/047-1.png differ
diff --git a/graphics/minimaps/080-1.png b/graphics/minimaps/080-1.png
deleted file mode 100644
index 0339a1e5..00000000
Binary files a/graphics/minimaps/080-1.png and /dev/null differ
diff --git a/graphics/minimaps/080-3.png b/graphics/minimaps/080-3.png
deleted file mode 100644
index fe7f6458..00000000
Binary files a/graphics/minimaps/080-3.png and /dev/null differ
diff --git a/graphics/minimaps/081-1.png b/graphics/minimaps/081-1.png
deleted file mode 100644
index 97e0abc9..00000000
Binary files a/graphics/minimaps/081-1.png and /dev/null differ
diff --git a/graphics/minimaps/081-2.png b/graphics/minimaps/081-2.png
deleted file mode 100644
index 14b93358..00000000
Binary files a/graphics/minimaps/081-2.png and /dev/null differ
diff --git a/graphics/minimaps/081-3.png b/graphics/minimaps/081-3.png
deleted file mode 100644
index 7f106a7c..00000000
Binary files a/graphics/minimaps/081-3.png and /dev/null differ
diff --git a/graphics/minimaps/082-2.png b/graphics/minimaps/082-2.png
deleted file mode 100644
index db05ed7e..00000000
Binary files a/graphics/minimaps/082-2.png and /dev/null differ
diff --git a/graphics/minimaps/082-3.png b/graphics/minimaps/082-3.png
deleted file mode 100644
index fb801d34..00000000
Binary files a/graphics/minimaps/082-3.png and /dev/null differ
diff --git a/graphics/minimaps/fermi.png b/graphics/minimaps/fermi.png
deleted file mode 100644
index 951bd7fa..00000000
Binary files a/graphics/minimaps/fermi.png and /dev/null differ
diff --git a/graphics/minimaps/guild.png b/graphics/minimaps/guild.png
deleted file mode 100644
index b3daa154..00000000
Binary files a/graphics/minimaps/guild.png and /dev/null differ
diff --git a/graphics/minimaps/prison.png b/graphics/minimaps/prison.png
deleted file mode 100644
index ae57c8f2..00000000
Binary files a/graphics/minimaps/prison.png and /dev/null differ
diff --git a/graphics/particles/beam-crit.png b/graphics/particles/beam-crit.png
deleted file mode 100644
index 8f64643d..00000000
Binary files a/graphics/particles/beam-crit.png and /dev/null differ
diff --git a/graphics/particles/beam-crit.xml b/graphics/particles/beam-crit.xml
deleted file mode 100644
index 1d5ba245..00000000
--- a/graphics/particles/beam-crit.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/beam.png b/graphics/particles/beam.png
deleted file mode 100644
index f340a61c..00000000
Binary files a/graphics/particles/beam.png and /dev/null differ
diff --git a/graphics/particles/beam.xml b/graphics/particles/beam.xml
deleted file mode 100644
index e05bc34c..00000000
--- a/graphics/particles/beam.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/blue-violent-glow.particle.xml b/graphics/particles/blue-violent-glow.particle.xml
deleted file mode 100644
index 583953ec..00000000
--- a/graphics/particles/blue-violent-glow.particle.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/bubble-ani_6x6.png b/graphics/particles/bubble-ani_6x6.png
deleted file mode 100644
index e04cc8c3..00000000
Binary files a/graphics/particles/bubble-ani_6x6.png and /dev/null differ
diff --git a/graphics/particles/bubble-ani_8x8.png b/graphics/particles/bubble-ani_8x8.png
deleted file mode 100644
index 134b352a..00000000
Binary files a/graphics/particles/bubble-ani_8x8.png and /dev/null differ
diff --git a/graphics/particles/bullet.xml b/graphics/particles/bullet.xml
deleted file mode 100644
index 244e3909..00000000
--- a/graphics/particles/bullet.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/cannonball.xml b/graphics/particles/cannonball.xml
deleted file mode 100644
index 9e31216b..00000000
--- a/graphics/particles/cannonball.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/channelling-cast-blue.particle.xml b/graphics/particles/channelling-cast-blue.particle.xml
deleted file mode 100644
index 871364cd..00000000
--- a/graphics/particles/channelling-cast-blue.particle.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/channelling-cast-red.particle.xml b/graphics/particles/channelling-cast-red.particle.xml
deleted file mode 100644
index b0b0364b..00000000
--- a/graphics/particles/channelling-cast-red.particle.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/channelling-raise-blue.particle.xml b/graphics/particles/channelling-raise-blue.particle.xml
deleted file mode 100644
index 7c3f8a6b..00000000
--- a/graphics/particles/channelling-raise-blue.particle.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/channelling-raise-red.particle.xml b/graphics/particles/channelling-raise-red.particle.xml
deleted file mode 100644
index 4a0e9377..00000000
--- a/graphics/particles/channelling-raise-red.particle.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/crit.particle.xml b/graphics/particles/crit.particle.xml
index aee7111e..7f534477 100644
--- a/graphics/particles/crit.particle.xml
+++ b/graphics/particles/crit.particle.xml
@@ -1,6 +1,6 @@
diff --git a/graphics/particles/electricity.red.danger-cell-left-right-big.xml b/graphics/particles/electricity.red.danger-cell-left-right-big.xml
deleted file mode 100644
index 9c073797..00000000
--- a/graphics/particles/electricity.red.danger-cell-left-right-big.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/electricity.red.danger-cell-left-right-small.xml b/graphics/particles/electricity.red.danger-cell-left-right-small.xml
deleted file mode 100644
index 5284fac6..00000000
--- a/graphics/particles/electricity.red.danger-cell-left-right-small.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/electricity.red.danger-cell-middle-big.xml b/graphics/particles/electricity.red.danger-cell-middle-big.xml
deleted file mode 100644
index 41055860..00000000
--- a/graphics/particles/electricity.red.danger-cell-middle-big.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/electricity.red.danger-cell-middle-small.xml b/graphics/particles/electricity.red.danger-cell-middle-small.xml
deleted file mode 100644
index d90a0868..00000000
--- a/graphics/particles/electricity.red.danger-cell-middle-small.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/flame_8x8.png b/graphics/particles/flame_8x8.png
deleted file mode 100644
index daaea9af..00000000
Binary files a/graphics/particles/flame_8x8.png and /dev/null differ
diff --git a/graphics/particles/hex-facet-outline-50.png b/graphics/particles/hex-facet-outline-50.png
index b9567852..711f6828 100644
Binary files a/graphics/particles/hex-facet-outline-50.png and b/graphics/particles/hex-facet-outline-50.png differ
diff --git a/graphics/particles/hex-facet-outline.png b/graphics/particles/hex-facet-outline.png
index b5cf58fb..c68dd9e2 100644
Binary files a/graphics/particles/hex-facet-outline.png and b/graphics/particles/hex-facet-outline.png differ
diff --git a/graphics/particles/mana-battery-smoke-and-sparks.xml b/graphics/particles/mana-battery-smoke-and-sparks.xml
deleted file mode 100644
index 09a4bb80..00000000
--- a/graphics/particles/mana-battery-smoke-and-sparks.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/manadust.particle.xml b/graphics/particles/manadust.particle.xml
deleted file mode 100644
index 6e4fff5b..00000000
--- a/graphics/particles/manadust.particle.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/monster-mushroom-moon.particle.xml b/graphics/particles/monster-moonshroom.particle.xml
similarity index 100%
rename from graphics/particles/monster-mushroom-moon.particle.xml
rename to graphics/particles/monster-moonshroom.particle.xml
diff --git a/graphics/particles/monster-mushroom-rain-attack.particle.xml b/graphics/particles/monster-mushroom-rain-attack.particle.xml
deleted file mode 100644
index 5bba0f0b..00000000
--- a/graphics/particles/monster-mushroom-rain-attack.particle.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/monster-mushroom-rain.particle.xml b/graphics/particles/monster-mushroom-rain.particle.xml
deleted file mode 100644
index 76136827..00000000
--- a/graphics/particles/monster-mushroom-rain.particle.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/monster-mushroom-snow-attack.particle.xml b/graphics/particles/monster-mushroom-snow-attack.particle.xml
deleted file mode 100644
index a772f494..00000000
--- a/graphics/particles/monster-mushroom-snow-attack.particle.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/monster-mushroom-snow.particle.xml b/graphics/particles/monster-mushroom-snow.particle.xml
deleted file mode 100644
index e2f50129..00000000
--- a/graphics/particles/monster-mushroom-snow.particle.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/monster-mushroom-sun-attack.particle.xml b/graphics/particles/monster-mushroom-sun-attack.particle.xml
deleted file mode 100644
index ec0611b9..00000000
--- a/graphics/particles/monster-mushroom-sun-attack.particle.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/monster-mushroom-sun.particle.xml b/graphics/particles/monster-mushroom-sun.particle.xml
deleted file mode 100644
index 4f11949b..00000000
--- a/graphics/particles/monster-mushroom-sun.particle.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/monster-rotter-crit.png b/graphics/particles/monster-rotter-crit.png
deleted file mode 100644
index 379743fe..00000000
Binary files a/graphics/particles/monster-rotter-crit.png and /dev/null differ
diff --git a/graphics/particles/monster-rotter-crit.xml b/graphics/particles/monster-rotter-crit.xml
deleted file mode 100644
index 7f265f1a..00000000
--- a/graphics/particles/monster-rotter-crit.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/monster-rotter-hit.xml b/graphics/particles/monster-rotter-hit.xml
deleted file mode 100644
index 5a4f3159..00000000
--- a/graphics/particles/monster-rotter-hit.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/monster-rotter-trail.xml b/graphics/particles/monster-rotter-trail.xml
deleted file mode 100644
index 287e48b6..00000000
--- a/graphics/particles/monster-rotter-trail.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/monster-rotter-vomit.png b/graphics/particles/monster-rotter-vomit.png
deleted file mode 100644
index 906ae472..00000000
Binary files a/graphics/particles/monster-rotter-vomit.png and /dev/null differ
diff --git a/graphics/particles/monster-rotter-vomit.xml b/graphics/particles/monster-rotter-vomit.xml
deleted file mode 100644
index 48e91a1b..00000000
--- a/graphics/particles/monster-rotter-vomit.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/monster-snail-trail.particle.xml b/graphics/particles/monster-snail-trail.particle.xml
index 37fafd2d..e86b02b1 100644
--- a/graphics/particles/monster-snail-trail.particle.xml
+++ b/graphics/particles/monster-snail-trail.particle.xml
@@ -1,17 +1,17 @@
-
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/graphics/particles/monster-troll-foefire.particle.xml b/graphics/particles/monster-troll-foefire.particle.xml
index f042ed79..6e3bcce2 100644
--- a/graphics/particles/monster-troll-foefire.particle.xml
+++ b/graphics/particles/monster-troll-foefire.particle.xml
@@ -25,10 +25,10 @@ used for the foefire attack of the Trolls.
-
-
+
+
-
+
diff --git a/graphics/particles/monster-zombie-trail.xml b/graphics/particles/monster-zombie-trail.xml
deleted file mode 100644
index 198fafbc..00000000
--- a/graphics/particles/monster-zombie-trail.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/monster-mushroom-moon-attack.particle.xml b/graphics/particles/moonshroom-attack.particle.xml
similarity index 100%
rename from graphics/particles/monster-mushroom-moon-attack.particle.xml
rename to graphics/particles/moonshroom-attack.particle.xml
diff --git a/graphics/particles/necroblast.particle.xml b/graphics/particles/necroblast.particle.xml
index 2f18a3f8..44a64ecd 100644
--- a/graphics/particles/necroblast.particle.xml
+++ b/graphics/particles/necroblast.particle.xml
@@ -1,6 +1,6 @@
@@ -8,54 +8,54 @@ Red Bone blaze: inspired by Demon fire
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
diff --git a/graphics/particles/quest-continue.particle.xml b/graphics/particles/quest-continue.particle.xml
deleted file mode 100644
index 90756040..00000000
--- a/graphics/particles/quest-continue.particle.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/quest-start.particle.xml b/graphics/particles/quest-start.particle.xml
deleted file mode 100644
index 315755d6..00000000
--- a/graphics/particles/quest-start.particle.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/rainbow-crit.xml b/graphics/particles/rainbow-crit.xml
deleted file mode 100644
index 1258ed15..00000000
--- a/graphics/particles/rainbow-crit.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/rainbow-hit.xml b/graphics/particles/rainbow-hit.xml
deleted file mode 100644
index 03ace72a..00000000
--- a/graphics/particles/rainbow-hit.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/raindrop-hit_16x16.png b/graphics/particles/raindrop-hit_16x16.png
deleted file mode 100644
index b0efb4ea..00000000
Binary files a/graphics/particles/raindrop-hit_16x16.png and /dev/null differ
diff --git a/graphics/particles/raindrop-hit_8x8.png b/graphics/particles/raindrop-hit_8x8.png
deleted file mode 100644
index f4484340..00000000
Binary files a/graphics/particles/raindrop-hit_8x8.png and /dev/null differ
diff --git a/graphics/particles/raindrop_3x5.png b/graphics/particles/raindrop_3x5.png
deleted file mode 100644
index 25ae3683..00000000
Binary files a/graphics/particles/raindrop_3x5.png and /dev/null differ
diff --git a/graphics/particles/raindrop_8x8.png b/graphics/particles/raindrop_8x8.png
deleted file mode 100644
index 281311a0..00000000
Binary files a/graphics/particles/raindrop_8x8.png and /dev/null differ
diff --git a/graphics/particles/rainerang.png b/graphics/particles/rainerang.png
deleted file mode 100644
index d20bb69b..00000000
Binary files a/graphics/particles/rainerang.png and /dev/null differ
diff --git a/graphics/particles/rainerang.xml b/graphics/particles/rainerang.xml
deleted file mode 100644
index 058938aa..00000000
--- a/graphics/particles/rainerang.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/red-magic-cast.particle.xml b/graphics/particles/red-magic-cast.particle.xml
deleted file mode 100644
index 48160531..00000000
--- a/graphics/particles/red-magic-cast.particle.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/particles/snowflake-7x7.png b/graphics/particles/snowflake-7x7.png
index 839f6c93..221b4d08 100644
Binary files a/graphics/particles/snowflake-7x7.png and b/graphics/particles/snowflake-7x7.png differ
diff --git a/graphics/particles/zap.xml b/graphics/particles/zap.xml
deleted file mode 100644
index 3fc60fd4..00000000
--- a/graphics/particles/zap.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/emote.png b/graphics/sprites/emote.png
index 41159f77..aaf6ff17 100644
Binary files a/graphics/sprites/emote.png and b/graphics/sprites/emote.png differ
diff --git a/graphics/sprites/emote.xml b/graphics/sprites/emote.xml
index 622f281e..6a5653c2 100644
--- a/graphics/sprites/emote.xml
+++ b/graphics/sprites/emote.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/graphics/sprites/equipment/amulets/angel-wings.png b/graphics/sprites/equipment/angel-wings.png
similarity index 100%
rename from graphics/sprites/equipment/amulets/angel-wings.png
rename to graphics/sprites/equipment/angel-wings.png
diff --git a/graphics/sprites/equipment/amulets/angel-wings.xml b/graphics/sprites/equipment/angel-wings.xml
similarity index 96%
rename from graphics/sprites/equipment/amulets/angel-wings.xml
rename to graphics/sprites/equipment/angel-wings.xml
index cd13e426..83844588 100644
--- a/graphics/sprites/equipment/amulets/angel-wings.xml
+++ b/graphics/sprites/equipment/angel-wings.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/graphics/sprites/equipment/head/assassin-mask.png b/graphics/sprites/equipment/head/assassin-mask.png
index a0c92b7a..d385c6ad 100644
Binary files a/graphics/sprites/equipment/head/assassin-mask.png and b/graphics/sprites/equipment/head/assassin-mask.png differ
diff --git a/graphics/sprites/equipment/head/blue-wolf-helmet.png b/graphics/sprites/equipment/head/blue-wolf-helmet.png
index fde366b9..7bf4bc9b 100644
Binary files a/graphics/sprites/equipment/head/blue-wolf-helmet.png and b/graphics/sprites/equipment/head/blue-wolf-helmet.png differ
diff --git a/graphics/sprites/equipment/head/captain-hat.png b/graphics/sprites/equipment/head/captain-hat.png
index 9116692e..6428de46 100644
Binary files a/graphics/sprites/equipment/head/captain-hat.png and b/graphics/sprites/equipment/head/captain-hat.png differ
diff --git a/graphics/sprites/equipment/head/crusadehelm-female.xml b/graphics/sprites/equipment/head/crusadehelm-female.xml
index a3aac532..fa774554 100644
--- a/graphics/sprites/equipment/head/crusadehelm-female.xml
+++ b/graphics/sprites/equipment/head/crusadehelm-female.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/graphics/sprites/equipment/head/crusadehelm.xml b/graphics/sprites/equipment/head/crusadehelm.xml
index 5cc83971..3b155eb4 100644
--- a/graphics/sprites/equipment/head/crusadehelm.xml
+++ b/graphics/sprites/equipment/head/crusadehelm.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/graphics/sprites/equipment/head/dark-helm-female.xml b/graphics/sprites/equipment/head/dark-helm-female.xml
index c1495b59..9396c41f 100644
--- a/graphics/sprites/equipment/head/dark-helm-female.xml
+++ b/graphics/sprites/equipment/head/dark-helm-female.xml
@@ -1,228 +1,226 @@
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
diff --git a/graphics/sprites/equipment/head/dark-helm.png b/graphics/sprites/equipment/head/dark-helm.png
index d9085c48..7a8e1446 100644
Binary files a/graphics/sprites/equipment/head/dark-helm.png and b/graphics/sprites/equipment/head/dark-helm.png differ
diff --git a/graphics/sprites/equipment/head/dark-helm.xml b/graphics/sprites/equipment/head/dark-helm.xml
index d326de06..5586fa30 100644
--- a/graphics/sprites/equipment/head/dark-helm.xml
+++ b/graphics/sprites/equipment/head/dark-helm.xml
@@ -1,228 +1,227 @@
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
+
-
-
-
-
+
+
+
+
diff --git a/graphics/sprites/equipment/head/headslime-female.xml b/graphics/sprites/equipment/head/headslime-female.xml
deleted file mode 100644
index 8f5fe908..00000000
--- a/graphics/sprites/equipment/head/headslime-female.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/graphics/sprites/equipment/head/headslime.png b/graphics/sprites/equipment/head/headslime.png
deleted file mode 100644
index 30bca403..00000000
Binary files a/graphics/sprites/equipment/head/headslime.png and /dev/null differ
diff --git a/graphics/sprites/equipment/head/headslime.xml b/graphics/sprites/equipment/head/headslime.xml
deleted file mode 100644
index 7a7fb2c2..00000000
--- a/graphics/sprites/equipment/head/headslime.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/graphics/sprites/equipment/head/infantryhelm-female.xml b/graphics/sprites/equipment/head/infantryhelm-female.xml
index d0cc4d17..adaac249 100644
--- a/graphics/sprites/equipment/head/infantryhelm-female.xml
+++ b/graphics/sprites/equipment/head/infantryhelm-female.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/graphics/sprites/equipment/head/infantryhelm.xml b/graphics/sprites/equipment/head/infantryhelm.xml
index 15f8fefa..be90144b 100644
--- a/graphics/sprites/equipment/head/infantryhelm.xml
+++ b/graphics/sprites/equipment/head/infantryhelm.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/graphics/sprites/equipment/head/leprechaunhead.png b/graphics/sprites/equipment/head/leprechaunhead.png
deleted file mode 100644
index 6f71df92..00000000
Binary files a/graphics/sprites/equipment/head/leprechaunhead.png and /dev/null differ
diff --git a/graphics/sprites/equipment/head/leprechaunhead.xml b/graphics/sprites/equipment/head/leprechaunhead.xml
deleted file mode 100644
index 26bf9888..00000000
--- a/graphics/sprites/equipment/head/leprechaunhead.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/equipment/head/rainshroomhat-female.xml b/graphics/sprites/equipment/head/rainshroomhat-female.xml
deleted file mode 100644
index 3f7daf1b..00000000
--- a/graphics/sprites/equipment/head/rainshroomhat-female.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/graphics/sprites/equipment/head/rainshroomhat.png b/graphics/sprites/equipment/head/rainshroomhat.png
deleted file mode 100644
index 48b8e336..00000000
Binary files a/graphics/sprites/equipment/head/rainshroomhat.png and /dev/null differ
diff --git a/graphics/sprites/equipment/head/rainshroomhat.xml b/graphics/sprites/equipment/head/rainshroomhat.xml
deleted file mode 100644
index 708df0f4..00000000
--- a/graphics/sprites/equipment/head/rainshroomhat.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/graphics/sprites/equipment/head/skullmask-dyable-female.xml b/graphics/sprites/equipment/head/skullmask-dyable-female.xml
deleted file mode 100644
index 818f9b49..00000000
--- a/graphics/sprites/equipment/head/skullmask-dyable-female.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/equipment/head/skullmask-dyable.png b/graphics/sprites/equipment/head/skullmask-dyable.png
deleted file mode 100644
index 0bba274f..00000000
Binary files a/graphics/sprites/equipment/head/skullmask-dyable.png and /dev/null differ
diff --git a/graphics/sprites/equipment/head/skullmask-dyable.xml b/graphics/sprites/equipment/head/skullmask-dyable.xml
deleted file mode 100644
index a6f8b482..00000000
--- a/graphics/sprites/equipment/head/skullmask-dyable.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/equipment/head/snowshroomhat-female.xml b/graphics/sprites/equipment/head/snowshroomhat-female.xml
deleted file mode 100644
index f88ad033..00000000
--- a/graphics/sprites/equipment/head/snowshroomhat-female.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/graphics/sprites/equipment/head/snowshroomhat.png b/graphics/sprites/equipment/head/snowshroomhat.png
deleted file mode 100644
index 57c2f39b..00000000
Binary files a/graphics/sprites/equipment/head/snowshroomhat.png and /dev/null differ
diff --git a/graphics/sprites/equipment/head/snowshroomhat.xml b/graphics/sprites/equipment/head/snowshroomhat.xml
deleted file mode 100644
index 464bd685..00000000
--- a/graphics/sprites/equipment/head/snowshroomhat.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/graphics/sprites/equipment/head/steel-dyable.png b/graphics/sprites/equipment/head/steel-dyable.png
deleted file mode 100644
index 9bea5878..00000000
Binary files a/graphics/sprites/equipment/head/steel-dyable.png and /dev/null differ
diff --git a/graphics/sprites/equipment/head/steel-dyable.xml b/graphics/sprites/equipment/head/steel-dyable.xml
deleted file mode 100644
index 8fbf13f9..00000000
--- a/graphics/sprites/equipment/head/steel-dyable.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
diff --git a/graphics/sprites/equipment/head/sunshroomhat-female.xml b/graphics/sprites/equipment/head/sunshroomhat-female.xml
deleted file mode 100644
index d984dc22..00000000
--- a/graphics/sprites/equipment/head/sunshroomhat-female.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/graphics/sprites/equipment/head/sunshroomhat.png b/graphics/sprites/equipment/head/sunshroomhat.png
deleted file mode 100644
index 90885482..00000000
Binary files a/graphics/sprites/equipment/head/sunshroomhat.png and /dev/null differ
diff --git a/graphics/sprites/equipment/head/sunshroomhat.xml b/graphics/sprites/equipment/head/sunshroomhat.xml
deleted file mode 100644
index b4e0cba2..00000000
--- a/graphics/sprites/equipment/head/sunshroomhat.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/graphics/sprites/equipment/head/warlordhelm-female.xml b/graphics/sprites/equipment/head/warlordhelm-female.xml
index 3f4b993e..89a106d7 100644
--- a/graphics/sprites/equipment/head/warlordhelm-female.xml
+++ b/graphics/sprites/equipment/head/warlordhelm-female.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/graphics/sprites/equipment/head/warlordhelm.xml b/graphics/sprites/equipment/head/warlordhelm.xml
index 730d300f..ddf44a0c 100644
--- a/graphics/sprites/equipment/head/warlordhelm.xml
+++ b/graphics/sprites/equipment/head/warlordhelm.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/graphics/sprites/equipment/head/wickedmushroomhat-female.xml b/graphics/sprites/equipment/head/wickedmushroomhat-female.xml
deleted file mode 100644
index 23c8df2e..00000000
--- a/graphics/sprites/equipment/head/wickedmushroomhat-female.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/graphics/sprites/equipment/head/wickedmushroomhat.png b/graphics/sprites/equipment/head/wickedmushroomhat.png
deleted file mode 100644
index f4aadeae1..00000000
Binary files a/graphics/sprites/equipment/head/wickedmushroomhat.png and /dev/null differ
diff --git a/graphics/sprites/equipment/head/wickedmushroomhat.xml b/graphics/sprites/equipment/head/wickedmushroomhat.xml
deleted file mode 100644
index 0c1d6679..00000000
--- a/graphics/sprites/equipment/head/wickedmushroomhat.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/graphics/sprites/equipment/head/yeti-mask.xml b/graphics/sprites/equipment/head/yeti-mask.xml
index f3e9b1de..401d4681 100644
--- a/graphics/sprites/equipment/head/yeti-mask.xml
+++ b/graphics/sprites/equipment/head/yeti-mask.xml
@@ -97,7 +97,7 @@
-
+
diff --git a/graphics/sprites/equipment/shields/knighthelm-dyable-female.xml b/graphics/sprites/equipment/shields/knighthelm-dyable-female.xml
deleted file mode 100644
index 57420a84..00000000
--- a/graphics/sprites/equipment/shields/knighthelm-dyable-female.xml
+++ /dev/null
@@ -1,229 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/equipment/shields/knighthelm-dyable.png b/graphics/sprites/equipment/shields/knighthelm-dyable.png
deleted file mode 100644
index 0f7b39ea..00000000
Binary files a/graphics/sprites/equipment/shields/knighthelm-dyable.png and /dev/null differ
diff --git a/graphics/sprites/equipment/shields/knighthelm-dyable.xml b/graphics/sprites/equipment/shields/knighthelm-dyable.xml
deleted file mode 100644
index 1f6312ab..00000000
--- a/graphics/sprites/equipment/shields/knighthelm-dyable.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/equipment/weapons/sword-beheader.png b/graphics/sprites/equipment/weapons/beheader.png
similarity index 100%
rename from graphics/sprites/equipment/weapons/sword-beheader.png
rename to graphics/sprites/equipment/weapons/beheader.png
diff --git a/graphics/sprites/equipment/weapons/sword-beheader.xml b/graphics/sprites/equipment/weapons/beheader.xml
similarity index 98%
rename from graphics/sprites/equipment/weapons/sword-beheader.xml
rename to graphics/sprites/equipment/weapons/beheader.xml
index ee887553..75fe84fd 100644
--- a/graphics/sprites/equipment/weapons/sword-beheader.xml
+++ b/graphics/sprites/equipment/weapons/beheader.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/graphics/sprites/equipment/weapons/dagger-setzer.png b/graphics/sprites/equipment/weapons/dagger-setzer.png
deleted file mode 100644
index 2e9120cc..00000000
Binary files a/graphics/sprites/equipment/weapons/dagger-setzer.png and /dev/null differ
diff --git a/graphics/sprites/equipment/weapons/dagger-setzer.xml b/graphics/sprites/equipment/weapons/dagger-setzer.xml
deleted file mode 100644
index 99da95d8..00000000
--- a/graphics/sprites/equipment/weapons/dagger-setzer.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/equipment/weapons/dragon-sword.png b/graphics/sprites/equipment/weapons/dragon-sword.png
new file mode 100644
index 00000000..91a27abd
Binary files /dev/null and b/graphics/sprites/equipment/weapons/dragon-sword.png differ
diff --git a/graphics/sprites/equipment/weapons/sword-dragon.xml b/graphics/sprites/equipment/weapons/dragon-sword.xml
similarity index 60%
rename from graphics/sprites/equipment/weapons/sword-dragon.xml
rename to graphics/sprites/equipment/weapons/dragon-sword.xml
index b46fda5c..1f980832 100644
--- a/graphics/sprites/equipment/weapons/sword-dragon.xml
+++ b/graphics/sprites/equipment/weapons/dragon-sword.xml
@@ -3,9 +3,9 @@
Copyright (C) 2020 Evol Online -->
-
+
diff --git a/graphics/sprites/equipment/weapons/flintlock.png b/graphics/sprites/equipment/weapons/gun.png
similarity index 100%
rename from graphics/sprites/equipment/weapons/flintlock.png
rename to graphics/sprites/equipment/weapons/gun.png
diff --git a/graphics/sprites/equipment/weapons/flintlock.xml b/graphics/sprites/equipment/weapons/gun.xml
similarity index 93%
rename from graphics/sprites/equipment/weapons/flintlock.xml
rename to graphics/sprites/equipment/weapons/gun.xml
index a1002741..e1417c18 100644
--- a/graphics/sprites/equipment/weapons/flintlock.xml
+++ b/graphics/sprites/equipment/weapons/gun.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/graphics/sprites/equipment/weapons/jackal.png b/graphics/sprites/equipment/weapons/jackal.png
new file mode 100644
index 00000000..ee74ee54
Binary files /dev/null and b/graphics/sprites/equipment/weapons/jackal.png differ
diff --git a/graphics/sprites/equipment/weapons/sword-jackal.xml b/graphics/sprites/equipment/weapons/jackal.xml
similarity index 96%
rename from graphics/sprites/equipment/weapons/sword-jackal.xml
rename to graphics/sprites/equipment/weapons/jackal.xml
index 60c6fdb4..d8cdf3f9 100644
--- a/graphics/sprites/equipment/weapons/sword-jackal.xml
+++ b/graphics/sprites/equipment/weapons/jackal.xml
@@ -1,7 +1,7 @@
-
+
@@ -69,19 +69,15 @@
-
-
-
-
diff --git a/graphics/sprites/equipment/weapons/sword-lider.png b/graphics/sprites/equipment/weapons/lidersword.png
similarity index 100%
rename from graphics/sprites/equipment/weapons/sword-lider.png
rename to graphics/sprites/equipment/weapons/lidersword.png
diff --git a/graphics/sprites/equipment/weapons/sword-lider.xml b/graphics/sprites/equipment/weapons/lidersword.xml
similarity index 96%
rename from graphics/sprites/equipment/weapons/sword-lider.xml
rename to graphics/sprites/equipment/weapons/lidersword.xml
index 528dcb9d..2002cf58 100644
--- a/graphics/sprites/equipment/weapons/sword-lider.xml
+++ b/graphics/sprites/equipment/weapons/lidersword.xml
@@ -1,6 +1,6 @@
-
+
@@ -34,23 +34,23 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/graphics/sprites/equipment/weapons/sword-sandcutter.png b/graphics/sprites/equipment/weapons/sandcutter.png
similarity index 100%
rename from graphics/sprites/equipment/weapons/sword-sandcutter.png
rename to graphics/sprites/equipment/weapons/sandcutter.png
diff --git a/graphics/sprites/equipment/weapons/sword-sandcutter.xml b/graphics/sprites/equipment/weapons/sandcutter.xml
similarity index 97%
rename from graphics/sprites/equipment/weapons/sword-sandcutter.xml
rename to graphics/sprites/equipment/weapons/sandcutter.xml
index d200855f..b61cebda 100644
--- a/graphics/sprites/equipment/weapons/sword-sandcutter.xml
+++ b/graphics/sprites/equipment/weapons/sandcutter.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/graphics/sprites/equipment/weapons/sword-dragon.png b/graphics/sprites/equipment/weapons/sword-dragon.png
deleted file mode 100644
index ccf40930..00000000
Binary files a/graphics/sprites/equipment/weapons/sword-dragon.png and /dev/null differ
diff --git a/graphics/sprites/equipment/weapons/sword-jackal.png b/graphics/sprites/equipment/weapons/sword-jackal.png
deleted file mode 100644
index 0d578e2b..00000000
Binary files a/graphics/sprites/equipment/weapons/sword-jackal.png and /dev/null differ
diff --git a/graphics/sprites/icons/cant-move.png b/graphics/sprites/icons/cant-move.png
deleted file mode 100644
index d749fc01..00000000
Binary files a/graphics/sprites/icons/cant-move.png and /dev/null differ
diff --git a/graphics/sprites/icons/cant-move.xml b/graphics/sprites/icons/cant-move.xml
deleted file mode 100644
index c74f82ed..00000000
--- a/graphics/sprites/icons/cant-move.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/icons/feather-outline.png b/graphics/sprites/icons/feather-outline.png
index a67dc40c..47eeb709 100644
Binary files a/graphics/sprites/icons/feather-outline.png and b/graphics/sprites/icons/feather-outline.png differ
diff --git a/graphics/sprites/icons/hidden-outline.png b/graphics/sprites/icons/hidden-outline.png
index 55ba2af2..f1011b7c 100644
Binary files a/graphics/sprites/icons/hidden-outline.png and b/graphics/sprites/icons/hidden-outline.png differ
diff --git a/graphics/sprites/icons/invisible-outline.png b/graphics/sprites/icons/invisible-outline.png
index b0f7e960..f40f4b2c 100644
Binary files a/graphics/sprites/icons/invisible-outline.png and b/graphics/sprites/icons/invisible-outline.png differ
diff --git a/graphics/sprites/icons/matk-potion.xml b/graphics/sprites/icons/matk-potion.xml
deleted file mode 100644
index ebab9e76..00000000
--- a/graphics/sprites/icons/matk-potion.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/icons/potion-g.png b/graphics/sprites/icons/potion-g.png
deleted file mode 100644
index 7d60ba81..00000000
Binary files a/graphics/sprites/icons/potion-g.png and /dev/null differ
diff --git a/graphics/sprites/icons/slow-move.png b/graphics/sprites/icons/slow-move.png
deleted file mode 100644
index fac2d8e2..00000000
Binary files a/graphics/sprites/icons/slow-move.png and /dev/null differ
diff --git a/graphics/sprites/icons/slow-move.xml b/graphics/sprites/icons/slow-move.xml
deleted file mode 100644
index d205e572..00000000
--- a/graphics/sprites/icons/slow-move.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/icons/spell-attack-generic-outline.png b/graphics/sprites/icons/spell-attack-generic-outline.png
index 2ba150ac..a6232f87 100644
Binary files a/graphics/sprites/icons/spell-attack-generic-outline.png and b/graphics/sprites/icons/spell-attack-generic-outline.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-ar-outline.png b/graphics/sprites/icons/spell-cooldown-ar-outline.png
index 4114d66c..5441acd9 100644
Binary files a/graphics/sprites/icons/spell-cooldown-ar-outline.png and b/graphics/sprites/icons/spell-cooldown-ar-outline.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-ar.png b/graphics/sprites/icons/spell-cooldown-ar.png
index 730ec630..04058e16 100644
Binary files a/graphics/sprites/icons/spell-cooldown-ar.png and b/graphics/sprites/icons/spell-cooldown-ar.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-cg.png b/graphics/sprites/icons/spell-cooldown-cg.png
deleted file mode 100644
index fe94dffa..00000000
Binary files a/graphics/sprites/icons/spell-cooldown-cg.png and /dev/null differ
diff --git a/graphics/sprites/icons/spell-cooldown-cg.xml b/graphics/sprites/icons/spell-cooldown-cg.xml
deleted file mode 100644
index 3d5a827b..00000000
--- a/graphics/sprites/icons/spell-cooldown-cg.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/icons/spell-cooldown-ench.png b/graphics/sprites/icons/spell-cooldown-ench.png
index da364c59..5950f38d 100644
Binary files a/graphics/sprites/icons/spell-cooldown-ench.png and b/graphics/sprites/icons/spell-cooldown-ench.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-koy.png b/graphics/sprites/icons/spell-cooldown-koy.png
index cde985e6..8efece99 100644
Binary files a/graphics/sprites/icons/spell-cooldown-koy.png and b/graphics/sprites/icons/spell-cooldown-koy.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-mg.png b/graphics/sprites/icons/spell-cooldown-mg.png
index 7777ac77..31e46a53 100644
Binary files a/graphics/sprites/icons/spell-cooldown-mg.png and b/graphics/sprites/icons/spell-cooldown-mg.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-mt.png b/graphics/sprites/icons/spell-cooldown-mt.png
index 215de45a..84fe8322 100644
Binary files a/graphics/sprites/icons/spell-cooldown-mt.png and b/graphics/sprites/icons/spell-cooldown-mt.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-outline.png b/graphics/sprites/icons/spell-cooldown-outline.png
index 3b794b56..bc16cb7b 100644
Binary files a/graphics/sprites/icons/spell-cooldown-outline.png and b/graphics/sprites/icons/spell-cooldown-outline.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-r-outline.png b/graphics/sprites/icons/spell-cooldown-r-outline.png
index 22d3cf1e..af56eda5 100644
Binary files a/graphics/sprites/icons/spell-cooldown-r-outline.png and b/graphics/sprites/icons/spell-cooldown-r-outline.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-r.png b/graphics/sprites/icons/spell-cooldown-r.png
index d09821d2..67555ebf 100644
Binary files a/graphics/sprites/icons/spell-cooldown-r.png and b/graphics/sprites/icons/spell-cooldown-r.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-sg.png b/graphics/sprites/icons/spell-cooldown-sg.png
deleted file mode 100644
index 02f42d61..00000000
Binary files a/graphics/sprites/icons/spell-cooldown-sg.png and /dev/null differ
diff --git a/graphics/sprites/icons/spell-cooldown-sg.xml b/graphics/sprites/icons/spell-cooldown-sg.xml
deleted file mode 100644
index 8f1737c9..00000000
--- a/graphics/sprites/icons/spell-cooldown-sg.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/icons/spell-cooldown-upmarmu.png b/graphics/sprites/icons/spell-cooldown-upmarmu.png
deleted file mode 100644
index 8b87f1b8..00000000
Binary files a/graphics/sprites/icons/spell-cooldown-upmarmu.png and /dev/null differ
diff --git a/graphics/sprites/icons/spell-cooldown-upmarmu.xml b/graphics/sprites/icons/spell-cooldown-upmarmu.xml
deleted file mode 100644
index a294ef98..00000000
--- a/graphics/sprites/icons/spell-cooldown-upmarmu.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/icons/spell-cooldown.png b/graphics/sprites/icons/spell-cooldown.png
index 3deda6d8..c34d1669 100644
Binary files a/graphics/sprites/icons/spell-cooldown.png and b/graphics/sprites/icons/spell-cooldown.png differ
diff --git a/graphics/sprites/monsters/accessories/ratto-tail.png b/graphics/sprites/monsters/accessories/ratto-tail.png
deleted file mode 100644
index 331e0f5e..00000000
Binary files a/graphics/sprites/monsters/accessories/ratto-tail.png and /dev/null differ
diff --git a/graphics/sprites/monsters/accessories/ratto-tail.xml b/graphics/sprites/monsters/accessories/ratto-tail.xml
deleted file mode 100644
index 31859b91..00000000
--- a/graphics/sprites/monsters/accessories/ratto-tail.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/accessories/slime-super-crown.png b/graphics/sprites/monsters/accessories/slime-super-crown.png
deleted file mode 100644
index 4214ade0..00000000
Binary files a/graphics/sprites/monsters/accessories/slime-super-crown.png and /dev/null differ
diff --git a/graphics/sprites/monsters/accessories/slime-super-crown.xml b/graphics/sprites/monsters/accessories/slime-super-crown.xml
deleted file mode 100644
index 4fe93ed0..00000000
--- a/graphics/sprites/monsters/accessories/slime-super-crown.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/beehive.png b/graphics/sprites/monsters/beehive.png
deleted file mode 100644
index c906b7a6..00000000
Binary files a/graphics/sprites/monsters/beehive.png and /dev/null differ
diff --git a/graphics/sprites/monsters/beehive.xml b/graphics/sprites/monsters/beehive.xml
deleted file mode 100644
index d234b2cc..00000000
--- a/graphics/sprites/monsters/beehive.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/bigbif.png b/graphics/sprites/monsters/bigbif.png
deleted file mode 100644
index 8a7551b1..00000000
Binary files a/graphics/sprites/monsters/bigbif.png and /dev/null differ
diff --git a/graphics/sprites/monsters/bigbif.xml b/graphics/sprites/monsters/bigbif.xml
deleted file mode 100644
index 6bb7c548..00000000
--- a/graphics/sprites/monsters/bigbif.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/bobone.png b/graphics/sprites/monsters/bobone.png
deleted file mode 100644
index aba90f13..00000000
Binary files a/graphics/sprites/monsters/bobone.png and /dev/null differ
diff --git a/graphics/sprites/monsters/bobone.xml b/graphics/sprites/monsters/bobone.xml
deleted file mode 100644
index 4eb13698..00000000
--- a/graphics/sprites/monsters/bobone.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/brainblow.png b/graphics/sprites/monsters/brainblow.png
deleted file mode 100644
index 6771f73f..00000000
Binary files a/graphics/sprites/monsters/brainblow.png and /dev/null differ
diff --git a/graphics/sprites/monsters/brainblow.xml b/graphics/sprites/monsters/brainblow.xml
deleted file mode 100644
index d11cdeb8..00000000
--- a/graphics/sprites/monsters/brainblow.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/croc.png b/graphics/sprites/monsters/croc.png
deleted file mode 100644
index aa81a7aa..00000000
Binary files a/graphics/sprites/monsters/croc.png and /dev/null differ
diff --git a/graphics/sprites/monsters/croc.xml b/graphics/sprites/monsters/croc.xml
deleted file mode 100644
index 292fa837..00000000
--- a/graphics/sprites/monsters/croc.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/darkduck.png b/graphics/sprites/monsters/darkduck.png
deleted file mode 100644
index 38881433..00000000
Binary files a/graphics/sprites/monsters/darkduck.png and /dev/null differ
diff --git a/graphics/sprites/monsters/darkduck.xml b/graphics/sprites/monsters/darkduck.xml
deleted file mode 100644
index 1d378113..00000000
--- a/graphics/sprites/monsters/darkduck.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/floyd.png b/graphics/sprites/monsters/floyd.png
index 225b50e4..9e8b787c 100644
Binary files a/graphics/sprites/monsters/floyd.png and b/graphics/sprites/monsters/floyd.png differ
diff --git a/graphics/sprites/monsters/frog-big.png b/graphics/sprites/monsters/frog-big.png
deleted file mode 100644
index f98d3aef..00000000
Binary files a/graphics/sprites/monsters/frog-big.png and /dev/null differ
diff --git a/graphics/sprites/monsters/frog-big.xml b/graphics/sprites/monsters/frog-big.xml
deleted file mode 100644
index 0455f4bb..00000000
--- a/graphics/sprites/monsters/frog-big.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/frog-small.png b/graphics/sprites/monsters/frog-small.png
deleted file mode 100644
index dc8f6fb4..00000000
Binary files a/graphics/sprites/monsters/frog-small.png and /dev/null differ
diff --git a/graphics/sprites/monsters/frog-small.xml b/graphics/sprites/monsters/frog-small.xml
deleted file mode 100644
index ca06f34c..00000000
--- a/graphics/sprites/monsters/frog-small.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/golem-blackcrystal.png b/graphics/sprites/monsters/golem-blackcrystal.png
index dd51c46e..be28544e 100644
Binary files a/graphics/sprites/monsters/golem-blackcrystal.png and b/graphics/sprites/monsters/golem-blackcrystal.png differ
diff --git a/graphics/sprites/monsters/golem-crystal.png b/graphics/sprites/monsters/golem-crystal.png
index c4aebd1e..c564f850 100644
Binary files a/graphics/sprites/monsters/golem-crystal.png and b/graphics/sprites/monsters/golem-crystal.png differ
diff --git a/graphics/sprites/monsters/golem-dyable.png b/graphics/sprites/monsters/golem-dyable.png
deleted file mode 100644
index 204ddef1..00000000
Binary files a/graphics/sprites/monsters/golem-dyable.png and /dev/null differ
diff --git a/graphics/sprites/monsters/golem-dyable.xml b/graphics/sprites/monsters/golem-dyable.xml
deleted file mode 100644
index f693d78e..00000000
--- a/graphics/sprites/monsters/golem-dyable.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/graphics/sprites/monsters/grass.png b/graphics/sprites/monsters/grass.png
deleted file mode 100644
index b26a6a3b..00000000
Binary files a/graphics/sprites/monsters/grass.png and /dev/null differ
diff --git a/graphics/sprites/monsters/grass.xml b/graphics/sprites/monsters/grass.xml
deleted file mode 100644
index d269f33a..00000000
--- a/graphics/sprites/monsters/grass.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/junglefowl.png b/graphics/sprites/monsters/junglefowl.png
deleted file mode 100644
index 15eebc56..00000000
Binary files a/graphics/sprites/monsters/junglefowl.png and /dev/null differ
diff --git a/graphics/sprites/monsters/junglefowl.xml b/graphics/sprites/monsters/junglefowl.xml
deleted file mode 100644
index fb3fc81b..00000000
--- a/graphics/sprites/monsters/junglefowl.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/mana-bug.png b/graphics/sprites/monsters/mana-bug.png
index ea7f1803..2843a562 100644
Binary files a/graphics/sprites/monsters/mana-bug.png and b/graphics/sprites/monsters/mana-bug.png differ
diff --git a/graphics/sprites/monsters/mananatree.png b/graphics/sprites/monsters/mananatree.png
deleted file mode 100644
index b2b5e143..00000000
Binary files a/graphics/sprites/monsters/mananatree.png and /dev/null differ
diff --git a/graphics/sprites/monsters/mananatree.xml b/graphics/sprites/monsters/mananatree.xml
deleted file mode 100644
index 477eb614..00000000
--- a/graphics/sprites/monsters/mananatree.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/mega-mana-bug.png b/graphics/sprites/monsters/mega-mana-bug.png
deleted file mode 100644
index f468bba4..00000000
Binary files a/graphics/sprites/monsters/mega-mana-bug.png and /dev/null differ
diff --git a/graphics/sprites/monsters/mega-mana-bug.xml b/graphics/sprites/monsters/mega-mana-bug.xml
deleted file mode 100644
index 4f563778..00000000
--- a/graphics/sprites/monsters/mega-mana-bug.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/mister-prickel.png b/graphics/sprites/monsters/mister-prickel.png
deleted file mode 100644
index 1b5e40e1..00000000
Binary files a/graphics/sprites/monsters/mister-prickel.png and /dev/null differ
diff --git a/graphics/sprites/monsters/mister-prickel.xml b/graphics/sprites/monsters/mister-prickel.xml
deleted file mode 100644
index c8276010..00000000
--- a/graphics/sprites/monsters/mister-prickel.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/montblanc.png b/graphics/sprites/monsters/montblanc.png
deleted file mode 100644
index cb3d61bf..00000000
Binary files a/graphics/sprites/monsters/montblanc.png and /dev/null differ
diff --git a/graphics/sprites/monsters/montblanc.xml b/graphics/sprites/monsters/montblanc.xml
deleted file mode 100644
index bdcc615a..00000000
--- a/graphics/sprites/monsters/montblanc.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/mushroom-moon.png b/graphics/sprites/monsters/moonshroom.png
similarity index 100%
rename from graphics/sprites/monsters/mushroom-moon.png
rename to graphics/sprites/monsters/moonshroom.png
diff --git a/graphics/sprites/monsters/mushroom-sun.xml b/graphics/sprites/monsters/moonshroom.xml
similarity index 95%
rename from graphics/sprites/monsters/mushroom-sun.xml
rename to graphics/sprites/monsters/moonshroom.xml
index ca7c0614..be815e17 100644
--- a/graphics/sprites/monsters/mushroom-sun.xml
+++ b/graphics/sprites/monsters/moonshroom.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/graphics/sprites/monsters/moubootaur.png b/graphics/sprites/monsters/moubootaur.png
deleted file mode 100644
index b901e7e1..00000000
Binary files a/graphics/sprites/monsters/moubootaur.png and /dev/null differ
diff --git a/graphics/sprites/monsters/moubootaur.xml b/graphics/sprites/monsters/moubootaur.xml
deleted file mode 100644
index ba8c5b8f..00000000
--- a/graphics/sprites/monsters/moubootaur.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/mushroom-moon.xml b/graphics/sprites/monsters/mushroom-moon.xml
deleted file mode 100644
index 894e34e3..00000000
--- a/graphics/sprites/monsters/mushroom-moon.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/mushroom-rain.png b/graphics/sprites/monsters/mushroom-rain.png
deleted file mode 100644
index d3f41eb5..00000000
Binary files a/graphics/sprites/monsters/mushroom-rain.png and /dev/null differ
diff --git a/graphics/sprites/monsters/mushroom-rain.xml b/graphics/sprites/monsters/mushroom-rain.xml
deleted file mode 100644
index edf23fa4..00000000
--- a/graphics/sprites/monsters/mushroom-rain.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/mushroom-snow.png b/graphics/sprites/monsters/mushroom-snow.png
deleted file mode 100644
index 39d21a3c..00000000
Binary files a/graphics/sprites/monsters/mushroom-snow.png and /dev/null differ
diff --git a/graphics/sprites/monsters/mushroom-snow.xml b/graphics/sprites/monsters/mushroom-snow.xml
deleted file mode 100644
index adf54e21..00000000
--- a/graphics/sprites/monsters/mushroom-snow.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/mushroom-sun.png b/graphics/sprites/monsters/mushroom-sun.png
deleted file mode 100644
index b4c23785..00000000
Binary files a/graphics/sprites/monsters/mushroom-sun.png and /dev/null differ
diff --git a/graphics/sprites/monsters/pet-cat.png b/graphics/sprites/monsters/pet-cat.png
deleted file mode 100644
index 8c366c6e..00000000
Binary files a/graphics/sprites/monsters/pet-cat.png and /dev/null differ
diff --git a/graphics/sprites/monsters/piou-king.png b/graphics/sprites/monsters/piou-king.png
deleted file mode 100644
index 47f2cc2c..00000000
Binary files a/graphics/sprites/monsters/piou-king.png and /dev/null differ
diff --git a/graphics/sprites/monsters/piou-king.xml b/graphics/sprites/monsters/piou-king.xml
deleted file mode 100644
index 23750d05..00000000
--- a/graphics/sprites/monsters/piou-king.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/ratto.png b/graphics/sprites/monsters/ratto.png
deleted file mode 100644
index fb5bded3..00000000
Binary files a/graphics/sprites/monsters/ratto.png and /dev/null differ
diff --git a/graphics/sprites/monsters/ratto.xml b/graphics/sprites/monsters/ratto.xml
deleted file mode 100644
index 1ee5116c..00000000
--- a/graphics/sprites/monsters/ratto.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/rot.png b/graphics/sprites/monsters/rot.png
deleted file mode 100644
index a10c0f46..00000000
Binary files a/graphics/sprites/monsters/rot.png and /dev/null differ
diff --git a/graphics/sprites/monsters/rot.xml b/graphics/sprites/monsters/rot.xml
deleted file mode 100644
index fadc8711..00000000
--- a/graphics/sprites/monsters/rot.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/rotter.png b/graphics/sprites/monsters/rotter.png
deleted file mode 100644
index 2acadd2f..00000000
Binary files a/graphics/sprites/monsters/rotter.png and /dev/null differ
diff --git a/graphics/sprites/monsters/rotter.xml b/graphics/sprites/monsters/rotter.xml
deleted file mode 100644
index c9eb1cce..00000000
--- a/graphics/sprites/monsters/rotter.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/skull-golden.png b/graphics/sprites/monsters/skull-golden.png
deleted file mode 100644
index 53a71314..00000000
Binary files a/graphics/sprites/monsters/skull-golden.png and /dev/null differ
diff --git a/graphics/sprites/monsters/skull-golden.xml b/graphics/sprites/monsters/skull-golden.xml
deleted file mode 100644
index b3976a01..00000000
--- a/graphics/sprites/monsters/skull-golden.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/skull-warlord.png b/graphics/sprites/monsters/skull-warlord.png
deleted file mode 100644
index c5f7c739..00000000
Binary files a/graphics/sprites/monsters/skull-warlord.png and /dev/null differ
diff --git a/graphics/sprites/monsters/skull-warlord.xml b/graphics/sprites/monsters/skull-warlord.xml
deleted file mode 100644
index 381d6211..00000000
--- a/graphics/sprites/monsters/skull-warlord.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/slime-super.png b/graphics/sprites/monsters/slime-super.png
deleted file mode 100644
index c88febbb..00000000
Binary files a/graphics/sprites/monsters/slime-super.png and /dev/null differ
diff --git a/graphics/sprites/monsters/slime-super.xml b/graphics/sprites/monsters/slime-super.xml
deleted file mode 100644
index 0cd70240..00000000
--- a/graphics/sprites/monsters/slime-super.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/smallbif.png b/graphics/sprites/monsters/smallbif.png
deleted file mode 100644
index 0840c66a..00000000
Binary files a/graphics/sprites/monsters/smallbif.png and /dev/null differ
diff --git a/graphics/sprites/monsters/smallbif.xml b/graphics/sprites/monsters/smallbif.xml
deleted file mode 100644
index 26225567..00000000
--- a/graphics/sprites/monsters/smallbif.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/spelt.png b/graphics/sprites/monsters/spelt.png
deleted file mode 100644
index 68ec2375..00000000
Binary files a/graphics/sprites/monsters/spelt.png and /dev/null differ
diff --git a/graphics/sprites/monsters/spelt.xml b/graphics/sprites/monsters/spelt.xml
deleted file mode 100644
index 9817f6ba..00000000
--- a/graphics/sprites/monsters/spelt.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/spider-queen-crystal.png b/graphics/sprites/monsters/spider-queen-crystal.png
deleted file mode 100644
index 66a16aa2..00000000
Binary files a/graphics/sprites/monsters/spider-queen-crystal.png and /dev/null differ
diff --git a/graphics/sprites/monsters/spider-queen-crystal.xml b/graphics/sprites/monsters/spider-queen-crystal.xml
deleted file mode 100644
index 827525dd..00000000
--- a/graphics/sprites/monsters/spider-queen-crystal.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/graphics/sprites/monsters/spider-queen.png b/graphics/sprites/monsters/spider-queen.png
deleted file mode 100644
index 7a2f6606..00000000
Binary files a/graphics/sprites/monsters/spider-queen.png and /dev/null differ
diff --git a/graphics/sprites/monsters/spider-queen.xml b/graphics/sprites/monsters/spider-queen.xml
deleted file mode 100644
index 02118fbd..00000000
--- a/graphics/sprites/monsters/spider-queen.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/tengu.xml b/graphics/sprites/monsters/tengu.xml
index fb7afd4e..651c684a 100644
--- a/graphics/sprites/monsters/tengu.xml
+++ b/graphics/sprites/monsters/tengu.xml
@@ -39,24 +39,31 @@
+
+
+
+
+
+
+
diff --git a/graphics/sprites/monsters/tortuga.png b/graphics/sprites/monsters/tortuga.png
deleted file mode 100644
index 570a0615..00000000
Binary files a/graphics/sprites/monsters/tortuga.png and /dev/null differ
diff --git a/graphics/sprites/monsters/tortuga.xml b/graphics/sprites/monsters/tortuga.xml
deleted file mode 100644
index 8da52685..00000000
--- a/graphics/sprites/monsters/tortuga.xml
+++ /dev/null
@@ -1,310 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/wonderwoodling.png b/graphics/sprites/monsters/wonderwoodling.png
deleted file mode 100644
index 07287e54..00000000
Binary files a/graphics/sprites/monsters/wonderwoodling.png and /dev/null differ
diff --git a/graphics/sprites/monsters/wonderwoodling.xml b/graphics/sprites/monsters/wonderwoodling.xml
deleted file mode 100644
index c6aba01a..00000000
--- a/graphics/sprites/monsters/wonderwoodling.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/blanc.png b/graphics/sprites/npcs/blanc.png
deleted file mode 100644
index 0b933f7a..00000000
Binary files a/graphics/sprites/npcs/blanc.png and /dev/null differ
diff --git a/graphics/sprites/npcs/blanc.xml b/graphics/sprites/npcs/blanc.xml
deleted file mode 100644
index 34080d47..00000000
--- a/graphics/sprites/npcs/blanc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/dig-01-flow.png b/graphics/sprites/npcs/dig-01-flow.png
deleted file mode 100644
index 86a98257..00000000
Binary files a/graphics/sprites/npcs/dig-01-flow.png and /dev/null differ
diff --git a/graphics/sprites/npcs/dig-01-flow.xml b/graphics/sprites/npcs/dig-01-flow.xml
deleted file mode 100644
index afad3d7c..00000000
--- a/graphics/sprites/npcs/dig-01-flow.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/dig-01-glow.png b/graphics/sprites/npcs/dig-01-glow.png
deleted file mode 100644
index 258ff235..00000000
Binary files a/graphics/sprites/npcs/dig-01-glow.png and /dev/null differ
diff --git a/graphics/sprites/npcs/dig-01-glow.xml b/graphics/sprites/npcs/dig-01-glow.xml
deleted file mode 100644
index 95ba2732..00000000
--- a/graphics/sprites/npcs/dig-01-glow.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/dig-01.png b/graphics/sprites/npcs/dig-01.png
deleted file mode 100644
index 4a02278a..00000000
Binary files a/graphics/sprites/npcs/dig-01.png and /dev/null differ
diff --git a/graphics/sprites/npcs/dig-01.xml b/graphics/sprites/npcs/dig-01.xml
deleted file mode 100644
index a123317d..00000000
--- a/graphics/sprites/npcs/dig-01.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/dig-02-flow.png b/graphics/sprites/npcs/dig-02-flow.png
deleted file mode 100644
index d191607a..00000000
Binary files a/graphics/sprites/npcs/dig-02-flow.png and /dev/null differ
diff --git a/graphics/sprites/npcs/dig-02-flow.xml b/graphics/sprites/npcs/dig-02-flow.xml
deleted file mode 100644
index 5a566bb8..00000000
--- a/graphics/sprites/npcs/dig-02-flow.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/dig-02-glow.png b/graphics/sprites/npcs/dig-02-glow.png
deleted file mode 100644
index 29bb45ab..00000000
Binary files a/graphics/sprites/npcs/dig-02-glow.png and /dev/null differ
diff --git a/graphics/sprites/npcs/dig-02-glow.xml b/graphics/sprites/npcs/dig-02-glow.xml
deleted file mode 100644
index b98e3854..00000000
--- a/graphics/sprites/npcs/dig-02-glow.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/dig-02.png b/graphics/sprites/npcs/dig-02.png
deleted file mode 100644
index 6d4523b2..00000000
Binary files a/graphics/sprites/npcs/dig-02.png and /dev/null differ
diff --git a/graphics/sprites/npcs/dig-02.xml b/graphics/sprites/npcs/dig-02.xml
deleted file mode 100644
index 08a2187c..00000000
--- a/graphics/sprites/npcs/dig-02.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/dig-03-flow.xml b/graphics/sprites/npcs/dig-03-flow.xml
deleted file mode 100644
index 4ad3945f..00000000
--- a/graphics/sprites/npcs/dig-03-flow.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/dig-03-glow.png b/graphics/sprites/npcs/dig-03-glow.png
deleted file mode 100644
index 9a33c372..00000000
Binary files a/graphics/sprites/npcs/dig-03-glow.png and /dev/null differ
diff --git a/graphics/sprites/npcs/dig-03-glow.xml b/graphics/sprites/npcs/dig-03-glow.xml
deleted file mode 100644
index 8e0c43ef..00000000
--- a/graphics/sprites/npcs/dig-03-glow.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/dig-03.png b/graphics/sprites/npcs/dig-03.png
deleted file mode 100644
index be73d1af..00000000
Binary files a/graphics/sprites/npcs/dig-03.png and /dev/null differ
diff --git a/graphics/sprites/npcs/dig-03.xml b/graphics/sprites/npcs/dig-03.xml
deleted file mode 100644
index c5f631e2..00000000
--- a/graphics/sprites/npcs/dig-03.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/dig-04-flow.png b/graphics/sprites/npcs/dig-04-flow.png
deleted file mode 100644
index fdcd9ef6..00000000
Binary files a/graphics/sprites/npcs/dig-04-flow.png and /dev/null differ
diff --git a/graphics/sprites/npcs/dig-04-flow.xml b/graphics/sprites/npcs/dig-04-flow.xml
deleted file mode 100644
index 3dbd7ce5..00000000
--- a/graphics/sprites/npcs/dig-04-flow.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/dig-04-glow.png b/graphics/sprites/npcs/dig-04-glow.png
deleted file mode 100644
index 172274fe..00000000
Binary files a/graphics/sprites/npcs/dig-04-glow.png and /dev/null differ
diff --git a/graphics/sprites/npcs/dig-04-glow.xml b/graphics/sprites/npcs/dig-04-glow.xml
deleted file mode 100644
index fb274ab5..00000000
--- a/graphics/sprites/npcs/dig-04-glow.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/dig-04.png b/graphics/sprites/npcs/dig-04.png
deleted file mode 100644
index 42d9ea10..00000000
Binary files a/graphics/sprites/npcs/dig-04.png and /dev/null differ
diff --git a/graphics/sprites/npcs/dig-04.xml b/graphics/sprites/npcs/dig-04.xml
deleted file mode 100644
index fe55de89..00000000
--- a/graphics/sprites/npcs/dig-04.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/portal_32x64-01.png b/graphics/sprites/npcs/portal_32x64-01.png
deleted file mode 100644
index e15b6dd9..00000000
Binary files a/graphics/sprites/npcs/portal_32x64-01.png and /dev/null differ
diff --git a/graphics/sprites/npcs/portal_32x64-01.xml b/graphics/sprites/npcs/portal_32x64-01.xml
deleted file mode 100644
index e56b3106..00000000
--- a/graphics/sprites/npcs/portal_32x64-01.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/npcs/teapot.png b/graphics/sprites/npcs/teapot.png
deleted file mode 100644
index a1d0f0a5..00000000
Binary files a/graphics/sprites/npcs/teapot.png and /dev/null differ
diff --git a/graphics/sprites/npcs/teapot.xml b/graphics/sprites/npcs/teapot.xml
deleted file mode 100644
index e640447f..00000000
--- a/graphics/sprites/npcs/teapot.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/graphics/tiles/aethyra/snow.png b/graphics/tiles/aethyra/snow.png
deleted file mode 100644
index a7545c94..00000000
Binary files a/graphics/tiles/aethyra/snow.png and /dev/null differ
diff --git a/graphics/tiles/aethyra/snow_building.png b/graphics/tiles/aethyra/snow_building.png
deleted file mode 100644
index 3e55b251..00000000
Binary files a/graphics/tiles/aethyra/snow_building.png and /dev/null differ
diff --git a/graphics/tiles/aethyra/snow_roof.png b/graphics/tiles/aethyra/snow_roof.png
deleted file mode 100644
index efc797fc..00000000
Binary files a/graphics/tiles/aethyra/snow_roof.png and /dev/null differ
diff --git a/graphics/tiles/aethyra/snow_water.png b/graphics/tiles/aethyra/snow_water.png
deleted file mode 100644
index 5a98f542..00000000
Binary files a/graphics/tiles/aethyra/snow_water.png and /dev/null differ
diff --git a/graphics/tiles/aethyra/snowset.png b/graphics/tiles/aethyra/snowset.png
deleted file mode 100644
index b866952c..00000000
Binary files a/graphics/tiles/aethyra/snowset.png and /dev/null differ
diff --git a/graphics/tiles/blanc.png b/graphics/tiles/blanc.png
deleted file mode 100644
index 1d294db4..00000000
Binary files a/graphics/tiles/blanc.png and /dev/null differ
diff --git a/graphics/tiles/br/christmastree.png b/graphics/tiles/br/christmastree.png
deleted file mode 100644
index ec323633..00000000
Binary files a/graphics/tiles/br/christmastree.png and /dev/null differ
diff --git a/graphics/tiles/br/snow_x3.png b/graphics/tiles/br/snow_x3.png
deleted file mode 100644
index dc5cbfc8..00000000
Binary files a/graphics/tiles/br/snow_x3.png and /dev/null differ
diff --git a/graphics/tiles/castle2.png b/graphics/tiles/castle2.png
index 81c7800d..c71ba0ee 100644
Binary files a/graphics/tiles/castle2.png and b/graphics/tiles/castle2.png differ
diff --git a/graphics/tiles/christmas.png b/graphics/tiles/christmas.png
deleted file mode 100644
index 744ee26c..00000000
Binary files a/graphics/tiles/christmas.png and /dev/null differ
diff --git a/graphics/tiles/crypt1.png b/graphics/tiles/crypt1.png
index 7e52973a..6f94f827 100644
Binary files a/graphics/tiles/crypt1.png and b/graphics/tiles/crypt1.png differ
diff --git a/graphics/tiles/edges_black_rotated.png b/graphics/tiles/edges_black_rotated.png
deleted file mode 100644
index 31015305..00000000
Binary files a/graphics/tiles/edges_black_rotated.png and /dev/null differ
diff --git a/graphics/tiles/edges_ice_rotated.png b/graphics/tiles/edges_ice_rotated.png
deleted file mode 100644
index 191b4aa8..00000000
Binary files a/graphics/tiles/edges_ice_rotated.png and /dev/null differ
diff --git a/graphics/tiles/lof/warp_gates.png b/graphics/tiles/lof/warp_gates.png
deleted file mode 100644
index cceec189..00000000
Binary files a/graphics/tiles/lof/warp_gates.png and /dev/null differ
diff --git a/graphics/tiles/lof/woodland_indoor.png b/graphics/tiles/lof/woodland_indoor.png
deleted file mode 100644
index 0038de1a..00000000
Binary files a/graphics/tiles/lof/woodland_indoor.png and /dev/null differ
diff --git a/graphics/tiles/lof/woodland_indoor_extra.png b/graphics/tiles/lof/woodland_indoor_extra.png
deleted file mode 100644
index 3eca9142..00000000
Binary files a/graphics/tiles/lof/woodland_indoor_extra.png and /dev/null differ
diff --git a/graphics/tiles/ml/cabana_in_fada.png b/graphics/tiles/ml/cabana_in_fada.png
deleted file mode 100644
index 90509c45..00000000
Binary files a/graphics/tiles/ml/cabana_in_fada.png and /dev/null differ
diff --git a/graphics/tiles/mushrooms_x2.png b/graphics/tiles/mushrooms_x2.png
index 1f6550eb..5ea36de5 100644
Binary files a/graphics/tiles/mushrooms_x2.png and b/graphics/tiles/mushrooms_x2.png differ
diff --git a/graphics/tiles/mushrooms_x3.png b/graphics/tiles/mushrooms_x3.png
index 051cdeeb..c6ed64bc 100644
Binary files a/graphics/tiles/mushrooms_x3.png and b/graphics/tiles/mushrooms_x3.png differ
diff --git a/graphics/tiles/set_cave.png b/graphics/tiles/set_cave.png
deleted file mode 100644
index aa6e1bfb..00000000
Binary files a/graphics/tiles/set_cave.png and /dev/null differ
diff --git a/graphics/tiles/set_desert.png b/graphics/tiles/set_desert.png
deleted file mode 100644
index 77a41eb9..00000000
Binary files a/graphics/tiles/set_desert.png and /dev/null differ
diff --git a/graphics/tiles/set_icecave.png b/graphics/tiles/set_icecave.png
deleted file mode 100644
index 8a1319b9..00000000
Binary files a/graphics/tiles/set_icecave.png and /dev/null differ
diff --git a/graphics/tiles/set_icemountain.png b/graphics/tiles/set_icemountain.png
deleted file mode 100644
index 3dab22e9..00000000
Binary files a/graphics/tiles/set_icemountain.png and /dev/null differ
diff --git a/graphics/tiles/set_rules.png b/graphics/tiles/set_rules.png
deleted file mode 100644
index bf7f93c7..00000000
Binary files a/graphics/tiles/set_rules.png and /dev/null differ
diff --git a/graphics/tiles/set_thermin_cave.png b/graphics/tiles/set_thermin_cave.png
deleted file mode 100644
index 05b23249..00000000
Binary files a/graphics/tiles/set_thermin_cave.png and /dev/null differ
diff --git a/graphics/tiles/set_woodland.png b/graphics/tiles/set_woodland.png
deleted file mode 100644
index 9661f074..00000000
Binary files a/graphics/tiles/set_woodland.png and /dev/null differ
diff --git a/graphics/tiles/signs_wooden_round_numbered.png b/graphics/tiles/signs_wooden_round_numbered.png
deleted file mode 100644
index 760e9280..00000000
Binary files a/graphics/tiles/signs_wooden_round_numbered.png and /dev/null differ
diff --git a/graphics/tiles/snow_village2.png b/graphics/tiles/snow_village2.png
index bc93774b..118c8086 100644
Binary files a/graphics/tiles/snow_village2.png and b/graphics/tiles/snow_village2.png differ
diff --git a/graphics/tiles/snow_village_x3.png b/graphics/tiles/snow_village_x3.png
index 5403969e..8f2de99d 100644
Binary files a/graphics/tiles/snow_village_x3.png and b/graphics/tiles/snow_village_x3.png differ
diff --git a/graphics/tiles/woodland_ground2.png b/graphics/tiles/woodland_ground2.png
index 0673ddf9..66a40507 100644
Binary files a/graphics/tiles/woodland_ground2.png and b/graphics/tiles/woodland_ground2.png differ
diff --git a/graphics/tiles/woodland_inn_1.png b/graphics/tiles/woodland_inn_1.png
index 7277c5e7..7c3e01d9 100644
Binary files a/graphics/tiles/woodland_inn_1.png and b/graphics/tiles/woodland_inn_1.png differ
diff --git a/graphics/tiles/woodland_inn_2.png b/graphics/tiles/woodland_inn_2.png
index b136a0cb..f1669dc9 100644
Binary files a/graphics/tiles/woodland_inn_2.png and b/graphics/tiles/woodland_inn_2.png differ
diff --git a/graphics/tiles/woodland_inn_x2.png b/graphics/tiles/woodland_inn_x2.png
index 664f3295..b7792e6c 100644
Binary files a/graphics/tiles/woodland_inn_x2.png and b/graphics/tiles/woodland_inn_x2.png differ
diff --git a/graphics/tiles/woodland_inn_x3.png b/graphics/tiles/woodland_inn_x3.png
index 1983d0ec..a6c54641 100644
Binary files a/graphics/tiles/woodland_inn_x3.png and b/graphics/tiles/woodland_inn_x3.png differ
diff --git a/graphics/tiles/woodland_inn_x4.png b/graphics/tiles/woodland_inn_x4.png
index 57002386..ab42f34f 100644
Binary files a/graphics/tiles/woodland_inn_x4.png and b/graphics/tiles/woodland_inn_x4.png differ
diff --git a/itemfields.xml b/itemfields.xml
index 33d0b3d2..1eb69361 100644
--- a/itemfields.xml
+++ b/itemfields.xml
@@ -34,9 +34,7 @@ Copyright (C) 2016 Evol Online -->
-
-
diff --git a/items.xml b/items.xml
index e6be37cc..1c82c815 100644
--- a/items.xml
+++ b/items.xml
@@ -14,8 +14,213 @@
-
+ -
+ equipment/weapons/jackal.xml
+ weapons/other/halberd/halberd-hit1.ogg
+ weapons/other/halberd/halberd-hit2.ogg
+ weapons/other/halberd/halberd-hit3.ogg
+ weapons/swords/sword-miss1.ogg
+
+ -
+ equipment/weapons/dragon-sword.xml
+ weapons/other/halberd/halberd-hit1.ogg
+ weapons/other/halberd/halberd-hit2.ogg
+ weapons/other/halberd/halberd-hit3.ogg
+ weapons/swords/sword-miss1.ogg
+
+ -
+ equipment/weapons/bow-life.xml
+ weapons/bows/banshee/banshee-miss1.ogg
+ weapons/bows/banshee/banshee-miss2.ogg
+ weapons/bows/banshee/banshee-miss3.ogg
+ weapons/bows/banshee/banshee-hit1.ogg
+ weapons/bows/banshee/banshee-hit2.ogg
+ weapons/bows/banshee/banshee-hit3.ogg
+
+ -
+ equipment/weapons/staff.xml
+ weapons/other/staff/staff-miss1.ogg
+ weapons/other/staff/staff-miss2.ogg
+ weapons/other/staff/staff-miss3.ogg
+ weapons/other/staff/staff-hit1.ogg
+ weapons/other/staff/staff-hit2.ogg
+ weapons/other/staff/staff-hit3.ogg
+
+
+
+
+
+
+
+
+ -
+ equipment/head/leprechaunhat.xml
+
+ -
+ equipment/head/party-red.xml
+
+ -
+ equipment/head/party-green.xml
+
+ -
+ equipment/head/party-blue.xml
+
+
+
+
+
+
+
+
diff --git a/items/equip-1hand/_include.xml b/items/equip-1hand/_include.xml
index 105c7907..fc4e3007 100644
--- a/items/equip-1hand/_include.xml
+++ b/items/equip-1hand/_include.xml
@@ -1,24 +1,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/items/equip-1hand/item0584_Jackal.xml b/items/equip-1hand/item0584_Jackal.xml
deleted file mode 100644
index e6c248d1..00000000
--- a/items/equip-1hand/item0584_Jackal.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
- -
- equipment/weapons/sword-jackal.xml
- weapons/other/halberd/halberd-hit1.ogg
- weapons/other/halberd/halberd-hit2.ogg
- weapons/other/halberd/halberd-hit3.ogg
- weapons/swords/sword-miss1.ogg
-
-
diff --git a/items/equip-1hand/item0590_DragonSword.xml b/items/equip-1hand/item0590_DragonSword.xml
deleted file mode 100644
index f737ecf9..00000000
--- a/items/equip-1hand/item0590_DragonSword.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
- -
- equipment/weapons/sword-dragon.xml
- weapons/other/halberd/halberd-hit1.ogg
- weapons/other/halberd/halberd-hit2.ogg
- weapons/other/halberd/halberd-hit3.ogg
- weapons/swords/sword-miss1.ogg
-
-
diff --git a/items/equip-1hand/item0591_LongSword.xml b/items/equip-1hand/item0591_LongSword.xml
deleted file mode 100644
index 478042fc..00000000
--- a/items/equip-1hand/item0591_LongSword.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
- -
- equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
- equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
- weapons/swords/longsword/longsword-hit1.ogg
- weapons/swords/longsword/longsword-hit2.ogg
- weapons/miss1.ogg
- weapons/miss2.ogg
- weapons/miss3.ogg
-
-
diff --git a/items/equip-1hand/item0910_Rainerang.xml b/items/equip-1hand/item0910_Rainerang.xml
deleted file mode 100644
index 046ba3e6..00000000
--- a/items/equip-1hand/item0910_Rainerang.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
- -
- weapons/projectiles/rainerang/rainerang-hit1.ogg
- weapons/projectiles/rainerang/rainerang-hit2.ogg
- weapons/projectiles/rainerang/rainerang-hit3.ogg
- weapons/projectiles/rainerang/rainerang-miss1.ogg
-
-
diff --git a/items/equip-1hand/item1171_Wand.xml b/items/equip-1hand/item1171_Wand.xml
index 8a07471b..86e25608 100644
--- a/items/equip-1hand/item1171_Wand.xml
+++ b/items/equip-1hand/item1171_Wand.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/weapons/wand.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d
equipment/weapons/wand-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d
diff --git a/items/equip-1hand/item1201_Knife.xml b/items/equip-1hand/item1201_Knife.xml
index d4c33b27..033ab28c 100644
--- a/items/equip-1hand/item1201_Knife.xml
+++ b/items/equip-1hand/item1201_Knife.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
weapons/knives/knife-miss1.ogg
diff --git a/items/equip-1hand/item1215_ToySabre.xml b/items/equip-1hand/item1215_ToySabre.xml
index 48a3ec2a..4b1de188 100644
--- a/items/equip-1hand/item1215_ToySabre.xml
+++ b/items/equip-1hand/item1215_ToySabre.xml
@@ -1,6 +1,6 @@
-
-
+
-
equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
diff --git a/items/equip-1hand/item0521_Dagger.xml b/items/equip-1hand/item521_Dagger.xml
similarity index 78%
rename from items/equip-1hand/item0521_Dagger.xml
rename to items/equip-1hand/item521_Dagger.xml
index b855d30a..3de9a3af 100644
--- a/items/equip-1hand/item0521_Dagger.xml
+++ b/items/equip-1hand/item521_Dagger.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
weapons/knives/knife-miss1.ogg
diff --git a/items/equip-1hand/item0522_SharpKnife.xml b/items/equip-1hand/item522_SharpKnife.xml
similarity index 83%
rename from items/equip-1hand/item0522_SharpKnife.xml
rename to items/equip-1hand/item522_SharpKnife.xml
index ec223b33..451d4872 100644
--- a/items/equip-1hand/item0522_SharpKnife.xml
+++ b/items/equip-1hand/item522_SharpKnife.xml
@@ -1,6 +1,6 @@
-
-
+
-
equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
weapons/knives/knife-miss1.ogg
diff --git a/items/equip-1hand/item5261_Launcher.xml b/items/equip-1hand/item5261_Launcher.xml
index 9587d061..e141f40e 100644
--- a/items/equip-1hand/item5261_Launcher.xml
+++ b/items/equip-1hand/item5261_Launcher.xml
@@ -1,6 +1,6 @@
-
-
+
-
equipment/weapons/xmas-bow-slingshot.xml
equipment/weapons/xmas-bow-slingshot.xml
weapons/projectiles/snowball/hit1.ogg
diff --git a/items/equip-1hand/item5284_Flintlock.xml b/items/equip-1hand/item5284_Flintlock.xml
deleted file mode 100644
index dfb341c9..00000000
--- a/items/equip-1hand/item5284_Flintlock.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
- equipment/weapons/flintlock.xml
- weapons/gun/gun-hit1.ogg
- weapons/gun/gun-miss1.ogg
- weapons/gun/gun-miss2.ogg
- weapons/gun/gun-miss3.ogg
-
-
diff --git a/items/equip-1hand/item5284_Revolver.xml b/items/equip-1hand/item5284_Revolver.xml
new file mode 100644
index 00000000..9789f779
--- /dev/null
+++ b/items/equip-1hand/item5284_Revolver.xml
@@ -0,0 +1,23 @@
+
+
+ -
+ equipment/weapons/gun.xml
+ weapons/gun/shot.ogg
+ weapons/gun/shot.ogg
+
+
diff --git a/items/equip-1hand/item0536_ShortSword.xml b/items/equip-1hand/item536_ShortSword.xml
similarity index 66%
rename from items/equip-1hand/item0536_ShortSword.xml
rename to items/equip-1hand/item536_ShortSword.xml
index 2cd48e94..a799c66e 100644
--- a/items/equip-1hand/item0536_ShortSword.xml
+++ b/items/equip-1hand/item536_ShortSword.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
weapons/knives/knife-miss1.ogg
diff --git a/items/equip-1hand/item0549_Axe.xml b/items/equip-1hand/item549_Axe.xml
similarity index 76%
rename from items/equip-1hand/item0549_Axe.xml
rename to items/equip-1hand/item549_Axe.xml
index ec8f72a1..6937ca2e 100644
--- a/items/equip-1hand/item0549_Axe.xml
+++ b/items/equip-1hand/item549_Axe.xml
@@ -1,6 +1,6 @@
-
-
+
-
equipment/weapons/axe-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
equipment/weapons/axe-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
diff --git a/items/equip-1hand/item0570_BoneKnife.xml b/items/equip-1hand/item570_BoneKnife.xml
similarity index 81%
rename from items/equip-1hand/item0570_BoneKnife.xml
rename to items/equip-1hand/item570_BoneKnife.xml
index 4cef4ae4..1301cc12 100644
--- a/items/equip-1hand/item0570_BoneKnife.xml
+++ b/items/equip-1hand/item570_BoneKnife.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
weapons/knives/knife-miss1.ogg
diff --git a/items/equip-1hand/item0571_Setzer.xml b/items/equip-1hand/item571_Setzer.xml
similarity index 56%
rename from items/equip-1hand/item0571_Setzer.xml
rename to items/equip-1hand/item571_Setzer.xml
index c7fd2169..e5edf196 100644
--- a/items/equip-1hand/item0571_Setzer.xml
+++ b/items/equip-1hand/item571_Setzer.xml
@@ -1,7 +1,8 @@
-
-
- equipment/weapons/dagger-setzer.xml
+
-
+ equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
+ equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
weapons/knives/setzer/setzer-hit1.ogg
weapons/knives/setzer/setzer-hit2.ogg
weapons/knives/setzer/setzer-hit3.ogg
diff --git a/items/equip-1hand/item0576_Beheader.xml b/items/equip-1hand/item576_Beheader.xml
similarity index 65%
rename from items/equip-1hand/item0576_Beheader.xml
rename to items/equip-1hand/item576_Beheader.xml
index b8ee7350..77fd2292 100644
--- a/items/equip-1hand/item0576_Beheader.xml
+++ b/items/equip-1hand/item576_Beheader.xml
@@ -1,7 +1,7 @@
-
-
- equipment/weapons/sword-beheader.xml
+
-
+ equipment/weapons/beheader.xml
weapons/other/staff/staff-miss1.ogg
weapons/other/staff/staff-miss2.ogg
weapons/other/staff/staff-miss3.ogg
diff --git a/items/equip-1hand/item0578_SandCutter.xml b/items/equip-1hand/item578_SandCutter.xml
similarity index 64%
rename from items/equip-1hand/item0578_SandCutter.xml
rename to items/equip-1hand/item578_SandCutter.xml
index 84d16c4e..c649281b 100644
--- a/items/equip-1hand/item0578_SandCutter.xml
+++ b/items/equip-1hand/item578_SandCutter.xml
@@ -1,7 +1,7 @@
-
-
- equipment/weapons/sword-sandcutter.xml
+
-
+ equipment/weapons/sandcutter.xml
weapons/knives/rock/rock-hit1.ogg
weapons/knives/rock/rock-hit2.ogg
weapons/swords/sword-miss1.ogg
diff --git a/items/equip-1hand/item0579_RockKnife.xml b/items/equip-1hand/item579_RockKnife.xml
similarity index 78%
rename from items/equip-1hand/item0579_RockKnife.xml
rename to items/equip-1hand/item579_RockKnife.xml
index 9d1debf7..6087eb3e 100644
--- a/items/equip-1hand/item0579_RockKnife.xml
+++ b/items/equip-1hand/item579_RockKnife.xml
@@ -1,6 +1,6 @@
-
-
+
-
equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
weapons/miss1.ogg
diff --git a/items/equip-1hand/item0587_Sword.xml b/items/equip-1hand/item587_Sword.xml
similarity index 70%
rename from items/equip-1hand/item0587_Sword.xml
rename to items/equip-1hand/item587_Sword.xml
index 824b1059..7383e3a0 100644
--- a/items/equip-1hand/item0587_Sword.xml
+++ b/items/equip-1hand/item587_Sword.xml
@@ -1,6 +1,6 @@
-
-
+
-
equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
diff --git a/items/equip-2hand/item0588_BastardSword.xml b/items/equip-1hand/item591_LongSword.xml
similarity index 51%
rename from items/equip-2hand/item0588_BastardSword.xml
rename to items/equip-1hand/item591_LongSword.xml
index cd596241..6d69692c 100644
--- a/items/equip-2hand/item0588_BastardSword.xml
+++ b/items/equip-1hand/item591_LongSword.xml
@@ -1,16 +1,6 @@
- -
+
-
equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
diff --git a/items/equip-1hand/item0599_FireSword.xml b/items/equip-1hand/item599_FireSword.xml
similarity index 76%
rename from items/equip-1hand/item0599_FireSword.xml
rename to items/equip-1hand/item599_FireSword.xml
index e6dd6108..b42c0e4e 100644
--- a/items/equip-1hand/item0599_FireSword.xml
+++ b/items/equip-1hand/item599_FireSword.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
diff --git a/items/equip-1hand/item0867_IceGladius.xml b/items/equip-1hand/item867_IceGladius.xml
similarity index 68%
rename from items/equip-1hand/item0867_IceGladius.xml
rename to items/equip-1hand/item867_IceGladius.xml
index 9b8ec863..5d66ecfe 100644
--- a/items/equip-1hand/item0867_IceGladius.xml
+++ b/items/equip-1hand/item867_IceGladius.xml
@@ -1,18 +1,6 @@
- -
+
-
equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
weapons/swords/ice_gladius/ice_gladius-hit1.ogg
diff --git a/items/equip-2hand/_include.xml b/items/equip-2hand/_include.xml
index 68aae96d..f8bfbbf9 100644
--- a/items/equip-2hand/_include.xml
+++ b/items/equip-2hand/_include.xml
@@ -1,20 +1,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/items/equip-2hand/item0609_ImperialBow.xml b/items/equip-2hand/item0609_ImperialBow.xml
deleted file mode 100644
index 6ea71da1..00000000
--- a/items/equip-2hand/item0609_ImperialBow.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
- equipment/weapons/bow-life.xml
- weapons/bows/imperial/imperial-hit1.ogg
- weapons/bows/imperial/imperial-hit2.ogg
- weapons/bows/imperial/imperial-hit3.ogg
- weapons/bows/imperial/imperial-hit4.ogg
- weapons/bows/imperial/imperial-hit5.ogg
- weapons/bows/imperial/imperial-hit6.ogg
- weapons/bows/imperial/imperial-miss1.ogg
-
-
diff --git a/items/equip-2hand/item0906_KidBook.xml b/items/equip-2hand/item0906_KidBook.xml
deleted file mode 100644
index 68d5f7e7..00000000
--- a/items/equip-2hand/item0906_KidBook.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- -
-
-
-
-
-
- monsters/fire-goblin/fire-goblin-hit1.ogg
- monsters/fire-goblin/fire-goblin-hit1.ogg
-
-
diff --git a/items/equip-2hand/item0907_FloydBook.xml b/items/equip-2hand/item0907_FloydBook.xml
deleted file mode 100644
index 5c575984..00000000
--- a/items/equip-2hand/item0907_FloydBook.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- -
-
-
-
-
- weapons/beam/beam-hit.ogg
- weapons/beam/beam-miss.ogg
-
-
diff --git a/items/equip-2hand/item1170_SweetToothStaff.xml b/items/equip-2hand/item1170_SweetToothStaff.xml
deleted file mode 100644
index c2a60f8e..00000000
--- a/items/equip-2hand/item1170_SweetToothStaff.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
- -
- equipment/weapons/staff.xml
- weapons/other/staff/staff-miss1.ogg
- weapons/other/staff/staff-miss2.ogg
- weapons/other/staff/staff-miss3.ogg
- weapons/other/staff/staff-hit1.ogg
- weapons/other/staff/staff-hit2.ogg
- weapons/other/staff/staff-hit3.ogg
-
-
diff --git a/items/equip-2hand/item1200_Bow.xml b/items/equip-2hand/item1200_Bow.xml
index 02d1e593..2e44d2e3 100644
--- a/items/equip-2hand/item1200_Bow.xml
+++ b/items/equip-2hand/item1200_Bow.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
weapons/bows/bow-miss1.ogg
diff --git a/items/equip-2hand/item0530_ShortBow.xml b/items/equip-2hand/item530_ShortBow.xml
similarity index 72%
rename from items/equip-2hand/item0530_ShortBow.xml
rename to items/equip-2hand/item530_ShortBow.xml
index 6b9cbe68..0defa8af 100644
--- a/items/equip-2hand/item0530_ShortBow.xml
+++ b/items/equip-2hand/item530_ShortBow.xml
@@ -1,6 +1,6 @@
-
-
+
-
equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
weapons/bows/short/short-miss1.ogg
diff --git a/items/equip-2hand/item0545_ForestBow.xml b/items/equip-2hand/item545_ForestBow.xml
similarity index 70%
rename from items/equip-2hand/item0545_ForestBow.xml
rename to items/equip-2hand/item545_ForestBow.xml
index 890dacf4..791ba3a4 100644
--- a/items/equip-2hand/item0545_ForestBow.xml
+++ b/items/equip-2hand/item545_ForestBow.xml
@@ -1,6 +1,6 @@
-
-
+
-
equipment/weapons/bow.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
equipment/weapons/bow-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
weapons/bows/forest/forest-miss1.ogg
diff --git a/items/equip-2hand/item0548_Halberd.xml b/items/equip-2hand/item548_Halberd.xml
similarity index 70%
rename from items/equip-2hand/item0548_Halberd.xml
rename to items/equip-2hand/item548_Halberd.xml
index 63459c0f..5df9008f 100644
--- a/items/equip-2hand/item0548_Halberd.xml
+++ b/items/equip-2hand/item548_Halberd.xml
@@ -1,17 +1,6 @@
-
-
+
-
equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
equipment/weapons/polearm-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
weapons/other/halberd/halberd-hit1.ogg
diff --git a/items/equip-2hand/item588_BastardSword.xml b/items/equip-2hand/item588_BastardSword.xml
new file mode 100644
index 00000000..2e49acca
--- /dev/null
+++ b/items/equip-2hand/item588_BastardSword.xml
@@ -0,0 +1,7 @@
+
+
+
-
+ equipment/weapons/sword-long.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
+ equipment/weapons/sword-long-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff
+
+
diff --git a/items/equip-2hand/item0594_Spear.xml b/items/equip-2hand/item594_Spear.xml
similarity index 57%
rename from items/equip-2hand/item0594_Spear.xml
rename to items/equip-2hand/item594_Spear.xml
index 2bca4833..985f39e6 100644
--- a/items/equip-2hand/item0594_Spear.xml
+++ b/items/equip-2hand/item594_Spear.xml
@@ -1,16 +1,6 @@
- -
+
-
equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
diff --git a/items/equip-2hand/item0595_HeavySpear.xml b/items/equip-2hand/item595_HeavySpear.xml
similarity index 80%
rename from items/equip-2hand/item0595_HeavySpear.xml
rename to items/equip-2hand/item595_HeavySpear.xml
index ac896423..af46c51d 100644
--- a/items/equip-2hand/item0595_HeavySpear.xml
+++ b/items/equip-2hand/item595_HeavySpear.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
diff --git a/items/equip-2hand/item0596_Pike.xml b/items/equip-2hand/item596_Pike.xml
similarity index 56%
rename from items/equip-2hand/item0596_Pike.xml
rename to items/equip-2hand/item596_Pike.xml
index ac6027fd..8e24ec34 100644
--- a/items/equip-2hand/item0596_Pike.xml
+++ b/items/equip-2hand/item596_Pike.xml
@@ -1,17 +1,6 @@
- -
+
-
equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
diff --git a/items/equip-2hand/item0597_HeavyPike.xml b/items/equip-2hand/item597_HeavyPike.xml
similarity index 81%
rename from items/equip-2hand/item0597_HeavyPike.xml
rename to items/equip-2hand/item597_HeavyPike.xml
index 31cfdc9d..88e50e66 100644
--- a/items/equip-2hand/item0597_HeavyPike.xml
+++ b/items/equip-2hand/item597_HeavyPike.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/weapons/polearm-spear.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
equipment/weapons/polearm-spear-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
diff --git a/items/equip-2hand/item0623_Scythe.xml b/items/equip-2hand/item623_Scythe.xml
similarity index 68%
rename from items/equip-2hand/item0623_Scythe.xml
rename to items/equip-2hand/item623_Scythe.xml
index 5f29134c..fc1f0098 100644
--- a/items/equip-2hand/item0623_Scythe.xml
+++ b/items/equip-2hand/item623_Scythe.xml
@@ -1,17 +1,6 @@
- -
+
-
equipment/weapons/polearm-stab.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
equipment/weapons/polearm-stab-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
weapons/other/staff/staff-miss1.ogg
diff --git a/items/equip-2hand/item0758_WoodenStaff.xml b/items/equip-2hand/item758_WoodenStaff.xml
similarity index 62%
rename from items/equip-2hand/item0758_WoodenStaff.xml
rename to items/equip-2hand/item758_WoodenStaff.xml
index 137e622b..596d6b19 100644
--- a/items/equip-2hand/item0758_WoodenStaff.xml
+++ b/items/equip-2hand/item758_WoodenStaff.xml
@@ -1,19 +1,6 @@
-
-
+
-
equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d
equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d
weapons/other/staff/staff-miss1.ogg
diff --git a/items/equip-2hand/item0878_BansheeBow.xml b/items/equip-2hand/item878_BansheeBow.xml
similarity index 78%
rename from items/equip-2hand/item0878_BansheeBow.xml
rename to items/equip-2hand/item878_BansheeBow.xml
index d6d57e0c..fc9dde61 100644
--- a/items/equip-2hand/item0878_BansheeBow.xml
+++ b/items/equip-2hand/item878_BansheeBow.xml
@@ -1,6 +1,6 @@
-
-
+
-
equipment/weapons/bow-banshee.xml|#27113e,7442a7,b498d1
equipment/weapons/bow-banshee-female.xml|#27113e,7442a7,b498d1
weapons/bows/banshee/banshee-miss1.ogg
diff --git a/items/equip-2hand/item0903_SlingShot.xml b/items/equip-2hand/item903_SlingShot.xml
similarity index 78%
rename from items/equip-2hand/item0903_SlingShot.xml
rename to items/equip-2hand/item903_SlingShot.xml
index f625fef8..a17ca411 100644
--- a/items/equip-2hand/item0903_SlingShot.xml
+++ b/items/equip-2hand/item903_SlingShot.xml
@@ -1,6 +1,6 @@
-
-
+
-
equipment/weapons/bow-slingshot.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
equipment/weapons/bow-slingshot-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d
diff --git a/items/equip-2hand/item906_KidBook.xml b/items/equip-2hand/item906_KidBook.xml
new file mode 100644
index 00000000..ab0f4178
--- /dev/null
+++ b/items/equip-2hand/item906_KidBook.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+
+
diff --git a/items/equip-2hand/item907_FloydBook.xml b/items/equip-2hand/item907_FloydBook.xml
new file mode 100644
index 00000000..6fefdb88
--- /dev/null
+++ b/items/equip-2hand/item907_FloydBook.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+
+
diff --git a/items/equip-ammo/_include.xml b/items/equip-ammo/_include.xml
index 22e92869..a442407c 100644
--- a/items/equip-ammo/_include.xml
+++ b/items/equip-ammo/_include.xml
@@ -1,12 +1,9 @@
-
-
-
+
+
+
-
-
-
diff --git a/items/equip-ammo/item5289_ArmorBreakerArrow.xml b/items/equip-ammo/item5289_ArmorBreakerArrow.xml
deleted file mode 100644
index 4345b202..00000000
--- a/items/equip-ammo/item5289_ArmorBreakerArrow.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/items/equip-ammo/item5290_SilverArrow.xml b/items/equip-ammo/item5290_SilverArrow.xml
deleted file mode 100644
index ceba8f26..00000000
--- a/items/equip-ammo/item5290_SilverArrow.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/items/equip-ammo/item5291_ThornArrow.xml b/items/equip-ammo/item5291_ThornArrow.xml
deleted file mode 100644
index 55a3d877..00000000
--- a/items/equip-ammo/item5291_ThornArrow.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/items/equip-ammo/item0529_IronArrow.xml b/items/equip-ammo/item529_IronArrow.xml
similarity index 100%
rename from items/equip-ammo/item0529_IronArrow.xml
rename to items/equip-ammo/item529_IronArrow.xml
diff --git a/items/equip-ammo/item0762_TerraniteArrow.xml b/items/equip-ammo/item762_TerraniteArrow.xml
similarity index 100%
rename from items/equip-ammo/item0762_TerraniteArrow.xml
rename to items/equip-ammo/item762_TerraniteArrow.xml
diff --git a/items/equip-ammo/item0904_SlingBullet.xml b/items/equip-ammo/item904_SlingBullet.xml
similarity index 100%
rename from items/equip-ammo/item0904_SlingBullet.xml
rename to items/equip-ammo/item904_SlingBullet.xml
diff --git a/items/equip-amulet/_include.xml b/items/equip-amulet/_include.xml
deleted file mode 100644
index 006583e5..00000000
--- a/items/equip-amulet/_include.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml b/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml
deleted file mode 100644
index dbc8e72e..00000000
--- a/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml b/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml
deleted file mode 100644
index 53413745..00000000
--- a/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/equip-amulet/item0831_SilverFourLeafAmulet.xml b/items/equip-amulet/item0831_SilverFourLeafAmulet.xml
deleted file mode 100644
index 97c0e6bf..00000000
--- a/items/equip-amulet/item0831_SilverFourLeafAmulet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml b/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml
deleted file mode 100644
index 14285fc7..00000000
--- a/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/equip-amulet/item0908_GMAmulet.xml b/items/equip-amulet/item0908_GMAmulet.xml
deleted file mode 100644
index 23c57f42..00000000
--- a/items/equip-amulet/item0908_GMAmulet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/equip-amulet/item1227_EnchantersAmulet.xml b/items/equip-amulet/item1227_EnchantersAmulet.xml
deleted file mode 100644
index c24506d5..00000000
--- a/items/equip-amulet/item1227_EnchantersAmulet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/equip-amulet/item5252_GuardianWings.xml b/items/equip-amulet/item5252_GuardianWings.xml
deleted file mode 100644
index baa87550..00000000
--- a/items/equip-amulet/item5252_GuardianWings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/amulets/angel-wings.xml
- graphics/particles/angel.particle.xml
-
-
diff --git a/items/equip-amulet/item5269_AssassinAmulet.xml b/items/equip-amulet/item5269_AssassinAmulet.xml
deleted file mode 100644
index dbd6c3e3..00000000
--- a/items/equip-amulet/item5269_AssassinAmulet.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/equip-amulet/item5270_ManaPearl.xml b/items/equip-amulet/item5270_ManaPearl.xml
deleted file mode 100644
index 39c232bf..00000000
--- a/items/equip-amulet/item5270_ManaPearl.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- -
- graphics/particles/manapearl.particle.xml
-
-
diff --git a/items/equip-arms/_include.xml b/items/equip-arms/_include.xml
index a5ee0467..3e568e73 100644
--- a/items/equip-arms/_include.xml
+++ b/items/equip-arms/_include.xml
@@ -1,12 +1,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/items/equip-arms/item0531_MinerGloves.xml b/items/equip-arms/item531_MinerGloves.xml
similarity index 100%
rename from items/equip-arms/item0531_MinerGloves.xml
rename to items/equip-arms/item531_MinerGloves.xml
diff --git a/items/equip-arms/item0532_LeatherGloves.xml b/items/equip-arms/item532_LeatherGloves.xml
similarity index 100%
rename from items/equip-arms/item0532_LeatherGloves.xml
rename to items/equip-arms/item532_LeatherGloves.xml
diff --git a/items/equip-arms/item0563_WinterGloves.xml b/items/equip-arms/item563_WinterGloves.xml
similarity index 100%
rename from items/equip-arms/item0563_WinterGloves.xml
rename to items/equip-arms/item563_WinterGloves.xml
diff --git a/items/equip-arms/item585_ScarabArmlet.xml b/items/equip-arms/item585_ScarabArmlet.xml
new file mode 100644
index 00000000..c867e8e4
--- /dev/null
+++ b/items/equip-arms/item585_ScarabArmlet.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/items/equip-arms/item0741_CottonGloves.xml b/items/equip-arms/item741_CottonGloves.xml
similarity index 100%
rename from items/equip-arms/item0741_CottonGloves.xml
rename to items/equip-arms/item741_CottonGloves.xml
diff --git a/items/equip-arms/item0756_AssassinGloves.xml b/items/equip-arms/item756_AssassinGloves.xml
similarity index 73%
rename from items/equip-arms/item0756_AssassinGloves.xml
rename to items/equip-arms/item756_AssassinGloves.xml
index 349d6e4f..a72666ba 100644
--- a/items/equip-arms/item0756_AssassinGloves.xml
+++ b/items/equip-arms/item756_AssassinGloves.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/hands/assassin.xml
equipment/hands/assassin-female.xml
diff --git a/items/equip-arms/item0794_BromenalGloves.xml b/items/equip-arms/item794_BromenalGloves.xml
similarity index 84%
rename from items/equip-arms/item0794_BromenalGloves.xml
rename to items/equip-arms/item794_BromenalGloves.xml
index 850c630a..fdddc2d6 100644
--- a/items/equip-arms/item0794_BromenalGloves.xml
+++ b/items/equip-arms/item794_BromenalGloves.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/hands/bromenalgloves.xml
equipment/hands/bromenalgloves-female.xml
diff --git a/items/equip-arms/item0868_SilkGloves.xml b/items/equip-arms/item868_SilkGloves.xml
similarity index 100%
rename from items/equip-arms/item0868_SilkGloves.xml
rename to items/equip-arms/item868_SilkGloves.xml
diff --git a/items/equip-charm/_include.xml b/items/equip-charm/_include.xml
index ff7953a8..0fc214aa 100644
--- a/items/equip-charm/_include.xml
+++ b/items/equip-charm/_include.xml
@@ -1,9 +1,16 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/items/equip-charm/item1227_EnchantersAmulet.xml b/items/equip-charm/item1227_EnchantersAmulet.xml
new file mode 100644
index 00000000..ba13cb75
--- /dev/null
+++ b/items/equip-charm/item1227_EnchantersAmulet.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/items/equip-charm/item1244_DarkTalisman.xml b/items/equip-charm/item1244_DarkTalisman.xml
index 2a002698..647f7d80 100644
--- a/items/equip-charm/item1244_DarkTalisman.xml
+++ b/items/equip-charm/item1244_DarkTalisman.xml
@@ -1,6 +1,6 @@
- -
+
-
graphics/particles/dark-talisman.xml
diff --git a/items/equip-charm/item5269_AssassinAmulet.xml b/items/equip-charm/item5269_AssassinAmulet.xml
new file mode 100644
index 00000000..ec66cbdc
--- /dev/null
+++ b/items/equip-charm/item5269_AssassinAmulet.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/items/equip-charm/item5270_ManaPearl.xml b/items/equip-charm/item5270_ManaPearl.xml
new file mode 100644
index 00000000..04daab60
--- /dev/null
+++ b/items/equip-charm/item5270_ManaPearl.xml
@@ -0,0 +1,6 @@
+
+
+ -
+ graphics/particles/manapearl.particle.xml
+
+
diff --git a/items/equip-charm/item0677_HeartNecklace.xml b/items/equip-charm/item677_HeartNecklace.xml
similarity index 100%
rename from items/equip-charm/item0677_HeartNecklace.xml
rename to items/equip-charm/item677_HeartNecklace.xml
diff --git a/items/equip-charm/item0742_FourLeafClover.xml b/items/equip-charm/item742_FourLeafClover.xml
similarity index 100%
rename from items/equip-charm/item0742_FourLeafClover.xml
rename to items/equip-charm/item742_FourLeafClover.xml
diff --git a/items/equip-charm/item0749_Towel.xml b/items/equip-charm/item749_Towel.xml
similarity index 100%
rename from items/equip-charm/item0749_Towel.xml
rename to items/equip-charm/item749_Towel.xml
diff --git a/items/equip-charm/item829_CrozeniteFourLeafAmulet.xml b/items/equip-charm/item829_CrozeniteFourLeafAmulet.xml
new file mode 100644
index 00000000..29d60d62
--- /dev/null
+++ b/items/equip-charm/item829_CrozeniteFourLeafAmulet.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/items/equip-charm/item830_BromenalFourLeafAmulet.xml b/items/equip-charm/item830_BromenalFourLeafAmulet.xml
new file mode 100644
index 00000000..79394b97
--- /dev/null
+++ b/items/equip-charm/item830_BromenalFourLeafAmulet.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/items/equip-charm/item831_SilverFourLeafAmulet.xml b/items/equip-charm/item831_SilverFourLeafAmulet.xml
new file mode 100644
index 00000000..379d3635
--- /dev/null
+++ b/items/equip-charm/item831_SilverFourLeafAmulet.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/items/equip-charm/item832_GoldenFourLeafAmulet.xml b/items/equip-charm/item832_GoldenFourLeafAmulet.xml
new file mode 100644
index 00000000..a1a5a12b
--- /dev/null
+++ b/items/equip-charm/item832_GoldenFourLeafAmulet.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/items/equip-charm/item0865_Grimoire.xml b/items/equip-charm/item865_Grimoire.xml
similarity index 100%
rename from items/equip-charm/item0865_Grimoire.xml
rename to items/equip-charm/item865_Grimoire.xml
diff --git a/items/equip-charm/item0879_HeartofIsis.xml b/items/equip-charm/item879_HeartofIsis.xml
similarity index 100%
rename from items/equip-charm/item0879_HeartofIsis.xml
rename to items/equip-charm/item879_HeartofIsis.xml
diff --git a/items/equip-feet/_include.xml b/items/equip-feet/_include.xml
index ad7b2328..6c06d202 100644
--- a/items/equip-feet/_include.xml
+++ b/items/equip-feet/_include.xml
@@ -1,12 +1,11 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -18,5 +17,4 @@
-
diff --git a/items/equip-feet/item0528_Boots.xml b/items/equip-feet/item528_Boots.xml
similarity index 100%
rename from items/equip-feet/item0528_Boots.xml
rename to items/equip-feet/item528_Boots.xml
diff --git a/items/equip-feet/item5323_BlackWarlordBoots.xml b/items/equip-feet/item5323_BlackWarlordBoots.xml
deleted file mode 100644
index dbe8817e..00000000
--- a/items/equip-feet/item5323_BlackWarlordBoots.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/feet/warlordboots.xml|#000000,ffffff
- equipment/feet/warlordboots-female.xml|#000000,ffffff
-
-
diff --git a/items/equip-feet/item0655_FurBoots.xml b/items/equip-feet/item655_FurBoots.xml
similarity index 100%
rename from items/equip-feet/item0655_FurBoots.xml
rename to items/equip-feet/item655_FurBoots.xml
diff --git a/items/equip-feet/item0734_BlackBoots.xml b/items/equip-feet/item734_BlackBoots.xml
similarity index 100%
rename from items/equip-feet/item0734_BlackBoots.xml
rename to items/equip-feet/item734_BlackBoots.xml
diff --git a/items/equip-feet/item0757_AssassinBoots.xml b/items/equip-feet/item757_AssassinBoots.xml
similarity index 67%
rename from items/equip-feet/item0757_AssassinBoots.xml
rename to items/equip-feet/item757_AssassinBoots.xml
index 2952d91b..ab0d8e24 100644
--- a/items/equip-feet/item0757_AssassinBoots.xml
+++ b/items/equip-feet/item757_AssassinBoots.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/feet/assassin-boots.xml
equipment/feet/assassin-boots-female.xml
diff --git a/items/equip-feet/item0792_BromenalBoots.xml b/items/equip-feet/item792_BromenalBoots.xml
similarity index 86%
rename from items/equip-feet/item0792_BromenalBoots.xml
rename to items/equip-feet/item792_BromenalBoots.xml
index ada38699..ac1f349d 100644
--- a/items/equip-feet/item0792_BromenalBoots.xml
+++ b/items/equip-feet/item792_BromenalBoots.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/feet/bromenalboots.xml
equipment/feet/bromenalboots-female.xml
diff --git a/items/equip-feet/item0876_WarlordBoots.xml b/items/equip-feet/item876_WarlordBoots.xml
similarity index 100%
rename from items/equip-feet/item0876_WarlordBoots.xml
rename to items/equip-feet/item876_WarlordBoots.xml
diff --git a/items/equip-head/_include.xml b/items/equip-head/_include.xml
index f36c30eb..f592b50b 100644
--- a/items/equip-head/_include.xml
+++ b/items/equip-head/_include.xml
@@ -1,79 +1,78 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -222,24 +221,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/items/equip-head/item0604_PirateBandana.xml b/items/equip-head/item0604_PirateBandana.xml
deleted file mode 100644
index 1c8b5265..00000000
--- a/items/equip-head/item0604_PirateBandana.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- -
- equipment/head/bandana.xml|#212121,555555
- equipment/head/bandana-female.xml|#212121,555555
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/items/equip-head/item0622_Bandana.xml b/items/equip-head/item0622_Bandana.xml
deleted file mode 100644
index dde4bec1..00000000
--- a/items/equip-head/item0622_Bandana.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- -
- equipment/head/bandana.xml|#ffffff;#ff4645
- equipment/head/bandana-female.xml|#ffffff;#ff4645
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/items/equip-head/item0801_PinkieHelmet.xml b/items/equip-head/item0801_PinkieHelmet.xml
deleted file mode 100644
index 1e3972d9..00000000
--- a/items/equip-head/item0801_PinkieHelmet.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
- -
- equipment/head/pinkie-helmet.xml
- equipment/head/pinkie-helmet-female.xml
-
-
-
-
-
diff --git a/items/equip-head/item0909_LeprechaunHead.xml b/items/equip-head/item0909_LeprechaunHead.xml
deleted file mode 100644
index 9afc03cd..00000000
--- a/items/equip-head/item0909_LeprechaunHead.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- -
- equipment/head/leprechaunhead.xml
-
-
-
-
-
diff --git a/items/equip-head/item1174_CashiersShade.xml b/items/equip-head/item1174_CashiersShade.xml
index 9cc11ce5..555662b9 100644
--- a/items/equip-head/item1174_CashiersShade.xml
+++ b/items/equip-head/item1174_CashiersShade.xml
@@ -1,14 +1,6 @@
- -
+
-
equipment/head/cashiershade.xml|#909090;#70ff1f
equipment/head/cashiershade-female.xml|#909090;#70ff1f
diff --git a/items/equip-head/item1203_RangerHat.xml b/items/equip-head/item1203_RangerHat.xml
index 6aa6894f..646476cb 100644
--- a/items/equip-head/item1203_RangerHat.xml
+++ b/items/equip-head/item1203_RangerHat.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/head/rangerhat.xml
equipment/head/rangerhat-female.xml
diff --git a/items/equip-head/item4027_YetiMask.xml b/items/equip-head/item4027_YetiMask.xml
index 3f0f90ea..00aa75b0 100644
--- a/items/equip-head/item4027_YetiMask.xml
+++ b/items/equip-head/item4027_YetiMask.xml
@@ -3,8 +3,5 @@
-
equipment/head/yeti-mask.xml
equipment/head/yeti-mask-female.xml
-
-
-
diff --git a/items/equip-head/item0511_SantaHat.xml b/items/equip-head/item511_SantaHat.xml
similarity index 100%
rename from items/equip-head/item0511_SantaHat.xml
rename to items/equip-head/item511_SantaHat.xml
diff --git a/items/equip-head/item5128_DarkHelm.xml b/items/equip-head/item5128_DarkHelm.xml
index 5d6f76c2..c9526392 100644
--- a/items/equip-head/item5128_DarkHelm.xml
+++ b/items/equip-head/item5128_DarkHelm.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/head/dark-helm.xml
equipment/head/dark-helm-female.xml
diff --git a/items/equip-head/item5129_UnderworldMask.xml b/items/equip-head/item5129_UnderworldMask.xml
index b50fd80c..fc585cb4 100644
--- a/items/equip-head/item5129_UnderworldMask.xml
+++ b/items/equip-head/item5129_UnderworldMask.xml
@@ -1,9 +1,9 @@
-
-
+
-
equipment/head/underworld-mask.xml
equipment/head/underworld-mask-female.xml
-
+
diff --git a/items/equip-head/item5130_Phylactery.xml b/items/equip-head/item5130_Phylactery.xml
index 49411f13..7f165ac0 100644
--- a/items/equip-head/item5130_Phylactery.xml
+++ b/items/equip-head/item5130_Phylactery.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/head/phylactery.xml
equipment/head/phylactery-female.xml
diff --git a/items/equip-head/item5202_PilotHat.xml b/items/equip-head/item5202_PilotHat.xml
index 713ee67c..f6d84669 100644
--- a/items/equip-head/item5202_PilotHat.xml
+++ b/items/equip-head/item5202_PilotHat.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/head/pilot-hat.xml
equipment/head/pilot-hat-female.xml
diff --git a/items/equip-head/item5203_MoonshroomHat.xml b/items/equip-head/item5203_MoonshroomHat.xml
index 9cc6d048..670df756 100644
--- a/items/equip-head/item5203_MoonshroomHat.xml
+++ b/items/equip-head/item5203_MoonshroomHat.xml
@@ -1,7 +1,6 @@
- -
- graphics/particles/monster-mushroom-moon.particle.xml
+
-
equipment/head/moonshroomhat.xml
equipment/head/moonshroomhat-female.xml
diff --git a/items/equip-head/item5205_EskimoHat.xml b/items/equip-head/item5205_EskimoHat.xml
index 9ad4f32a..549ba20c 100644
--- a/items/equip-head/item5205_EskimoHat.xml
+++ b/items/equip-head/item5205_EskimoHat.xml
@@ -1,6 +1,6 @@
-
-
+
-
equipment/head/eskimohat.xml
equipment/head/eskimohat-female.xml
diff --git a/items/equip-head/item5231_RedPresentHat.xml b/items/equip-head/item5231_RedPresentHat.xml
index 143813ae..c8a7291b 100644
--- a/items/equip-head/item5231_RedPresentHat.xml
+++ b/items/equip-head/item5231_RedPresentHat.xml
@@ -3,8 +3,5 @@
-
equipment/head/presenthat.xml|#ff4b4b,ffcccc;#72ED5A,CCF9C3
equipment/head/presenthat-female.xml|#ff4b4b,ffcccc;#72ED5A,CCF9C3
-
-
-
diff --git a/items/equip-head/item5232_GreenPresentHat.xml b/items/equip-head/item5232_GreenPresentHat.xml
index 68b9d339..9bcac764 100644
--- a/items/equip-head/item5232_GreenPresentHat.xml
+++ b/items/equip-head/item5232_GreenPresentHat.xml
@@ -3,8 +3,5 @@
-
equipment/head/presenthat.xml|#4bff4b,ccffcc;#EF4A76,FF9FB9
equipment/head/presenthat-female.xml|#4bff4b,ccffcc;#EF4A76,FF9FB9
-
-
-
diff --git a/items/equip-head/item5233_BluePresentHat.xml b/items/equip-head/item5233_BluePresentHat.xml
index 937898e2..b0e347e0 100644
--- a/items/equip-head/item5233_BluePresentHat.xml
+++ b/items/equip-head/item5233_BluePresentHat.xml
@@ -3,8 +3,5 @@
-
equipment/head/presenthat.xml|#4b99ff,cceeff;#FF8D00,FCCA8C
equipment/head/presenthat-female.xml|#4b99ff,cceeff;#FF8D00,FCCA8C
-
-
-
diff --git a/items/equip-head/item0524_FancyHat.xml b/items/equip-head/item524_FancyHat.xml
similarity index 100%
rename from items/equip-head/item0524_FancyHat.xml
rename to items/equip-head/item524_FancyHat.xml
diff --git a/items/equip-head/item0525_MinersHat.xml b/items/equip-head/item525_MinersHat.xml
similarity index 100%
rename from items/equip-head/item0525_MinersHat.xml
rename to items/equip-head/item525_MinersHat.xml
diff --git a/items/equip-head/item5266_CloverHat.xml b/items/equip-head/item5266_CloverHat.xml
index adece8f2..bf2149c9 100644
--- a/items/equip-head/item5266_CloverHat.xml
+++ b/items/equip-head/item5266_CloverHat.xml
@@ -1,14 +1,6 @@
- -
+
-
diff --git a/items/equip-head/item5267_AssassinMask.xml b/items/equip-head/item5267_AssassinMask.xml
index 3259acff..7ec31eda 100644
--- a/items/equip-head/item5267_AssassinMask.xml
+++ b/items/equip-head/item5267_AssassinMask.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/head/assassin-mask.xml
equipment/head/assassin-mask-female.xml
diff --git a/items/equip-head/item5280_LeprechaunHat.xml b/items/equip-head/item5280_LeprechaunHat.xml
deleted file mode 100644
index ac9a68a3..00000000
--- a/items/equip-head/item5280_LeprechaunHat.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- equipment/head/leprechaunhat.xml
-
-
diff --git a/items/equip-head/item5281_PartyHatRed.xml b/items/equip-head/item5281_PartyHatRed.xml
deleted file mode 100644
index 3248f33d..00000000
--- a/items/equip-head/item5281_PartyHatRed.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- -
- equipment/head/party-red.xml
-
-
diff --git a/items/equip-head/item5282_PartyHatGreen.xml b/items/equip-head/item5282_PartyHatGreen.xml
deleted file mode 100644
index 8087ec8a..00000000
--- a/items/equip-head/item5282_PartyHatGreen.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- -
- equipment/head/party-green.xml
-
-
diff --git a/items/equip-head/item5283_PartyHatBlue.xml b/items/equip-head/item5283_PartyHatBlue.xml
deleted file mode 100644
index 16d41287..00000000
--- a/items/equip-head/item5283_PartyHatBlue.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- -
- equipment/head/party-blue.xml
-
-
diff --git a/items/equip-head/item5324_BlackWarlordHelmet.xml b/items/equip-head/item5324_BlackWarlordHelmet.xml
deleted file mode 100644
index 3cd6ab28..00000000
--- a/items/equip-head/item5324_BlackWarlordHelmet.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- -
- equipment/head/warlordhelm.xml|#000000,ffffff
- equipment/head/warlordhelm-female.xml|#000000,ffffff
-
-
-
-
-
-
-
diff --git a/items/equip-head/item5325_BlackInfantryHelmet.xml b/items/equip-head/item5325_BlackInfantryHelmet.xml
deleted file mode 100644
index f83f6a0f..00000000
--- a/items/equip-head/item5325_BlackInfantryHelmet.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- -
- equipment/head/infantryhelm.xml|#000000,ffffff
- equipment/head/infantryhelm-female.xml|#000000,ffffff
-
-
-
-
-
-
-
-
-
diff --git a/items/equip-head/item5326_BlackCrusadeHelmet.xml b/items/equip-head/item5326_BlackCrusadeHelmet.xml
deleted file mode 100644
index 62029b35..00000000
--- a/items/equip-head/item5326_BlackCrusadeHelmet.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- -
- equipment/head/crusadehelm.xml|#000000,ffffff
- equipment/head/crusadehelm-female.xml|#000000,ffffff
-
-
-
-
-
diff --git a/items/equip-head/item5392_SunshroomHat.xml b/items/equip-head/item5392_SunshroomHat.xml
deleted file mode 100644
index 476e8151..00000000
--- a/items/equip-head/item5392_SunshroomHat.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- -
- graphics/particles/monster-mushroom-sun.particle.xml
- equipment/head/sunshroomhat.xml
- equipment/head/sunshroomhat-female.xml
-
-
-
-
-
diff --git a/items/equip-head/item5394_BlackKnightsHelmet.xml b/items/equip-head/item5394_BlackKnightsHelmet.xml
deleted file mode 100644
index 5d587cf3..00000000
--- a/items/equip-head/item5394_BlackKnightsHelmet.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
- -
- equipment/head/knighthelm-dyable.xml|#000000,ffffff
- equipment/head/knighthelm-dyable-female.xml|#000000,ffffff
-
-
-
-
-
-
-
diff --git a/items/equip-head/item5395_BlackRoseHat.xml b/items/equip-head/item5395_BlackRoseHat.xml
deleted file mode 100644
index bddcc4c3..00000000
--- a/items/equip-head/item5395_BlackRoseHat.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/head/rosehat.xml|#111111,444444,555555,ffffff
- equipment/head/rosehat-female.xml|#111111,444444,555555,ffffff
-
-
diff --git a/items/equip-head/item5396_SnowshroomHat.xml b/items/equip-head/item5396_SnowshroomHat.xml
deleted file mode 100644
index 8eb7819b..00000000
--- a/items/equip-head/item5396_SnowshroomHat.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- -
- graphics/particles/monster-mushroom-snow.particle.xml
- equipment/head/snowshroomhat.xml
- equipment/head/snowshroomhat-female.xml
-
-
-
-
-
diff --git a/items/equip-head/item5397_WickedMushroomHat.xml b/items/equip-head/item5397_WickedMushroomHat.xml
deleted file mode 100644
index c21b1c55..00000000
--- a/items/equip-head/item5397_WickedMushroomHat.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- -
- equipment/head/wickedmushroomhat.xml
- equipment/head/wickedmushroomhat-female.xml
-
-
-
-
-
diff --git a/items/equip-head/item5399_IceSkullMask.xml b/items/equip-head/item5399_IceSkullMask.xml
deleted file mode 100644
index b846189a..00000000
--- a/items/equip-head/item5399_IceSkullMask.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/head/skullmask-dyable.xml|#2b55ab,6b95eb,88a9cd,b9d0e8,eff8ff;#000000
- equipment/head/skullmask-dyable-female.xml|#2b55ab,6b95eb,88a9cd,b9d0e8,eff8ff;#000000
-
-
diff --git a/items/equip-head/item5400_GoldenSkullMask.xml b/items/equip-head/item5400_GoldenSkullMask.xml
deleted file mode 100644
index dfc5bd1f..00000000
--- a/items/equip-head/item5400_GoldenSkullMask.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/head/skullmask-dyable.xml|#573f10,9c8226,d3c04b,ffffff;#000000
- equipment/head/skullmask-dyable-female.xml|#573f10,9c8226,d3c04b,ffffff;#000000
-
-
diff --git a/items/equip-head/item5401_YellowHeadSlime.xml b/items/equip-head/item5401_YellowHeadSlime.xml
deleted file mode 100644
index df601899..00000000
--- a/items/equip-head/item5401_YellowHeadSlime.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/head/headslime.xml|#b47f00,ffffff
- equipment/head/headslime-female.xml|#b47f00,ffffff
-
-
diff --git a/items/equip-head/item5402_RedHeadSlime.xml b/items/equip-head/item5402_RedHeadSlime.xml
deleted file mode 100644
index 51fd9ee6..00000000
--- a/items/equip-head/item5402_RedHeadSlime.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/head/headslime.xml|#7e0000,ffffff
- equipment/head/headslime-female.xml|#7e0000,ffffff
-
-
diff --git a/items/equip-head/item5403_GreenHeadSlime.xml b/items/equip-head/item5403_GreenHeadSlime.xml
deleted file mode 100644
index ee47e9c2..00000000
--- a/items/equip-head/item5403_GreenHeadSlime.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/head/headslime.xml|#72982c,ffffff
- equipment/head/headslime-female.xml|#72982c,ffffff
-
-
diff --git a/items/equip-head/item5404_BlueHeadSlime.xml b/items/equip-head/item5404_BlueHeadSlime.xml
deleted file mode 100644
index 8fa3fc43..00000000
--- a/items/equip-head/item5404_BlueHeadSlime.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/head/headslime.xml|#2121ae,ffffff
- equipment/head/headslime-female.xml|#2121ae,ffffff
-
-
diff --git a/items/equip-head/item5407_RainshroomHat.xml b/items/equip-head/item5407_RainshroomHat.xml
deleted file mode 100644
index 658572ff..00000000
--- a/items/equip-head/item5407_RainshroomHat.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
- -
- graphics/particles/monster-mushroom-rain.particle.xml
- equipment/head/rainshroomhat.xml
- equipment/head/rainshroomhat-female.xml
-
-
-
-
-
diff --git a/items/equip-head/item0543_StandardHeadband.xml b/items/equip-head/item543_StandardHeadband.xml
similarity index 100%
rename from items/equip-head/item0543_StandardHeadband.xml
rename to items/equip-head/item543_StandardHeadband.xml
diff --git a/items/equip-head/item0544_SilkHeadband.xml b/items/equip-head/item544_SilkHeadband.xml
similarity index 100%
rename from items/equip-head/item0544_SilkHeadband.xml
rename to items/equip-head/item544_SilkHeadband.xml
diff --git a/items/equip-head/item0615_PumpkinHelmet.xml b/items/equip-head/item615_PumpkinHelmet.xml
similarity index 100%
rename from items/equip-head/item0615_PumpkinHelmet.xml
rename to items/equip-head/item615_PumpkinHelmet.xml
diff --git a/items/equip-head/item0616_AxeHat.xml b/items/equip-head/item616_AxeHat.xml
similarity index 100%
rename from items/equip-head/item0616_AxeHat.xml
rename to items/equip-head/item616_AxeHat.xml
diff --git a/items/equip-head/item0617_PirateHat.xml b/items/equip-head/item617_PirateHat.xml
similarity index 100%
rename from items/equip-head/item0617_PirateHat.xml
rename to items/equip-head/item617_PirateHat.xml
diff --git a/items/equip-head/item0618_Goggles.xml b/items/equip-head/item618_Goggles.xml
similarity index 100%
rename from items/equip-head/item0618_Goggles.xml
rename to items/equip-head/item618_Goggles.xml
diff --git a/items/equip-head/item0619_LeatherGoggles.xml b/items/equip-head/item619_LeatherGoggles.xml
similarity index 100%
rename from items/equip-head/item0619_LeatherGoggles.xml
rename to items/equip-head/item619_LeatherGoggles.xml
diff --git a/items/equip-head/item0620_Circlet.xml b/items/equip-head/item620_Circlet.xml
similarity index 100%
rename from items/equip-head/item0620_Circlet.xml
rename to items/equip-head/item620_Circlet.xml
diff --git a/items/equip-head/item0621_Eyepatch.xml b/items/equip-head/item621_Eyepatch.xml
similarity index 100%
rename from items/equip-head/item0621_Eyepatch.xml
rename to items/equip-head/item621_Eyepatch.xml
diff --git a/items/equip-head/item622_Bandana.xml b/items/equip-head/item622_Bandana.xml
new file mode 100644
index 00000000..a47926f9
--- /dev/null
+++ b/items/equip-head/item622_Bandana.xml
@@ -0,0 +1,10 @@
+
+
+ -
+ equipment/head/bandana.xml|#ffffff;#ff4645
+ equipment/head/bandana-female.xml|#ffffff;#ff4645
+
+
+
+
+
diff --git a/items/equip-head/item0627_TopHat.xml b/items/equip-head/item627_TopHat.xml
similarity index 100%
rename from items/equip-head/item0627_TopHat.xml
rename to items/equip-head/item627_TopHat.xml
diff --git a/items/equip-head/item0628_FunkyHat.xml b/items/equip-head/item628_FunkyHat.xml
similarity index 100%
rename from items/equip-head/item0628_FunkyHat.xml
rename to items/equip-head/item628_FunkyHat.xml
diff --git a/items/equip-head/item0629_MushHat.xml b/items/equip-head/item629_MushHat.xml
similarity index 100%
rename from items/equip-head/item0629_MushHat.xml
rename to items/equip-head/item629_MushHat.xml
diff --git a/items/equip-head/item0630_ShroomHat.xml b/items/equip-head/item630_ShroomHat.xml
similarity index 100%
rename from items/equip-head/item0630_ShroomHat.xml
rename to items/equip-head/item630_ShroomHat.xml
diff --git a/items/equip-head/item0633_ChristmasElfHat.xml b/items/equip-head/item633_ChristmasElfHat.xml
similarity index 100%
rename from items/equip-head/item0633_ChristmasElfHat.xml
rename to items/equip-head/item633_ChristmasElfHat.xml
diff --git a/items/equip-head/item0634_FaceMask.xml b/items/equip-head/item634_FaceMask.xml
similarity index 100%
rename from items/equip-head/item0634_FaceMask.xml
rename to items/equip-head/item634_FaceMask.xml
diff --git a/items/equip-head/item0636_WarlordHelmet.xml b/items/equip-head/item636_WarlordHelmet.xml
similarity index 100%
rename from items/equip-head/item0636_WarlordHelmet.xml
rename to items/equip-head/item636_WarlordHelmet.xml
diff --git a/items/equip-head/item0637_KnightsHelmet.xml b/items/equip-head/item637_KnightsHelmet.xml
similarity index 100%
rename from items/equip-head/item0637_KnightsHelmet.xml
rename to items/equip-head/item637_KnightsHelmet.xml
diff --git a/items/equip-head/item0638_InfantryHelmet.xml b/items/equip-head/item638_InfantryHelmet.xml
similarity index 100%
rename from items/equip-head/item0638_InfantryHelmet.xml
rename to items/equip-head/item638_InfantryHelmet.xml
diff --git a/items/equip-head/item0639_CrusadeHelmet.xml b/items/equip-head/item639_CrusadeHelmet.xml
similarity index 100%
rename from items/equip-head/item0639_CrusadeHelmet.xml
rename to items/equip-head/item639_CrusadeHelmet.xml
diff --git a/items/equip-head/item0643_WhiteCowboyHat.xml b/items/equip-head/item643_WhiteCowboyHat.xml
similarity index 100%
rename from items/equip-head/item0643_WhiteCowboyHat.xml
rename to items/equip-head/item643_WhiteCowboyHat.xml
diff --git a/items/equip-head/item0644_BlackCowboyHat.xml b/items/equip-head/item644_BlackCowboyHat.xml
similarity index 100%
rename from items/equip-head/item0644_BlackCowboyHat.xml
rename to items/equip-head/item644_BlackCowboyHat.xml
diff --git a/items/equip-head/item0646_Crown.xml b/items/equip-head/item646_Crown.xml
similarity index 100%
rename from items/equip-head/item0646_Crown.xml
rename to items/equip-head/item646_Crown.xml
diff --git a/items/equip-head/item0647_DevelopersCap.xml b/items/equip-head/item647_DevelopersCap.xml
similarity index 100%
rename from items/equip-head/item0647_DevelopersCap.xml
rename to items/equip-head/item647_DevelopersCap.xml
diff --git a/items/equip-head/item0654_Cap.xml b/items/equip-head/item654_Cap.xml
similarity index 100%
rename from items/equip-head/item0654_Cap.xml
rename to items/equip-head/item654_Cap.xml
diff --git a/items/equip-head/item0656_SerfHat.xml b/items/equip-head/item656_SerfHat.xml
similarity index 100%
rename from items/equip-head/item0656_SerfHat.xml
rename to items/equip-head/item656_SerfHat.xml
diff --git a/items/equip-head/item0675_GraduationCap.xml b/items/equip-head/item675_GraduationCap.xml
similarity index 79%
rename from items/equip-head/item0675_GraduationCap.xml
rename to items/equip-head/item675_GraduationCap.xml
index 8d3b911c..2b70d6be 100644
--- a/items/equip-head/item0675_GraduationCap.xml
+++ b/items/equip-head/item675_GraduationCap.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/head/gradcap.xml
equipment/head/gradcap-female.xml
diff --git a/items/equip-head/item0678_NohMask.xml b/items/equip-head/item678_NohMask.xml
similarity index 100%
rename from items/equip-head/item0678_NohMask.xml
rename to items/equip-head/item678_NohMask.xml
diff --git a/items/equip-head/item0679_DemonMask.xml b/items/equip-head/item679_DemonMask.xml
similarity index 100%
rename from items/equip-head/item0679_DemonMask.xml
rename to items/equip-head/item679_DemonMask.xml
diff --git a/items/equip-head/item0721_HighPriestCrown.xml b/items/equip-head/item721_HighPriestCrown.xml
similarity index 100%
rename from items/equip-head/item0721_HighPriestCrown.xml
rename to items/equip-head/item721_HighPriestCrown.xml
diff --git a/items/equip-head/item0722_MonsterSkullHelmet.xml b/items/equip-head/item722_MonsterSkullHelmet.xml
similarity index 100%
rename from items/equip-head/item0722_MonsterSkullHelmet.xml
rename to items/equip-head/item722_MonsterSkullHelmet.xml
diff --git a/items/equip-head/item0723_DesertHat.xml b/items/equip-head/item723_DesertHat.xml
similarity index 100%
rename from items/equip-head/item0723_DesertHat.xml
rename to items/equip-head/item723_DesertHat.xml
diff --git a/items/equip-head/item0724_CottonHeadband.xml b/items/equip-head/item724_CottonHeadband.xml
similarity index 100%
rename from items/equip-head/item0724_CottonHeadband.xml
rename to items/equip-head/item724_CottonHeadband.xml
diff --git a/items/equip-head/item0725_GMCap.xml b/items/equip-head/item725_GMCap.xml
similarity index 100%
rename from items/equip-head/item0725_GMCap.xml
rename to items/equip-head/item725_GMCap.xml
diff --git a/items/equip-feet/item0735_CottonBoots.xml b/items/equip-head/item735_CottonBoots.xml
similarity index 84%
rename from items/equip-feet/item0735_CottonBoots.xml
rename to items/equip-head/item735_CottonBoots.xml
index 14aed202..ed9f57d7 100644
--- a/items/equip-feet/item0735_CottonBoots.xml
+++ b/items/equip-head/item735_CottonBoots.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/feet/boots.xml|#a4b2b2,ffffff
equipment/feet/boots-female.xml|#a4b2b2,ffffff
diff --git a/items/equip-head/item0751_PinkieHat.xml b/items/equip-head/item751_PinkieHat.xml
similarity index 100%
rename from items/equip-head/item0751_PinkieHat.xml
rename to items/equip-head/item751_PinkieHat.xml
diff --git a/items/equip-head/item0752_FluffyHat.xml b/items/equip-head/item752_FluffyHat.xml
similarity index 100%
rename from items/equip-head/item0752_FluffyHat.xml
rename to items/equip-head/item752_FluffyHat.xml
diff --git a/items/equip-head/item0759_PaladinsHelmet.xml b/items/equip-head/item759_PaladinsHelmet.xml
similarity index 100%
rename from items/equip-head/item0759_PaladinsHelmet.xml
rename to items/equip-head/item759_PaladinsHelmet.xml
diff --git a/items/equip-head/item0760_OverlordsHelmet.xml b/items/equip-head/item760_OverlordsHelmet.xml
similarity index 74%
rename from items/equip-head/item0760_OverlordsHelmet.xml
rename to items/equip-head/item760_OverlordsHelmet.xml
index 16d5a7f9..d80588ad 100644
--- a/items/equip-head/item0760_OverlordsHelmet.xml
+++ b/items/equip-head/item760_OverlordsHelmet.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/head/overlordhelm.xml
equipment/head/overlordhelm-female.xml
diff --git a/items/equip-head/item0761_DesertHelmet.xml b/items/equip-head/item761_DesertHelmet.xml
similarity index 100%
rename from items/equip-head/item0761_DesertHelmet.xml
rename to items/equip-head/item761_DesertHelmet.xml
diff --git a/items/equip-head/item0764_SailorHat.xml b/items/equip-head/item764_SailorHat.xml
similarity index 100%
rename from items/equip-head/item0764_SailorHat.xml
rename to items/equip-head/item764_SailorHat.xml
diff --git a/items/equip-head/item0765_CaptainsHat.xml b/items/equip-head/item765_CaptainsHat.xml
similarity index 100%
rename from items/equip-head/item0765_CaptainsHat.xml
rename to items/equip-head/item765_CaptainsHat.xml
diff --git a/items/equip-head/item0766_TerraniteHelmet.xml b/items/equip-head/item766_TerraniteHelmet.xml
similarity index 100%
rename from items/equip-head/item0766_TerraniteHelmet.xml
rename to items/equip-head/item766_TerraniteHelmet.xml
diff --git a/items/equip-head/item0769_GuyFawkesMask.xml b/items/equip-head/item769_GuyFawkesMask.xml
similarity index 100%
rename from items/equip-head/item0769_GuyFawkesMask.xml
rename to items/equip-head/item769_GuyFawkesMask.xml
diff --git a/items/equip-head/item0770_FairyHat.xml b/items/equip-head/item770_FairyHat.xml
similarity index 100%
rename from items/equip-head/item0770_FairyHat.xml
rename to items/equip-head/item770_FairyHat.xml
diff --git a/items/equip-head/item0781_WitchDoctorsMask.xml b/items/equip-head/item781_WitchDoctorsMask.xml
similarity index 100%
rename from items/equip-head/item0781_WitchDoctorsMask.xml
rename to items/equip-head/item781_WitchDoctorsMask.xml
diff --git a/items/equip-head/item0795_BromenalHelmet.xml b/items/equip-head/item795_BromenalHelmet.xml
similarity index 88%
rename from items/equip-head/item0795_BromenalHelmet.xml
rename to items/equip-head/item795_BromenalHelmet.xml
index c3041c7b..5ca66fcb 100644
--- a/items/equip-head/item0795_BromenalHelmet.xml
+++ b/items/equip-head/item795_BromenalHelmet.xml
@@ -1,6 +1,6 @@
-
-
+
-
equipment/head/bromenalhelmet.xml
equipment/head/bromenalhelmet-female.xml
diff --git a/items/equip-head/item0800_BowlerHatBrown.xml b/items/equip-head/item800_BowlerHatBrown.xml
similarity index 100%
rename from items/equip-head/item0800_BowlerHatBrown.xml
rename to items/equip-head/item800_BowlerHatBrown.xml
diff --git a/items/equip-head/item801_PinkieHelmet.xml b/items/equip-head/item801_PinkieHelmet.xml
new file mode 100644
index 00000000..00c1d8f5
--- /dev/null
+++ b/items/equip-head/item801_PinkieHelmet.xml
@@ -0,0 +1,10 @@
+
+
+
-
+ equipment/head/pinkie-helmet.xml
+ equipment/head/pinkie-helmet-female.xml
+
+
+
+
+
diff --git a/items/equip-head/item0848_Earmuffs.xml b/items/equip-head/item848_Earmuffs.xml
similarity index 100%
rename from items/equip-head/item0848_Earmuffs.xml
rename to items/equip-head/item848_Earmuffs.xml
diff --git a/items/equip-head/item0854_ElfNightcap.xml b/items/equip-head/item854_ElfNightcap.xml
similarity index 100%
rename from items/equip-head/item0854_ElfNightcap.xml
rename to items/equip-head/item854_ElfNightcap.xml
diff --git a/items/equip-head/item0855_Sunglasses.xml b/items/equip-head/item855_Sunglasses.xml
similarity index 100%
rename from items/equip-head/item0855_Sunglasses.xml
rename to items/equip-head/item855_Sunglasses.xml
diff --git a/items/equip-head/item0856_KnitCap.xml b/items/equip-head/item856_KnitCap.xml
similarity index 100%
rename from items/equip-head/item0856_KnitCap.xml
rename to items/equip-head/item856_KnitCap.xml
diff --git a/items/equip-head/item0877_BullHelmet.xml b/items/equip-head/item877_BullHelmet.xml
similarity index 100%
rename from items/equip-head/item0877_BullHelmet.xml
rename to items/equip-head/item877_BullHelmet.xml
diff --git a/items/equip-head/item0882_RedEggshellHat.xml b/items/equip-head/item882_RedEggshellHat.xml
similarity index 100%
rename from items/equip-head/item0882_RedEggshellHat.xml
rename to items/equip-head/item882_RedEggshellHat.xml
diff --git a/items/equip-head/item0883_BlueEggshellHat.xml b/items/equip-head/item883_BlueEggshellHat.xml
similarity index 100%
rename from items/equip-head/item0883_BlueEggshellHat.xml
rename to items/equip-head/item883_BlueEggshellHat.xml
diff --git a/items/equip-head/item0884_YellowEggshellHat.xml b/items/equip-head/item884_YellowEggshellHat.xml
similarity index 100%
rename from items/equip-head/item0884_YellowEggshellHat.xml
rename to items/equip-head/item884_YellowEggshellHat.xml
diff --git a/items/equip-head/item0885_GreenEggshellHat.xml b/items/equip-head/item885_GreenEggshellHat.xml
similarity index 100%
rename from items/equip-head/item0885_GreenEggshellHat.xml
rename to items/equip-head/item885_GreenEggshellHat.xml
diff --git a/items/equip-head/item0886_OrangeEggshellHat.xml b/items/equip-head/item886_OrangeEggshellHat.xml
similarity index 100%
rename from items/equip-head/item0886_OrangeEggshellHat.xml
rename to items/equip-head/item886_OrangeEggshellHat.xml
diff --git a/items/equip-head/item0887_DarkEggshellHat.xml b/items/equip-head/item887_DarkEggshellHat.xml
similarity index 100%
rename from items/equip-head/item0887_DarkEggshellHat.xml
rename to items/equip-head/item887_DarkEggshellHat.xml
diff --git a/items/equip-head/item0888_MagicGMTopHat.xml b/items/equip-head/item888_MagicGMTopHat.xml
similarity index 100%
rename from items/equip-head/item0888_MagicGMTopHat.xml
rename to items/equip-head/item888_MagicGMTopHat.xml
diff --git a/items/equip-head/item0889_MurdererCrown.xml b/items/equip-head/item889_MurdererCrown.xml
similarity index 100%
rename from items/equip-head/item0889_MurdererCrown.xml
rename to items/equip-head/item889_MurdererCrown.xml
diff --git a/items/equip-head/item0890_BeanieCopter.xml b/items/equip-head/item890_BeanieCopter.xml
similarity index 100%
rename from items/equip-head/item0890_BeanieCopter.xml
rename to items/equip-head/item890_BeanieCopter.xml
diff --git a/items/equip-head/item0897_RedRoseHat.xml b/items/equip-head/item897_RedRoseHat.xml
similarity index 100%
rename from items/equip-head/item0897_RedRoseHat.xml
rename to items/equip-head/item897_RedRoseHat.xml
diff --git a/items/equip-head/item0898_WhiteRoseHat.xml b/items/equip-head/item898_WhiteRoseHat.xml
similarity index 100%
rename from items/equip-head/item0898_WhiteRoseHat.xml
rename to items/equip-head/item898_WhiteRoseHat.xml
diff --git a/items/equip-head/item0899_PinkRoseHat.xml b/items/equip-head/item899_PinkRoseHat.xml
similarity index 100%
rename from items/equip-head/item0899_PinkRoseHat.xml
rename to items/equip-head/item899_PinkRoseHat.xml
diff --git a/items/equip-head/item0900_YellowRoseHat.xml b/items/equip-head/item900_YellowRoseHat.xml
similarity index 100%
rename from items/equip-head/item0900_YellowRoseHat.xml
rename to items/equip-head/item900_YellowRoseHat.xml
diff --git a/items/equip-head/item0901_OrangeRoseHat.xml b/items/equip-head/item901_OrangeRoseHat.xml
similarity index 100%
rename from items/equip-head/item0901_OrangeRoseHat.xml
rename to items/equip-head/item901_OrangeRoseHat.xml
diff --git a/items/equip-head/item0902_BlueRoseHat.xml b/items/equip-head/item902_BlueRoseHat.xml
similarity index 100%
rename from items/equip-head/item0902_BlueRoseHat.xml
rename to items/equip-head/item902_BlueRoseHat.xml
diff --git a/items/equip-head/item0905_BucketHat.xml b/items/equip-head/item905_BucketHat.xml
similarity index 100%
rename from items/equip-head/item0905_BucketHat.xml
rename to items/equip-head/item905_BucketHat.xml
diff --git a/items/equip-legs/_include.xml b/items/equip-legs/_include.xml
index 28da0c09..bed2022f 100644
--- a/items/equip-legs/_include.xml
+++ b/items/equip-legs/_include.xml
@@ -1,16 +1,16 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/items/equip-legs/item0586_CottonShorts.xml b/items/equip-legs/item586_CottonShorts.xml
similarity index 100%
rename from items/equip-legs/item0586_CottonShorts.xml
rename to items/equip-legs/item586_CottonShorts.xml
diff --git a/items/equip-legs/item0610_JeansShorts.xml b/items/equip-legs/item610_JeansShorts.xml
similarity index 100%
rename from items/equip-legs/item0610_JeansShorts.xml
rename to items/equip-legs/item610_JeansShorts.xml
diff --git a/items/equip-legs/item0632_CottonSkirt.xml b/items/equip-legs/item632_CottonSkirt.xml
similarity index 100%
rename from items/equip-legs/item0632_CottonSkirt.xml
rename to items/equip-legs/item632_CottonSkirt.xml
diff --git a/items/equip-legs/item0642_JeansChaps.xml b/items/equip-legs/item642_JeansChaps.xml
similarity index 100%
rename from items/equip-legs/item0642_JeansChaps.xml
rename to items/equip-legs/item642_JeansChaps.xml
diff --git a/items/equip-legs/item0648_CottonTrousers.xml b/items/equip-legs/item648_CottonTrousers.xml
similarity index 100%
rename from items/equip-legs/item0648_CottonTrousers.xml
rename to items/equip-legs/item648_CottonTrousers.xml
diff --git a/items/equip-legs/item0731_AssassinPants.xml b/items/equip-legs/item731_AssassinPants.xml
similarity index 66%
rename from items/equip-legs/item0731_AssassinPants.xml
rename to items/equip-legs/item731_AssassinPants.xml
index 4df67df7..404d9fef 100644
--- a/items/equip-legs/item0731_AssassinPants.xml
+++ b/items/equip-legs/item731_AssassinPants.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/legs/assassin.xml
equipment/legs/assassin-female.xml
diff --git a/items/equip-legs/item0768_TerraniteLegs.xml b/items/equip-legs/item768_TerraniteLegs.xml
similarity index 100%
rename from items/equip-legs/item0768_TerraniteLegs.xml
rename to items/equip-legs/item768_TerraniteLegs.xml
diff --git a/items/equip-legs/item0771_Miniskirt.xml b/items/equip-legs/item771_Miniskirt.xml
similarity index 100%
rename from items/equip-legs/item0771_Miniskirt.xml
rename to items/equip-legs/item771_Miniskirt.xml
diff --git a/items/equip-legs/item0796_BromenalLegs.xml b/items/equip-legs/item796_BromenalLegs.xml
similarity index 83%
rename from items/equip-legs/item0796_BromenalLegs.xml
rename to items/equip-legs/item796_BromenalLegs.xml
index 4a2604f5..8fe6fb8a 100644
--- a/items/equip-legs/item0796_BromenalLegs.xml
+++ b/items/equip-legs/item796_BromenalLegs.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/legs/bromenallegs.xml
equipment/legs/bromenallegs-female.xml
diff --git a/items/equip-legs/item0857_LeatherTrousers.xml b/items/equip-legs/item857_LeatherTrousers.xml
similarity index 100%
rename from items/equip-legs/item0857_LeatherTrousers.xml
rename to items/equip-legs/item857_LeatherTrousers.xml
diff --git a/items/equip-legs/item0881_RaggedShorts.xml b/items/equip-legs/item881_RaggedShorts.xml
similarity index 100%
rename from items/equip-legs/item0881_RaggedShorts.xml
rename to items/equip-legs/item881_RaggedShorts.xml
diff --git a/items/equip-ring/_include.xml b/items/equip-ring/_include.xml
index 628269c4..71518519 100644
--- a/items/equip-ring/_include.xml
+++ b/items/equip-ring/_include.xml
@@ -1,6 +1,6 @@
-
+
@@ -8,6 +8,7 @@
+
diff --git a/items/equip-ring/item5252_GuardianWings.xml b/items/equip-ring/item5252_GuardianWings.xml
new file mode 100644
index 00000000..dd9b9663
--- /dev/null
+++ b/items/equip-ring/item5252_GuardianWings.xml
@@ -0,0 +1,7 @@
+
+
+ -
+ equipment/angel-wings.xml
+ graphics/particles/angel.particle.xml
+
+
diff --git a/items/equip-ring/item5253_MagicRing.xml b/items/equip-ring/item5253_MagicRing.xml
index 43316a8a..b16e193e 100644
--- a/items/equip-ring/item5253_MagicRing.xml
+++ b/items/equip-ring/item5253_MagicRing.xml
@@ -1,14 +1,5 @@
- -
+
-
diff --git a/items/equip-ring/item0702_WeddingRing.xml b/items/equip-ring/item702_WeddingRing.xml
similarity index 100%
rename from items/equip-ring/item0702_WeddingRing.xml
rename to items/equip-ring/item702_WeddingRing.xml
diff --git a/items/equip-shield/_include.xml b/items/equip-shield/_include.xml
index 52c514bf..2ff019f2 100644
--- a/items/equip-shield/_include.xml
+++ b/items/equip-shield/_include.xml
@@ -1,10 +1,7 @@
-
-
-
-
-
+
+
+
-
diff --git a/items/equip-shield/item0585_ScarabArmlet.xml b/items/equip-shield/item0585_ScarabArmlet.xml
deleted file mode 100644
index e2f5ed6e..00000000
--- a/items/equip-shield/item0585_ScarabArmlet.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/items/equip-shield/item0797_BromenalShield.xml b/items/equip-shield/item0797_BromenalShield.xml
deleted file mode 100644
index 7bd4eb51..00000000
--- a/items/equip-shield/item0797_BromenalShield.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- -
-
- equipment/shields/wooden.xml
-
-
diff --git a/items/equip-shield/item5285_DragonShield.xml b/items/equip-shield/item5285_DragonShield.xml
index 8f0a76ff..642ae392 100644
--- a/items/equip-shield/item5285_DragonShield.xml
+++ b/items/equip-shield/item5285_DragonShield.xml
@@ -4,6 +4,7 @@
image="equipment/shield/dragonshield.png"
name="Dragon Shield"
description="A mighty shield from the dragons of another world."
+ effect="Unobtainable."
defense="27"
mattack="-200"
type="equip-shield"
diff --git a/items/equip-shield/item5393_BlackSteelShield.xml b/items/equip-shield/item5393_BlackSteelShield.xml
deleted file mode 100644
index 685e6b98..00000000
--- a/items/equip-shield/item5393_BlackSteelShield.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- -
- equipment/shields/steel-dyable.xml|#000000,ffffff
-
-
diff --git a/items/equip-shield/item0601_SteelShield.xml b/items/equip-shield/item601_SteelShield.xml
similarity index 100%
rename from items/equip-shield/item0601_SteelShield.xml
rename to items/equip-shield/item601_SteelShield.xml
diff --git a/items/equip-shield/item0602_WoodenShield.xml b/items/equip-shield/item602_WoodenShield.xml
similarity index 100%
rename from items/equip-shield/item0602_WoodenShield.xml
rename to items/equip-shield/item602_WoodenShield.xml
diff --git a/items/equip-shield/item0603_LeatherShield.xml b/items/equip-shield/item603_LeatherShield.xml
similarity index 100%
rename from items/equip-shield/item0603_LeatherShield.xml
rename to items/equip-shield/item603_LeatherShield.xml
diff --git a/items/equip-torso/_include.xml b/items/equip-torso/_include.xml
index 00f8ec37..c40f010b 100644
--- a/items/equip-torso/_include.xml
+++ b/items/equip-torso/_include.xml
@@ -1,32 +1,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -239,18 +239,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/items/equip-torso/item0523_LeatherShirt.xml b/items/equip-torso/item523_LeatherShirt.xml
similarity index 100%
rename from items/equip-torso/item0523_LeatherShirt.xml
rename to items/equip-torso/item523_LeatherShirt.xml
diff --git a/items/equip-torso/item5299_RedSaviorArmor.xml b/items/equip-torso/item5299_RedSaviorArmor.xml
deleted file mode 100644
index b93f6eaa..00000000
--- a/items/equip-torso/item5299_RedSaviorArmor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/chest/saviorarmor-male.xml|#581a1a,a41111,c03a3a,ff6060
- equipment/chest/saviorarmor-female.xml|#581a1a,a41111,c03a3a,ff6060
-
-
diff --git a/items/equip-torso/item5300_GreenSaviorArmor.xml b/items/equip-torso/item5300_GreenSaviorArmor.xml
deleted file mode 100644
index 1916d605..00000000
--- a/items/equip-torso/item5300_GreenSaviorArmor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/chest/saviorarmor-male.xml|#255511,579932,4aaf36,4ed65e
- equipment/chest/saviorarmor-female.xml|#255511,579932,4aaf36,4ed65e
-
-
diff --git a/items/equip-torso/item5301_DarkBlueSaviorArmor.xml b/items/equip-torso/item5301_DarkBlueSaviorArmor.xml
deleted file mode 100644
index b5824cce..00000000
--- a/items/equip-torso/item5301_DarkBlueSaviorArmor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/chest/saviorarmor-male.xml|#1a1a41,392b6e,4c529f,5d5dc2
- equipment/chest/saviorarmor-female.xml|#1a1a41,392b6e,4c529f,5d5dc2
-
-
diff --git a/items/equip-torso/item5302_YellowSaviorArmor.xml b/items/equip-torso/item5302_YellowSaviorArmor.xml
deleted file mode 100644
index a699a300..00000000
--- a/items/equip-torso/item5302_YellowSaviorArmor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/chest/saviorarmor-male.xml|#846928,dab641,ffef93,fff7c9
- equipment/chest/saviorarmor-female.xml|#846928,dab641,ffef93,fff7c9
-
-
diff --git a/items/equip-torso/item5303_LightBlueSaviorArmor.xml b/items/equip-torso/item5303_LightBlueSaviorArmor.xml
deleted file mode 100644
index 0083ee8a..00000000
--- a/items/equip-torso/item5303_LightBlueSaviorArmor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/chest/saviorarmor-male.xml|#16486e,498ec5,e4f2fc
- equipment/chest/saviorarmor-female.xml|#16486e,498ec5,e4f2fc
-
-
diff --git a/items/equip-torso/item5304_PinkSaviorArmor.xml b/items/equip-torso/item5304_PinkSaviorArmor.xml
deleted file mode 100644
index 10c75155..00000000
--- a/items/equip-torso/item5304_PinkSaviorArmor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/chest/saviorarmor-male.xml|#bf369b,f25cb1,ff87b7,ffcccf
- equipment/chest/saviorarmor-female.xml|#bf369b,f25cb1,ff87b7,ffcccf
-
-
diff --git a/items/equip-torso/item5305_BlackSaviorArmor.xml b/items/equip-torso/item5305_BlackSaviorArmor.xml
deleted file mode 100644
index 56b0c29c..00000000
--- a/items/equip-torso/item5305_BlackSaviorArmor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/chest/saviorarmor-male.xml|#111111,222222,333333,444444,555555,aaaaaa
- equipment/chest/saviorarmor-female.xml|#111111,222222,333333,444444,555555,aaaaaa
-
-
diff --git a/items/equip-torso/item5306_OrangeSaviorArmor.xml b/items/equip-torso/item5306_OrangeSaviorArmor.xml
deleted file mode 100644
index d97aa7b4..00000000
--- a/items/equip-torso/item5306_OrangeSaviorArmor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/chest/saviorarmor-male.xml|#80280f,b04810,ef681f,ffb830
- equipment/chest/saviorarmor-female.xml|#80280f,b04810,ef681f,ffb830
-
-
diff --git a/items/equip-torso/item5307_PurpleSaviorArmor.xml b/items/equip-torso/item5307_PurpleSaviorArmor.xml
deleted file mode 100644
index f58fc074..00000000
--- a/items/equip-torso/item5307_PurpleSaviorArmor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/chest/saviorarmor-male.xml|#1a0a33,380f4d,82158c,b359ab
- equipment/chest/saviorarmor-female.xml|#1a0a33,380f4d,82158c,b359ab
-
-
diff --git a/items/equip-torso/item5308_DarkGreenSaviorArmor.xml b/items/equip-torso/item5308_DarkGreenSaviorArmor.xml
deleted file mode 100644
index 1e1b4729..00000000
--- a/items/equip-torso/item5308_DarkGreenSaviorArmor.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/chest/saviorarmor-male.xml|#0b300b,195519,3e832e,3e9c3e
- equipment/chest/saviorarmor-female.xml|#0b300b,195519,3e832e,3e9c3e
-
-
diff --git a/items/equip-torso/item5320_BlackChainmailShirt.xml b/items/equip-torso/item5320_BlackChainmailShirt.xml
deleted file mode 100644
index de8e2bec..00000000
--- a/items/equip-torso/item5320_BlackChainmailShirt.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/chest/chainmail.xml|#000000,ffffff
- equipment/chest/chainmail-female.xml|#000000,ffffff
-
-
diff --git a/items/equip-torso/item5321_BlackLightPlatemail.xml b/items/equip-torso/item5321_BlackLightPlatemail.xml
deleted file mode 100644
index e2e53b70..00000000
--- a/items/equip-torso/item5321_BlackLightPlatemail.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/chest/lightplatemail.xml|#000000,ffffff
- equipment/chest/lightplatemail-female.xml|#000000,ffffff
-
-
diff --git a/items/equip-torso/item5322_BlackWarlordPlate.xml b/items/equip-torso/item5322_BlackWarlordPlate.xml
deleted file mode 100644
index 86e94d61..00000000
--- a/items/equip-torso/item5322_BlackWarlordPlate.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- -
- equipment/chest/warlordplate.xml|#000000,ffffff
- equipment/chest/warlordplate-female.xml|#000000,ffffff
-
-
diff --git a/items/equip-torso/item5398_RaggedShirt.xml b/items/equip-torso/item5398_RaggedShirt.xml
deleted file mode 100644
index d23bd12b..00000000
--- a/items/equip-torso/item5398_RaggedShirt.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- -
- equipment/chest/cotton.xml|#95887F,E0D1C9
- equipment/chest/cotton-female.xml|#95887F,E0D1C9
-
-
-
-
-
-
-
-
-
-
diff --git a/items/equip-torso/item0546_DesertShirt.xml b/items/equip-torso/item546_DesertShirt.xml
similarity index 100%
rename from items/equip-torso/item0546_DesertShirt.xml
rename to items/equip-torso/item546_DesertShirt.xml
diff --git a/items/equip-torso/item0564_TurtleneckSweater.xml b/items/equip-torso/item564_TurtleneckSweater.xml
similarity index 100%
rename from items/equip-torso/item0564_TurtleneckSweater.xml
rename to items/equip-torso/item564_TurtleneckSweater.xml
diff --git a/items/equip-torso/item0624_VNeckSweater.xml b/items/equip-torso/item624_VNeckSweater.xml
similarity index 100%
rename from items/equip-torso/item0624_VNeckSweater.xml
rename to items/equip-torso/item624_VNeckSweater.xml
diff --git a/items/equip-torso/item0625_ChainmailShirt.xml b/items/equip-torso/item625_ChainmailShirt.xml
similarity index 100%
rename from items/equip-torso/item0625_ChainmailShirt.xml
rename to items/equip-torso/item625_ChainmailShirt.xml
diff --git a/items/equip-torso/item0626_LightPlatemail.xml b/items/equip-torso/item626_LightPlatemail.xml
similarity index 100%
rename from items/equip-torso/item0626_LightPlatemail.xml
rename to items/equip-torso/item626_LightPlatemail.xml
diff --git a/items/equip-torso/item0645_GoldenPlatemail.xml b/items/equip-torso/item645_GoldenPlatemail.xml
similarity index 79%
rename from items/equip-torso/item0645_GoldenPlatemail.xml
rename to items/equip-torso/item645_GoldenPlatemail.xml
index 30da7a0b..f754bcdb 100644
--- a/items/equip-torso/item0645_GoldenPlatemail.xml
+++ b/items/equip-torso/item645_GoldenPlatemail.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/chest/lightplatemail.xml|#573f10,9c8226,d3c04b,ffffff
equipment/chest/lightplatemail-female.xml|#573f10,9c8226,d3c04b,ffffff
diff --git a/items/equip-torso/item0649_WhiteEvokersRobeBlue.xml b/items/equip-torso/item649_WhiteEvokersRobeBlue.xml
similarity index 100%
rename from items/equip-torso/item0649_WhiteEvokersRobeBlue.xml
rename to items/equip-torso/item649_WhiteEvokersRobeBlue.xml
diff --git a/items/equip-torso/item0650_BlackEvokersRobeBlue.xml b/items/equip-torso/item650_BlackEvokersRobeBlue.xml
similarity index 100%
rename from items/equip-torso/item0650_BlackEvokersRobeBlue.xml
rename to items/equip-torso/item650_BlackEvokersRobeBlue.xml
diff --git a/items/equip-torso/item0651_WhiteWizardRobe.xml b/items/equip-torso/item651_WhiteWizardRobe.xml
similarity index 100%
rename from items/equip-torso/item0651_WhiteWizardRobe.xml
rename to items/equip-torso/item651_WhiteWizardRobe.xml
diff --git a/items/equip-torso/item0652_BlackWizardRobe.xml b/items/equip-torso/item652_BlackWizardRobe.xml
similarity index 100%
rename from items/equip-torso/item0652_BlackWizardRobe.xml
rename to items/equip-torso/item652_BlackWizardRobe.xml
diff --git a/items/equip-torso/item0653_ApprenticeRobe.xml b/items/equip-torso/item653_ApprenticeRobe.xml
similarity index 100%
rename from items/equip-torso/item0653_ApprenticeRobe.xml
rename to items/equip-torso/item653_ApprenticeRobe.xml
diff --git a/items/equip-torso/item0658_WarlordPlate.xml b/items/equip-torso/item658_WarlordPlate.xml
similarity index 100%
rename from items/equip-torso/item0658_WarlordPlate.xml
rename to items/equip-torso/item658_WarlordPlate.xml
diff --git a/items/equip-torso/item0659_GoldenWarlordPlate.xml b/items/equip-torso/item659_GoldenWarlordPlate.xml
similarity index 83%
rename from items/equip-torso/item0659_GoldenWarlordPlate.xml
rename to items/equip-torso/item659_GoldenWarlordPlate.xml
index fd425941..e11fed4b 100644
--- a/items/equip-torso/item0659_GoldenWarlordPlate.xml
+++ b/items/equip-torso/item659_GoldenWarlordPlate.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/chest/warlordplate.xml|#573f10,9c8226,d3c04b,ffffff
equipment/chest/warlordplate-female.xml|#573f10,9c8226,d3c04b,ffffff
diff --git a/items/equip-torso/item0688_TankTop.xml b/items/equip-torso/item688_TankTop.xml
similarity index 100%
rename from items/equip-torso/item0688_TankTop.xml
rename to items/equip-torso/item688_TankTop.xml
diff --git a/items/equip-torso/item0689_ShortTankTop.xml b/items/equip-torso/item689_ShortTankTop.xml
similarity index 100%
rename from items/equip-torso/item0689_ShortTankTop.xml
rename to items/equip-torso/item689_ShortTankTop.xml
diff --git a/items/equip-torso/item0720_SilkRobe.xml b/items/equip-torso/item720_SilkRobe.xml
similarity index 100%
rename from items/equip-torso/item0720_SilkRobe.xml
rename to items/equip-torso/item720_SilkRobe.xml
diff --git a/items/equip-torso/item0726_GMRobe.xml b/items/equip-torso/item726_GMRobe.xml
similarity index 100%
rename from items/equip-torso/item0726_GMRobe.xml
rename to items/equip-torso/item726_GMRobe.xml
diff --git a/items/equip-torso/item0755_AssassinShirt.xml b/items/equip-torso/item755_AssassinShirt.xml
similarity index 60%
rename from items/equip-torso/item0755_AssassinShirt.xml
rename to items/equip-torso/item755_AssassinShirt.xml
index a44a88ae..42be3e1e 100644
--- a/items/equip-torso/item0755_AssassinShirt.xml
+++ b/items/equip-torso/item755_AssassinShirt.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/chest/assassin.xml
equipment/chest/assassin-female.xml
diff --git a/items/equip-torso/item0767_TerraniteChestArmor.xml b/items/equip-torso/item767_TerraniteChestArmor.xml
similarity index 100%
rename from items/equip-torso/item0767_TerraniteChestArmor.xml
rename to items/equip-torso/item767_TerraniteChestArmor.xml
diff --git a/items/equip-torso/item0782_ForestArmor.xml b/items/equip-torso/item782_ForestArmor.xml
similarity index 100%
rename from items/equip-torso/item0782_ForestArmor.xml
rename to items/equip-torso/item782_ForestArmor.xml
diff --git a/items/equip-torso/item0783_ValentineDress.xml b/items/equip-torso/item783_ValentineDress.xml
similarity index 100%
rename from items/equip-torso/item0783_ValentineDress.xml
rename to items/equip-torso/item783_ValentineDress.xml
diff --git a/items/equip-torso/item0791_YetiSkinShirt.xml b/items/equip-torso/item791_YetiSkinShirt.xml
similarity index 100%
rename from items/equip-torso/item0791_YetiSkinShirt.xml
rename to items/equip-torso/item791_YetiSkinShirt.xml
diff --git a/items/equip-torso/item0793_BromenalChest.xml b/items/equip-torso/item793_BromenalChest.xml
similarity index 84%
rename from items/equip-torso/item0793_BromenalChest.xml
rename to items/equip-torso/item793_BromenalChest.xml
index 0bc9e4d6..efefec54 100644
--- a/items/equip-torso/item0793_BromenalChest.xml
+++ b/items/equip-torso/item793_BromenalChest.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/chest/bromenalchest.xml|#fbf5e9
equipment/chest/bromenalchest-female.xml|#fbf5e9
diff --git a/items/equip-torso/item0798_SorcererRobeRed.xml b/items/equip-torso/item798_SorcererRobeRed.xml
similarity index 100%
rename from items/equip-torso/item0798_SorcererRobeRed.xml
rename to items/equip-torso/item798_SorcererRobeRed.xml
diff --git a/items/equip-torso/item0870_FineDress.xml b/items/equip-torso/item870_FineDress.xml
similarity index 100%
rename from items/equip-torso/item0870_FineDress.xml
rename to items/equip-torso/item870_FineDress.xml
diff --git a/items/equip-torso/item0880_LazuriteRobe.xml b/items/equip-torso/item880_LazuriteRobe.xml
similarity index 79%
rename from items/equip-torso/item0880_LazuriteRobe.xml
rename to items/equip-torso/item880_LazuriteRobe.xml
index ed8088ad..9ef34667 100644
--- a/items/equip-torso/item0880_LazuriteRobe.xml
+++ b/items/equip-torso/item880_LazuriteRobe.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/chest/sorcerer-robe.xml|#2470BF,C9EAFF,D9D244;#cc7722
equipment/chest/sorcerer-robe-female.xml|#2470BF,C9EAFF,D9D244;#cc7722
diff --git a/items/generic/_include.xml b/items/generic/_include.xml
index 2c9418dc..8b450b61 100644
--- a/items/generic/_include.xml
+++ b/items/generic/_include.xml
@@ -1,147 +1,147 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -159,6 +159,7 @@
+
@@ -222,7 +223,7 @@
-
+
@@ -249,60 +250,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/items/generic/item0505_InsectSlime.xml b/items/generic/item0505_InsectSlime.xml
deleted file mode 100644
index e7fa77d8..00000000
--- a/items/generic/item0505_InsectSlime.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item0518_InsectLeg.xml b/items/generic/item0518_InsectLeg.xml
deleted file mode 100644
index 7f1b3162..00000000
--- a/items/generic/item0518_InsectLeg.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/usable/item1226_SilverBell.xml b/items/generic/item1226_SilverBell.xml
similarity index 53%
rename from items/usable/item1226_SilverBell.xml
rename to items/generic/item1226_SilverBell.xml
index 2d0b837e..21ff07d4 100644
--- a/items/usable/item1226_SilverBell.xml
+++ b/items/generic/item1226_SilverBell.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/generic/item0503_CasinoCoins.xml b/items/generic/item503_CasinoCoins.xml
similarity index 100%
rename from items/generic/item0503_CasinoCoins.xml
rename to items/generic/item503_CasinoCoins.xml
diff --git a/items/generic/item0504_DecorCandy.xml b/items/generic/item504_DecorCandy.xml
similarity index 100%
rename from items/generic/item0504_DecorCandy.xml
rename to items/generic/item504_DecorCandy.xml
diff --git a/items/generic/item505_MaggotSlime.xml b/items/generic/item505_MaggotSlime.xml
new file mode 100644
index 00000000..e5c98a00
--- /dev/null
+++ b/items/generic/item505_MaggotSlime.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/items/generic/item0507_ScorpionStinger.xml b/items/generic/item507_ScorpionStinger.xml
similarity index 100%
rename from items/generic/item0507_ScorpionStinger.xml
rename to items/generic/item507_ScorpionStinger.xml
diff --git a/items/generic/item5116_StalkerHorn.xml b/items/generic/item5116_StalkerHorn.xml
deleted file mode 100644
index 02bde735..00000000
--- a/items/generic/item5116_StalkerHorn.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5116_WraithHorn.xml b/items/generic/item5116_WraithHorn.xml
new file mode 100644
index 00000000..ed65df51
--- /dev/null
+++ b/items/generic/item5116_WraithHorn.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/items/generic/item0515_PurplePresentBox.xml b/items/generic/item515_PurplePresentBox.xml
similarity index 100%
rename from items/generic/item0515_PurplePresentBox.xml
rename to items/generic/item515_PurplePresentBox.xml
diff --git a/items/generic/item0516_BluePresentBox.xml b/items/generic/item516_BluePresentBox.xml
similarity index 100%
rename from items/generic/item0516_BluePresentBox.xml
rename to items/generic/item516_BluePresentBox.xml
diff --git a/items/generic/item0517_RedScorpionStinger.xml b/items/generic/item517_RedScorpionStinger.xml
similarity index 100%
rename from items/generic/item0517_RedScorpionStinger.xml
rename to items/generic/item517_RedScorpionStinger.xml
diff --git a/items/generic/item518_BugLeg.xml b/items/generic/item518_BugLeg.xml
new file mode 100644
index 00000000..419dd335
--- /dev/null
+++ b/items/generic/item518_BugLeg.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/items/generic/item5218_RedTicket.xml b/items/generic/item5218_RedTicket.xml
index bb8bf5c1..98897d84 100644
--- a/items/generic/item5218_RedTicket.xml
+++ b/items/generic/item5218_RedTicket.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/generic/item5219_YellowTicket.xml b/items/generic/item5219_YellowTicket.xml
index 2bc02fe4..70b1708a 100644
--- a/items/generic/item5219_YellowTicket.xml
+++ b/items/generic/item5219_YellowTicket.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/generic/item5220_GoldTicket.xml b/items/generic/item5220_GoldTicket.xml
index 455c281d..c1d4f0ef 100644
--- a/items/generic/item5220_GoldTicket.xml
+++ b/items/generic/item5220_GoldTicket.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/generic/item5221_GreenTicket.xml b/items/generic/item5221_GreenTicket.xml
index 7618fd3e..f09044f2 100644
--- a/items/generic/item5221_GreenTicket.xml
+++ b/items/generic/item5221_GreenTicket.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/generic/item5222_AquaTicket.xml b/items/generic/item5222_AquaTicket.xml
index 47c09188..48a87ce0 100644
--- a/items/generic/item5222_AquaTicket.xml
+++ b/items/generic/item5222_AquaTicket.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/generic/item5223_BlueTicket.xml b/items/generic/item5223_BlueTicket.xml
index 5ca5dc23..fc5c460a 100644
--- a/items/generic/item5223_BlueTicket.xml
+++ b/items/generic/item5223_BlueTicket.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/generic/item5224_PurpleTicket.xml b/items/generic/item5224_PurpleTicket.xml
index a907718c..f3b9c32e 100644
--- a/items/generic/item5224_PurpleTicket.xml
+++ b/items/generic/item5224_PurpleTicket.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/generic/item5225_PinkTicket.xml b/items/generic/item5225_PinkTicket.xml
index 9d8da2fa..f352b535 100644
--- a/items/generic/item5225_PinkTicket.xml
+++ b/items/generic/item5225_PinkTicket.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/generic/item0526_CoinBag.xml b/items/generic/item526_CoinBag.xml
similarity index 100%
rename from items/generic/item0526_CoinBag.xml
rename to items/generic/item526_CoinBag.xml
diff --git a/items/generic/item5279_Carrot.xml b/items/generic/item5279_Carrot.xml
new file mode 100644
index 00000000..0e2719f3
--- /dev/null
+++ b/items/generic/item5279_Carrot.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/items/generic/item5279_LegendaryCarrot.xml b/items/generic/item5279_LegendaryCarrot.xml
deleted file mode 100644
index 78abefa3..00000000
--- a/items/generic/item5279_LegendaryCarrot.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5288_Naphthalene.xml b/items/generic/item5288_Naphthalene.xml
deleted file mode 100644
index 47ad85dc..00000000
--- a/items/generic/item5288_Naphthalene.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5292_SilverOre.xml b/items/generic/item5292_SilverOre.xml
deleted file mode 100644
index 483cbc82..00000000
--- a/items/generic/item5292_SilverOre.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5293_CrystallizedDragonBlood.xml b/items/generic/item5293_CrystallizedDragonBlood.xml
deleted file mode 100644
index 3a5ed859..00000000
--- a/items/generic/item5293_CrystallizedDragonBlood.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5295_PinkFlowerSeed.xml b/items/generic/item5295_PinkFlowerSeed.xml
deleted file mode 100644
index 9507c5bb..00000000
--- a/items/generic/item5295_PinkFlowerSeed.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5296_SilverIngot.xml b/items/generic/item5296_SilverIngot.xml
deleted file mode 100644
index 83f4b43a..00000000
--- a/items/generic/item5296_SilverIngot.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
diff --git a/items/generic/item5297_GoldenTooth.xml b/items/generic/item5297_GoldenTooth.xml
deleted file mode 100644
index cc9c441d..00000000
--- a/items/generic/item5297_GoldenTooth.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5298_CloverDrawing.xml b/items/generic/item5298_CloverDrawing.xml
deleted file mode 100644
index e6762288..00000000
--- a/items/generic/item5298_CloverDrawing.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5311_ShadowHerb.xml b/items/generic/item5311_ShadowHerb.xml
deleted file mode 100644
index d8027ac6..00000000
--- a/items/generic/item5311_ShadowHerb.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5313_CrozeniteCrystal.xml b/items/generic/item5313_CrozeniteCrystal.xml
deleted file mode 100644
index cce5c85d..00000000
--- a/items/generic/item5313_CrozeniteCrystal.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5314_GoldOre.xml b/items/generic/item5314_GoldOre.xml
deleted file mode 100644
index bb6ece6b..00000000
--- a/items/generic/item5314_GoldOre.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5315_GoldIngot.xml b/items/generic/item5315_GoldIngot.xml
deleted file mode 100644
index f4bf128e..00000000
--- a/items/generic/item5315_GoldIngot.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
diff --git a/items/generic/item5316_BromenalOre.xml b/items/generic/item5316_BromenalOre.xml
deleted file mode 100644
index 743ccfff..00000000
--- a/items/generic/item5316_BromenalOre.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5317_BromenalIngot.xml b/items/generic/item5317_BromenalIngot.xml
deleted file mode 100644
index fbc5044f..00000000
--- a/items/generic/item5317_BromenalIngot.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
diff --git a/items/generic/item5318_BromenalDroplet.xml b/items/generic/item5318_BromenalDroplet.xml
deleted file mode 100644
index 3c1ac35a..00000000
--- a/items/generic/item5318_BromenalDroplet.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5319_ShadowPlantCrystalDust.xml b/items/generic/item5319_ShadowPlantCrystalDust.xml
deleted file mode 100644
index 094e5bf5..00000000
--- a/items/generic/item5319_ShadowPlantCrystalDust.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5327_CopperOre.xml b/items/generic/item5327_CopperOre.xml
deleted file mode 100644
index 5b9cd3d2..00000000
--- a/items/generic/item5327_CopperOre.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5328_CopperIngot.xml b/items/generic/item5328_CopperIngot.xml
deleted file mode 100644
index ff1bc62c..00000000
--- a/items/generic/item5328_CopperIngot.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5332_Charcoal.xml b/items/generic/item5332_Charcoal.xml
deleted file mode 100644
index a8f373e7..00000000
--- a/items/generic/item5332_Charcoal.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5355_TortugaShellFragment.xml b/items/generic/item5355_TortugaShellFragment.xml
deleted file mode 100644
index 3caed153..00000000
--- a/items/generic/item5355_TortugaShellFragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5356_TortugaShell.xml b/items/generic/item5356_TortugaShell.xml
deleted file mode 100644
index 995904ea..00000000
--- a/items/generic/item5356_TortugaShell.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5357_RattoTail.xml b/items/generic/item5357_RattoTail.xml
deleted file mode 100644
index f1da9ab9..00000000
--- a/items/generic/item5357_RattoTail.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5358_RattoTeeth.xml b/items/generic/item5358_RattoTeeth.xml
deleted file mode 100644
index 379641de..00000000
--- a/items/generic/item5358_RattoTeeth.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5359_SilverKey.xml b/items/generic/item5359_SilverKey.xml
deleted file mode 100644
index 7d7d0f96..00000000
--- a/items/generic/item5359_SilverKey.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5360_MushroomSpores.xml b/items/generic/item5360_MushroomSpores.xml
deleted file mode 100644
index 149f91ab..00000000
--- a/items/generic/item5360_MushroomSpores.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5361_Snowflake.xml b/items/generic/item5361_Snowflake.xml
deleted file mode 100644
index d98d5837..00000000
--- a/items/generic/item5361_Snowflake.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5362_BeeStinger.xml b/items/generic/item5362_BeeStinger.xml
deleted file mode 100644
index 63879cc9..00000000
--- a/items/generic/item5362_BeeStinger.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5363_Flour.xml b/items/generic/item5363_Flour.xml
deleted file mode 100644
index 81b51d8a..00000000
--- a/items/generic/item5363_Flour.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5365_DuckFeather.xml b/items/generic/item5365_DuckFeather.xml
deleted file mode 100644
index a5ed3806..00000000
--- a/items/generic/item5365_DuckFeather.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5366_CrocClaw.xml b/items/generic/item5366_CrocClaw.xml
deleted file mode 100644
index 57d403db..00000000
--- a/items/generic/item5366_CrocClaw.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5367_ScorpionClaw.xml b/items/generic/item5367_ScorpionClaw.xml
deleted file mode 100644
index 79c3cb73..00000000
--- a/items/generic/item5367_ScorpionClaw.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5368_RedScorpionClaw.xml b/items/generic/item5368_RedScorpionClaw.xml
deleted file mode 100644
index 59d18273..00000000
--- a/items/generic/item5368_RedScorpionClaw.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5369_BlackScorpionClaw.xml b/items/generic/item5369_BlackScorpionClaw.xml
deleted file mode 100644
index 4395918d..00000000
--- a/items/generic/item5369_BlackScorpionClaw.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5370_GoldenScorpionClaw.xml b/items/generic/item5370_GoldenScorpionClaw.xml
deleted file mode 100644
index d4b900e8..00000000
--- a/items/generic/item5370_GoldenScorpionClaw.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5371_DragonScales.xml b/items/generic/item5371_DragonScales.xml
deleted file mode 100644
index 040c8fa0..00000000
--- a/items/generic/item5371_DragonScales.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5372_DragonHorn.xml b/items/generic/item5372_DragonHorn.xml
deleted file mode 100644
index 50e3e3d3..00000000
--- a/items/generic/item5372_DragonHorn.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5375_JunglefowlFeather.xml b/items/generic/item5375_JunglefowlFeather.xml
deleted file mode 100644
index 11d5093f..00000000
--- a/items/generic/item5375_JunglefowlFeather.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5376_KingChonkyBirbFeather.xml b/items/generic/item5376_KingChonkyBirbFeather.xml
deleted file mode 100644
index 88da7a16..00000000
--- a/items/generic/item5376_KingChonkyBirbFeather.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5377_Honeycomb.xml b/items/generic/item5377_Honeycomb.xml
deleted file mode 100644
index a6c1b611..00000000
--- a/items/generic/item5377_Honeycomb.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5378_Beeswax.xml b/items/generic/item5378_Beeswax.xml
deleted file mode 100644
index 09ae4120..00000000
--- a/items/generic/item5378_Beeswax.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item0537_TreasureKey.xml b/items/generic/item537_TreasureKey.xml
similarity index 100%
rename from items/generic/item0537_TreasureKey.xml
rename to items/generic/item537_TreasureKey.xml
diff --git a/items/generic/item5380_Stone.xml b/items/generic/item5380_Stone.xml
deleted file mode 100644
index e9d87f5d..00000000
--- a/items/generic/item5380_Stone.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5381_Brick.xml b/items/generic/item5381_Brick.xml
deleted file mode 100644
index deb6b9e6..00000000
--- a/items/generic/item5381_Brick.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5384_MountainCrystal.xml b/items/generic/item5384_MountainCrystal.xml
deleted file mode 100644
index 9fea62f0..00000000
--- a/items/generic/item5384_MountainCrystal.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5385_BlackQuartz.xml b/items/generic/item5385_BlackQuartz.xml
deleted file mode 100644
index c919c947..00000000
--- a/items/generic/item5385_BlackQuartz.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5386_GlassShards.xml b/items/generic/item5386_GlassShards.xml
deleted file mode 100644
index 7574de96..00000000
--- a/items/generic/item5386_GlassShards.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5387_Hay.xml b/items/generic/item5387_Hay.xml
deleted file mode 100644
index 41497f7a..00000000
--- a/items/generic/item5387_Hay.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5388_Straw.xml b/items/generic/item5388_Straw.xml
deleted file mode 100644
index 15c6f8be..00000000
--- a/items/generic/item5388_Straw.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5389_SpeltSeeds.xml b/items/generic/item5389_SpeltSeeds.xml
deleted file mode 100644
index cce7e8fa..00000000
--- a/items/generic/item5389_SpeltSeeds.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item0538_GreenPresentBox.xml b/items/generic/item538_GreenPresentBox.xml
similarity index 100%
rename from items/generic/item0538_GreenPresentBox.xml
rename to items/generic/item538_GreenPresentBox.xml
diff --git a/items/generic/item5390_MoonDust.xml b/items/generic/item5390_MoonDust.xml
deleted file mode 100644
index 4464262c..00000000
--- a/items/generic/item5390_MoonDust.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5391_SunDust.xml b/items/generic/item5391_SunDust.xml
deleted file mode 100644
index dab7cd40..00000000
--- a/items/generic/item5391_SunDust.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item0540_EmptyBottle.xml b/items/generic/item540_EmptyBottle.xml
similarity index 61%
rename from items/generic/item0540_EmptyBottle.xml
rename to items/generic/item540_EmptyBottle.xml
index 31781bb7..7168acad 100644
--- a/items/generic/item0540_EmptyBottle.xml
+++ b/items/generic/item540_EmptyBottle.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/generic/item5410_WonderWood.xml b/items/generic/item5410_WonderWood.xml
deleted file mode 100644
index e851154a..00000000
--- a/items/generic/item5410_WonderWood.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5411_WonderWoodlingBlossom.xml b/items/generic/item5411_WonderWoodlingBlossom.xml
deleted file mode 100644
index affd5e30..00000000
--- a/items/generic/item5411_WonderWoodlingBlossom.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5412_WonderWoodlingSeed.xml b/items/generic/item5412_WonderWoodlingSeed.xml
deleted file mode 100644
index 9c7c585b..00000000
--- a/items/generic/item5412_WonderWoodlingSeed.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5413_Moonshiner.xml b/items/generic/item5413_Moonshiner.xml
deleted file mode 100644
index 1f326864..00000000
--- a/items/generic/item5413_Moonshiner.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5414_Raindrop.xml b/items/generic/item5414_Raindrop.xml
deleted file mode 100644
index 94838f47..00000000
--- a/items/generic/item5414_Raindrop.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item5415_PinkQuartz.xml b/items/generic/item5415_PinkQuartz.xml
deleted file mode 100644
index 41e8ac1b..00000000
--- a/items/generic/item5415_PinkQuartz.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/generic/item0542_BottleofSand.xml b/items/generic/item542_BottleofSand.xml
similarity index 100%
rename from items/generic/item0542_BottleofSand.xml
rename to items/generic/item542_BottleofSand.xml
diff --git a/items/generic/item0551_AquaHint.xml b/items/generic/item551_AquaHint.xml
similarity index 100%
rename from items/generic/item0551_AquaHint.xml
rename to items/generic/item551_AquaHint.xml
diff --git a/items/generic/item0552_MagentaHint.xml b/items/generic/item552_MagentaHint.xml
similarity index 100%
rename from items/generic/item0552_MagentaHint.xml
rename to items/generic/item552_MagentaHint.xml
diff --git a/items/generic/item0553_YellowHint.xml b/items/generic/item553_YellowHint.xml
similarity index 100%
rename from items/generic/item0553_YellowHint.xml
rename to items/generic/item553_YellowHint.xml
diff --git a/items/generic/item0554_GreenHint.xml b/items/generic/item554_GreenHint.xml
similarity index 100%
rename from items/generic/item0554_GreenHint.xml
rename to items/generic/item554_GreenHint.xml
diff --git a/items/generic/item0555_TealHint.xml b/items/generic/item555_TealHint.xml
similarity index 100%
rename from items/generic/item0555_TealHint.xml
rename to items/generic/item555_TealHint.xml
diff --git a/items/generic/item0556_PurpleHint.xml b/items/generic/item556_PurpleHint.xml
similarity index 100%
rename from items/generic/item0556_PurpleHint.xml
rename to items/generic/item556_PurpleHint.xml
diff --git a/items/generic/item0557_RedHint.xml b/items/generic/item557_RedHint.xml
similarity index 100%
rename from items/generic/item0557_RedHint.xml
rename to items/generic/item557_RedHint.xml
diff --git a/items/generic/item0558_BlueHint.xml b/items/generic/item558_BlueHint.xml
similarity index 100%
rename from items/generic/item0558_BlueHint.xml
rename to items/generic/item558_BlueHint.xml
diff --git a/items/generic/item0559_OrangeHint.xml b/items/generic/item559_OrangeHint.xml
similarity index 100%
rename from items/generic/item0559_OrangeHint.xml
rename to items/generic/item559_OrangeHint.xml
diff --git a/items/generic/item0560_GrayHint.xml b/items/generic/item560_GrayHint.xml
similarity index 100%
rename from items/generic/item0560_GrayHint.xml
rename to items/generic/item560_GrayHint.xml
diff --git a/items/generic/item0569_RawLog.xml b/items/generic/item569_RawLog.xml
similarity index 100%
rename from items/generic/item0569_RawLog.xml
rename to items/generic/item569_RawLog.xml
diff --git a/items/generic/item0589_Toothbrush.xml b/items/generic/item589_Toothbrush.xml
similarity index 100%
rename from items/generic/item0589_Toothbrush.xml
rename to items/generic/item589_Toothbrush.xml
diff --git a/items/generic/item0611_WhiteFur.xml b/items/generic/item611_WhiteFur.xml
similarity index 100%
rename from items/generic/item0611_WhiteFur.xml
rename to items/generic/item611_WhiteFur.xml
diff --git a/items/generic/item0612_CaveSnakeLamp.xml b/items/generic/item612_CaveSnakeLamp.xml
similarity index 100%
rename from items/generic/item0612_CaveSnakeLamp.xml
rename to items/generic/item612_CaveSnakeLamp.xml
diff --git a/items/generic/item0613_HardSpike.xml b/items/generic/item613_HardSpike.xml
similarity index 100%
rename from items/generic/item0613_HardSpike.xml
rename to items/generic/item613_HardSpike.xml
diff --git a/items/generic/item0614_PinkAntenna.xml b/items/generic/item614_PinkAntenna.xml
similarity index 100%
rename from items/generic/item0614_PinkAntenna.xml
rename to items/generic/item614_PinkAntenna.xml
diff --git a/items/generic/item0631_DarkCrystal.xml b/items/generic/item631_DarkCrystal.xml
similarity index 100%
rename from items/generic/item0631_DarkCrystal.xml
rename to items/generic/item631_DarkCrystal.xml
diff --git a/items/generic/item0635_SantaCookie.xml b/items/generic/item635_SantaCookie.xml
similarity index 100%
rename from items/generic/item0635_SantaCookie.xml
rename to items/generic/item635_SantaCookie.xml
diff --git a/items/generic/item0640_IronOre.xml b/items/generic/item640_IronOre.xml
similarity index 100%
rename from items/generic/item0640_IronOre.xml
rename to items/generic/item640_IronOre.xml
diff --git a/items/generic/item0641_SnakeSkin.xml b/items/generic/item641_SnakeSkin.xml
similarity index 100%
rename from items/generic/item0641_SnakeSkin.xml
rename to items/generic/item641_SnakeSkin.xml
diff --git a/items/generic/item0660_CottonCloth.xml b/items/generic/item660_CottonCloth.xml
similarity index 100%
rename from items/generic/item0660_CottonCloth.xml
rename to items/generic/item660_CottonCloth.xml
diff --git a/items/generic/item0661_RedRose.xml b/items/generic/item661_RedRose.xml
similarity index 100%
rename from items/generic/item0661_RedRose.xml
rename to items/generic/item661_RedRose.xml
diff --git a/items/generic/item0662_WhiteRose.xml b/items/generic/item662_WhiteRose.xml
similarity index 100%
rename from items/generic/item0662_WhiteRose.xml
rename to items/generic/item662_WhiteRose.xml
diff --git a/items/generic/item0663_DarkRedRose.xml b/items/generic/item663_DarkRedRose.xml
similarity index 100%
rename from items/generic/item0663_DarkRedRose.xml
rename to items/generic/item663_DarkRedRose.xml
diff --git a/items/generic/item0664_PinkRose.xml b/items/generic/item664_PinkRose.xml
similarity index 100%
rename from items/generic/item0664_PinkRose.xml
rename to items/generic/item664_PinkRose.xml
diff --git a/items/generic/item0665_YellowRose.xml b/items/generic/item665_YellowRose.xml
similarity index 100%
rename from items/generic/item0665_YellowRose.xml
rename to items/generic/item665_YellowRose.xml
diff --git a/items/generic/item0666_BlackRose.xml b/items/generic/item666_BlackRose.xml
similarity index 100%
rename from items/generic/item0666_BlackRose.xml
rename to items/generic/item666_BlackRose.xml
diff --git a/items/generic/item0667_OrangeRose.xml b/items/generic/item667_OrangeRose.xml
similarity index 100%
rename from items/generic/item0667_OrangeRose.xml
rename to items/generic/item667_OrangeRose.xml
diff --git a/items/generic/item0668_BlueRose.xml b/items/generic/item668_BlueRose.xml
similarity index 100%
rename from items/generic/item0668_BlueRose.xml
rename to items/generic/item668_BlueRose.xml
diff --git a/items/generic/item0669_YellowTulip.xml b/items/generic/item669_YellowTulip.xml
similarity index 100%
rename from items/generic/item0669_YellowTulip.xml
rename to items/generic/item669_YellowTulip.xml
diff --git a/items/generic/item0670_PurpleTulip.xml b/items/generic/item670_PurpleTulip.xml
similarity index 100%
rename from items/generic/item0670_PurpleTulip.xml
rename to items/generic/item670_PurpleTulip.xml
diff --git a/items/generic/item0671_RedTulip.xml b/items/generic/item671_RedTulip.xml
similarity index 100%
rename from items/generic/item0671_RedTulip.xml
rename to items/generic/item671_RedTulip.xml
diff --git a/items/generic/item0672_WhiteTulip.xml b/items/generic/item672_WhiteTulip.xml
similarity index 100%
rename from items/generic/item0672_WhiteTulip.xml
rename to items/generic/item672_WhiteTulip.xml
diff --git a/items/generic/item0673_PinkTulip.xml b/items/generic/item673_PinkTulip.xml
similarity index 100%
rename from items/generic/item0673_PinkTulip.xml
rename to items/generic/item673_PinkTulip.xml
diff --git a/items/generic/item0674_OrangeTulip.xml b/items/generic/item674_OrangeTulip.xml
similarity index 100%
rename from items/generic/item0674_OrangeTulip.xml
rename to items/generic/item674_OrangeTulip.xml
diff --git a/items/generic/item0680_MauveHerb.xml b/items/generic/item680_MauveHerb.xml
similarity index 100%
rename from items/generic/item0680_MauveHerb.xml
rename to items/generic/item680_MauveHerb.xml
diff --git a/items/generic/item0681_CobaltHerb.xml b/items/generic/item681_CobaltHerb.xml
similarity index 100%
rename from items/generic/item0681_CobaltHerb.xml
rename to items/generic/item681_CobaltHerb.xml
diff --git a/items/generic/item0682_GambogeHerb.xml b/items/generic/item682_GambogeHerb.xml
similarity index 100%
rename from items/generic/item0682_GambogeHerb.xml
rename to items/generic/item682_GambogeHerb.xml
diff --git a/items/generic/item0683_AlizarinHerb.xml b/items/generic/item683_AlizarinHerb.xml
similarity index 100%
rename from items/generic/item0683_AlizarinHerb.xml
rename to items/generic/item683_AlizarinHerb.xml
diff --git a/items/generic/item0690_RedDye.xml b/items/generic/item690_RedDye.xml
similarity index 100%
rename from items/generic/item0690_RedDye.xml
rename to items/generic/item690_RedDye.xml
diff --git a/items/generic/item0691_GreenDye.xml b/items/generic/item691_GreenDye.xml
similarity index 100%
rename from items/generic/item0691_GreenDye.xml
rename to items/generic/item691_GreenDye.xml
diff --git a/items/generic/item0692_DarkBlueDye.xml b/items/generic/item692_DarkBlueDye.xml
similarity index 100%
rename from items/generic/item0692_DarkBlueDye.xml
rename to items/generic/item692_DarkBlueDye.xml
diff --git a/items/generic/item0693_YellowDye.xml b/items/generic/item693_YellowDye.xml
similarity index 100%
rename from items/generic/item0693_YellowDye.xml
rename to items/generic/item693_YellowDye.xml
diff --git a/items/generic/item0694_LightBlueDye.xml b/items/generic/item694_LightBlueDye.xml
similarity index 100%
rename from items/generic/item0694_LightBlueDye.xml
rename to items/generic/item694_LightBlueDye.xml
diff --git a/items/generic/item0695_PinkDye.xml b/items/generic/item695_PinkDye.xml
similarity index 100%
rename from items/generic/item0695_PinkDye.xml
rename to items/generic/item695_PinkDye.xml
diff --git a/items/generic/item0696_BlackDye.xml b/items/generic/item696_BlackDye.xml
similarity index 100%
rename from items/generic/item0696_BlackDye.xml
rename to items/generic/item696_BlackDye.xml
diff --git a/items/generic/item0697_OrangeDye.xml b/items/generic/item697_OrangeDye.xml
similarity index 100%
rename from items/generic/item0697_OrangeDye.xml
rename to items/generic/item697_OrangeDye.xml
diff --git a/items/generic/item0698_PurpleDye.xml b/items/generic/item698_PurpleDye.xml
similarity index 100%
rename from items/generic/item0698_PurpleDye.xml
rename to items/generic/item698_PurpleDye.xml
diff --git a/items/generic/item0699_DarkGreenDye.xml b/items/generic/item699_DarkGreenDye.xml
similarity index 100%
rename from items/generic/item0699_DarkGreenDye.xml
rename to items/generic/item699_DarkGreenDye.xml
diff --git a/items/generic/item0700_Pearl.xml b/items/generic/item700_Pearl.xml
similarity index 100%
rename from items/generic/item0700_Pearl.xml
rename to items/generic/item700_Pearl.xml
diff --git a/items/generic/item0701_PileofAsh.xml b/items/generic/item701_PileofAsh.xml
similarity index 100%
rename from items/generic/item0701_PileofAsh.xml
rename to items/generic/item701_PileofAsh.xml
diff --git a/items/generic/item0703_SulphurPowder.xml b/items/generic/item703_SulphurPowder.xml
similarity index 100%
rename from items/generic/item0703_SulphurPowder.xml
rename to items/generic/item703_SulphurPowder.xml
diff --git a/items/generic/item0704_IronPowder.xml b/items/generic/item704_IronPowder.xml
similarity index 100%
rename from items/generic/item0704_IronPowder.xml
rename to items/generic/item704_IronPowder.xml
diff --git a/items/generic/item0706_GoldenScorpionStinger.xml b/items/generic/item706_GoldenScorpionStinger.xml
similarity index 100%
rename from items/generic/item0706_GoldenScorpionStinger.xml
rename to items/generic/item706_GoldenScorpionStinger.xml
diff --git a/items/generic/item0707_MonsterOilPotion.xml b/items/generic/item707_MonsterOilPotion.xml
similarity index 100%
rename from items/generic/item0707_MonsterOilPotion.xml
rename to items/generic/item707_MonsterOilPotion.xml
diff --git a/items/generic/item0708_LeatherPatch.xml b/items/generic/item708_LeatherPatch.xml
similarity index 100%
rename from items/generic/item0708_LeatherPatch.xml
rename to items/generic/item708_LeatherPatch.xml
diff --git a/items/generic/item0709_BlackScorpionStinger.xml b/items/generic/item709_BlackScorpionStinger.xml
similarity index 100%
rename from items/generic/item0709_BlackScorpionStinger.xml
rename to items/generic/item709_BlackScorpionStinger.xml
diff --git a/items/generic/item0710_SnakeTongue.xml b/items/generic/item710_SnakeTongue.xml
similarity index 100%
rename from items/generic/item0710_SnakeTongue.xml
rename to items/generic/item710_SnakeTongue.xml
diff --git a/items/generic/item0711_MountainSnakeTongue.xml b/items/generic/item711_MountainSnakeTongue.xml
similarity index 100%
rename from items/generic/item0711_MountainSnakeTongue.xml
rename to items/generic/item711_MountainSnakeTongue.xml
diff --git a/items/generic/item0712_GrassSnakeTongue.xml b/items/generic/item712_GrassSnakeTongue.xml
similarity index 100%
rename from items/generic/item0712_GrassSnakeTongue.xml
rename to items/generic/item712_GrassSnakeTongue.xml
diff --git a/items/generic/item0713_CaveSnakeTongue.xml b/items/generic/item713_CaveSnakeTongue.xml
similarity index 100%
rename from items/generic/item0713_CaveSnakeTongue.xml
rename to items/generic/item713_CaveSnakeTongue.xml
diff --git a/items/generic/item0718_SilkCocoon.xml b/items/generic/item718_SilkCocoon.xml
similarity index 100%
rename from items/generic/item0718_SilkCocoon.xml
rename to items/generic/item718_SilkCocoon.xml
diff --git a/items/generic/item0727_Iten.xml b/items/generic/item727_Iten.xml
similarity index 100%
rename from items/generic/item0727_Iten.xml
rename to items/generic/item727_Iten.xml
diff --git a/items/generic/item0728_MoubooFigurine.xml b/items/generic/item728_MoubooFigurine.xml
similarity index 100%
rename from items/generic/item0728_MoubooFigurine.xml
rename to items/generic/item728_MoubooFigurine.xml
diff --git a/items/generic/item0729_WarpedLog.xml b/items/generic/item729_WarpedLog.xml
similarity index 100%
rename from items/generic/item0729_WarpedLog.xml
rename to items/generic/item729_WarpedLog.xml
diff --git a/items/generic/item0730_Lifestone.xml b/items/generic/item730_Lifestone.xml
similarity index 100%
rename from items/generic/item0730_Lifestone.xml
rename to items/generic/item730_Lifestone.xml
diff --git a/items/generic/item0732_DruidTreeBranch.xml b/items/generic/item732_DruidTreeBranch.xml
similarity index 100%
rename from items/generic/item0732_DruidTreeBranch.xml
rename to items/generic/item732_DruidTreeBranch.xml
diff --git a/items/generic/item0740_Root.xml b/items/generic/item740_Root.xml
similarity index 100%
rename from items/generic/item0740_Root.xml
rename to items/generic/item740_Root.xml
diff --git a/items/generic/item0753_BatWing.xml b/items/generic/item753_BatWing.xml
similarity index 100%
rename from items/generic/item0753_BatWing.xml
rename to items/generic/item753_BatWing.xml
diff --git a/items/generic/item0754_BatTeeth.xml b/items/generic/item754_BatTeeth.xml
similarity index 100%
rename from items/generic/item0754_BatTeeth.xml
rename to items/generic/item754_BatTeeth.xml
diff --git a/items/generic/item0763_TerraniteOre.xml b/items/generic/item763_TerraniteOre.xml
similarity index 100%
rename from items/generic/item0763_TerraniteOre.xml
rename to items/generic/item763_TerraniteOre.xml
diff --git a/items/generic/item0772_WispPowder.xml b/items/generic/item772_WispPowder.xml
similarity index 100%
rename from items/generic/item0772_WispPowder.xml
rename to items/generic/item772_WispPowder.xml
diff --git a/items/generic/item0773_SpectrePowder.xml b/items/generic/item773_SpectrePowder.xml
similarity index 100%
rename from items/generic/item0773_SpectrePowder.xml
rename to items/generic/item773_SpectrePowder.xml
diff --git a/items/generic/item0774_PoltergeistPowder.xml b/items/generic/item774_PoltergeistPowder.xml
similarity index 100%
rename from items/generic/item0774_PoltergeistPowder.xml
rename to items/generic/item774_PoltergeistPowder.xml
diff --git a/items/generic/item0775_Bone.xml b/items/generic/item775_Bone.xml
similarity index 100%
rename from items/generic/item0775_Bone.xml
rename to items/generic/item775_Bone.xml
diff --git a/items/generic/item0776_Skull.xml b/items/generic/item776_Skull.xml
similarity index 100%
rename from items/generic/item0776_Skull.xml
rename to items/generic/item776_Skull.xml
diff --git a/items/generic/item0777_RottenRags.xml b/items/generic/item777_RottenRags.xml
similarity index 100%
rename from items/generic/item0777_RottenRags.xml
rename to items/generic/item777_RottenRags.xml
diff --git a/items/generic/item0778_DiseasedHeart.xml b/items/generic/item778_DiseasedHeart.xml
similarity index 100%
rename from items/generic/item0778_DiseasedHeart.xml
rename to items/generic/item778_DiseasedHeart.xml
diff --git a/items/generic/item0779_UndeadEar.xml b/items/generic/item779_UndeadEar.xml
similarity index 100%
rename from items/generic/item0779_UndeadEar.xml
rename to items/generic/item779_UndeadEar.xml
diff --git a/items/generic/item0780_UndeadEye.xml b/items/generic/item780_UndeadEye.xml
similarity index 100%
rename from items/generic/item0780_UndeadEye.xml
rename to items/generic/item780_UndeadEye.xml
diff --git a/items/generic/item0799_MylarinDust.xml b/items/generic/item799_MylarinDust.xml
similarity index 100%
rename from items/generic/item0799_MylarinDust.xml
rename to items/generic/item799_MylarinDust.xml
diff --git a/items/generic/item0802_EasterBasket.xml b/items/generic/item802_EasterBasket.xml
similarity index 100%
rename from items/generic/item0802_EasterBasket.xml
rename to items/generic/item802_EasterBasket.xml
diff --git a/items/generic/item0803_GrassLiner.xml b/items/generic/item803_GrassLiner.xml
similarity index 100%
rename from items/generic/item0803_GrassLiner.xml
rename to items/generic/item803_GrassLiner.xml
diff --git a/items/generic/item0804_JellyBeans.xml b/items/generic/item804_JellyBeans.xml
similarity index 100%
rename from items/generic/item0804_JellyBeans.xml
rename to items/generic/item804_JellyBeans.xml
diff --git a/items/generic/item0805_ChocolateMouboo.xml b/items/generic/item805_ChocolateMouboo.xml
similarity index 100%
rename from items/generic/item0805_ChocolateMouboo.xml
rename to items/generic/item805_ChocolateMouboo.xml
diff --git a/items/generic/item0806_ReedBundle.xml b/items/generic/item806_ReedBundle.xml
similarity index 100%
rename from items/generic/item0806_ReedBundle.xml
rename to items/generic/item806_ReedBundle.xml
diff --git a/items/generic/item0807_GrassSeeds.xml b/items/generic/item807_GrassSeeds.xml
similarity index 100%
rename from items/generic/item0807_GrassSeeds.xml
rename to items/generic/item807_GrassSeeds.xml
diff --git a/items/generic/item0819_DiamondPowder.xml b/items/generic/item819_DiamondPowder.xml
similarity index 100%
rename from items/generic/item0819_DiamondPowder.xml
rename to items/generic/item819_DiamondPowder.xml
diff --git a/items/generic/item0820_RubyPowder.xml b/items/generic/item820_RubyPowder.xml
similarity index 100%
rename from items/generic/item0820_RubyPowder.xml
rename to items/generic/item820_RubyPowder.xml
diff --git a/items/generic/item0821_EmeraldPowder.xml b/items/generic/item821_EmeraldPowder.xml
similarity index 100%
rename from items/generic/item0821_EmeraldPowder.xml
rename to items/generic/item821_EmeraldPowder.xml
diff --git a/items/generic/item0822_SapphirePowder.xml b/items/generic/item822_SapphirePowder.xml
similarity index 100%
rename from items/generic/item0822_SapphirePowder.xml
rename to items/generic/item822_SapphirePowder.xml
diff --git a/items/generic/item0823_TopazPowder.xml b/items/generic/item823_TopazPowder.xml
similarity index 100%
rename from items/generic/item0823_TopazPowder.xml
rename to items/generic/item823_TopazPowder.xml
diff --git a/items/generic/item0824_AmethystPowder.xml b/items/generic/item824_AmethystPowder.xml
similarity index 100%
rename from items/generic/item0824_AmethystPowder.xml
rename to items/generic/item824_AmethystPowder.xml
diff --git a/items/generic/item0833_BrokenFourLeafAmulet.xml b/items/generic/item833_BrokenFourLeafAmulet.xml
similarity index 100%
rename from items/generic/item0833_BrokenFourLeafAmulet.xml
rename to items/generic/item833_BrokenFourLeafAmulet.xml
diff --git a/items/generic/item0834_BrokenDoll.xml b/items/generic/item834_BrokenDoll.xml
similarity index 100%
rename from items/generic/item0834_BrokenDoll.xml
rename to items/generic/item834_BrokenDoll.xml
diff --git a/items/generic/item0835_HyvernStinger.xml b/items/generic/item835_HyvernStinger.xml
similarity index 100%
rename from items/generic/item0835_HyvernStinger.xml
rename to items/generic/item835_HyvernStinger.xml
diff --git a/items/generic/item0836_GrubSlime.xml b/items/generic/item836_GrubSlime.xml
similarity index 100%
rename from items/generic/item0836_GrubSlime.xml
rename to items/generic/item836_GrubSlime.xml
diff --git a/items/generic/item0841_RedDottedWrap.xml b/items/generic/item841_RedDottedWrap.xml
similarity index 100%
rename from items/generic/item0841_RedDottedWrap.xml
rename to items/generic/item841_RedDottedWrap.xml
diff --git a/items/generic/item0842_YellowDottedWrap.xml b/items/generic/item842_YellowDottedWrap.xml
similarity index 100%
rename from items/generic/item0842_YellowDottedWrap.xml
rename to items/generic/item842_YellowDottedWrap.xml
diff --git a/items/generic/item0843_BlueDottedWrap.xml b/items/generic/item843_BlueDottedWrap.xml
similarity index 100%
rename from items/generic/item0843_BlueDottedWrap.xml
rename to items/generic/item843_BlueDottedWrap.xml
diff --git a/items/generic/item0844_PurpleStripedWrap.xml b/items/generic/item844_PurpleStripedWrap.xml
similarity index 100%
rename from items/generic/item0844_PurpleStripedWrap.xml
rename to items/generic/item844_PurpleStripedWrap.xml
diff --git a/items/generic/item0845_RedGoldenStripedWrap.xml b/items/generic/item845_RedGoldenStripedWrap.xml
similarity index 100%
rename from items/generic/item0845_RedGoldenStripedWrap.xml
rename to items/generic/item845_RedGoldenStripedWrap.xml
diff --git a/items/generic/item0846_GreenRedStripedWrap.xml b/items/generic/item846_GreenRedStripedWrap.xml
similarity index 100%
rename from items/generic/item0846_GreenRedStripedWrap.xml
rename to items/generic/item846_GreenRedStripedWrap.xml
diff --git a/items/generic/item0847_PlushMouboo.xml b/items/generic/item847_PlushMouboo.xml
similarity index 100%
rename from items/generic/item0847_PlushMouboo.xml
rename to items/generic/item847_PlushMouboo.xml
diff --git a/items/generic/item0849_OpenPresentBox.xml b/items/generic/item849_OpenPresentBox.xml
similarity index 100%
rename from items/generic/item0849_OpenPresentBox.xml
rename to items/generic/item849_OpenPresentBox.xml
diff --git a/items/generic/item0850_ClosedChristmasBox.xml b/items/generic/item850_ClosedChristmasBox.xml
similarity index 100%
rename from items/generic/item0850_ClosedChristmasBox.xml
rename to items/generic/item850_ClosedChristmasBox.xml
diff --git a/items/generic/item0851_StickReinboo.xml b/items/generic/item851_StickReinboo.xml
similarity index 100%
rename from items/generic/item0851_StickReinboo.xml
rename to items/generic/item851_StickReinboo.xml
diff --git a/items/generic/item0852_LeatherBall.xml b/items/generic/item852_LeatherBall.xml
similarity index 100%
rename from items/generic/item0852_LeatherBall.xml
rename to items/generic/item852_LeatherBall.xml
diff --git a/items/generic/item0853_Doll.xml b/items/generic/item853_Doll.xml
similarity index 100%
rename from items/generic/item0853_Doll.xml
rename to items/generic/item853_Doll.xml
diff --git a/items/generic/item0858_WolvernTooth.xml b/items/generic/item858_WolvernTooth.xml
similarity index 100%
rename from items/generic/item0858_WolvernTooth.xml
rename to items/generic/item858_WolvernTooth.xml
diff --git a/items/generic/item0859_WolvernPelt.xml b/items/generic/item859_WolvernPelt.xml
similarity index 100%
rename from items/generic/item0859_WolvernPelt.xml
rename to items/generic/item859_WolvernPelt.xml
diff --git a/items/generic/item0860_SquirrelPelt.xml b/items/generic/item860_SquirrelPelt.xml
similarity index 100%
rename from items/generic/item0860_SquirrelPelt.xml
rename to items/generic/item860_SquirrelPelt.xml
diff --git a/items/generic/item0861_WhiteBellTuber.xml b/items/generic/item861_WhiteBellTuber.xml
similarity index 100%
rename from items/generic/item0861_WhiteBellTuber.xml
rename to items/generic/item861_WhiteBellTuber.xml
diff --git a/items/generic/item0862_IcedWater.xml b/items/generic/item862_IcedWater.xml
similarity index 100%
rename from items/generic/item0862_IcedWater.xml
rename to items/generic/item862_IcedWater.xml
diff --git a/items/generic/item0863_SilverMirror.xml b/items/generic/item863_SilverMirror.xml
similarity index 83%
rename from items/generic/item0863_SilverMirror.xml
rename to items/generic/item863_SilverMirror.xml
index 43ae6161..43565e2d 100644
--- a/items/generic/item0863_SilverMirror.xml
+++ b/items/generic/item863_SilverMirror.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/generic/item0864_BookPage.xml b/items/generic/item864_BookPage.xml
similarity index 100%
rename from items/generic/item0864_BookPage.xml
rename to items/generic/item864_BookPage.xml
diff --git a/items/generic/item0866_LeatherSuitcase.xml b/items/generic/item866_LeatherSuitcase.xml
similarity index 100%
rename from items/generic/item0866_LeatherSuitcase.xml
rename to items/generic/item866_LeatherSuitcase.xml
diff --git a/items/generic/item0869_Antlers.xml b/items/generic/item869_Antlers.xml
similarity index 100%
rename from items/generic/item0869_Antlers.xml
rename to items/generic/item869_Antlers.xml
diff --git a/items/generic/item0871_SealedSoul.xml b/items/generic/item871_SealedSoul.xml
similarity index 100%
rename from items/generic/item0871_SealedSoul.xml
rename to items/generic/item871_SealedSoul.xml
diff --git a/items/generic/item0872_LockPicks.xml b/items/generic/item872_LockPicks.xml
similarity index 100%
rename from items/generic/item0872_LockPicks.xml
rename to items/generic/item872_LockPicks.xml
diff --git a/items/generic/item0873_LazuriteShard.xml b/items/generic/item873_LazuriteShard.xml
similarity index 100%
rename from items/generic/item0873_LazuriteShard.xml
rename to items/generic/item873_LazuriteShard.xml
diff --git a/items/generic/item0874_LazuriteCrystal.xml b/items/generic/item874_LazuriteCrystal.xml
similarity index 100%
rename from items/generic/item0874_LazuriteCrystal.xml
rename to items/generic/item874_LazuriteCrystal.xml
diff --git a/items/generic/item0875_HeartofLazurite.xml b/items/generic/item875_HeartofLazurite.xml
similarity index 100%
rename from items/generic/item0875_HeartofLazurite.xml
rename to items/generic/item875_HeartofLazurite.xml
diff --git a/items/generic/item0891_SilkSheet.xml b/items/generic/item891_SilkSheet.xml
similarity index 100%
rename from items/generic/item0891_SilkSheet.xml
rename to items/generic/item891_SilkSheet.xml
diff --git a/items/generic/item0892_OrangeSummonFlower.xml b/items/generic/item892_OrangeSummonFlower.xml
similarity index 100%
rename from items/generic/item0892_OrangeSummonFlower.xml
rename to items/generic/item892_OrangeSummonFlower.xml
diff --git a/items/generic/item0893_PurpleSummonFlower.xml b/items/generic/item893_PurpleSummonFlower.xml
similarity index 100%
rename from items/generic/item0893_PurpleSummonFlower.xml
rename to items/generic/item893_PurpleSummonFlower.xml
diff --git a/items/generic/item0894_WhiteSummonFlower.xml b/items/generic/item894_WhiteSummonFlower.xml
similarity index 100%
rename from items/generic/item0894_WhiteSummonFlower.xml
rename to items/generic/item894_WhiteSummonFlower.xml
diff --git a/items/generic/item0895_YellowSummonFlower.xml b/items/generic/item895_YellowSummonFlower.xml
similarity index 100%
rename from items/generic/item0895_YellowSummonFlower.xml
rename to items/generic/item895_YellowSummonFlower.xml
diff --git a/items/generic/item0896_RedSummonFlower.xml b/items/generic/item896_RedSummonFlower.xml
similarity index 100%
rename from items/generic/item0896_RedSummonFlower.xml
rename to items/generic/item896_RedSummonFlower.xml
diff --git a/items/hairsprite/_include.xml b/items/hairsprite/_include.xml
index aaeb9cb7..0fae080e 100644
--- a/items/hairsprite/_include.xml
+++ b/items/hairsprite/_include.xml
@@ -1,23 +1,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/items/hairsprite/item10_Shortandcurly.xml b/items/hairsprite/item-10_Shortandcurly.xml
similarity index 100%
rename from items/hairsprite/item10_Shortandcurly.xml
rename to items/hairsprite/item-10_Shortandcurly.xml
diff --git a/items/hairsprite/item11_Pigtails.xml b/items/hairsprite/item-11_Pigtails.xml
similarity index 100%
rename from items/hairsprite/item11_Pigtails.xml
rename to items/hairsprite/item-11_Pigtails.xml
diff --git a/items/hairsprite/item12_Longandcurly.xml b/items/hairsprite/item-12_Longandcurly.xml
similarity index 100%
rename from items/hairsprite/item12_Longandcurly.xml
rename to items/hairsprite/item-12_Longandcurly.xml
diff --git a/items/hairsprite/item13_Parted.xml b/items/hairsprite/item-13_Parted.xml
similarity index 100%
rename from items/hairsprite/item13_Parted.xml
rename to items/hairsprite/item-13_Parted.xml
diff --git a/items/hairsprite/item14_Perkyponytail.xml b/items/hairsprite/item-14_Perkyponytail.xml
similarity index 100%
rename from items/hairsprite/item14_Perkyponytail.xml
rename to items/hairsprite/item-14_Perkyponytail.xml
diff --git a/items/hairsprite/item15_Wave.xml b/items/hairsprite/item-15_Wave.xml
similarity index 100%
rename from items/hairsprite/item15_Wave.xml
rename to items/hairsprite/item-15_Wave.xml
diff --git a/items/hairsprite/item16_Mane.xml b/items/hairsprite/item-16_Mane.xml
similarity index 100%
rename from items/hairsprite/item16_Mane.xml
rename to items/hairsprite/item-16_Mane.xml
diff --git a/items/hairsprite/item17_Bun.xml b/items/hairsprite/item-17_Bun.xml
similarity index 100%
rename from items/hairsprite/item17_Bun.xml
rename to items/hairsprite/item-17_Bun.xml
diff --git a/items/hairsprite/item18_Shoulderlengthflick.xml b/items/hairsprite/item-18_Shoulderlengthflick.xml
similarity index 100%
rename from items/hairsprite/item18_Shoulderlengthflick.xml
rename to items/hairsprite/item-18_Shoulderlengthflick.xml
diff --git a/items/hairsprite/item19_Fizzy.xml b/items/hairsprite/item-19_Fizzy.xml
similarity index 100%
rename from items/hairsprite/item19_Fizzy.xml
rename to items/hairsprite/item-19_Fizzy.xml
diff --git a/items/hairsprite/item01_Bald.xml b/items/hairsprite/item-1_Bald.xml
similarity index 100%
rename from items/hairsprite/item01_Bald.xml
rename to items/hairsprite/item-1_Bald.xml
diff --git a/items/hairsprite/item20_LongandClipped.xml b/items/hairsprite/item-20_LongandClipped.xml
similarity index 100%
rename from items/hairsprite/item20_LongandClipped.xml
rename to items/hairsprite/item-20_LongandClipped.xml
diff --git a/items/hairsprite/item02_Flatponytail.xml b/items/hairsprite/item-2_Flatponytail.xml
similarity index 100%
rename from items/hairsprite/item02_Flatponytail.xml
rename to items/hairsprite/item-2_Flatponytail.xml
diff --git a/items/hairsprite/item03_Bowlcut.xml b/items/hairsprite/item-3_Bowlcut.xml
similarity index 100%
rename from items/hairsprite/item03_Bowlcut.xml
rename to items/hairsprite/item-3_Bowlcut.xml
diff --git a/items/hairsprite/item04_Combedback.xml b/items/hairsprite/item-4_Combedback.xml
similarity index 100%
rename from items/hairsprite/item04_Combedback.xml
rename to items/hairsprite/item-4_Combedback.xml
diff --git a/items/hairsprite/item05_Emo.xml b/items/hairsprite/item-5_Emo.xml
similarity index 100%
rename from items/hairsprite/item05_Emo.xml
rename to items/hairsprite/item-5_Emo.xml
diff --git a/items/hairsprite/item06_Mohawk.xml b/items/hairsprite/item-6_Mohawk.xml
similarity index 100%
rename from items/hairsprite/item06_Mohawk.xml
rename to items/hairsprite/item-6_Mohawk.xml
diff --git a/items/hairsprite/item07_Pompadour.xml b/items/hairsprite/item-7_Pompadour.xml
similarity index 100%
rename from items/hairsprite/item07_Pompadour.xml
rename to items/hairsprite/item-7_Pompadour.xml
diff --git a/items/hairsprite/item08_CenterpartingShortandslick.xml b/items/hairsprite/item-8_CenterpartingShortandslick.xml
similarity index 100%
rename from items/hairsprite/item08_CenterpartingShortandslick.xml
rename to items/hairsprite/item-8_CenterpartingShortandslick.xml
diff --git a/items/hairsprite/item09_Longandslick.xml b/items/hairsprite/item-9_Longandslick.xml
similarity index 100%
rename from items/hairsprite/item09_Longandslick.xml
rename to items/hairsprite/item-9_Longandslick.xml
diff --git a/items/misc/_include.xml b/items/misc/_include.xml
index ab2c12b0..dec94feb 100644
--- a/items/misc/_include.xml
+++ b/items/misc/_include.xml
@@ -1,11 +1,11 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/items/misc/item0030_.xml b/items/misc/item30_.xml
similarity index 100%
rename from items/misc/item0030_.xml
rename to items/misc/item30_.xml
diff --git a/items/misc/item0031_.xml b/items/misc/item31_.xml
similarity index 100%
rename from items/misc/item0031_.xml
rename to items/misc/item31_.xml
diff --git a/items/misc/item0032_.xml b/items/misc/item32_.xml
similarity index 100%
rename from items/misc/item0032_.xml
rename to items/misc/item32_.xml
diff --git a/items/misc/item0033_.xml b/items/misc/item33_.xml
similarity index 100%
rename from items/misc/item0033_.xml
rename to items/misc/item33_.xml
diff --git a/items/misc/item0034_.xml b/items/misc/item34_.xml
similarity index 100%
rename from items/misc/item0034_.xml
rename to items/misc/item34_.xml
diff --git a/items/misc/item0035_.xml b/items/misc/item35_.xml
similarity index 100%
rename from items/misc/item0035_.xml
rename to items/misc/item35_.xml
diff --git a/items/racesprite/_include.xml b/items/racesprite/_include.xml
index f0879182..20941000 100644
--- a/items/racesprite/_include.xml
+++ b/items/racesprite/_include.xml
@@ -1,12 +1,11 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/items/racesprite/item00100_Deprecated.xml b/items/racesprite/item-100_Deprecated.xml
similarity index 100%
rename from items/racesprite/item00100_Deprecated.xml
rename to items/racesprite/item-100_Deprecated.xml
diff --git a/items/racesprite/item00101_Talpan.xml b/items/racesprite/item-101_Talpan.xml
similarity index 100%
rename from items/racesprite/item00101_Talpan.xml
rename to items/racesprite/item-101_Talpan.xml
diff --git a/items/racesprite/item00102_Tritan.xml b/items/racesprite/item-102_Tritan.xml
similarity index 100%
rename from items/racesprite/item00102_Tritan.xml
rename to items/racesprite/item-102_Tritan.xml
diff --git a/items/racesprite/item00103_Ifriton.xml b/items/racesprite/item-103_Ifriton.xml
similarity index 100%
rename from items/racesprite/item00103_Ifriton.xml
rename to items/racesprite/item-103_Ifriton.xml
diff --git a/items/racesprite/item00104_Gispaan.xml b/items/racesprite/item-104_Gispaan.xml
similarity index 100%
rename from items/racesprite/item00104_Gispaan.xml
rename to items/racesprite/item-104_Gispaan.xml
diff --git a/items/racesprite/item00105_Sparron.xml b/items/racesprite/item-105_Sparron.xml
similarity index 100%
rename from items/racesprite/item00105_Sparron.xml
rename to items/racesprite/item-105_Sparron.xml
diff --git a/items/racesprite/item00106_Undead.xml b/items/racesprite/item-106_Undead.xml
similarity index 100%
rename from items/racesprite/item00106_Undead.xml
rename to items/racesprite/item-106_Undead.xml
diff --git a/items/racesprite/item99054_Troll.xml b/items/racesprite/item-99054_Troll.xml
similarity index 63%
rename from items/racesprite/item99054_Troll.xml
rename to items/racesprite/item-99054_Troll.xml
index 5a1bcdf0..767539d7 100644
--- a/items/racesprite/item99054_Troll.xml
+++ b/items/racesprite/item-99054_Troll.xml
@@ -3,4 +3,7 @@
-
monsters/troll-race.xml|#FFDEC2;#FF4D4D;#FF99FF;#FFC88A
+ -
+ monsters/floyd.xml
+
diff --git a/items/racesprite/item99168_Floyd.xml b/items/racesprite/item99168_Floyd.xml
deleted file mode 100644
index 30f09265..00000000
--- a/items/racesprite/item99168_Floyd.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- -
- monsters/floyd.xml
-
-
diff --git a/items/usable/_include.xml b/items/usable/_include.xml
index 2f79dc5a..a2b7283d 100644
--- a/items/usable/_include.xml
+++ b/items/usable/_include.xml
@@ -1,78 +1,77 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -82,11 +81,9 @@
-
+
-
-
@@ -94,11 +91,6 @@
-
-
-
-
-
@@ -107,41 +99,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/items/usable/item0562_BirdLeg.xml b/items/usable/item0562_BirdLeg.xml
deleted file mode 100644
index f162341d..00000000
--- a/items/usable/item0562_BirdLeg.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/usable/item1258_GlutenFreeHoney.xml b/items/usable/item1258_Honey.xml
similarity index 100%
rename from items/usable/item1258_GlutenFreeHoney.xml
rename to items/usable/item1258_Honey.xml
diff --git a/items/usable/item1283_ArrowBundle.xml b/items/usable/item1283_ArrowBundle.xml
deleted file mode 100644
index 65e79c44..00000000
--- a/items/usable/item1283_ArrowBundle.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/usable/item1284_LightningOrb.xml b/items/usable/item1284_LightningOrb.xml
deleted file mode 100644
index 3dc5b895..00000000
--- a/items/usable/item1284_LightningOrb.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
diff --git a/items/usable/item3001_RubberBat.xml b/items/usable/item3001_RubberBat.xml
index 999c5064..d5ceb24a 100644
--- a/items/usable/item3001_RubberBat.xml
+++ b/items/usable/item3001_RubberBat.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0501_CactusDrink.xml b/items/usable/item501_CactusDrink.xml
similarity index 100%
rename from items/usable/item0501_CactusDrink.xml
rename to items/usable/item501_CactusDrink.xml
diff --git a/items/usable/item0502_CactusPotion.xml b/items/usable/item502_CactusPotion.xml
similarity index 100%
rename from items/usable/item0502_CactusPotion.xml
rename to items/usable/item502_CactusPotion.xml
diff --git a/items/usable/item0506_CandyCane.xml b/items/usable/item506_CandyCane.xml
similarity index 100%
rename from items/usable/item0506_CandyCane.xml
rename to items/usable/item506_CandyCane.xml
diff --git a/items/usable/item0508_XmasCake.xml b/items/usable/item508_XmasCake.xml
similarity index 100%
rename from items/usable/item0508_XmasCake.xml
rename to items/usable/item508_XmasCake.xml
diff --git a/items/usable/item0509_ChocolateBar.xml b/items/usable/item509_ChocolateBar.xml
similarity index 100%
rename from items/usable/item0509_ChocolateBar.xml
rename to items/usable/item509_ChocolateBar.xml
diff --git a/items/usable/item0510_Candy.xml b/items/usable/item510_Candy.xml
similarity index 100%
rename from items/usable/item0510_Candy.xml
rename to items/usable/item510_Candy.xml
diff --git a/items/usable/item0512_GingerBreadMan.xml b/items/usable/item512_GingerBreadMan.xml
similarity index 100%
rename from items/usable/item0512_GingerBreadMan.xml
rename to items/usable/item512_GingerBreadMan.xml
diff --git a/items/usable/item0513_Cake.xml b/items/usable/item513_Cake.xml
similarity index 100%
rename from items/usable/item0513_Cake.xml
rename to items/usable/item513_Cake.xml
diff --git a/items/usable/item5141_AlizarinScroll.xml b/items/usable/item5141_AlizarinScroll.xml
deleted file mode 100644
index 6336ce0e..00000000
--- a/items/usable/item5141_AlizarinScroll.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5142_CobaltScroll.xml b/items/usable/item5142_CobaltScroll.xml
deleted file mode 100644
index 00db9044..00000000
--- a/items/usable/item5142_CobaltScroll.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5143_GambogeScroll.xml b/items/usable/item5143_GambogeScroll.xml
deleted file mode 100644
index 57274572..00000000
--- a/items/usable/item5143_GambogeScroll.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5144_MauveScroll.xml b/items/usable/item5144_MauveScroll.xml
deleted file mode 100644
index 6fa1edfc..00000000
--- a/items/usable/item5144_MauveScroll.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5145_JoyplimScroll.xml b/items/usable/item5145_JoyplimScroll.xml
deleted file mode 100644
index 73952f8b..00000000
--- a/items/usable/item5145_JoyplimScroll.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/items/usable/item0514_XmasCandyCane.xml b/items/usable/item514_XmasCandyCane.xml
similarity index 100%
rename from items/usable/item0514_XmasCandyCane.xml
rename to items/usable/item514_XmasCandyCane.xml
diff --git a/items/usable/item0519_CherryCake.xml b/items/usable/item519_CherryCake.xml
similarity index 100%
rename from items/usable/item0519_CherryCake.xml
rename to items/usable/item519_CherryCake.xml
diff --git a/items/usable/item0520_EasterEgg.xml b/items/usable/item520_EasterEgg.xml
similarity index 100%
rename from items/usable/item0520_EasterEgg.xml
rename to items/usable/item520_EasterEgg.xml
diff --git a/items/usable/item5214_LactoseFreeAcorn.xml b/items/usable/item5214_LactoseFreeAcorn.xml
index 20cb2842..35390de7 100644
--- a/items/usable/item5214_LactoseFreeAcorn.xml
+++ b/items/usable/item5214_LactoseFreeAcorn.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item5251_Tomato.xml b/items/usable/item5251_Tomato.xml
index 21377e44..ec9fb156 100644
--- a/items/usable/item5251_Tomato.xml
+++ b/items/usable/item5251_Tomato.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0527_Milk.xml b/items/usable/item527_Milk.xml
similarity index 100%
rename from items/usable/item0527_Milk.xml
rename to items/usable/item527_Milk.xml
diff --git a/items/usable/item5294_CrazyRum.xml b/items/usable/item5294_CrazyRum.xml
deleted file mode 100644
index 14445f7b..00000000
--- a/items/usable/item5294_CrazyRum.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5309_ManaDust.xml b/items/usable/item5309_ManaDust.xml
deleted file mode 100644
index 1a1e459e..00000000
--- a/items/usable/item5309_ManaDust.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/items/usable/item5310_EnlighteningElixir.xml b/items/usable/item5310_EnlighteningElixir.xml
deleted file mode 100644
index dc23fa4e..00000000
--- a/items/usable/item5310_EnlighteningElixir.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5312_Honey.xml b/items/usable/item5312_Honey.xml
deleted file mode 100644
index e1a252a6..00000000
--- a/items/usable/item5312_Honey.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5329_IronShovel.xml b/items/usable/item5329_IronShovel.xml
deleted file mode 100644
index 21e24963..00000000
--- a/items/usable/item5329_IronShovel.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
- -
-
-
-
-
-
-
diff --git a/items/usable/item5330_ShadowScroll.xml b/items/usable/item5330_ShadowScroll.xml
deleted file mode 100644
index 9760f785..00000000
--- a/items/usable/item5330_ShadowScroll.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5331_YellowApple.xml b/items/usable/item5331_YellowApple.xml
deleted file mode 100644
index c2eae7a9..00000000
--- a/items/usable/item5331_YellowApple.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5333_Bread.xml b/items/usable/item5333_Bread.xml
deleted file mode 100644
index ca963776..00000000
--- a/items/usable/item5333_Bread.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5334_Fungus.xml b/items/usable/item5334_Fungus.xml
deleted file mode 100644
index af23deb8..00000000
--- a/items/usable/item5334_Fungus.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5335_Cheese.xml b/items/usable/item5335_Cheese.xml
deleted file mode 100644
index 5904953d..00000000
--- a/items/usable/item5335_Cheese.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5336_LettuceLeaf.xml b/items/usable/item5336_LettuceLeaf.xml
deleted file mode 100644
index 3db3dd36..00000000
--- a/items/usable/item5336_LettuceLeaf.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5337_Piberries.xml b/items/usable/item5337_Piberries.xml
deleted file mode 100644
index b4e3ea63..00000000
--- a/items/usable/item5337_Piberries.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5338_Croconut.xml b/items/usable/item5338_Croconut.xml
deleted file mode 100644
index 417f7902..00000000
--- a/items/usable/item5338_Croconut.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5339_HalfCroconut.xml b/items/usable/item5339_HalfCroconut.xml
deleted file mode 100644
index 04a4de74..00000000
--- a/items/usable/item5339_HalfCroconut.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/items/usable/item0533_RoastedMaggot.xml b/items/usable/item533_RoastedMaggot.xml
similarity index 100%
rename from items/usable/item0533_RoastedMaggot.xml
rename to items/usable/item533_RoastedMaggot.xml
diff --git a/items/usable/item5340_DeliciousCookie.xml b/items/usable/item5340_DeliciousCookie.xml
deleted file mode 100644
index 1eff11f2..00000000
--- a/items/usable/item5340_DeliciousCookie.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5341_Manana.xml b/items/usable/item5341_Manana.xml
deleted file mode 100644
index 43a34a7e..00000000
--- a/items/usable/item5341_Manana.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5342_Carrot.xml b/items/usable/item5342_Carrot.xml
deleted file mode 100644
index af979de4..00000000
--- a/items/usable/item5342_Carrot.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5343_PumpkinJuice.xml b/items/usable/item5343_PumpkinJuice.xml
deleted file mode 100644
index 17fea6b6..00000000
--- a/items/usable/item5343_PumpkinJuice.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5344_ChocolateBiscuit.xml b/items/usable/item5344_ChocolateBiscuit.xml
deleted file mode 100644
index c474f612..00000000
--- a/items/usable/item5344_ChocolateBiscuit.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5345_ChocolateBunny.xml b/items/usable/item5345_ChocolateBunny.xml
deleted file mode 100644
index 10b348e6..00000000
--- a/items/usable/item5345_ChocolateBunny.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5346_Potatoz.xml b/items/usable/item5346_Potatoz.xml
deleted file mode 100644
index 15b153f9..00000000
--- a/items/usable/item5346_Potatoz.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5347_RipePumpkin.xml b/items/usable/item5347_RipePumpkin.xml
deleted file mode 100644
index 82356933..00000000
--- a/items/usable/item5347_RipePumpkin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5348_FruitSalad.xml b/items/usable/item5348_FruitSalad.xml
deleted file mode 100644
index 75ed6d04..00000000
--- a/items/usable/item5348_FruitSalad.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5349_DuckEgg.xml b/items/usable/item5349_DuckEgg.xml
deleted file mode 100644
index 0fc82cc6..00000000
--- a/items/usable/item5349_DuckEgg.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
diff --git a/items/usable/item0534_OrangeCupcake.xml b/items/usable/item534_OrangeCupcake.xml
similarity index 100%
rename from items/usable/item0534_OrangeCupcake.xml
rename to items/usable/item534_OrangeCupcake.xml
diff --git a/items/usable/item5350_Dragonfruit.xml b/items/usable/item5350_Dragonfruit.xml
deleted file mode 100644
index 5514efdd..00000000
--- a/items/usable/item5350_Dragonfruit.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5351_PirateTreasureMap.xml b/items/usable/item5351_PirateTreasureMap.xml
deleted file mode 100644
index ce50c1f8..00000000
--- a/items/usable/item5351_PirateTreasureMap.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5352_DungeonMap.xml b/items/usable/item5352_DungeonMap.xml
deleted file mode 100644
index 0ef07ce0..00000000
--- a/items/usable/item5352_DungeonMap.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5353_TreasureMap.xml b/items/usable/item5353_TreasureMap.xml
deleted file mode 100644
index 8ddcb6fc..00000000
--- a/items/usable/item5353_TreasureMap.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5354_RubberDucky.xml b/items/usable/item5354_RubberDucky.xml
deleted file mode 100644
index 86be9967..00000000
--- a/items/usable/item5354_RubberDucky.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/usable/item0535_RedApple.xml b/items/usable/item535_RedApple.xml
similarity index 100%
rename from items/usable/item0535_RedApple.xml
rename to items/usable/item535_RedApple.xml
diff --git a/items/usable/item5364_ButterButterfly.xml b/items/usable/item5364_ButterButterfly.xml
deleted file mode 100644
index 654a6361..00000000
--- a/items/usable/item5364_ButterButterfly.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5373_JunglefowlEgg.xml b/items/usable/item5373_JunglefowlEgg.xml
deleted file mode 100644
index 2b1c2179..00000000
--- a/items/usable/item5373_JunglefowlEgg.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5374_KingChonkyBirbEgg.xml b/items/usable/item5374_KingChonkyBirbEgg.xml
deleted file mode 100644
index 6bc8b5d5..00000000
--- a/items/usable/item5374_KingChonkyBirbEgg.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5379_Sauerkraut.xml b/items/usable/item5379_Sauerkraut.xml
deleted file mode 100644
index f4695072..00000000
--- a/items/usable/item5379_Sauerkraut.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5382_AnchorStone.xml b/items/usable/item5382_AnchorStone.xml
deleted file mode 100644
index c846eaa1..00000000
--- a/items/usable/item5382_AnchorStone.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/usable/item5383_AnchoredAnchorStone.xml b/items/usable/item5383_AnchoredAnchorStone.xml
deleted file mode 100644
index 8b55497e..00000000
--- a/items/usable/item5383_AnchoredAnchorStone.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
diff --git a/items/usable/item0539_Beer.xml b/items/usable/item539_Beer.xml
similarity index 100%
rename from items/usable/item0539_Beer.xml
rename to items/usable/item539_Beer.xml
diff --git a/items/usable/item5405_LegendaryShovel.xml b/items/usable/item5405_LegendaryShovel.xml
deleted file mode 100644
index 5861ee4d..00000000
--- a/items/usable/item5405_LegendaryShovel.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
- -
-
-
-
-
-
-
diff --git a/items/usable/item5406_LegendaryTreasureMap.xml b/items/usable/item5406_LegendaryTreasureMap.xml
deleted file mode 100644
index d4c9a076..00000000
--- a/items/usable/item5406_LegendaryTreasureMap.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
diff --git a/items/usable/item0541_BottleofWater.xml b/items/usable/item541_BottleofWater.xml
similarity index 100%
rename from items/usable/item0541_BottleofWater.xml
rename to items/usable/item541_BottleofWater.xml
diff --git a/items/usable/item562_ChickenLeg.xml b/items/usable/item562_ChickenLeg.xml
new file mode 100644
index 00000000..710e4b24
--- /dev/null
+++ b/items/usable/item562_ChickenLeg.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/items/usable/item0565_PinkPetal.xml b/items/usable/item565_PinkPetal.xml
similarity index 85%
rename from items/usable/item0565_PinkPetal.xml
rename to items/usable/item565_PinkPetal.xml
index 8ed50411..43726747 100644
--- a/items/usable/item0565_PinkPetal.xml
+++ b/items/usable/item565_PinkPetal.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0566_SmallMushroom.xml b/items/usable/item566_SmallMushroom.xml
similarity index 95%
rename from items/usable/item0566_SmallMushroom.xml
rename to items/usable/item566_SmallMushroom.xml
index cf2ffd6e..c076bc85 100644
--- a/items/usable/item0566_SmallMushroom.xml
+++ b/items/usable/item566_SmallMushroom.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0567_IronPotion.xml b/items/usable/item567_IronPotion.xml
similarity index 100%
rename from items/usable/item0567_IronPotion.xml
rename to items/usable/item567_IronPotion.xml
diff --git a/items/usable/item0568_ConcentrationPotion.xml b/items/usable/item568_ConcentrationPotion.xml
similarity index 100%
rename from items/usable/item0568_ConcentrationPotion.xml
rename to items/usable/item568_ConcentrationPotion.xml
diff --git a/items/usable/item0657_Orange.xml b/items/usable/item657_Orange.xml
similarity index 100%
rename from items/usable/item0657_Orange.xml
rename to items/usable/item657_Orange.xml
diff --git a/items/usable/item0676_Steak.xml b/items/usable/item676_Steak.xml
similarity index 100%
rename from items/usable/item0676_Steak.xml
rename to items/usable/item676_Steak.xml
diff --git a/items/usable/item0684_TinyHealingPotion.xml b/items/usable/item684_TinyHealingPotion.xml
similarity index 100%
rename from items/usable/item0684_TinyHealingPotion.xml
rename to items/usable/item684_TinyHealingPotion.xml
diff --git a/items/usable/item0685_SmallHealingPotion.xml b/items/usable/item685_SmallHealingPotion.xml
similarity index 100%
rename from items/usable/item0685_SmallHealingPotion.xml
rename to items/usable/item685_SmallHealingPotion.xml
diff --git a/items/usable/item0686_MediumHealingPotion.xml b/items/usable/item686_MediumHealingPotion.xml
similarity index 100%
rename from items/usable/item0686_MediumHealingPotion.xml
rename to items/usable/item686_MediumHealingPotion.xml
diff --git a/items/usable/item0687_LargeHealingPotion.xml b/items/usable/item687_LargeHealingPotion.xml
similarity index 100%
rename from items/usable/item0687_LargeHealingPotion.xml
rename to items/usable/item687_LargeHealingPotion.xml
diff --git a/items/usable/item0705_ManaPotion.xml b/items/usable/item705_ManaPotion.xml
similarity index 100%
rename from items/usable/item0705_ManaPotion.xml
rename to items/usable/item705_ManaPotion.xml
diff --git a/items/usable/item0714_SnakeEgg.xml b/items/usable/item714_SnakeEgg.xml
similarity index 100%
rename from items/usable/item0714_SnakeEgg.xml
rename to items/usable/item714_SnakeEgg.xml
diff --git a/items/usable/item0715_MountainSnakeEgg.xml b/items/usable/item715_MountainSnakeEgg.xml
similarity index 100%
rename from items/usable/item0715_MountainSnakeEgg.xml
rename to items/usable/item715_MountainSnakeEgg.xml
diff --git a/items/usable/item0716_GrassSnakeEgg.xml b/items/usable/item716_GrassSnakeEgg.xml
similarity index 100%
rename from items/usable/item0716_GrassSnakeEgg.xml
rename to items/usable/item716_GrassSnakeEgg.xml
diff --git a/items/usable/item0717_CaveSnakeEgg.xml b/items/usable/item717_CaveSnakeEgg.xml
similarity index 100%
rename from items/usable/item0717_CaveSnakeEgg.xml
rename to items/usable/item717_CaveSnakeEgg.xml
diff --git a/items/usable/item0719_GreenApple.xml b/items/usable/item719_GreenApple.xml
similarity index 81%
rename from items/usable/item0719_GreenApple.xml
rename to items/usable/item719_GreenApple.xml
index 7efa7485..f59c2aff 100644
--- a/items/usable/item0719_GreenApple.xml
+++ b/items/usable/item719_GreenApple.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0733_PurificationPotion.xml b/items/usable/item733_PurificationPotion.xml
similarity index 100%
rename from items/usable/item0733_PurificationPotion.xml
rename to items/usable/item733_PurificationPotion.xml
diff --git a/items/usable/item0736_WhiteCake.xml b/items/usable/item736_WhiteCake.xml
similarity index 100%
rename from items/usable/item0736_WhiteCake.xml
rename to items/usable/item736_WhiteCake.xml
diff --git a/items/usable/item0737_ChocolateCake.xml b/items/usable/item737_ChocolateCake.xml
similarity index 100%
rename from items/usable/item0737_ChocolateCake.xml
rename to items/usable/item737_ChocolateCake.xml
diff --git a/items/usable/item0738_OrangeCake.xml b/items/usable/item738_OrangeCake.xml
similarity index 100%
rename from items/usable/item0738_OrangeCake.xml
rename to items/usable/item738_OrangeCake.xml
diff --git a/items/usable/item0739_AppleCake.xml b/items/usable/item739_AppleCake.xml
similarity index 100%
rename from items/usable/item0739_AppleCake.xml
rename to items/usable/item739_AppleCake.xml
diff --git a/items/usable/item0743_Acorn.xml b/items/usable/item743_Acorn.xml
similarity index 100%
rename from items/usable/item0743_Acorn.xml
rename to items/usable/item743_Acorn.xml
diff --git a/items/usable/item0744_DilutedConcentrationPotion.xml b/items/usable/item744_DilutedConcentrationPotion.xml
similarity index 100%
rename from items/usable/item0744_DilutedConcentrationPotion.xml
rename to items/usable/item744_DilutedConcentrationPotion.xml
diff --git a/items/usable/item0745_DarkConcentrationPotion.xml b/items/usable/item745_DarkConcentrationPotion.xml
similarity index 100%
rename from items/usable/item0745_DarkConcentrationPotion.xml
rename to items/usable/item745_DarkConcentrationPotion.xml
diff --git a/items/usable/item0746_MopoxCurePotion.xml b/items/usable/item746_MopoxCurePotion.xml
similarity index 100%
rename from items/usable/item0746_MopoxCurePotion.xml
rename to items/usable/item746_MopoxCurePotion.xml
diff --git a/items/usable/item0747_LacedChocolateCake.xml b/items/usable/item747_LacedChocolateCake.xml
similarity index 100%
rename from items/usable/item0747_LacedChocolateCake.xml
rename to items/usable/item747_LacedChocolateCake.xml
diff --git a/items/usable/item0748_LacedOrangeCupcake.xml b/items/usable/item748_LacedOrangeCupcake.xml
similarity index 100%
rename from items/usable/item0748_LacedOrangeCupcake.xml
rename to items/usable/item748_LacedOrangeCupcake.xml
diff --git a/items/usable/item0750_SlowPoisonPotion.xml b/items/usable/item750_SlowPoisonPotion.xml
similarity index 100%
rename from items/usable/item0750_SlowPoisonPotion.xml
rename to items/usable/item750_SlowPoisonPotion.xml
diff --git a/items/usable/item0784_ZombieNachos.xml b/items/usable/item784_ZombieNachos.xml
similarity index 100%
rename from items/usable/item0784_ZombieNachos.xml
rename to items/usable/item784_ZombieNachos.xml
diff --git a/items/usable/item0785_LadyFingers.xml b/items/usable/item785_LadyFingers.xml
similarity index 100%
rename from items/usable/item0785_LadyFingers.xml
rename to items/usable/item785_LadyFingers.xml
diff --git a/items/usable/item0786_SlimeJellAhh.xml b/items/usable/item786_SlimeJellAhh.xml
similarity index 100%
rename from items/usable/item0786_SlimeJellAhh.xml
rename to items/usable/item786_SlimeJellAhh.xml
diff --git a/items/usable/item0787_Snapple.xml b/items/usable/item787_Snapple.xml
similarity index 100%
rename from items/usable/item0787_Snapple.xml
rename to items/usable/item787_Snapple.xml
diff --git a/items/usable/item0788_BeetleJuice.xml b/items/usable/item788_BeetleJuice.xml
similarity index 100%
rename from items/usable/item0788_BeetleJuice.xml
rename to items/usable/item788_BeetleJuice.xml
diff --git a/items/usable/item0789_GutBusterAle.xml b/items/usable/item789_GutBusterAle.xml
similarity index 100%
rename from items/usable/item0789_GutBusterAle.xml
rename to items/usable/item789_GutBusterAle.xml
diff --git a/items/usable/item0790_BloodWine.xml b/items/usable/item790_BloodWine.xml
similarity index 100%
rename from items/usable/item0790_BloodWine.xml
rename to items/usable/item790_BloodWine.xml
diff --git a/items/usable/item0808_HitchhikersTowel.xml b/items/usable/item808_HitchhikersTowel.xml
similarity index 63%
rename from items/usable/item0808_HitchhikersTowel.xml
rename to items/usable/item808_HitchhikersTowel.xml
index 82ec32bd..abbf794e 100644
--- a/items/usable/item0808_HitchhikersTowel.xml
+++ b/items/usable/item808_HitchhikersTowel.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0809_WhiteHitchhikersTowel.xml b/items/usable/item809_WhiteHitchhikersTowel.xml
similarity index 77%
rename from items/usable/item0809_WhiteHitchhikersTowel.xml
rename to items/usable/item809_WhiteHitchhikersTowel.xml
index 9af2e10e..d0f5889e 100644
--- a/items/usable/item0809_WhiteHitchhikersTowel.xml
+++ b/items/usable/item809_WhiteHitchhikersTowel.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0810_RedHitchhikersTowel.xml b/items/usable/item810_RedHitchhikersTowel.xml
similarity index 76%
rename from items/usable/item0810_RedHitchhikersTowel.xml
rename to items/usable/item810_RedHitchhikersTowel.xml
index 1c753a01..bbef7a84 100644
--- a/items/usable/item0810_RedHitchhikersTowel.xml
+++ b/items/usable/item810_RedHitchhikersTowel.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0811_GreenHitchhikersTowel.xml b/items/usable/item811_GreenHitchhikersTowel.xml
similarity index 57%
rename from items/usable/item0811_GreenHitchhikersTowel.xml
rename to items/usable/item811_GreenHitchhikersTowel.xml
index 60e18c69..c34193b0 100644
--- a/items/usable/item0811_GreenHitchhikersTowel.xml
+++ b/items/usable/item811_GreenHitchhikersTowel.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0812_BlueHitchhikersTowel.xml b/items/usable/item812_BlueHitchhikersTowel.xml
similarity index 57%
rename from items/usable/item0812_BlueHitchhikersTowel.xml
rename to items/usable/item812_BlueHitchhikersTowel.xml
index bc7cd983..f5f3f72b 100644
--- a/items/usable/item0812_BlueHitchhikersTowel.xml
+++ b/items/usable/item812_BlueHitchhikersTowel.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0813_YellowHitchhikersTowel.xml b/items/usable/item813_YellowHitchhikersTowel.xml
similarity index 77%
rename from items/usable/item0813_YellowHitchhikersTowel.xml
rename to items/usable/item813_YellowHitchhikersTowel.xml
index 98322ccb..7905f785 100644
--- a/items/usable/item0813_YellowHitchhikersTowel.xml
+++ b/items/usable/item813_YellowHitchhikersTowel.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0814_PurpleHitchhikersTowel.xml b/items/usable/item814_PurpleHitchhikersTowel.xml
similarity index 77%
rename from items/usable/item0814_PurpleHitchhikersTowel.xml
rename to items/usable/item814_PurpleHitchhikersTowel.xml
index aef4e613..a51b60d2 100644
--- a/items/usable/item0814_PurpleHitchhikersTowel.xml
+++ b/items/usable/item814_PurpleHitchhikersTowel.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0815_OrangeHitchhikersTowel.xml b/items/usable/item815_OrangeHitchhikersTowel.xml
similarity index 75%
rename from items/usable/item0815_OrangeHitchhikersTowel.xml
rename to items/usable/item815_OrangeHitchhikersTowel.xml
index b5d5171c..b9d409ab 100644
--- a/items/usable/item0815_OrangeHitchhikersTowel.xml
+++ b/items/usable/item815_OrangeHitchhikersTowel.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0816_PinkHitchhikersTowel.xml b/items/usable/item816_PinkHitchhikersTowel.xml
similarity index 76%
rename from items/usable/item0816_PinkHitchhikersTowel.xml
rename to items/usable/item816_PinkHitchhikersTowel.xml
index e5957e8f..6dfcbc88 100644
--- a/items/usable/item0816_PinkHitchhikersTowel.xml
+++ b/items/usable/item816_PinkHitchhikersTowel.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0817_TealHitchhikersTowel.xml b/items/usable/item817_TealHitchhikersTowel.xml
similarity index 59%
rename from items/usable/item0817_TealHitchhikersTowel.xml
rename to items/usable/item817_TealHitchhikersTowel.xml
index f8ef8b54..0ee888fd 100644
--- a/items/usable/item0817_TealHitchhikersTowel.xml
+++ b/items/usable/item817_TealHitchhikersTowel.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0818_LimeHitchhikersTowel.xml b/items/usable/item818_LimeHitchhikersTowel.xml
similarity index 59%
rename from items/usable/item0818_LimeHitchhikersTowel.xml
rename to items/usable/item818_LimeHitchhikersTowel.xml
index 834e3213..f87cfe09 100644
--- a/items/usable/item0818_LimeHitchhikersTowel.xml
+++ b/items/usable/item818_LimeHitchhikersTowel.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/usable/item0825_TinyManaElixir.xml b/items/usable/item825_TinyManaElixir.xml
similarity index 100%
rename from items/usable/item0825_TinyManaElixir.xml
rename to items/usable/item825_TinyManaElixir.xml
diff --git a/items/usable/item0826_SmallManaElixir.xml b/items/usable/item826_SmallManaElixir.xml
similarity index 100%
rename from items/usable/item0826_SmallManaElixir.xml
rename to items/usable/item826_SmallManaElixir.xml
diff --git a/items/usable/item0827_MediumManaElixir.xml b/items/usable/item827_MediumManaElixir.xml
similarity index 100%
rename from items/usable/item0827_MediumManaElixir.xml
rename to items/usable/item827_MediumManaElixir.xml
diff --git a/items/usable/item0828_LargeManaElixir.xml b/items/usable/item828_LargeManaElixir.xml
similarity index 100%
rename from items/usable/item0828_LargeManaElixir.xml
rename to items/usable/item828_LargeManaElixir.xml
diff --git a/items/usable/item0838_CranberryLollipop.xml b/items/usable/item838_CranberryLollipop.xml
similarity index 100%
rename from items/usable/item0838_CranberryLollipop.xml
rename to items/usable/item838_CranberryLollipop.xml
diff --git a/items/usable/item0839_GrapeLollipop.xml b/items/usable/item839_GrapeLollipop.xml
similarity index 100%
rename from items/usable/item0839_GrapeLollipop.xml
rename to items/usable/item839_GrapeLollipop.xml
diff --git a/items/usable/item0840_OrangeLollipop.xml b/items/usable/item840_OrangeLollipop.xml
similarity index 100%
rename from items/usable/item0840_OrangeLollipop.xml
rename to items/usable/item840_OrangeLollipop.xml
diff --git a/license.md b/license.md
index 24704df4..ef76d32c 100644
--- a/license.md
+++ b/license.md
@@ -106,11 +106,7 @@ File | Artists | Licenses
### Ambient Effects
File | Artists | Licenses
---- |:-------:|:--------:
-`graphics/images/ambient/aethyr.jpg` | LuminousDragonGames | CC0
-`graphics/images/ambient/cloud.png` | Len, Reid | CC BY-SA 3.0
`graphics/images/ambient/clouds.png` | Crush | GPLv2, CC BY-SA 3.0
-`graphics/images/ambient/darkness1.png` | jesusalva | CC0
-`graphics/images/ambient/darkness2.png` | jesusalva | CC0
`graphics/images/ambient/dd5_absorb.png` | Crush, Jesusalva | GPLv2, CC BY-SA 3.0
`graphics/images/ambient/dd5_bones.png` | Crush, Jesusalva | GPLv2, CC BY-SA 3.0
`graphics/images/ambient/dd5_doubledef.png` | Crush, Jesusalva | GPLv2, CC BY-SA 3.0
@@ -119,7 +115,6 @@ File | Artists | Licenses
`graphics/images/ambient/dd5_kaflosh.png` | Crush, Jesusalva | GPLv2, CC BY-SA 3.0
`graphics/images/ambient/dd5_melee.png` | Crush, Jesusalva | GPLv2, CC BY-SA 3.0
`graphics/images/ambient/dd5_potions.png` | Crush, Jesusalva | GPLv2, CC BY-SA 3.0
-`graphics/images/ambient/desertclouds.png` | Saulc | CC BY-SA 4.0
`graphics/images/ambient/fog.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/images/ambient/night.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/images/ambient/rain.png` | wushin | GPLv2, CC BY-SA 3.0
@@ -145,34 +140,18 @@ File | Artists | Licenses
`graphics/items/equipment/ammo/snowball.png` | Ledmitz, Reid | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/ammo/stoneprojectile-icon.png` | wushin, tux9th | GPLv2, CC BY-SA 3.0
-#### Amulets
-File | Artists | Licenses
----- |:-------:|:--------:
-`graphics/items/equipment/amulets/angel-wings.png` | :grey_question:, Varuna, Arikel, HoraK-FDF | GPLv2
-`graphics/items/equipment/amulets/enchanter.png` | Fate | GPLv2, CC BY-SA 3.0
-`graphics/items/equipment/amulets/fourleaf-amulet.png` | Fate | GPLv2, CC BY-SA 3.0
-`graphics/items/equipment/amulets/gmamulet.png` | Ledmitz | GPLv2, CC BY-SA 3.0
-`graphics/items/equipment/amulets/manapearl.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/items/equipment/amulets/assassin-amulet.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-
#### Charms
File | Artists | Licenses
---- |:-------:|:--------:
`graphics/items/equipment/charms/clover.png` | 5t3v3 | GPLv2
+`graphics/items/equipment/charms/enchanter.png` | Fate | GPLv2, CC BY-SA 3.0
+`graphics/items/equipment/charms/fourleaf-amulet.png` | Fate | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/charms/heart-of-isis.png` | V0id | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/charms/heartnecklace.png` | Jetryl | GPLv2
`graphics/items/equipment/charms/skeletoncharm.png` | Cassy, Jetryl | GPLv2
`graphics/items/equipment/charms/towel.png` | Bjorn | GPLv2, CC BY-SA 3.0
-`graphics/items/equipment/charms/darktalisman.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-
-#### Rings
-File | Artists | Licenses
----- |:-------:|:--------:
-`graphics/items/equipment/rings/gem.png` | Salmondine | GPLv2
-`graphics/items/equipment/rings/magic.png` | Nami | GPLv2, CC BY-SA 3.0
-`graphics/items/equipment/rings/simple.png` | Salmondine | GPLv2
-`graphics/items/equipment/rings/wedding.png` | Kess | GPLv2
-`graphics/items/equipment/rings/assassin-ring.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
+`graphics/items/equipment/charms/manapearl.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
+`graphics/items/equipment/charms/assassin-amulet.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
#### Chest
File | Artists | Licenses
@@ -222,7 +201,7 @@ File | Artists | Licenses
`graphics/items/equipment/head/phylactery.png` | strealyn, wushin | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/nutcrackerhat.png` | Chayenne, Alige, Lizandra, Salmondine | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/dark-helm.png` | Bankai777 | GPLv2
-`graphics/items/equipment/head/underworld-mask.png` | wushin | GPLv2, CC BY-SA 3.0
+`graphics/sprites/equipment/head/underworld-mask.png` | wushin | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/bandana.png` | Modanung | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/beaniecopter.png` | Alige, Black Don, Milla, Veryape | GPLv2
`graphics/items/equipment/head/beret.png` | Varuna | GPLv2
@@ -257,24 +236,19 @@ File | Artists | Licenses
`graphics/items/equipment/head/goggles.png` | Fettsack | GPLv2
`graphics/items/equipment/head/gradcap.png` | Arilious | GPLv2
`graphics/items/equipment/head/guyfawkes.png` | 5t3v3 | GPLv2
-`graphics/items/equipment/head/headslime.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/equipment/head/heart-glasses.png` | Lizandra | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/highpriest-crown.png` | Black Don | GPLv2
`graphics/items/equipment/head/infantryhelm.png` | Black Don | GPLv2
`graphics/items/equipment/head/inspector-hat.png` | Micksha | GPLv2
`graphics/items/equipment/head/jestermask.png` | Spit23 | GPLv2
`graphics/items/equipment/head/knighthelm.png` | Black Don | GPLv2
-`graphics/items/equipment/head/knighthelm-dyable.png` | Black Don, HoraK-FDF | GPLv2
`graphics/items/equipment/head/knit-cap.png` | Salmondine, jak1 | GPLv2
`graphics/items/equipment/head/leathergoggles.png` | Fettsack | GPLv2
-`graphics/items/equipment/head/leprechaunhat.png` | Scorpius, QOAL, Saulc | GPLv2
-`graphics/items/equipment/head/leprechaunhead.png` | Ledmitz, (leprechaunhat.png | Scorpius, QOAL, Saulc | GPLv2) | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/magicgmtophat.png` | QOAL, V0id | GPLv2
`graphics/items/equipment/head/mask.png` | QOAL | GPLv2
`graphics/items/equipment/head/minershat.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/monocle.png` | Skipy | GPLv2
`graphics/items/equipment/head/monster-skull-helm.png` | Black Don | GPLv2
-`graphics/items/equipment/head/moonshroomhat.png` | Cassy | CC BY-SA 3.0
`graphics/items/equipment/head/opera-mask.png` | Meway | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/overlord-helm.png` | Black Don | GPLv2
`graphics/items/equipment/head/paladin-helm.png` | Black Don | GPLv2
@@ -287,7 +261,6 @@ File | Artists | Licenses
`graphics/items/equipment/head/pvpcap.png` | Black Don, kytty | GPLv2
`graphics/items/equipment/head/pvpcap-golden.png` | Black Don, kytty, Ledmitz | GPLv2
`graphics/items/equipment/head/rabbit-ears.png` | Black Don, Harufym | GPLv2
-`graphics/items/equipment/head/rainshroomhat.png` | Cassy, HoraK-FDF | CC BY-SA 3.0
`graphics/items/equipment/head/rangerhat.png` | Pauan | GPLv2
`graphics/items/equipment/head/rednose.png` | ChefChelios, UntamedMonkey | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/rosehat.png` | Nami, skipy, Alige | GPLv2
@@ -295,17 +268,13 @@ File | Artists | Licenses
`graphics/items/equipment/head/santahat.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/silkheadband.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/skullmask.png` | Beelzebub, FotherJ | GPLv2
-`graphics/items/equipment/head/skullmask-dyable.png` | Beelzebub, FotherJ, HoraK-FDF | GPLv2
`graphics/items/equipment/head/snowgoggles.png` | VXD | GPLv2, CC BY-SA 3.0
-`graphics/items/equipment/head/snowshroomhat.png` | Cassy, HoraK-FDF | CC BY-SA 3.0
`graphics/items/equipment/head/sunglasses.png` | UntamedMonkey | GPLv2, CC BY-SA 3.0
-`graphics/items/equipment/head/sunshroomhat.png` | Cassy, HoraK-FDF | CC BY-SA 3.0
`graphics/items/equipment/head/terranitehelm.png` | Kr0n05931 | GPLv2
`graphics/items/equipment/head/thin-crown.png` | Black Don, V0id | GPLv2
`graphics/items/equipment/head/tophat.png` | QOAL | GPLv2
`graphics/items/equipment/head/warlordhelm.png` | Black Don | GPLv2
-`graphics/items/equipment/head/wickedmushroomhat.png` | Cassy, Yuuki, HoraK-FDF | GPLv2
-`graphics/items/equipment/head/witch-doctor-mask.png` | Black Don, Hello=) | GPLv2
+`graphics/items/equipment/head/witch-doctor-mask.png` | Black Don | GPLv2
`graphics/items/equipment/head/witch-hat.png` | Meway | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/wizard-hat.png` | Crush, Hal9000 | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/head/yeti-mask.png` | Skipy | GPLv2
@@ -326,6 +295,15 @@ File | Artists | Licenses
`graphics/items/equipment/legs/silkpants.png` | LuH | GPLv2
`graphics/items/equipment/legs/terranitepants.png` | Kr0n05931 | GPLv2
+#### Rings
+File | Artists | Licenses
+---- |:-------:|:--------:
+`graphics/items/equipment/rings/gem.png` | Salmondine | GPLv2
+`graphics/items/equipment/rings/magic.png` | Nami | GPLv2, CC BY-SA 3.0
+`graphics/items/equipment/rings/simple.png` | Salmondine | GPLv2
+`graphics/items/equipment/rings/wedding.png` | Kess | GPLv2
+`graphics/items/equipment/rings/assassin-ring.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
+
#### Shields
File | Artists | Licenses
---- |:-------:|:--------:
@@ -335,9 +313,7 @@ File | Artists | Licenses
`graphics/items/equipment/shield/leather.png` | Meway | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/shield/scarabarmlet.png` | Adarias | GPLv2
`graphics/items/equipment/shield/steel.png` | Irukard | GPLv2, CC BY-SA 3.0
-`graphics/items/equipment/shield/steel-dyable.png` | Irukard, HoraK-FDF | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/shield/wooden.png` | Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/equipment/shield/bromenal.png` | Skipy | GPLv2
`graphics/items/equipment/shield/dragonshield.png` | tametomo | GPLv2
#### Weapons
@@ -368,7 +344,6 @@ File | Artists | Licenses
`graphics/items/equipment/weapon/polearm-scorpion.png` | Adarias | GPLv2
`graphics/items/equipment/weapon/polearm-spear.png` | Irukard | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/weapon/polearm-trident.png` | Irukard | GPLv2, CC BY-SA 3.0
-`graphics/items/equipment/weapon/rainerang.png` | Ledmitz | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/weapon/staff-crescentrod.png` | Adarias | GPLv2
`graphics/items/equipment/weapon/staff-staffoffire.png` | Adarias | GPLv2
`graphics/items/equipment/weapon/staff-staffofice.png` | Adarias | GPLv2
@@ -391,7 +366,7 @@ File | Artists | Licenses
`graphics/items/equipment/weapon/slingshot-icon.png` | wushin | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/weapon/sword-dead.png` | Wombat, wushin | GPLv2, CC BY-SA 3.0
`graphics/items/equipment/weapon/wand.png` | wushin | GPLv2, CC BY-SA 3.0
-`graphics/items/equipment/weapons/flintlock.png` | Skipy, Micksha | GPLv2
+`graphics/items/equipment/weapons/revolver.png` | Skipy, Micksha | GPLv2
#### Generic
File | Artists | Licenses
@@ -401,71 +376,47 @@ File | Artists | Licenses
`graphics/items/generic/bandit-hood.png` | Wombat, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/batteeth.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/batwing.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/beeswax.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/bent-needle.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/generic/blackpearl.png` | :grey_question:, Fate, Enchilado | GPLv2
-`graphics/items/generic/blackscorpionclaw.png` | Saulc | CC BY-SA 3.0
`graphics/items/generic/blanket.png` | Nami, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/blossom-wonderwoodling.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/bone.png` | Yosuhara, Enchilado | GPLv2
`graphics/items/generic/bottle-empty.png` | FotherJ, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/bottle-ice.png` | FotherJ, Nami, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/bottle-moon.png` | FotherJ, Enchilado, HoraK-FDF | GPLv2, CC BY-SA 3.0
`graphics/items/generic/bottle-sand.png` | FotherJ, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/brick-a.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/broken-fourleaf-amulet.png` | Alige, Fate, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/brokendoll.png` | Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/bromenal-droplet.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/bugleg.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/generic/butterfly.png` | Meway, Saulc | GPL 3.0/CC BY-SA 3.0
-`graphics/items/generic/carrot-legendary.png` | Enchilado, Reid, ? | CC BY-SA 3.0
`graphics/items/generic/casinocoins.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/generic/cavesnakelamp.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/generic/charcoal.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/chocolatemouboo.png` | :grey_question:, Chicka-Maria, Enchilado | GPLv2
`graphics/items/generic/christmasbox-closed.png` | Lizandra, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/christmasbox-open.png` | Lizandra, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/christmasbulb.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/generic/claylump_big.png` | Jumpy, Enchilado | GPLv2
`graphics/items/generic/claylump_small.png` | Fate, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/clover-drawing.png` | Adamaix, Enchilado, HoraK | GPLv2
`graphics/items/generic/coal.png` | Enchilado, Meway, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/coinbag.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/generic/crocclaw.png` | Reid, Enchilado | CC BY-SA 3.0
`graphics/items/generic/crystal.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/crystal-black-quartz.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/items/generic/crystal-crozenite.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/items/generic/crystal-mountain.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/items/generic/crystal-pink-quartz.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/items/generic/crystalized-dragon-blood.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/dark-easter-egg.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/generic/dark-petal.png` | Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/doll.png` | Lizandra, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/dragon-horn.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/items/generic/dragonscales.png` | Lugia/Lunovox?, TMW-Br | GPLv2
`graphics/items/generic/dry-branch.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/generic/duckfeather.png` | Saulc | CC BY-SA 4.0
`graphics/items/generic/ear-zombie.png` | Goku, Enchilado | GPLv2
`graphics/items/generic/easterbasket.png` | Salmondine, Enchilado | GPLv2
`graphics/items/generic/easteregg.png` | Crush, Enchilado, wushin | GPLv2, CC BY-SA 3.0
`graphics/items/generic/eyeball.png` | Yosuhara, Enchilado | GPLv2
`graphics/items/generic/fabric.png` | Crush, Enchilado, wushin | GPLv2, CC BY-SA 3.0
`graphics/items/generic/fakefangs.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/generic/feather-a.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/flawed-lens.png` | Skipy, Enchilado | GPLv2
`graphics/items/generic/flighttalisman.png` | Nami, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/flour.png` | Micksha | MIT
`graphics/items/generic/frozen-yeti-tear.png` | ChefChelios, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/gempowder.png` | Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/gemstone-a.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/gemstone-b.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/glass-shards.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/items/generic/golden-tooth.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/grassliner.png` | Salmondine, Enchilado | GPLv2
`graphics/items/generic/grassseeds.png` | Coolkid782, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/grub-slime.png` | Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/hardspike.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/hay.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/heart-diseased.png` | FotherJ, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/herb.png` | Irukard | GPLv2, CC BY-SA 3.0
`graphics/items/generic/herb-mauve.png` | Enchilado | GPLv2, CC BY-SA 3.0
@@ -473,7 +424,6 @@ File | Artists | Licenses
`graphics/items/generic/herb-gamboge.png` | Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/herb-alizarin.png` | Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/hint.png` | Modanung, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/honeycomb.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/ice-cube.png` | Alige, Arikel, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/ingot.png` | Wombat, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/ironore.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
@@ -486,25 +436,19 @@ File | Artists | Licenses
`graphics/items/generic/lazurite-shard.png` | V0id, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/leatherball.png` | Lizandra, Salmondine, Enchilado | GPLv2
`graphics/items/generic/leathersuitcase.png` | Nami, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/mushroomspores.png` | Reid | CC BY-SA 3.0
`graphics/items/generic/mylarin-dust.png` | :grey_question:, FotherJ, Salmondine | GPLv2
`graphics/items/generic/patch-leather.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/generic/pearl.png` | Fate, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/petal.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/generic/pink-flower-seed.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/pinkantennae.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/plushmouboo.png` | Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/powder.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/pumpkinseed.png` | Enchilado | GPLv2
`graphics/items/generic/presentbox.png` | Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/raindrop.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/rags-rotten.png` | FotherJ, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/rattotail.png` | Reid, Alige | CC BY-SA 3.0
-`graphics/items/generic/rattoteeth.png` | Reid, Alige | CC BY-SA 3.0
`graphics/items/generic/rawlog.png` | Lien, Enchilado | GPLv2
`graphics/items/generic/rawtalisman.png` | Nami, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/realisticbrain.png` | Skipy, Enchilado | GPLv2
-`graphics/items/generic/redscorpionclaw.png` | Saulc | CC BY-SA 3.0
`graphics/items/generic/redstocking.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/generic/reedbundle.png` | Salmondine, Enchilado | GPLv2
`graphics/items/generic/reinboo-stick.png` | :grey_question:, Enchilado | GPLv2
@@ -515,12 +459,9 @@ File | Artists | Licenses
`graphics/items/generic/santacookie.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/santaglobe.png` | Enchilado | GPLv2
`graphics/items/generic/scissors.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/generic/scorpionclaw.png` | Saulc | CC BY-SA 3.0
`graphics/items/generic/scorpionstinger.png` | :grey_question:, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/scroll.png` | Adamaix, Enchilado | GPLv2
-`graphics/items/generic/seed-wonderwoodling.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/sealed-soul.png` | V0id, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/shipkey.png` | Hal9000, Reid | CC BY-SA 3.0
`graphics/items/generic/silkcocoon.png` | Fate, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/silk-sheet.png` | bh28, Bjorn, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/silverbell.png` | FotherJ, Enchilado | GPLv2, CC BY-SA 3.0
@@ -529,24 +470,17 @@ File | Artists | Licenses
`graphics/items/generic/smallmushroom.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/generic/snake-tongue.png` | Fate, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/snakeskin.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/generic/snowflake.png` | mkwong98, Open Game Art, jesusalva | CC0
`graphics/items/generic/snowmanglobe.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/generic/spectral-orb.png` | Kr0n05931, Enchilado | GPLv2
`graphics/items/generic/spell-book-page.png` | Salmondine, Enchilado | GPLv2
`graphics/items/generic/spell-book.png` | Salmondine, Enchilado | GPLv2
-`graphics/items/generic/seeds-dyable.png` | Coolkid782, Enchilado, HoraK-FDF | GPLv2, CC BY-SA 3.0
`graphics/items/generic/spice.png` | FotherJ, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/squichyclaws.png` | Reid | CC BY-SA 3.0
`graphics/items/generic/squirrel-pelt.png` | Wombat, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/stinger.png` | Wombat, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/stone-a.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/strange-coin.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/generic/straw.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/terraniteore.png` | Kr0n05931, Enchilado | GPLv2
`graphics/items/generic/tongue.png` | Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/toothbrush.png` | Chay | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/tortugashell.png` | Reid | CC BY-SA 3.0
-`graphics/items/generic/tortugashellfragment.png` | Reid | CC BY-SA 3.0
`graphics/items/generic/transmutedflower` | Korcha, V0id, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/treasurekey.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/generic/tuber.png` | Salmondine, Enchilado | GPLv2
@@ -555,7 +489,6 @@ File | Artists | Licenses
`graphics/items/generic/whitefur.png` | Crush, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/wolvern-pelt.png` | Len, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/wolvern-tooth.png` | Alige, Nami, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/generic/wonder-wood.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/generic/wooden-mouboo.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/generic/wrapping-paper-dotted.png` | Lizandra, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/generic/wrapping-paper-striped.png` | Lizandra, Enchilado | GPLv2, CC BY-SA 3.0
@@ -576,57 +509,37 @@ File | Artists | Licenses
`graphics/items/use/food/acornroasted.png` | Nami, V0id, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/use/food/apple.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/use/food/beer.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/use/food/bird-big-egg-a.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/items/use/food/bird-egg-a.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/use/food/bigcake.png` | Freeyorp101, Kr0n05931, Enchilado | GPLv2
`graphics/items/use/food/blueberries.png` | Meway, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/use/food/bread.png` | Coolkid782 | CC BY-SA 3.0
`graphics/items/use/food/cake.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/use/food/candy.png` | Kekskiller, Enchilado | GPLv2
`graphics/items/use/food/candycane.png` | Kekskiller, Enchilado | GPLv2
`graphics/items/use/food/candypumpkin.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/use/food/caramelapple.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/use/food/caramelcandy.png` | TMW-BR Team | GPLv2
-`graphics/items/use/food/carrot.png` | Enchilado, Reid | CC BY-SA 3.0
-`graphics/items/use/food/cheese.png` | Reid | CC BY-SA 3.0
`graphics/items/use/food/cherry.png` | Alige, Len, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/use/food/cherrycake.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/use/food/chickenleg.png` | Modanung, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/use/food/chocolatebar.png` | Kinwa, Enchilado | GPLv2
-`graphics/items/use/food/chocolatebiscuit.png` | jesusalva, TMW-Br | GPLv2
-`graphics/items/use/food/chocolatebunny.png` | TMW.Org Forum | GPLv2
`graphics/items/use/food/decorcandy.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/use/food/deliciouscookie.png` | Enchilado, Alige | CC BY-SA 3.0
-`graphics/items/use/food/dragonfruit.png` | seeds | GPL3/CC BY-SA 4.0
-`graphics/items/use/food/duckegg.png` | +seeds | CC BY-SA 4.0
`graphics/items/use/food/easteregg.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/use/food/fruit-salad.png` | Meway, jesusalva | MIT
-`graphics/items/use/food/fungus.png` | Enchilado | CC BY-SA 3.0
`graphics/items/use/food/gingerbreadman.png` | Kekskiller, Enchilado | GPLv2
`graphics/items/use/food/golden-apple.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/use/food/halfcroconut.png` | Hal9000 | CC BY-SA 3.0
`graphics/items/use/food/honey.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/use/food/jello.png` | Nmaligec, Salmondine, Enchilado | GPLv2
`graphics/items/use/food/jellyskull.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/use/food/juice.png` | Nmaligec, Skipy, Enchilado | GPLv2
`graphics/items/use/food/lady-fingers.png` | ChefChelios, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/use/food/lettuceleaf.png` | Reid | CC BY-SA 3.0
`graphics/items/use/food/lollipop.png` | :grey_question:, Wombat, Enchilado | GPLv2
`graphics/items/use/food/lollipop2.png` | Lizandra, Enchilado, wushin | GPLv2, CC BY-SA 3.0
-`graphics/items/use/food/manana.png` | Reid, IvanMorve | CC BY-SA 3.0
`graphics/items/use/food/marshmallow.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/use/food/milk.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/use/food/orange.png` | EJlol, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/use/food/orangecupcake.png` | :grey_question:, Enchilado | GPLv2
`graphics/items/use/food/pear.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/use/food/piberries.png` | Reid | CC BY-SA 3.0
`graphics/items/use/food/pickled_beets.png` | Nami, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/use/food/plum.png` | Alige, Meway, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/use/food/potatoz.png` | Saulc, Joshua Taylor | CC BY-SA 3.0
-`graphics/items/use/food/pumpkin.png` | Enchilado | CC BY-SA 3.0
-`graphics/items/use/food/pumpkinjuice.png` | Enchilado, Reid | CC BY-SA 3.0
`graphics/items/use/food/roastedmaggot.png` | :grey_question:, Enchilado | GPLv2
-`graphics/items/use/food/sauerkraut.png` | Nmaligec, Salmondine, Enchilado, HoraK-FDF | GPLv2
`graphics/items/use/food/sex-candy.png` | TMW-BR Team | GPLv2
`graphics/items/use/food/shock-candy.png` | Kekskiller, Enchilado | GPLv2
`graphics/items/use/food/skull-mug.png` | :grey_question:, Enchilado | GPLv2
@@ -644,17 +557,6 @@ File | Artists | Licenses
#### Misc Usable Items
File | Artists | Licenses
---- |:-------:|:--------:
-`graphics/items/use/others/anchor-stone.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/items/use/others/anchor-stone-anchored.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/items/use/others/arrow_bundle.png` Irukard, Wellvin | GPLv2, CC BY-SA 3.0
-`graphics/items/use/others/croconut.png` | Hal9000 | CC BY-SA 3.0
-`graphics/items/use/others/rubberducky.png` | Salmondine, dangerDuck | GPLv2
-`graphics/items/use/others/lightning-orb.png` | Hello=), Horak-FDF | GPLv2, CC BY-SA 4.0
-`graphics/items/use/others/shovel.png` | Alige, Reid | CC BY-SA 3.0
-`graphics/items/use/others/shovel-legendary.png` | Alige, Reid, ?, HoraK-FDF | CC BY-SA 3.0
-`graphics/items/use/others/treasuremap.png` | Diego, TMW-Br | GPLv2
-`graphics/items/use/others/treasuremap2.png` | Salmondine | GPLv2
-`graphics/items/use/others/treasuremap-legendary.png` | Salmondine, ?, HoraK-FDF | GPLv2
`graphics/items/use/others/warp-towel.png` | Bjorn, ChefChelios | GPLv2, CC BY-SA 3.0
#### Potions
@@ -665,20 +567,20 @@ File | Artists | Licenses
`graphics/items/use/potions/c.png` | Varuna, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/use/potions/d.png` | Varuna, Enchilado | GPLv2, CC BY-SA 3.0
`graphics/items/use/potions/e.png` | Fate, Enchilado | GPLv2, CC BY-SA 3.0
-`graphics/items/use/potions/g.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/items/use/potions/skull.png` | Varuna | GPLv2, CC BY-SA 3.0
#### Scrolls
File | Artists | Licenses
---- |:-------:|:--------:
`graphics/items/use/scrolls/firescroll.png` | Adamaix, Enchilado | GPLv2
-`graphics/items/use/scrolls/scroll-shadow.png` | Adamaix, Enchilado, HoraK | GPLv2
+
### Minimaps
File | Artists | Licenses
---- |:-------:|:--------:
`graphics/minimaps/*.png` | The Mana World Development Team | GPLv2
+
### Particles
File | Artists | Licenses
---- |:-------:|:--------:
@@ -688,17 +590,12 @@ File | Artists | Licenses
`graphics/particles/arrowh-banshee.png` | :grey_question:, V0id | GPLv2
`graphics/particles/blaze.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/particles/bubble_8px.png` | Crush | GPLv2, CC BY-SA 3.0
-`graphics/particles/bubble-ani_6x6.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/particles/bubble-ani_8x8.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/particles/anibubble_8px.png` | Crush,wushin | GPLv2, CC BY-SA 3.0
`graphics/particles/anibubble_8px_green.png` | Crush,wushin | GPLv2, CC BY-SA 3.0
-`graphics/particles/beam.png` | Ledmitz | GPLv2, CC BY-SA 3.0
-`graphics/particles/beam-crit.png` | Ledmitz | GPLv2, CC BY-SA 3.0
`graphics/particles/bubble_12px.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/particles/bubble_32px.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/particles/casket-trap_96x96.png` | Skipy | GPLv2
`graphics/particles/dart.png` | Ledmitz | GPLv2, CC BY-SA 3.0
-`graphics/particles/flame-8x8.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/particles/fog-medium-a.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/particles/fog-medium-b.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/particles/fog-medium-c.png` | Crush | GPLv2, CC BY-SA 3.0
@@ -710,8 +607,6 @@ File | Artists | Licenses
`graphics/particles/mist-face-a.png` | Nmaligec | GPLv2
`graphics/particles/mist-face-b.png` | Nmaligec | GPLv2
`graphics/particles/monster-troll-foefire.particle.png` | FotherJ | GPLv2, CC BY-SA 3.0
-`graphics/particles/monster-rotter-crit.png` | Ledmitz | GPLv2, CC BY-SA 3.0
-`graphics/particles/monster-rotter-vomit.png` | Ledmitz | GPLv2, CC BY-SA 3.0
`graphics/particles/orb-large.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/particles/orb-medium.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/particles/orb-small.png` | Crush | GPLv2, CC BY-SA 3.0
@@ -719,20 +614,12 @@ File | Artists | Licenses
`graphics/particles/pool_32x59.particle.png` | Skipy | GPLv2
`graphics/particles/pool_65x27.particle.png` | Skipy | GPLv2
`graphics/particles/pool-undyed.png` | Alige, Skipy | GPLv2
-`graphics/particles/raindrop-hit_16x16.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/particles/raindrop-hit_8x8.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/particles/raindrop_3x5.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/particles/raindrop_8x8.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/particles/rainerang.png` | Ledmitz | GPLv2, CC BY-SA 3.0
`graphics/particles/snowball.png` | Ledmitz, Reid | GPLv2, CC BY-SA 3.0
`graphics/particles/star-medium.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/particles/star-small.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/particles/waterfall-a.png` | Modanung | GPLv2, CC BY-SA 3.0
`graphics/particles/manapearl_4x4.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/particles/snowflake-7x7.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/particles/snowflake-9x9.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/particles/hex-facet-outline.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/particles/hex-facet-outline-50.png` | ?, HoraK-FDF | GPLv2, CC BY-SA 4.0
+
### Skills
File | Artists | Licenses
@@ -763,6 +650,8 @@ File | Artists | Licenses
---- |:-------:|:--------:
`graphics/sprites/emote.png` | Alige, Arikel, DerLoisl, Modanung, Reid | GPLv2, CC BY-SA 3.0
`graphics/sprites/error.png` | Wushin | GPLv2, CC BY-SA 3.0
+`graphics/sprites/equipment/angel-wings.png` | :grey_question:, Varuna, Arikel | GPLv2
+`graphics/sprites/equipment/shields/dragon.png` | ?, TMW-Br Team | GPLv2
`graphics/sprites/races/savior-male.png` | Modanung, Talaroc, Alige, Reid, Saphy, Jesusalva | CC BY-SA 4.0 (GPLv3)
#### Status Icons
@@ -773,26 +662,6 @@ File | Artists | Licenses
`graphics/sprites/icons/slow-poison.png` | Freeyorp101 | GPLv2, CC BY-SA 3.0
`graphics/sprites/icons/spell-haste.png` | Graingert | GPLv2
`graphics/sprites/icons/spell-protection-generic.png` | Freeyorp101 | GPLv2, CC BY-SA 3.0
-`graphics/sprites/icons/cant-move.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/slow-move.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/weight-big.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/weight-small.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/spell-cooldown-cg.png` | Hocus, HoraK-FDF | MIT, GPLv2, CC BY-SA 3.0
-`graphics/sprites/icons/spell-cooldown-mg.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/spell-cooldown-mt.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/spell-cooldown-ench.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/spell-cooldown-koy.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/spell-cooldown-ar.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/spell-cooldown-ar-outline.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/spell-cooldown-r.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/spell-cooldown-r-outline.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/spell-cooldown-upmarmu.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/spell-cooldown-sg.png` | Hocus, HoraK-FDF | MIT, GPLv2, CC BY-SA 3.0
-`graphics/sprites/icons/spell-attack-generic-outline.png` | :grey_question:, HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/feather-outline.png` | :grey_question:, HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/hidden-outline.png` | :grey_question:, HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/invisible-outline.png` | :grey_question:, HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/icons/potion-g.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
#### Actor Models
File | Artists | Licenses
@@ -802,11 +671,6 @@ File | Artists | Licenses
`graphics/sprites/model/male.png` | Modanung, Skipy, Talaroc, Wombat, Nami, Wushin | GPLv2
`graphics/sprites/model/city-emblems.png` | Alige, Wushin | GPLv2
-#### Amulets
-File | Artists | Licenses
----- |:-------:|:--------:
-`graphics/sprites/equipment/amulets/angel-wings.png` | :grey_question:, Varuna, Arikel | GPLv2
-
#### Weapons
File | Artists | Licenses
---- |:-------:|:--------:
@@ -814,20 +678,18 @@ File | Artists | Licenses
`graphics/sprites/equipment/weapons/axe-stab.png` | :grey_question:, Wombat, Wushin, Varuna | GPLv2
`graphics/sprites/equipment/weapons/bow-banshee.png` | V0id | GPLv2
`graphics/sprites/equipment/weapons/bow-slingshot.png` | Chef Chelios, wushin | GPLv2
-`graphics/sprites/equipment/weapons/dagger-setzer.png` | :grey_question:, TMW-Br Team | GPLv2
`graphics/sprites/equipment/weapons/null.png` | Ledmitz | CC0
`graphics/sprites/equipment/weapons/polearm-blunt.png` | :grey_question:, Wombat, Wushin | GPLv2
`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` | ?, TMW-Br Team, HoraK-FDF | GPLv2
`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/flintlock.png` | Skipy, Jesusalva | GPLv2
+`graphics/sprites/equipment/weapons/beheader.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
+`graphics/sprites/equipment/weapons/gun.png` | Skipy, Jesusalva | GPLv2
#### Chest
File | Artists | Licenses
@@ -871,8 +733,8 @@ File | Artists | Licenses
`graphics/sprites/equipment/chest/vnecksweater-male.png` | Saphy | GPLv2
`graphics/sprites/equipment/chest/saviorarmor-male.png` | Saphy, slave | GPLv2
`graphics/sprites/equipment/chest/saviorarmor-female.png` | Saphy, slave | GPLv2
-`graphics/sprites/equipment/chest/redknightarmor-female.png` | :grey_question:, TMW-Br Team, Saulc | GPLv2
-`graphics/sprites/equipment/chest/redknightarmor-male.png` | :grey_question:, TMW-Br Team, Saulc | GPLv2
+`graphics/sprites/equipment/chest/redknightarmor-female.png` | ?, TMW-Br Team, Saulc | GPLv2
+`graphics/sprites/equipment/chest/redknightarmor-male.png` | ?, TMW-Br Team, Saulc | GPLv2
#### Feet
File | Artists | Licenses
@@ -938,23 +800,18 @@ File | Artists | Licenses
`graphics/sprites/equipment/head/goggles.png` | Fettsack | GPLv2
`graphics/sprites/equipment/head/gradcap.png` | Arilious | GPLv2
`graphics/sprites/equipment/head/guyfawkes.png` | 5t3v3 | GPLv2
-`graphics/sprites/equipment/head/headslime.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/sprites/equipment/head/heart-glasses.png` | Lizandra | GPLv2, CC BY-SA 3.0
`graphics/sprites/equipment/head/highpriest-crown.png` | Black Don | GPLv2
`graphics/sprites/equipment/head/infantryhelm.png` | Black Don | GPLv2
`graphics/sprites/equipment/head/inspector-hat.png` | ? | GPLv2
`graphics/sprites/equipment/head/jestermask.png` | Spit23 | GPLv2
`graphics/sprites/equipment/head/knighthelm.png` | Black Don | GPLv2
-`graphics/sprites/equipment/head/knighthelm-dyable.png` | Black Don, HoraK-FDF | GPLv2
`graphics/sprites/equipment/head/knit-cap.png` | Salmondine | GPLv2
-`graphics/sprites/equipment/head/leprechaunhat.png` | Scorpius, QOAL, Saulc | GPLv2
-`graphics/sprites/equipment/head/leprechaunhead.png` | Ledmitz, (leprechaunhat.png | Scorpius, QOAL, Saulc | GPLv2) | GPLv2, CC BY-SA 3.0
`graphics/sprites/equipment/head/magicgmtophat.png` | QOAL, V0id | GPLv2
`graphics/sprites/equipment/head/mask.png` | QOAL | GPLv2
`graphics/sprites/equipment/head/minershat.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/sprites/equipment/head/monocle.png` | Skipy | GPLv2
`graphics/sprites/equipment/head/monster-skull-helm.png` | Black Don | GPLv2
-`graphics/sprites/equipment/head/moonshroomhat.png` | Saulc, Cassy | CC BY-SA 3.0
`graphics/sprites/equipment/head/mushroom.png` | crevost2, Yuuki | GPLv2
`graphics/sprites/equipment/head/nutcrackerhat.png` | Chayenne, :grey_question:, Alige, Lizandra, Salmondine | GPLv2
`graphics/sprites/equipment/head/operamask.png` | Meway | GPLv2, CC BY-SA 3.0
@@ -969,7 +826,6 @@ File | Artists | Licenses
`graphics/sprites/equipment/head/pvp-cap.png` | Black Don, kytty | GPLv2
`graphics/sprites/equipment/head/pvpcap-golden.png` | Black Don, kytty, Ledmitz | GPLv2
`graphics/sprites/equipment/head/rabbit-ears.png` | Black Don, Harufym | GPLv2
-`graphics/sprites/equipment/head/rainhroomhat.png` | Saulc, Cassy, HoraK-FDF | CC BY-SA 3.0
`graphics/sprites/equipment/head/rangerhat.png` | Pauan | GPLv2
`graphics/sprites/equipment/head/rednose.png` | ChefChelios, UntamedMonkey | GPLv2, CC BY-SA 3.0
`graphics/sprites/equipment/head/rosehat.png` | Nami, skipy, Alige | GPLv2
@@ -978,18 +834,13 @@ File | Artists | Licenses
`graphics/sprites/equipment/head/shroom.png` | crevost2, Yuuki | GPLv2
`graphics/sprites/equipment/head/silkheadband.png` | Crush | GPLv2, CC BY-SA 3.0
`graphics/sprites/equipment/head/skullmask.png` | Beelzebub, FotherJ | GPLv2
-`graphics/sprites/equipment/head/skullmask-dyable.png` | Beelzebub, FotherJ, HoraK-FDF | GPLv2
`graphics/sprites/equipment/head/smileycap.png` | +seeds | GPLv2, CC BY-SA 3.0
`graphics/sprites/equipment/head/snowgoggles.png` | VXD | GPLv2, CC BY-SA 3.0
-`graphics/sprites/equipment/head/snowshroomhat.png` | Saulc, Cassy, HoraK-FDF | CC BY-SA 3.0
`graphics/sprites/equipment/head/sunglasses.png` | UntamedMonkey | GPLv2, CC BY-SA 3.0
-`graphics/sprites/equipment/head/sunshroomhat.png` | Saulc, Cassy, HoraK-FDF | CC BY-SA 3.0
`graphics/sprites/equipment/head/terranitehelm.png` | Kr0n05931 | GPLv2
`graphics/sprites/equipment/head/thin-crown.png` | Black Don, V0id | GPLv2
`graphics/sprites/equipment/head/tophat.png` | QOAL | GPLv2
-`graphics/sprites/equipment/head/underworld-mask.png` | Saulc, Dustman, wushin | CC BY-SA 3.0
`graphics/sprites/equipment/head/warlordhelm.png` | Black Don | GPLv2
-`graphics/sprites/equipment/head/wickedmushroomhat.png` | Cassy, Yuuki, HoraK-FDF | GPLv2
`graphics/sprites/equipment/head/witch-doctor-mask.png` | Black Don | GPLv2
`graphics/sprites/equipment/head/witch-hat.png` | Meway | GPLv2, CC BY-SA 3.0
`graphics/sprites/equipment/head/wizard-hat.png` | Chayenne, Crush, Hal9000 | GPLv2, CC BY-SA 3.0
@@ -998,6 +849,7 @@ File | Artists | Licenses
`graphics/sprites/equipment/head/shades.png` | jak1 | GPLv2, CC BY-SA 3.0
`graphics/sprites/equipment/head/assassin-mask.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
+
#### Legs
File | Artists | Licenses
---- |:-------:|:--------:
@@ -1016,15 +868,6 @@ File | Artists | Licenses
`graphics/sprites/equipment/legs/terranite-female.png` | Kr0n05931 | GPLv2
`graphics/sprites/equipment/legs/terranite-male.png` | Kr0n05931 | GPLv2
-#### Shields
-File | Artists | Licenses
----- |:-------:|:--------:
-`graphics/sprites/equipment/shields/dragon.png` | ?, TMW-Br Team | GPLv2
-`graphics/sprites/equipment/shields/leather.png` | ?, Irukard, TMW-Br Team | GPLv2
-`graphics/sprites/equipment/shields/steel.png` | ?, Irukard, TMW-Br Team | GPLv2
-`graphics/sprites/equipment/shields/steel-dyable.png` | ?, Irukard, TMW-Br Team, HoraK-FDF | GPLv2
-`graphics/sprites/equipment/shields/wooden.png` | Enchilado | GPL 3.0/CC BY-SA 3.0
-
#### Override
File | Artists | Licenses
---- |:-------:|:--------:
@@ -1062,93 +905,59 @@ File | Artists | Licenses
`graphics/sprites/monsters/bandit-lord.png` | Alige, Skipy, Wombat | GPLv2
`graphics/sprites/monsters/bandit.png` | Alige, Skipy, Wombat | GPLv2
`graphics/sprites/monsters/bat.png` | neoriceisgood | GPLv2
-`graphics/sprites/monsters/beehive.png` | Len, TMW.org | CC BY-SA 4.0
`graphics/sprites/monsters/bluepar.png` | Crush, Meway | GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/bobone.png` | Pateame, HoraK-FDF | GPLv2
-`graphics/sprites/monsters/brainblow.png` | Ledmitz | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/butterfly.png` | Meway | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/cave-maggot-giant.png` | :grey_question:, Neoriceisgood | GPLv2
`graphics/sprites/monsters/cave-maggot.png` | :grey_question:, Neoriceisgood | GPLv2
`graphics/sprites/monsters/christmas-mouboo.png` | Cassy, Yuuki | GPLv2
`graphics/sprites/monsters/clover.png` | 5t3v3 | GPLv2
-`graphics/sprites/monsters/croc.png` | Reid, Coolkid782, Enchilado | CC BY-SA 3.0
-`graphics/sprites/monsters/darkduck.png` | Meway, ?, TMW-Br, dangerDuck | CC BY-SA 3.0
`graphics/sprites/monsters/demon.png` | FotherJ, V0id | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/dragon.png` | Lunovox, Jesusalva | GPLv2
`graphics/sprites/monsters/duck.png` | Meway | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/element-ball.png` | Reid | GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/wonderwoodling.png` | macmanmatty, jesusalva | CC BY-SA 4.0
-`graphics/sprites/monsters/frog-big.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/frog-small.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/ghost-pumpkin.png` | :grey_question:, Modanung | GPLv2
`graphics/sprites/monsters/goblin-fire.png` | :grey_question:, Neoriceisgood | GPLv2
`graphics/sprites/monsters/goblin-ice.png` | :grey_question:, Neoriceisgood | GPLv2
`graphics/sprites/monsters/golem.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/golem-blackcrystal.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/golem-crystal.png` | Hocus, HoraK-FDF | MIT, GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/golem-dyable.png` | Hocus, HoraK-FDF | MIT, GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/golem-red.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/grass.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/monsters/junglefowl.png` | Pateame, Virtual Reality | GPLv2
`graphics/sprites/monsters/larvespa.png` | Arikel | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/lizard.png` | Len, Pateame | GPLv2
`graphics/sprites/monsters/logmonster.png` | FotherJ | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/maggot-giant.png` | :grey_question:, Neoriceisgood | GPLv2
`graphics/sprites/monsters/maggot.png` | Neoriceisgood | GPLv2
-`graphics/sprites/monsters/mananatree.png` | Len, Saphy, Reid | CC BY-SA 3.0
-`graphics/sprites/monsters/mana-bug.png` | Meway, HoraK-FDF | GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/mega-mana-bug.png` | Meway, HoraK-FDF | GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/mister-prickles.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0
+`graphics/sprites/monsters/mana-bug.png` | Meway | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/moggun.png` | Modanung, Pateame | GPLv2
`graphics/sprites/monsters/mouboo.png` | Yuuki | GPLv2
`graphics/sprites/monsters/mouboo-demonic.png` | Cassy, Yuuki | GPLv2
-`graphics/sprites/monsters/moubootaur.png` | Hocus | MIT
-`graphics/sprites/monsters/montblanc.png` | KokoroReflections (piratehat.png | Fettsack | GPLv2) (cannon | AntumDeluge | CC BY 3.0, OGA BY 3.0) | CC BY 4.0
-`graphics/sprites/monsters/mushroom-moon.png` | Cassy, Yuuki | GPLv2
-`graphics/sprites/monsters/mushroom-rain.png` | Cassy, Yuuki, HoraK-FDF | GPLv2
`graphics/sprites/monsters/mushroom-red.png` | Yuuki | GPLv2
-`graphics/sprites/monsters/mushroom-snow.png` | Cassy, Yuuki, HoraK-FDF | GPLv2
`graphics/sprites/monsters/mushroom-spiky.png` | Yuuki | GPLv2
-`graphics/sprites/monsters/mushroom-sun.png` | Cassy, Yuuki, HoraK-FDF | GPLv2
`graphics/sprites/monsters/mushroom-void.png` | Cassy, Yuuki, Jesusalva | GPLv2
`graphics/sprites/monsters/mushroom-wicked.png` | Cassy, Yuuki | GPLv2
+`graphics/sprites/monsters/mushroom-moon.png` | Cassy, Yuuki | GPLv2
`graphics/sprites/monsters/nutcracker.png` | Chayenne, :grey_question:, Alige, Lizandra, Salmondine | GPLv2
`graphics/sprites/monsters/penguin.png` | Fother | GPLv2
`graphics/sprites/monsters/pinkie.png` | Crush | GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/piou-king.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/plant.png` | Crush, Seradest | GPLv2
-`graphics/sprites/monsters/ratto.png` | Coolkid782 | CC BY-SA 3.0
`graphics/sprites/monsters/reaper.png` | Alige, Len, Reid, Skipy | GPLv2
-`graphics/sprites/monsters/rot.png` | Ledmitz | GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/rotter.png` | Ledmitz | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/sasquatch.png` | Xtreem | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/serqet.png` | ChefChelios | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/silkworm.png` | Fate | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/skeleton.png` | FotherJ | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/skull-fire.png` | Modanung | GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/skull-golden.png` | ChefChelios, Saulc | CC BY-SA 3.0
`graphics/sprites/monsters/skull-ice.png` | ChefChelios | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/skull-poison.png` | Modanung | GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/skull-warlord.png` | Saulc, Modanung, HoraK-FDF | CC BY-SA 3.0
`graphics/sprites/monsters/sleeping-bandit.png` | Alige, Skipy, V0id, Wombat | GPLv2
`graphics/sprites/monsters/slime.png` | :grey_question:, Neoriceisgood | GPLv2
-`graphics/sprites/monsters/slime-super.png` | Reid, HoraK-FDF | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/snail.png` | FotherJ | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/snake-cave.png` | :grey_question:, Neoriceisgood | GPLv2
`graphics/sprites/monsters/snake.png` | :grey_question:, Neoriceisgood | GPLv2
`graphics/sprites/monsters/snowflower.png` | Salmondine | GPLv2
-`graphics/sprites/monsters/spelt.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/sprites/monsters/spider.png` | FotherJ | GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/spider-crystal.png` | FotherJ, HoraK-FDF | GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/spider-queen.png` | Hocus | MIT, GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/spider-queen-crystal.png` | Hocus, HoraK-FDF | MIT, GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/spinning-scythe.png` | Nmaligec, Skipy | GPLv2
`graphics/sprites/monsters/spirit-demonic.png` | :grey_question:, Neoriceisgood, V0id | GPLv2
`graphics/sprites/monsters/squirrel.png` | FotherJ, Wombat | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/terranite-mask.png` | Kr0n05931 | GPLv2
`graphics/sprites/monsters/tengu.png` | Hocus | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/terranite.png` | Kr0n05931 | GPLv2
-`graphics/sprites/monsters/tortuga.png` | Coolkid782, Reid | CC BY-SA 3.0
`graphics/sprites/monsters/troll.png` | FotherJ | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/vampire-bat.png` | Meway | GPLv2
`graphics/sprites/monsters/vespa.png` | Arikel | GPLv2, CC BY-SA 3.0
@@ -1166,11 +975,9 @@ File | Artists | Licenses
`graphics/sprites/monsters/accessories/mouboo-red-saddle.png` | Cassy | GPLv2
`graphics/sprites/monsters/accessories/mouboo-red-shoes.png` | Cassy | GPLv2
`graphics/sprites/monsters/accessories/mouboo-santa-hat.png` | Cassy | GPLv2
-`graphics/sprites/monsters/accessories/ratto-tail.png` | Coolkid782 | CC BY-SA 3.0
`graphics/sprites/monsters/accessories/slime-bubble.png` | Fother | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/accessories/slime-littleslime.png` | Wombat | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/accessories/slime-seajelly.png` | FotherJ | GPLv2, CC BY-SA 3.0
-`graphics/sprites/monsters/accessories/slime-super-crown.png` | Reid, HoraK-FDF | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/accessories/mushroom-base1-arms1.png` | FotherJ | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/accessories/mushroom-base1-cap1.png` | FotherJ | GPLv2, CC BY-SA 3.0
`graphics/sprites/monsters/accessories/mushroom-base1-cap1-spikes.png` | FotherJ | GPLv2, CC BY-SA 3.0
@@ -1184,23 +991,11 @@ File | Artists | Licenses
---- |:-------:|:--------:
`graphics/sprites/npcs/airship.png` | Modanung | GPLv2
`graphics/sprites/npcs/anon.png` | Lien, Modanung, Reid, Crush, Fother, Nami, Talaroc | CC-BY-SA 3.0
-`graphics/npcs/blanc.png` | KokoroReflections, Hocus (piratehat.png | Fettsack | GPLv2) | CC BY 4.0
`graphics/sprites/npcs/bones.png` | FotherJ, Salmondine | GPLv2
`graphics/sprites/npcs/childoutfits.png` | Milla, Mrgrey, Nami, Salmondine, Wombat | GPLv2
`graphics/sprites/npcs/childposes.png` | Milla, Mrgrey, Nami, Salmondine | GPLv2
`graphics/sprites/npcs/christmas_npcs.png` | :grey_question:, Alige, Lizandra, Salmondine | GPLv2
`graphics/sprites/npcs/christmastree.png` | Chayenne, :grey_question:, Alige, Hal9000, Enchilado, Kekskiller, FotherJ | GPLv2
-`graphics/sprites/npcs/dig-01.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/npcs/dig-02.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/npcs/dig-03.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/npcs/dig-04.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/npcs/dig-01-flow.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/npcs/dig-02-flow.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/npcs/dig-04-flow.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/npcs/dig-01-glow.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/npcs/dig-02-glow.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/npcs/dig-03-glow.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/sprites/npcs/dig-04-glow.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/sprites/npcs/furnace.png` | Salmondine | GPLv2
`graphics/sprites/npcs/hugenpcs.png` | ChefChelios, Nami | GPLv2, CC BY-SA 3.0
`graphics/sprites/npcs/npc-beerguyghost.png` | Reid, Skipy | GPLv2
@@ -1227,7 +1022,6 @@ File | Artists | Licenses
`graphics/sprites/npcs/npcs.png` | :grey_question:, Crush, Fate, Haay, Lien, Qwerty Dragon, Salmondine, Skipy, Wombat | GPLv2
`graphics/sprites/npcs/npcs2.png` | Reid, Salmondine, Skipy | GPLv2
`graphics/sprites/npcs/outfits.png` | Wombat | GPLv2, CC BY-SA 3.0
-`graphics/sprites/npcs/portal_32x64-01.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
`graphics/sprites/npcs/poses.png` | Lien, Meemixes, Salmondine, Wombat | GPLv2
`graphics/sprites/npcs/saboteur.png` | Wombat | GPLv2, CC BY-SA 3.0
`graphics/sprites/npcs/sages.png` | Alige, Nami, Salmondine | GPLv2
@@ -1238,8 +1032,6 @@ File | Artists | Licenses
`graphics/sprites/npcs/thermin_npcs.png` | Lien, Nami, Salmondine, Varuna | GPLv2
`graphics/sprites/npcs/xmas-palm.png` | Chayenne, :grey_question:, Enchilado | GPLv2
`graphics/sprites/npcs/xmastree-nosnow.png` | Chayenne, :grey_question:, Alige, Hal9000, Enchilado, Kekskiller, FotherJ | GPLv2
-`graphics/sprites/npcs/teapot.png` | Reid | CC-BY-SA 3.0
-
### Tilesets
File | Artists | Licenses
@@ -1266,7 +1058,6 @@ File | Artists | Licenses
`graphics/tiles/cave2_x2.png` | :grey_question:, Bjorn, Octalot, Len, wushin | GPLv2
`graphics/tiles/clock.png` | Salmondine | GPLv2
`graphics/tiles/collision.png` | Bjorn | GPLv2
-`graphics/tiles/christmas.png` | ???, TMW.org | ???
`graphics/tiles/crypt1.png` | Black Don, Crush, Irukard, Skipy, Spit23, Wushin | GPLv2
`graphics/tiles/crypt2.png` | Black Don, Crush, Irukard, Skipy, Spit23, Wushin | GPLv2
`graphics/tiles/crypt2_x4.png` | Black Don, Crush, Irukard, Skipy, Spit23, Wushin | GPLv2
@@ -1302,8 +1093,6 @@ File | Artists | Licenses
`graphics/tiles/desert_city.png` | Modanung, Wushin | GPLv2, CC BY-SA 3.0
`graphics/tiles/desert_city_x2.png` | Modanung, Wushin | GPLv2, CC BY-SA 3.0
`graphics/tiles/desert_city_x4.png` | Modanung, Wushin | GPLv2, CC BY-SA 3.0
-`graphics/tiles/edges_black_rotated.png` | HoraK-FDF | GPLv2, CC BY-SA 4.0
-`graphics/tiles/edges_ice_rotated.png` | ?, Tametomo - Aethyra, HoraK-FDF | GPL 3.0
`graphics/tiles/evil_obelisk.png` | Alige, ChefChelios, Leela | GPLv2
`graphics/tiles/forest_cover.png` | Len | GPLv2, CC BY-SA 3.0
`graphics/tiles/forest.png` | Len | GPLv2
@@ -1321,9 +1110,9 @@ File | Artists | Licenses
`graphics/tiles/snow_ground.png` | bagzie, gumi, :grey_question: | GPLv2
`graphics/tiles/snow_tree_x3.png` | :grey_question:, Alige, Hal9000 | GPLv2
`graphics/tiles/snow_village.png` | bagzie, gumi, :grey_question: | GPLv2
-`graphics/tiles/snow_village_x3.png` | bagzie, gumi, :grey_question:, HoraK-FDF | GPLv2
+`graphics/tiles/snow_village_x3.png` | bagzie, gumi, :grey_question: | GPLv2
`graphics/tiles/snow_village_x4.png` | bagzie, gumi, :grey_question: | GPLv2
-`graphics/tiles/snow_village2.png` | bagzie, gumi, :grey_question:, HoraK-FDF | GPLv2
+`graphics/tiles/snow_village2.png` | bagzie, gumi, :grey_question: | GPLv2
`graphics/tiles/snow_x2.png` | Nami, Salmondine, Arkhen | (CC BY 4.0)
`graphics/tiles/snow_x4.png` | gumi | GPLv2
`graphics/tiles/snow.png` | bagzie, gumi, wushin, :grey_question: | GPLv2
@@ -1355,25 +1144,6 @@ File | Artists | Licenses
`graphics/tiles/woodland_x8.png` | Len | GPLv2, CC BY-SA 3.0
`graphics/tiles/arrows.png` | gumi | CC0
-### Aethyra Tilesets
-`graphics/tiles/aethyra/snow.png` | ?, Tametomo - Aethyra | GPL 3.0
-`graphics/tiles/aethyra/snow_building.png` | ?, Tametomo - Aethyra | GPL 3.0
-`graphics/tiles/aethyra/snow_roof.png` | ? ,Tametomo - Aethyra | GPL 3.0
-`graphics/tiles/aethyra/snow_water.png` | ?, Tametomo - Aethyra | GPL 3.0
-`graphics/tiles/aethyra/snowset.png` | ?, Tametomo - Aethyra | GPL 3.0
-
-### Br Tilesets
-`graphics/tilesets/br/christmastree.png` | ?, TMW-BR, TMW Org | GPL 2.0
-`graphics/tilesets/br/snow_x3.png` | ?, TMW-BR | GPL 2.0
-
-### Lof Tilesets
-`graphics/tiles/lof/warp_gates.png` | ?, LoF | GPL 2.0
-`graphics/tiles/lof/woodland_indoor.png` | ?, LoF | GPL 2.0
-`graphics/tiles/lof/woodland_indoor_extra.png` | ?, LoF, Jesusalva | GPL 2.0
-
-### ML Tilesets
-`graphics/tiles/ml/cabana_in_fada.png` | Lunovox?, TMW-Br | GPLv2
-
## Sounds
File | Artists | Licenses
---- |:-------:|:--------:
@@ -1388,9 +1158,7 @@ File | Artists | Licenses
`sfx/env/env-waterfall1.ogg` | Dariuna | GPLv2
`sfx/env/fart.ogg` | unknown | CC0
`sfx/env/flame.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/env/rubber_duck.ogg` | Ledmitz | GPLv2, CC0
`sfx/env/spawn_burst.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/env/tiny_bell.ogg` | SamuelGremaud, Ledmitz | CC0
`sfx/env/zap.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/magic/astral.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/magic/betsanc-on.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
@@ -1426,22 +1194,8 @@ File | Artists | Licenses
`sfx/monsters/bee/bee-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/bee/bee-miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/bee/bee-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/brainblow-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/brainblow-die2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/brainblow-die3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/casket-monster/casket-monster.ogg` | Dariuna | GPLv2
`sfx/monsters/cavesnake/cavesnake-hit1.ogg` | Krazyjakee | GPLv2
-`sfx/monsters/croc/hit1.ogg` | Ezili, Reid, Socapex | CC BY-SA 3.0
-`sfx/monsters/croc/hit2.ogg` | Ezili, Reid, Socapex | CC BY-SA 3.0
-`sfx/monsters/croc/hurt1.ogg` | Ezili, Reid, Socapex | CC BY-SA 3.0
-`sfx/monsters/croc/hurt2.ogg` | Ezili, Reid, Socapex | CC BY-SA 3.0
-`sfx/monsters/croc/hurt3.ogg` | Ezili, Reid, Socapex | CC BY-SA 3.0
-`sfx/monsters/croc/miss1.ogg` | Ezili, Reid, Socapex | CC BY-SA 3.0
-`sfx/monsters/croc/spawn1.ogg` | Ezili, Reid, Socapex | CC BY-SA 3.0
-`sfx/monsters/crocotree/die1.ogg` | KomradeJack, Reid, Socapex | CC BY-SA 3.0
-`sfx/monsters/crocotree/hurt1.ogg` | KomradeJack, Reid, Socapex | CC BY-SA 3.0
-`sfx/monsters/crocotree/hurt2.ogg` | KomradeJack, Reid, Socapex | CC BY-SA 3.0
-`sfx/monsters/crocotree/hurt3.ogg` | KomradeJack, Reid, Socapex | CC BY-SA 3.0
`sfx/monsters/fallen/fallen-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/fallen/fallen-die2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/fallen/fallen-hurt1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
@@ -1461,21 +1215,11 @@ File | Artists | Licenses
`sfx/monsters/flower/flower-hit1.ogg` | Cosmostrator | GPLv2
`sfx/monsters/flower/flower-hit2.ogg` | Cosmostrator | GPLv2
`sfx/monsters/flower/flower-miss1.ogg` | Cosmostrator | GPLv2
-`sfx/monsters/floyd/floyd-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/floyd/floyd-hurt1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/floyd/floyd-hurt2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/floyd/floyd-hurt3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/floyd/floyd-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/floyd/floyd-move2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/floyd/floyd-move3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/floyd/floyd-move4.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/floyd/floyd-move5.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/fluffy/fluffy-hit1.ogg` | Cosmostrator | GPLv2
`sfx/monsters/fluffy/fluffy-hit2.ogg` | Cosmostrator | GPLv2
`sfx/monsters/fluffy/fluffy-hit3.ogg` | Cosmostrator | GPLv2
`sfx/monsters/fluffy/fluffy-hurt1.ogg` | Cosmostrator | GPLv2
`sfx/monsters/fluffy/fluffy-miss1.ogg` | Cosmostrator | GPLv2
-`sfx/monsters/frostiana/hit1.ogg` | Cosmostrator | CC BY-SA 3.0
`sfx/monsters/golem/die.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/golem/hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/golem/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
@@ -1490,7 +1234,6 @@ File | Artists | Licenses
`sfx/monsters/maggot/maggot-hit1.ogg` | Cosmostrator | GPLv2
`sfx/monsters/maggot/maggot-hit2.ogg` | Cosmostrator | GPLv2
`sfx/monsters/maggot/maggot-miss1.ogg` | Cosmostrator | GPLv2
-`sfx/monsters/montblanc/montblanc-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/ghost/ghost-die1.ogg` | Ledmitz (ghostly-moans / Alivvie / CC by SA 3.0) | GPLv2, CC BY-SA 3.0
`sfx/monsters/ghost/ghost-move1.ogg` | Ledmitz (ghostly-moans / Alivvie / CC by SA 3.0) | GPLv2, CC BY-SA 3.0
`sfx/monsters/ghost/ghost-move2.ogg` | Ledmitz (ghostly-moans / Alivvie / CC by SA 3.0) | GPLv2, CC BY-SA 3.0
@@ -1508,25 +1251,10 @@ File | Artists | Licenses
`sfx/monsters/pollett/pollett-hurt5.ogg` | clort | GPLv2, CC BY-SA 3.0
`sfx/monsters/pollett/pollett-hurt6.ogg` | clort | GPLv2, CC BY-SA 3.0
`sfx/monsters/pumpkin/pumpkin-explosion.ogg` | Ledmitz (firework_explosion_fizz.wav / soundscalpel.co / CC BY 3.0) | GPLv2, CC BY-SA 3.0
-`sfx/monsters/ratto/die1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0
-`sfx/monsters/ratto/hit1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0
-`sfx/monsters/ratto/hit2.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0
-`sfx/monsters/ratto/hurt1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0
-`sfx/monsters/ratto/spawn1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0
`sfx/monsters/reaper/reaper-die1.ogg` | Ledmitz, nmaligec | GPLv2, CC BY-SA 3.0
`sfx/monsters/reaper/reaper-hit1.ogg` | Ledmitz, nmaligec | GPLv2, CC BY-SA 3.0
`sfx/monsters/reaper/reaper-hurt1.ogg` | nmaligec | GPLv2
`sfx/monsters/reaper/reaper-move1.ogg` | Ledmitz, nmaligec | GPLv2, CC BY-SA 3.0
-`sfx/monsters/rotter/crit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/rotter/die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/rotter/die2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/rotter/hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/rotter/hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/rotter/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/rotter/miss2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/rotter/move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/rotter/move2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/rotter/move3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/sasquatch/sasquatch-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/sasquatch/sasquatch-move2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/scorpion/scorpion-hit1.ogg` | Cosmostrator | GPLv2
@@ -1562,33 +1290,21 @@ File | Artists | Licenses
`sfx/monsters/slime/slime-hurt3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/slime/slime-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/slime/slime-move2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/slime-super/slime-super-die1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/slime-super/slime-super-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/slime-super/slime-super-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/slime-super/slime-super-hit3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/slime-super/slime-super-hurt1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/slime-super/slime-super-hurt2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/slime-super/slime-super-hurt3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/slime-super/slime-super-miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/slime-super/slime-super-miss2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/slime-super/slime-super-miss3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/slime-super/slime-super-move1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/slime-super/slime-super-move2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/snail/snail-die1.ogg` | alpha [Ledmitz] | GPLv2
`sfx/monsters/snail/snail-hit1.ogg` | alpha [Ledmitz] | GPLv2
`sfx/monsters/snail/snail-hurt1.ogg` | alpha [Ledmitz] | GPLv2
`sfx/monsters/snail/snail-hurt2.ogg` | alpha [Ledmitz] | GPLv2
`sfx/monsters/snowman_boss/hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/snowman_boss/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/spider/spider-die1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0
-`sfx/monsters/spider/spider-hit1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0
-`sfx/monsters/spider/spider-hit2.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0
-`sfx/monsters/spider/spider-hit3.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0
-`sfx/monsters/spider/spider-move1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0
-`sfx/monsters/spider/spider-move2.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0
-`sfx/monsters/spider/spider-move3.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0
-`sfx/monsters/spider/spider-move4.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0
-`sfx/monsters/spider/spider-move5.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0
+`sfx/monsters/spider/spider-die1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`sfx/monsters/spider/spider-hit1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`sfx/monsters/spider/spider-hit2.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`sfx/monsters/spider/spider-hit3.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`sfx/monsters/spider/spider-move1.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`sfx/monsters/spider/spider-move2.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`sfx/monsters/spider/spider-move3.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`sfx/monsters/spider/spider-move4.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
+`sfx/monsters/spider/spider-move5.ogg` | alpha [Ledmitz] | GPLv2, CC BY-SA 3.0`
`sfx/monsters/squirrel/squirrel-die1.ogg` | Krazyjakee | GPLv2
`sfx/monsters/squirrel/squirrel-die2.ogg` | Krazyjakee | GPLv2
`sfx/monsters/squirrel/squirrel-hurt1.ogg` | Krazyjakee | GPLv2
@@ -1611,12 +1327,6 @@ File | Artists | Licenses
`sfx/monsters/tengu/hurt2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/tengu/hurt3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/monsters/tengu/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/monsters/tortuga/die1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0
-`sfx/monsters/tortuga/hit1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0
-`sfx/monsters/tortuga/hit2.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0
-`sfx/monsters/tortuga/hurt1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0
-`sfx/monsters/tortuga/miss1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0
-`sfx/monsters/tortuga/spawn1.ogg` | Cosmostrator, Socapex | CC BY-SA 3.0
`sfx/monsters/wolvern/wolvern-dying1.ogg` | Chicka-Maria | GPLv2, CC BY-SA 3.0
`sfx/monsters/wolvern/wolvern-hit1.ogg` | Chicka-Maria | GPLv2, CC BY-SA 3.0
`sfx/monsters/wolvern/wolvern-hit2.ogg` | Chicka-Maria | GPLv2, CC BY-SA 3.0
@@ -1660,9 +1370,6 @@ File | Artists | Licenses
`sfx/weapons/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/miss2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/miss3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/weapons/beam/beam-crit.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/weapons/beam/beam-hit.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/weapons/beam/beam-miss.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/bow_shoot_1.ogg` | Cosmostrator | GPLv2
`sfx/weapons/bows/banshee/banshee-hit1.ogg` | Ledmitz (rocket-shots.mp3 / Audionautics / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/banshee/banshee-hit2.ogg` | Ledmitz (rocket-shots.mp3 / Audionautics / CC BY 3.0) | GPLv2, CC BY-SA 3.0
@@ -1672,21 +1379,11 @@ File | Artists | Licenses
`sfx/weapons/bows/banshee/banshee-miss3.ogg` | Ledmitz (rocket-shots.mp3 / Audionautics / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/forest/forest-hit1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/forest/forest-miss1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
-`sfx/weapons/bows/imperial/imperial-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/weapons/bows/imperial/imperial-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/weapons/bows/imperial/imperial-hit3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/weapons/bows/imperial/imperial-hit4.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/weapons/bows/imperial/imperial-hit5.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/weapons/bows/imperial/imperial-hit6.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/weapons/bows/imperial/imperial-miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/short/short-hit1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/short/short-miss1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/bow-hit1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/bows/bow-miss1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0
-`sfx/weapons/gun/gun-hit1.ogg` | Bird-Man, Freesound.org(shot), Jesusalva | CC 0
-`sfx/weapons/gun/gun-miss1.ogg` | Bird-Man, Freesound.org(shot), craigsmith, Freesound.org(Rifle ricochets), Jesusalva, Ledmitz | CC 0
-`sfx/weapons/gun/gun-miss2.ogg` | Bird-Man, Freesound.org(shot), craigsmith, Freesound.org(Rifle ricochets), Jesusalva, Ledmitz | CC 0
-`sfx/weapons/gun/gun-miss3.ogg` | Bird-Man, Freesound.org(shot), craigsmith, Freesound.org(Rifle ricochets), Jesusalva, Ledmitz | CC 0
+`sfx/weapons/gunstaff/shot.ogg` | Bird-Man, Freesound.org, Jesusalva | CC 0
`sfx/weapons/knives/knife-hit1.ogg` | Cosmostrator | GPLv2
`sfx/weapons/knives/knife-miss1.ogg` | Cosmostrator | GPLv2
`sfx/weapons/knives/rock/rock-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
@@ -1695,17 +1392,11 @@ File | Artists | Licenses
`sfx/weapons/knives/setzer/setzer-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/knives/setzer/setzer-hit3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/knives/sharpknife-miss1.ogg` | Krazyjakee | GPLv2
-`sfx/weapons/lightsaber/crit.ogg` | ?, FreedroidRPG | GPL v2)
-`sfx/weapons/lightsaber/hit1.ogg` | skytheguy, Freesound.org, Jesusalva | CC BY 3.0)
-`sfx/weapons/lightsaber/hit2.ogg` | skytheguy, Freesound.org, Jesusalva | CC BY 3.0)
-`sfx/weapons/lightsaber/hit3.ogg` | skytheguy, Freesound.org, Jesusalva | CC BY 3.0)
-`sfx/weapons/lightsaber/miss.ogg` | skytheguy, Freesound.org, Jesusalva | CC BY 3.0)
`sfx/weapons/projectiles/snowball/hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/projectiles/snowball/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/weapons/projectiles/rainerang/rainerang-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/weapons/projectiles/rainerang/rainerang-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/weapons/projectiles/rainerang/rainerang-hit3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
-`sfx/weapons/projectiles/rainerang/rainerang-miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/punch1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/punch2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/punch3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/other/halberd/halberd-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/other/halberd/halberd-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/other/halberd/halberd-hit3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
@@ -1722,8 +1413,8 @@ File | Artists | Licenses
`sfx/weapons/swords/ice_gladius/ice_gladius-hit3.ogg` | Ledmitz (ting shas wav.mp3 / CMeeson / CC BY-3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/swords/ice_gladius/ice_gladius-hit4.ogg` | Ledmitz (ting shas wav.mp3 / CMeeson / CC BY-3.0) | GPLv2, CC BY-SA 3.0
`sfx/weapons/swords/ice_gladius/ice_gladius-hit5.ogg` | Ledmitz (ting shas wav.mp3 / CMeeson / CC BY-3.0) | GPLv2, CC BY-SA 3.0
-`sfx/weapons/swords/longsword/longsword-hit1.ogg` | Krazyjakee | GPLv2
-`sfx/weapons/swords/longsword/longsword-hit2.ogg` | Krazyjakee | GPLv2
+`sfx/weapons/swords/longsword-hit1.ogg` | Krazyjakee | GPLv2
+`sfx/weapons/swords/longsword-hit2.ogg` | Krazyjakee | GPLv2
`sfx/weapons/swords/longsword-miss1.ogg` | Krazyjakee | GPLv2
`sfx/weapons/swords/rapier-hit1.ogg` | Krazyjakee | GPLv2
`sfx/weapons/swords/sabre-hit1.ogg` | Krazyjakee | GPLv2
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index d7e2a944..adceb3c0 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -1,5 +1,5 @@
-