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..a49aed0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,42 +1,27 @@
stages:
- test
-image: debian:bullseye
+image: debian:buster
before_script:
- uname -a
-pngcheck:
+.pngcheck:
stage: test
script:
- ./.tools/pngcheck.sh
#allow_failure: true
-imagemagiccheck:
+.imagemagiccheck:
stage: test
script:
- ./.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
@@ -44,7 +29,7 @@ old_manaplus:
expire_in: 3 week
allow_failure: true
-newlines:
+.newlines:
stage: test
tags:
- lightweight
@@ -57,7 +42,7 @@ newlines:
expire_in: 3 week
#allow_failure: true
-licensecheck:
+.licensecheck:
stage: test
tags:
- lightweight
@@ -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..0930241e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
[submodule "music"]
path = music
- url = https://git.themanaworld.org/tmw/music.git
+ url = https://git.themanaworld.org/legacy/music.git
[submodule "mods"]
path = mods
- url = https://git.themanaworld.org/tmw/mods.git
+ url = https://git.themanaworld.org/legacy/mods.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..7a0d3eb1 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
@@ -42,12 +18,32 @@ function gitclone1 {
return $?
}
+# First try cloning $2 into $3 from this repository's
+# project space, then use provided fallback space ($1).
function gitclone {
- export name1=$1/$2
- export name2=${CI_BUILD_REPO##*@}
- export name2=https://${name2%/*}/$2
+ printf '$CI_BUILD_REPO is %s\n' "$CI_BUILD_REPO"
+ printf '$CI_REPOSITORY_URL is %s\n' "$CI_REPOSITORY_URL"
+ printf '$CI_PROJECT_URL is %s\n' "$CI_PROJECT_URL"
+ local name1=$1/$2
+ # Format https://gitlab-ci-token:$CI_JOB_TOKEN@gitlab.example.com/my-group/my-project.git
+ # strip token part
+ local name2=${CI_REPOSITORY_URL##*@}
+ # Strip URL down to namespace and append the project we want
+ local 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 +65,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..9982554b 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
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/effects.xml b/effects.xml
index 332c54f9..bb91119c 100644
--- a/effects.xml
+++ b/effects.xml
@@ -101,7 +101,6 @@
-
@@ -122,8 +121,6 @@
-
-
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/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/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/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/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/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/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/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/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/legendary-carrot.png b/graphics/items/generic/legendary-carrot.png
new file mode 100644
index 00000000..c61f58f7
Binary files /dev/null and b/graphics/items/generic/legendary-carrot.png 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/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/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/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/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/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/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/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/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/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/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/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/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/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-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-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/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/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/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/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/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/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/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/wonderwoodling.png b/graphics/sprites/monsters/ent.png
similarity index 100%
rename from graphics/sprites/monsters/wonderwoodling.png
rename to graphics/sprites/monsters/ent.png
diff --git a/graphics/sprites/monsters/wonderwoodling.xml b/graphics/sprites/monsters/ent.xml
similarity index 94%
rename from graphics/sprites/monsters/wonderwoodling.xml
rename to graphics/sprites/monsters/ent.xml
index c6aba01a..8569c99c 100644
--- a/graphics/sprites/monsters/wonderwoodling.xml
+++ b/graphics/sprites/monsters/ent.xml
@@ -1,6 +1,6 @@
-
+
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/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.xml b/graphics/sprites/monsters/moubootaur.xml
index ba8c5b8f..48d720dd 100644
--- a/graphics/sprites/monsters/moubootaur.xml
+++ b/graphics/sprites/monsters/moubootaur.xml
@@ -56,30 +56,37 @@ Copyright (C) 2011-2021 Moubootaur Legends -->
+
+
+
+
+
+
+
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/piou-king.xml b/graphics/sprites/monsters/piou-king.xml
index 23750d05..5e3d8e09 100644
--- a/graphics/sprites/monsters/piou-king.xml
+++ b/graphics/sprites/monsters/piou-king.xml
@@ -95,34 +95,42 @@ Copyright (C) 2011-2021 Moubootaur Legends -->
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/monsters/ratto.xml b/graphics/sprites/monsters/ratto.xml
index 1ee5116c..9572a8ba 100644
--- a/graphics/sprites/monsters/ratto.xml
+++ b/graphics/sprites/monsters/ratto.xml
@@ -61,6 +61,7 @@ Copyright (C) 2011-2013 Evol Online -->
+
@@ -68,6 +69,7 @@ Copyright (C) 2011-2013 Evol Online -->
+
@@ -75,6 +77,7 @@ Copyright (C) 2011-2013 Evol Online -->
+
@@ -82,6 +85,7 @@ Copyright (C) 2011-2013 Evol Online -->
+
@@ -89,6 +93,7 @@ Copyright (C) 2011-2013 Evol Online -->
+
@@ -96,6 +101,7 @@ Copyright (C) 2011-2013 Evol Online -->
+
@@ -103,6 +109,7 @@ Copyright (C) 2011-2013 Evol Online -->
+
@@ -110,6 +117,7 @@ Copyright (C) 2011-2013 Evol Online -->
+
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/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/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/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/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/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/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/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/items/equip-1hand/item0578_SandCutter.xml b/items/equip-1hand/item0578_SandCutter.xml
index 84d16c4e..b93f6ae2 100644
--- a/items/equip-1hand/item0578_SandCutter.xml
+++ b/items/equip-1hand/item0578_SandCutter.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/weapons/sword-sandcutter.xml
weapons/knives/rock/rock-hit1.ogg
weapons/knives/rock/rock-hit2.ogg
diff --git a/items/equip-1hand/item0584_Jackal.xml b/items/equip-1hand/item0584_Jackal.xml
index e6c248d1..5ade59f2 100644
--- a/items/equip-1hand/item0584_Jackal.xml
+++ b/items/equip-1hand/item0584_Jackal.xml
@@ -4,7 +4,7 @@
image="equipment/weapon/sword-jackal.png"
name="Jackal"
description="Made to parry attacks from drakes, relic of a long forsaken war."
- effect="Attack Speed +1% / Accuracy +5 / HP +50 / HP Drain 5% / Weapon Level 1"
+ effect="Attack Speed +1% / Accuracy +5% / HP +50 / HP Drain 5% / Weapon Level 1"
attack="150"
attack-range="1"
defense="5"
diff --git a/items/equip-1hand/item0590_DragonSword.xml b/items/equip-1hand/item0590_DragonSword.xml
index f737ecf9..c47a37e3 100644
--- a/items/equip-1hand/item0590_DragonSword.xml
+++ b/items/equip-1hand/item0590_DragonSword.xml
@@ -4,7 +4,7 @@
image="equipment/weapon/sword-dragon.png"
name="Dragon Sword"
description="Empowered by demure's drakes, relic of a long forsaken war."
- effect="Attack Speed +2% / Accuracy +5 / Base Attack Delay -25 / Weapon Level 2"
+ effect="Attack Speed +2% / Accuracy +5% / Base Attack Delay -25 / Weapon Level 2"
req-str="50+"
req-agi="50+"
req-vit="50+"
diff --git a/items/equip-1hand/item0910_Rainerang.xml b/items/equip-1hand/item0910_Rainerang.xml
index 046ba3e6..3cab482c 100644
--- a/items/equip-1hand/item0910_Rainerang.xml
+++ b/items/equip-1hand/item0910_Rainerang.xml
@@ -10,9 +10,7 @@
weight="115"
missile-particle="graphics/particles/rainerang.xml"
sellProtected="true">
- weapons/projectiles/rainerang/rainerang-hit1.ogg
- weapons/projectiles/rainerang/rainerang-hit2.ogg
- weapons/projectiles/rainerang/rainerang-hit3.ogg
- weapons/projectiles/rainerang/rainerang-miss1.ogg
+ weapons/bows/forest/forest-miss1.ogg
+ weapons/bows/forest/forest-hit1.ogg
diff --git a/items/equip-ammo/item5291_ThornArrow.xml b/items/equip-ammo/item5291_ThornArrow.xml
index 55a3d877..7b6aa1e5 100644
--- a/items/equip-ammo/item5291_ThornArrow.xml
+++ b/items/equip-ammo/item5291_ThornArrow.xml
@@ -7,6 +7,6 @@
effect="Critical +10 / Hit +25"
type="equip-ammo"
attack="65"
- weight="1"
+ weight="12"
/>
diff --git a/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml b/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml
index dbc8e72e..170cf010 100644
--- a/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml
+++ b/items/equip-amulet/item0829_CrozeniteFourLeafAmulet.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml b/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml
index 53413745..774fa2a9 100644
--- a/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml
+++ b/items/equip-amulet/item0830_BromenalFourLeafAmulet.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/equip-amulet/item0831_SilverFourLeafAmulet.xml b/items/equip-amulet/item0831_SilverFourLeafAmulet.xml
index 97c0e6bf..93849ded 100644
--- a/items/equip-amulet/item0831_SilverFourLeafAmulet.xml
+++ b/items/equip-amulet/item0831_SilverFourLeafAmulet.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml b/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml
index 14285fc7..3276f54f 100644
--- a/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml
+++ b/items/equip-amulet/item0832_GoldenFourLeafAmulet.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/equip-amulet/item0908_GMAmulet.xml b/items/equip-amulet/item0908_GMAmulet.xml
index 23c57f42..c8d93eb3 100644
--- a/items/equip-amulet/item0908_GMAmulet.xml
+++ b/items/equip-amulet/item0908_GMAmulet.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/equip-amulet/item1227_EnchantersAmulet.xml b/items/equip-amulet/item1227_EnchantersAmulet.xml
index c24506d5..aa6bacb8 100644
--- a/items/equip-amulet/item1227_EnchantersAmulet.xml
+++ b/items/equip-amulet/item1227_EnchantersAmulet.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/equip-amulet/item5252_GuardianWings.xml b/items/equip-amulet/item5252_GuardianWings.xml
index baa87550..a0cf9143 100644
--- a/items/equip-amulet/item5252_GuardianWings.xml
+++ b/items/equip-amulet/item5252_GuardianWings.xml
@@ -1,6 +1,6 @@
- -
+
-
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
index dbd6c3e3..6b10f6af 100644
--- a/items/equip-amulet/item5269_AssassinAmulet.xml
+++ b/items/equip-amulet/item5269_AssassinAmulet.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/equip-amulet/item5270_ManaPearl.xml b/items/equip-amulet/item5270_ManaPearl.xml
index 39c232bf..b25ba0be 100644
--- a/items/equip-amulet/item5270_ManaPearl.xml
+++ b/items/equip-amulet/item5270_ManaPearl.xml
@@ -1,6 +1,6 @@
- -
+
-
graphics/particles/manapearl.particle.xml
diff --git a/items/equip-feet/item0757_AssassinBoots.xml b/items/equip-feet/item0757_AssassinBoots.xml
index 2952d91b..8a2bff95 100644
--- a/items/equip-feet/item0757_AssassinBoots.xml
+++ b/items/equip-feet/item0757_AssassinBoots.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/feet/assassin-boots.xml
equipment/feet/assassin-boots-female.xml
diff --git a/items/equip-head/_include.xml b/items/equip-head/_include.xml
index f36c30eb..d8077c1e 100644
--- a/items/equip-head/_include.xml
+++ b/items/equip-head/_include.xml
@@ -5,7 +5,6 @@
-
@@ -230,16 +229,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
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
index dde4bec1..a47926f9 100644
--- a/items/equip-head/item0622_Bandana.xml
+++ b/items/equip-head/item0622_Bandana.xml
@@ -1,23 +1,10 @@
- -
+
-
equipment/head/bandana.xml|#ffffff;#ff4645
equipment/head/bandana-female.xml|#ffffff;#ff4645
-
-
-
-
-
-
-
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/item5129_UnderworldMask.xml b/items/equip-head/item5129_UnderworldMask.xml
index b50fd80c..8cc029ab 100644
--- a/items/equip-head/item5129_UnderworldMask.xml
+++ b/items/equip-head/item5129_UnderworldMask.xml
@@ -3,7 +3,7 @@
-
equipment/head/underworld-mask.xml
equipment/head/underworld-mask-female.xml
-
+
diff --git a/items/equip-head/item5203_MoonshroomHat.xml b/items/equip-head/item5203_MoonshroomHat.xml
index 9cc6d048..02786a16 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/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-legs/item0731_AssassinPants.xml b/items/equip-legs/item0731_AssassinPants.xml
index 4df67df7..4161a867 100644
--- a/items/equip-legs/item0731_AssassinPants.xml
+++ b/items/equip-legs/item0731_AssassinPants.xml
@@ -1,6 +1,6 @@
- -
+
-
equipment/legs/assassin.xml
equipment/legs/assassin-female.xml
diff --git a/items/equip-shield/_include.xml b/items/equip-shield/_include.xml
index 52c514bf..c562b270 100644
--- a/items/equip-shield/_include.xml
+++ b/items/equip-shield/_include.xml
@@ -6,5 +6,4 @@
-
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-torso/_include.xml b/items/equip-torso/_include.xml
index 00f8ec37..aa44e3da 100644
--- a/items/equip-torso/_include.xml
+++ b/items/equip-torso/_include.xml
@@ -252,5 +252,4 @@
-
diff --git a/items/equip-torso/item0645_GoldenPlatemail.xml b/items/equip-torso/item0645_GoldenPlatemail.xml
index 30da7a0b..f754bcdb 100644
--- a/items/equip-torso/item0645_GoldenPlatemail.xml
+++ b/items/equip-torso/item0645_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/item0659_GoldenWarlordPlate.xml b/items/equip-torso/item0659_GoldenWarlordPlate.xml
index fd425941..e11fed4b 100644
--- a/items/equip-torso/item0659_GoldenWarlordPlate.xml
+++ b/items/equip-torso/item0659_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/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/generic/_include.xml b/items/generic/_include.xml
index 2c9418dc..f670aec9 100644
--- a/items/generic/_include.xml
+++ b/items/generic/_include.xml
@@ -159,6 +159,7 @@
+
@@ -222,7 +223,7 @@
-
+
@@ -293,16 +294,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/items/generic/item0540_EmptyBottle.xml b/items/generic/item0540_EmptyBottle.xml
index 31781bb7..7168acad 100644
--- a/items/generic/item0540_EmptyBottle.xml
+++ b/items/generic/item0540_EmptyBottle.xml
@@ -1,4 +1,4 @@
-
+
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/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/item5279_LegendaryCarrot.xml b/items/generic/item5279_LegendaryCarrot.xml
index 78abefa3..c5ef1bd0 100644
--- a/items/generic/item5279_LegendaryCarrot.xml
+++ b/items/generic/item5279_LegendaryCarrot.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/items/generic/item5361_Snowflake.xml b/items/generic/item5361_Snowflake.xml
index d98d5837..4a5a149f 100644
--- a/items/generic/item5361_Snowflake.xml
+++ b/items/generic/item5361_Snowflake.xml
@@ -5,5 +5,5 @@
name="Snowflake"
description="A weightless (and worthless) snow flake. The winter has come!"
type="generic"
- weight="1"/>
+ weight="0"/>
diff --git a/items/generic/item5375_JunglefowlFeather.xml b/items/generic/item5375_JunglefowlFeather.xml
index 11d5093f..b6649eac 100644
--- a/items/generic/item5375_JunglefowlFeather.xml
+++ b/items/generic/item5375_JunglefowlFeather.xml
@@ -1,4 +1,4 @@
-
+
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/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/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/usable/_include.xml b/items/usable/_include.xml
index 2f79dc5a..e1902d24 100644
--- a/items/usable/_include.xml
+++ b/items/usable/_include.xml
@@ -72,7 +72,6 @@
-
@@ -85,8 +84,6 @@
-
-
@@ -142,6 +139,4 @@
-
-
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/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/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/license.md b/license.md
index 24704df4..a26b76c5 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
@@ -222,7 +217,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,14 +252,12 @@ 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
@@ -274,7 +267,6 @@ File | Artists | Licenses
`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 +279,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 +286,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
@@ -335,7 +322,6 @@ 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
@@ -406,11 +392,9 @@ File | Artists | Licenses
`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
@@ -418,7 +402,6 @@ File | Artists | Licenses
`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
@@ -436,7 +419,6 @@ File | Artists | Licenses
`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
@@ -459,13 +441,11 @@ File | Artists | Licenses
`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
@@ -497,7 +477,6 @@ File | Artists | Licenses
`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
@@ -518,7 +497,6 @@ File | Artists | Licenses
`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
@@ -534,14 +512,12 @@ File | Artists | Licenses
`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
@@ -555,7 +531,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
@@ -646,15 +621,11 @@ 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
@@ -688,8 +659,6 @@ 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
@@ -698,7 +667,6 @@ File | Artists | Licenses
`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
@@ -719,10 +687,6 @@ 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
@@ -777,7 +741,6 @@ File | Artists | Licenses
`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
@@ -938,14 +901,12 @@ 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
@@ -954,7 +915,6 @@ File | Artists | Licenses
`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 +929,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 +937,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
@@ -1022,7 +976,6 @@ 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
@@ -1077,7 +1030,7 @@ File | Artists | Licenses
`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/ent.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
@@ -1088,7 +1041,6 @@ File | Artists | Licenses
`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
@@ -1104,14 +1056,11 @@ File | Artists | Licenses
`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
@@ -1126,18 +1075,14 @@ File | Artists | Licenses
`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
@@ -1170,7 +1115,6 @@ File | Artists | Licenses
`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
@@ -1190,17 +1134,6 @@ File | Artists | Licenses
`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 +1160,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 +1170,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 +1196,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 +1231,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 +1248,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 +1282,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
---- |:-------:|:--------:
@@ -1562,18 +1470,6 @@ 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
@@ -1702,10 +1598,9 @@ File | Artists | Licenses
`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
diff --git a/maps/001-1.tmx b/maps/001-1.tmx
index d7e2a944..0d6b6e72 100644
--- a/maps/001-1.tmx
+++ b/maps/001-1.tmx
@@ -1,5 +1,5 @@
-