diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b33ddcf3..b003594a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
stages:
- test
-image: debian:buster
+image: debian:bullseye
before_script:
- uname -a
@@ -17,11 +17,26 @@ imagemagiccheck:
- ./.tools/imagemagiccheck.sh
allow_failure: true
-manaplus:
+manaverse:
stage: test
+ image: ubuntu:20.04
+ variables:
+ GIT_SUBMODULE_STRATEGY: recursive
script:
- - ./.tools/manaplus.sh
- image: debian:unstable
+ - ./.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
artifacts:
paths:
- shared
@@ -54,8 +69,6 @@ licensecheck:
testxml:
stage: test
image: ubuntu:18.04
- tags:
- - glados
script:
- ./.tools/testxml.sh
- pwd
diff --git a/.gitmodules b/.gitmodules
index 0930241e..de9d5ec1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
[submodule "music"]
path = music
- url = https://git.themanaworld.org/legacy/music.git
+ url = https://git.themanaworld.org/tmw/music.git
[submodule "mods"]
path = mods
- url = https://git.themanaworld.org/legacy/mods.git
+ url = https://git.themanaworld.org/tmw/mods.git
diff --git a/.tools/downloadlib.sh b/.tools/downloadlib.sh
deleted file mode 100755
index 2e27ba80..00000000
--- a/.tools/downloadlib.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-export zipname="lib.zip"
-export libname="$1_$2"
-
-mkdir libdownload
-cd libdownload
-rm "${zipname}"
-
-wget --retry-connrefused --retry-on-host-error --tries=10 --waitretry=5 \
- -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/init.sh b/.tools/init.sh
index 01a6d3d5..15f096d9 100755
--- a/.tools/init.sh
+++ b/.tools/init.sh
@@ -69,7 +69,7 @@ function update_repos {
function aptget_update {
update_repos
- retry_with_increasing_wait apt-get update
+ retry_with_increasing_wait apt-get -y -qq update
check_error $?
}
@@ -80,7 +80,9 @@ function aptget_install {
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/manaplus.sh b/.tools/manaplus.sh
index 239696c9..d7ffc469 100755
--- a/.tools/manaplus.sh
+++ b/.tools/manaplus.sh
@@ -1,33 +1,62 @@
#!/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 \
wget unzip
pwd
-ls
+ls -la
-./clientdata/.tools/downloadlib.sh manaplus master || exit 1
+# --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"
-export HOME=`pwd`/clientdata/shared
+# 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
-cd manaplus_master || exit 1
+PATH="$PATH:/usr/games"
export SDL_VIDEODRIVER=dummy
-./bin/manaplus --validate -u -d ../clientdata || exit 1
+manaplus --version || exit 1
+manaplus --validate -u -d clientdata || exit 1
-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"
+log_path="$HOME/.local/share/mana/$logfile"
+if [[ ! -f "$log_path" ]]; then
+ printf "Error: logfile %s not found\n" "$log_path"
exit 1
fi
-cd ..
+# 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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index ed5c991f..00000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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 5f6b20d3..332c54f9 100644
--- a/effects.xml
+++ b/effects.xml
@@ -101,6 +101,7 @@
+
diff --git a/graphics/images/ambient/aethyr.jpg b/graphics/images/ambient/aethyr.jpg
new file mode 100644
index 00000000..359c0535
Binary files /dev/null and b/graphics/images/ambient/aethyr.jpg differ
diff --git a/graphics/images/ambient/cloud.png b/graphics/images/ambient/cloud.png
new file mode 100644
index 00000000..c914b466
Binary files /dev/null and b/graphics/images/ambient/cloud.png differ
diff --git a/graphics/images/ambient/darkness1.png b/graphics/images/ambient/darkness1.png
new file mode 100644
index 00000000..5e9bc724
Binary files /dev/null and b/graphics/images/ambient/darkness1.png differ
diff --git a/graphics/images/ambient/darkness2.png b/graphics/images/ambient/darkness2.png
new file mode 100644
index 00000000..dba9b9c6
Binary files /dev/null and b/graphics/images/ambient/darkness2.png differ
diff --git a/graphics/images/ambient/desertclouds.png b/graphics/images/ambient/desertclouds.png
new file mode 100644
index 00000000..b95ad6c4
Binary files /dev/null and b/graphics/images/ambient/desertclouds.png differ
diff --git a/graphics/items/equipment/head/rainshroomhat.png b/graphics/items/equipment/head/rainshroomhat.png
new file mode 100644
index 00000000..69c462e0
Binary files /dev/null and b/graphics/items/equipment/head/rainshroomhat.png differ
diff --git a/graphics/items/equipment/head/witch-doctor-mask.png b/graphics/items/equipment/head/witch-doctor-mask.png
index f2a641d1..fd3ea418 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/generic/blossom-wonderwoodling.png b/graphics/items/generic/blossom-wonderwoodling.png
new file mode 100644
index 00000000..3bfd6ac0
Binary files /dev/null and b/graphics/items/generic/blossom-wonderwoodling.png differ
diff --git a/graphics/items/generic/bottle-moon.png b/graphics/items/generic/bottle-moon.png
new file mode 100644
index 00000000..4f8efe6f
Binary files /dev/null and b/graphics/items/generic/bottle-moon.png differ
diff --git a/graphics/items/generic/carrot-legendary.png b/graphics/items/generic/carrot-legendary.png
new file mode 100644
index 00000000..dd054770
Binary files /dev/null and b/graphics/items/generic/carrot-legendary.png differ
diff --git a/graphics/items/generic/crystal-pink-quartz.png b/graphics/items/generic/crystal-pink-quartz.png
new file mode 100644
index 00000000..623e401f
Binary files /dev/null and b/graphics/items/generic/crystal-pink-quartz.png differ
diff --git a/graphics/items/generic/legendary-carrot.png b/graphics/items/generic/legendary-carrot.png
deleted file mode 100644
index c61f58f7..00000000
Binary files a/graphics/items/generic/legendary-carrot.png and /dev/null differ
diff --git a/graphics/items/generic/raindrop.png b/graphics/items/generic/raindrop.png
new file mode 100644
index 00000000..19f6a0d4
Binary files /dev/null and b/graphics/items/generic/raindrop.png differ
diff --git a/graphics/items/generic/seed-wonderwoodling.png b/graphics/items/generic/seed-wonderwoodling.png
new file mode 100644
index 00000000..0f99dfad
Binary files /dev/null and b/graphics/items/generic/seed-wonderwoodling.png differ
diff --git a/graphics/items/generic/wonder-wood.png b/graphics/items/generic/wonder-wood.png
new file mode 100644
index 00000000..7092bf59
Binary files /dev/null and b/graphics/items/generic/wonder-wood.png differ
diff --git a/graphics/items/use/others/arrow_bundle.png b/graphics/items/use/others/arrow_bundle.png
new file mode 100644
index 00000000..86583716
Binary files /dev/null and b/graphics/items/use/others/arrow_bundle.png differ
diff --git a/graphics/items/use/others/lightning-orb.png b/graphics/items/use/others/lightning-orb.png
new file mode 100644
index 00000000..639527fe
Binary files /dev/null and b/graphics/items/use/others/lightning-orb.png differ
diff --git a/graphics/items/use/others/shovel-legendary.png b/graphics/items/use/others/shovel-legendary.png
new file mode 100644
index 00000000..3c63ecf4
Binary files /dev/null and b/graphics/items/use/others/shovel-legendary.png differ
diff --git a/graphics/items/use/others/treasuremap-legendary.png b/graphics/items/use/others/treasuremap-legendary.png
new file mode 100644
index 00000000..04c54567
Binary files /dev/null and b/graphics/items/use/others/treasuremap-legendary.png differ
diff --git a/graphics/minimaps/001-2.png b/graphics/minimaps/001-2.png
index 4fbc5ef4..06ed9fca 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
new file mode 100644
index 00000000..0339a1e5
Binary files /dev/null and b/graphics/minimaps/080-1.png differ
diff --git a/graphics/minimaps/080-3.png b/graphics/minimaps/080-3.png
new file mode 100644
index 00000000..fe7f6458
Binary files /dev/null and b/graphics/minimaps/080-3.png differ
diff --git a/graphics/minimaps/081-1.png b/graphics/minimaps/081-1.png
new file mode 100644
index 00000000..97e0abc9
Binary files /dev/null and b/graphics/minimaps/081-1.png differ
diff --git a/graphics/minimaps/081-2.png b/graphics/minimaps/081-2.png
new file mode 100644
index 00000000..14b93358
Binary files /dev/null and b/graphics/minimaps/081-2.png differ
diff --git a/graphics/minimaps/081-3.png b/graphics/minimaps/081-3.png
new file mode 100644
index 00000000..7f106a7c
Binary files /dev/null and b/graphics/minimaps/081-3.png differ
diff --git a/graphics/minimaps/082-2.png b/graphics/minimaps/082-2.png
new file mode 100644
index 00000000..db05ed7e
Binary files /dev/null and b/graphics/minimaps/082-2.png differ
diff --git a/graphics/minimaps/082-3.png b/graphics/minimaps/082-3.png
new file mode 100644
index 00000000..fb801d34
Binary files /dev/null and b/graphics/minimaps/082-3.png differ
diff --git a/graphics/minimaps/fermi.png b/graphics/minimaps/fermi.png
new file mode 100644
index 00000000..951bd7fa
Binary files /dev/null and b/graphics/minimaps/fermi.png differ
diff --git a/graphics/minimaps/guild.png b/graphics/minimaps/guild.png
new file mode 100644
index 00000000..b3daa154
Binary files /dev/null and b/graphics/minimaps/guild.png differ
diff --git a/graphics/minimaps/prison.png b/graphics/minimaps/prison.png
new file mode 100644
index 00000000..ae57c8f2
Binary files /dev/null and b/graphics/minimaps/prison.png differ
diff --git a/graphics/particles/bubble-ani_6x6.png b/graphics/particles/bubble-ani_6x6.png
new file mode 100644
index 00000000..e04cc8c3
Binary files /dev/null and b/graphics/particles/bubble-ani_6x6.png differ
diff --git a/graphics/particles/bubble-ani_8x8.png b/graphics/particles/bubble-ani_8x8.png
new file mode 100644
index 00000000..134b352a
Binary files /dev/null and b/graphics/particles/bubble-ani_8x8.png differ
diff --git a/graphics/particles/monster-mushroom-rain-attack.particle.xml b/graphics/particles/monster-mushroom-rain-attack.particle.xml
new file mode 100644
index 00000000..5bba0f0b
--- /dev/null
+++ b/graphics/particles/monster-mushroom-rain-attack.particle.xml
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/graphics/particles/monster-mushroom-rain.particle.xml b/graphics/particles/monster-mushroom-rain.particle.xml
new file mode 100644
index 00000000..76136827
--- /dev/null
+++ b/graphics/particles/monster-mushroom-rain.particle.xml
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/graphics/particles/monster-mushroom-snow-attack.particle.xml b/graphics/particles/monster-mushroom-snow-attack.particle.xml
index e5da0996..a772f494 100644
--- a/graphics/particles/monster-mushroom-snow-attack.particle.xml
+++ b/graphics/particles/monster-mushroom-snow-attack.particle.xml
@@ -7,14 +7,15 @@ Small white particles (spores/snowflakes) which float to the ground and is shot
+
-
+
-
+
@@ -27,14 +28,15 @@ Small white particles (spores/snowflakes) which float to the ground and is shot
-
+
-
+
+
-
+
-
+
@@ -43,14 +45,15 @@ Small white particles (spores/snowflakes) which float to the ground and is shot
+
-
+
-
+
@@ -63,14 +66,15 @@ Small white particles (spores/snowflakes) which float to the ground and is shot
-
+
-
+
+
-
+
-
+
diff --git a/graphics/particles/monster-mushroom-snow.particle.xml b/graphics/particles/monster-mushroom-snow.particle.xml
index 7eed52c8..e2f50129 100644
--- a/graphics/particles/monster-mushroom-snow.particle.xml
+++ b/graphics/particles/monster-mushroom-snow.particle.xml
@@ -8,18 +8,18 @@ Small white particles (spores/snowflakes) which float to the ground.
-
-
-
-
+
+
+
+
-
-
+
+
-
+
@@ -29,20 +29,20 @@ Small white particles (spores/snowflakes) which float to the ground.
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
-
+
+
+
+
diff --git a/graphics/particles/monster-mushroom-sun-attack.particle.xml b/graphics/particles/monster-mushroom-sun-attack.particle.xml
index 5be6f448..ec0611b9 100644
--- a/graphics/particles/monster-mushroom-sun-attack.particle.xml
+++ b/graphics/particles/monster-mushroom-sun-attack.particle.xml
@@ -4,6 +4,7 @@ Small yellow particles (spores/sundust) which float to the ground and start to b
-->
+
@@ -14,9 +15,9 @@ Small yellow particles (spores/sundust) which float to the ground and start to b
-
-
-
+
+
+
@@ -32,32 +33,34 @@ Small yellow particles (spores/sundust) which float to the ground and start to b
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
+
@@ -68,9 +71,9 @@ Small yellow particles (spores/sundust) which float to the ground and start to b
-
+
-
+
@@ -83,12 +86,12 @@ Small yellow particles (spores/sundust) which float to the ground and start to b
-
+
-
-
-
-
+
+
+
+
@@ -97,15 +100,15 @@ Small yellow particles (spores/sundust) which float to the ground and start to b
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/graphics/particles/monster-mushroom-sun.particle.xml b/graphics/particles/monster-mushroom-sun.particle.xml
index 46eeb309..4f11949b 100644
--- a/graphics/particles/monster-mushroom-sun.particle.xml
+++ b/graphics/particles/monster-mushroom-sun.particle.xml
@@ -8,20 +8,20 @@ Small yellow particles (spores/sundust) which float to the ground and start to b
-
-
-
-
+
+
+
+
-
+
-
-
-
-
+
+
+
+
@@ -29,19 +29,19 @@ Small yellow particles (spores/sundust) which float to the ground and start to b
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
@@ -49,20 +49,20 @@ Small yellow particles (spores/sundust) which float to the ground and start to b
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
+
+
diff --git a/graphics/particles/quest-continue.particle.xml b/graphics/particles/quest-continue.particle.xml
new file mode 100644
index 00000000..90756040
--- /dev/null
+++ b/graphics/particles/quest-continue.particle.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/graphics/particles/quest-start.particle.xml b/graphics/particles/quest-start.particle.xml
new file mode 100644
index 00000000..315755d6
--- /dev/null
+++ b/graphics/particles/quest-start.particle.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/graphics/particles/raindrop-hit_16x16.png b/graphics/particles/raindrop-hit_16x16.png
new file mode 100644
index 00000000..b0efb4ea
Binary files /dev/null and b/graphics/particles/raindrop-hit_16x16.png differ
diff --git a/graphics/particles/raindrop-hit_8x8.png b/graphics/particles/raindrop-hit_8x8.png
new file mode 100644
index 00000000..f4484340
Binary files /dev/null and b/graphics/particles/raindrop-hit_8x8.png differ
diff --git a/graphics/particles/raindrop_3x5.png b/graphics/particles/raindrop_3x5.png
new file mode 100644
index 00000000..25ae3683
Binary files /dev/null and b/graphics/particles/raindrop_3x5.png differ
diff --git a/graphics/particles/raindrop_8x8.png b/graphics/particles/raindrop_8x8.png
new file mode 100644
index 00000000..281311a0
Binary files /dev/null and b/graphics/particles/raindrop_8x8.png differ
diff --git a/graphics/sprites/equipment/head/rainshroomhat-female.xml b/graphics/sprites/equipment/head/rainshroomhat-female.xml
new file mode 100644
index 00000000..3f7daf1b
--- /dev/null
+++ b/graphics/sprites/equipment/head/rainshroomhat-female.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/graphics/sprites/equipment/head/rainshroomhat.png b/graphics/sprites/equipment/head/rainshroomhat.png
new file mode 100644
index 00000000..48b8e336
Binary files /dev/null and b/graphics/sprites/equipment/head/rainshroomhat.png differ
diff --git a/graphics/sprites/equipment/head/rainshroomhat.xml b/graphics/sprites/equipment/head/rainshroomhat.xml
new file mode 100644
index 00000000..708df0f4
--- /dev/null
+++ b/graphics/sprites/equipment/head/rainshroomhat.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/graphics/sprites/icons/spell-cooldown-cg.png b/graphics/sprites/icons/spell-cooldown-cg.png
new file mode 100644
index 00000000..fe94dffa
Binary files /dev/null and b/graphics/sprites/icons/spell-cooldown-cg.png differ
diff --git a/graphics/sprites/icons/spell-cooldown-cg.xml b/graphics/sprites/icons/spell-cooldown-cg.xml
new file mode 100644
index 00000000..3d5a827b
--- /dev/null
+++ b/graphics/sprites/icons/spell-cooldown-cg.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/monsters/moubootaur.xml b/graphics/sprites/monsters/moubootaur.xml
index 48d720dd..ba8c5b8f 100644
--- a/graphics/sprites/monsters/moubootaur.xml
+++ b/graphics/sprites/monsters/moubootaur.xml
@@ -56,37 +56,30 @@ Copyright (C) 2011-2021 Moubootaur Legends -->
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/mushroom-rain.png b/graphics/sprites/monsters/mushroom-rain.png
new file mode 100644
index 00000000..d3f41eb5
Binary files /dev/null and b/graphics/sprites/monsters/mushroom-rain.png differ
diff --git a/graphics/sprites/monsters/mushroom-rain.xml b/graphics/sprites/monsters/mushroom-rain.xml
new file mode 100644
index 00000000..edf23fa4
--- /dev/null
+++ b/graphics/sprites/monsters/mushroom-rain.xml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/monsters/piou-king.xml b/graphics/sprites/monsters/piou-king.xml
index 5e3d8e09..23750d05 100644
--- a/graphics/sprites/monsters/piou-king.xml
+++ b/graphics/sprites/monsters/piou-king.xml
@@ -95,42 +95,34 @@ Copyright (C) 2011-2021 Moubootaur Legends -->
-
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/ratto.xml b/graphics/sprites/monsters/ratto.xml
index 9572a8ba..1ee5116c 100644
--- a/graphics/sprites/monsters/ratto.xml
+++ b/graphics/sprites/monsters/ratto.xml
@@ -61,7 +61,6 @@ Copyright (C) 2011-2013 Evol Online -->
-
@@ -69,7 +68,6 @@ Copyright (C) 2011-2013 Evol Online -->
-
@@ -77,7 +75,6 @@ Copyright (C) 2011-2013 Evol Online -->
-
@@ -85,7 +82,6 @@ Copyright (C) 2011-2013 Evol Online -->
-
@@ -93,7 +89,6 @@ Copyright (C) 2011-2013 Evol Online -->
-
@@ -101,7 +96,6 @@ Copyright (C) 2011-2013 Evol Online -->
-
@@ -109,7 +103,6 @@ Copyright (C) 2011-2013 Evol Online -->
-
@@ -117,7 +110,6 @@ Copyright (C) 2011-2013 Evol Online -->
-
diff --git a/graphics/sprites/monsters/tengu.xml b/graphics/sprites/monsters/tengu.xml
index 651c684a..fb7afd4e 100644
--- a/graphics/sprites/monsters/tengu.xml
+++ b/graphics/sprites/monsters/tengu.xml
@@ -39,31 +39,24 @@
-
-
-
-
-
-
-
diff --git a/graphics/sprites/monsters/ent.png b/graphics/sprites/monsters/wonderwoodling.png
similarity index 100%
rename from graphics/sprites/monsters/ent.png
rename to graphics/sprites/monsters/wonderwoodling.png
diff --git a/graphics/sprites/monsters/ent.xml b/graphics/sprites/monsters/wonderwoodling.xml
similarity index 94%
rename from graphics/sprites/monsters/ent.xml
rename to graphics/sprites/monsters/wonderwoodling.xml
index 8569c99c..c6aba01a 100644
--- a/graphics/sprites/monsters/ent.xml
+++ b/graphics/sprites/monsters/wonderwoodling.xml
@@ -1,6 +1,6 @@
-
+
diff --git a/graphics/sprites/npcs/dig-01-flow.png b/graphics/sprites/npcs/dig-01-flow.png
new file mode 100644
index 00000000..86a98257
Binary files /dev/null and b/graphics/sprites/npcs/dig-01-flow.png differ
diff --git a/graphics/sprites/npcs/dig-01-flow.xml b/graphics/sprites/npcs/dig-01-flow.xml
new file mode 100644
index 00000000..afad3d7c
--- /dev/null
+++ b/graphics/sprites/npcs/dig-01-flow.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/npcs/dig-01-glow.png b/graphics/sprites/npcs/dig-01-glow.png
new file mode 100644
index 00000000..258ff235
Binary files /dev/null and b/graphics/sprites/npcs/dig-01-glow.png differ
diff --git a/graphics/sprites/npcs/dig-01-glow.xml b/graphics/sprites/npcs/dig-01-glow.xml
new file mode 100644
index 00000000..95ba2732
--- /dev/null
+++ b/graphics/sprites/npcs/dig-01-glow.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/npcs/dig-01.png b/graphics/sprites/npcs/dig-01.png
new file mode 100644
index 00000000..4a02278a
Binary files /dev/null and b/graphics/sprites/npcs/dig-01.png differ
diff --git a/graphics/sprites/npcs/dig-01.xml b/graphics/sprites/npcs/dig-01.xml
new file mode 100644
index 00000000..a123317d
--- /dev/null
+++ b/graphics/sprites/npcs/dig-01.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/npcs/dig-02-flow.png b/graphics/sprites/npcs/dig-02-flow.png
new file mode 100644
index 00000000..d191607a
Binary files /dev/null and b/graphics/sprites/npcs/dig-02-flow.png differ
diff --git a/graphics/sprites/npcs/dig-02-flow.xml b/graphics/sprites/npcs/dig-02-flow.xml
new file mode 100644
index 00000000..5a566bb8
--- /dev/null
+++ b/graphics/sprites/npcs/dig-02-flow.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/npcs/dig-02-glow.png b/graphics/sprites/npcs/dig-02-glow.png
new file mode 100644
index 00000000..29bb45ab
Binary files /dev/null and b/graphics/sprites/npcs/dig-02-glow.png differ
diff --git a/graphics/sprites/npcs/dig-02-glow.xml b/graphics/sprites/npcs/dig-02-glow.xml
new file mode 100644
index 00000000..b98e3854
--- /dev/null
+++ b/graphics/sprites/npcs/dig-02-glow.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/npcs/dig-02.png b/graphics/sprites/npcs/dig-02.png
new file mode 100644
index 00000000..6d4523b2
Binary files /dev/null and b/graphics/sprites/npcs/dig-02.png differ
diff --git a/graphics/sprites/npcs/dig-02.xml b/graphics/sprites/npcs/dig-02.xml
new file mode 100644
index 00000000..08a2187c
--- /dev/null
+++ b/graphics/sprites/npcs/dig-02.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/npcs/dig-03-flow.xml b/graphics/sprites/npcs/dig-03-flow.xml
new file mode 100644
index 00000000..4ad3945f
--- /dev/null
+++ b/graphics/sprites/npcs/dig-03-flow.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/npcs/dig-03-glow.png b/graphics/sprites/npcs/dig-03-glow.png
new file mode 100644
index 00000000..9a33c372
Binary files /dev/null and b/graphics/sprites/npcs/dig-03-glow.png differ
diff --git a/graphics/sprites/npcs/dig-03-glow.xml b/graphics/sprites/npcs/dig-03-glow.xml
new file mode 100644
index 00000000..8e0c43ef
--- /dev/null
+++ b/graphics/sprites/npcs/dig-03-glow.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/npcs/dig-03.png b/graphics/sprites/npcs/dig-03.png
new file mode 100644
index 00000000..be73d1af
Binary files /dev/null and b/graphics/sprites/npcs/dig-03.png differ
diff --git a/graphics/sprites/npcs/dig-03.xml b/graphics/sprites/npcs/dig-03.xml
new file mode 100644
index 00000000..c5f631e2
--- /dev/null
+++ b/graphics/sprites/npcs/dig-03.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/npcs/dig-04-flow.png b/graphics/sprites/npcs/dig-04-flow.png
new file mode 100644
index 00000000..fdcd9ef6
Binary files /dev/null and b/graphics/sprites/npcs/dig-04-flow.png differ
diff --git a/graphics/sprites/npcs/dig-04-flow.xml b/graphics/sprites/npcs/dig-04-flow.xml
new file mode 100644
index 00000000..3dbd7ce5
--- /dev/null
+++ b/graphics/sprites/npcs/dig-04-flow.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/npcs/dig-04-glow.png b/graphics/sprites/npcs/dig-04-glow.png
new file mode 100644
index 00000000..172274fe
Binary files /dev/null and b/graphics/sprites/npcs/dig-04-glow.png differ
diff --git a/graphics/sprites/npcs/dig-04-glow.xml b/graphics/sprites/npcs/dig-04-glow.xml
new file mode 100644
index 00000000..fb274ab5
--- /dev/null
+++ b/graphics/sprites/npcs/dig-04-glow.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/npcs/dig-04.png b/graphics/sprites/npcs/dig-04.png
new file mode 100644
index 00000000..42d9ea10
Binary files /dev/null and b/graphics/sprites/npcs/dig-04.png differ
diff --git a/graphics/sprites/npcs/dig-04.xml b/graphics/sprites/npcs/dig-04.xml
new file mode 100644
index 00000000..fe55de89
--- /dev/null
+++ b/graphics/sprites/npcs/dig-04.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/npcs/portal_32x64-01.png b/graphics/sprites/npcs/portal_32x64-01.png
new file mode 100644
index 00000000..e15b6dd9
Binary files /dev/null and b/graphics/sprites/npcs/portal_32x64-01.png differ
diff --git a/graphics/sprites/npcs/portal_32x64-01.xml b/graphics/sprites/npcs/portal_32x64-01.xml
new file mode 100644
index 00000000..e56b3106
--- /dev/null
+++ b/graphics/sprites/npcs/portal_32x64-01.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/graphics/sprites/npcs/teapot.png b/graphics/sprites/npcs/teapot.png
new file mode 100644
index 00000000..a1d0f0a5
Binary files /dev/null and b/graphics/sprites/npcs/teapot.png differ
diff --git a/graphics/sprites/npcs/teapot.xml b/graphics/sprites/npcs/teapot.xml
new file mode 100644
index 00000000..e640447f
--- /dev/null
+++ b/graphics/sprites/npcs/teapot.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/graphics/tiles/aethyra/snow.png b/graphics/tiles/aethyra/snow.png
new file mode 100644
index 00000000..a7545c94
Binary files /dev/null and b/graphics/tiles/aethyra/snow.png differ
diff --git a/graphics/tiles/aethyra/snow_building.png b/graphics/tiles/aethyra/snow_building.png
new file mode 100644
index 00000000..3e55b251
Binary files /dev/null and b/graphics/tiles/aethyra/snow_building.png differ
diff --git a/graphics/tiles/aethyra/snow_roof.png b/graphics/tiles/aethyra/snow_roof.png
new file mode 100644
index 00000000..efc797fc
Binary files /dev/null and b/graphics/tiles/aethyra/snow_roof.png differ
diff --git a/graphics/tiles/aethyra/snow_water.png b/graphics/tiles/aethyra/snow_water.png
new file mode 100644
index 00000000..5a98f542
Binary files /dev/null and b/graphics/tiles/aethyra/snow_water.png differ
diff --git a/graphics/tiles/aethyra/snowset.png b/graphics/tiles/aethyra/snowset.png
new file mode 100644
index 00000000..b866952c
Binary files /dev/null and b/graphics/tiles/aethyra/snowset.png differ
diff --git a/graphics/tiles/br/christmastree.png b/graphics/tiles/br/christmastree.png
new file mode 100644
index 00000000..ec323633
Binary files /dev/null and b/graphics/tiles/br/christmastree.png differ
diff --git a/graphics/tiles/br/snow_x3.png b/graphics/tiles/br/snow_x3.png
new file mode 100644
index 00000000..dc5cbfc8
Binary files /dev/null and b/graphics/tiles/br/snow_x3.png differ
diff --git a/graphics/tiles/castle2.png b/graphics/tiles/castle2.png
index c71ba0ee..81c7800d 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
new file mode 100644
index 00000000..744ee26c
Binary files /dev/null and b/graphics/tiles/christmas.png differ
diff --git a/graphics/tiles/edges_black_rotated.png b/graphics/tiles/edges_black_rotated.png
new file mode 100644
index 00000000..31015305
Binary files /dev/null and b/graphics/tiles/edges_black_rotated.png differ
diff --git a/graphics/tiles/edges_ice_rotated.png b/graphics/tiles/edges_ice_rotated.png
new file mode 100644
index 00000000..191b4aa8
Binary files /dev/null and b/graphics/tiles/edges_ice_rotated.png differ
diff --git a/graphics/tiles/lof/warp_gates.png b/graphics/tiles/lof/warp_gates.png
new file mode 100644
index 00000000..cceec189
Binary files /dev/null and b/graphics/tiles/lof/warp_gates.png differ
diff --git a/graphics/tiles/lof/woodland_indoor.png b/graphics/tiles/lof/woodland_indoor.png
new file mode 100644
index 00000000..0038de1a
Binary files /dev/null and b/graphics/tiles/lof/woodland_indoor.png differ
diff --git a/graphics/tiles/lof/woodland_indoor_extra.png b/graphics/tiles/lof/woodland_indoor_extra.png
new file mode 100644
index 00000000..3eca9142
Binary files /dev/null and b/graphics/tiles/lof/woodland_indoor_extra.png differ
diff --git a/graphics/tiles/ml/cabana_in_fada.png b/graphics/tiles/ml/cabana_in_fada.png
new file mode 100644
index 00000000..90509c45
Binary files /dev/null and b/graphics/tiles/ml/cabana_in_fada.png differ
diff --git a/graphics/tiles/snow_village2.png b/graphics/tiles/snow_village2.png
index 118c8086..bc93774b 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 8f2de99d..5403969e 100644
Binary files a/graphics/tiles/snow_village_x3.png and b/graphics/tiles/snow_village_x3.png differ
diff --git a/items/equip-ammo/item5291_ThornArrow.xml b/items/equip-ammo/item5291_ThornArrow.xml
index 7b6aa1e5..55a3d877 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="12"
+ weight="1"
/>
diff --git a/items/equip-head/_include.xml b/items/equip-head/_include.xml
index 4582c562..f36c30eb 100644
--- a/items/equip-head/_include.xml
+++ b/items/equip-head/_include.xml
@@ -5,6 +5,7 @@
+
@@ -240,4 +241,5 @@
+
diff --git a/items/equip-head/item0604_PirateBandana.xml b/items/equip-head/item0604_PirateBandana.xml
new file mode 100644
index 00000000..1c8b5265
--- /dev/null
+++ b/items/equip-head/item0604_PirateBandana.xml
@@ -0,0 +1,23 @@
+
+
+ -
+ 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 a47926f9..dde4bec1 100644
--- a/items/equip-head/item0622_Bandana.xml
+++ b/items/equip-head/item0622_Bandana.xml
@@ -1,10 +1,23 @@
- -
+
-
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 646476cb..6aa6894f 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/item5203_MoonshroomHat.xml b/items/equip-head/item5203_MoonshroomHat.xml
index 02786a16..9cc6d048 100644
--- a/items/equip-head/item5203_MoonshroomHat.xml
+++ b/items/equip-head/item5203_MoonshroomHat.xml
@@ -1,6 +1,7 @@
-
+ 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
index cc4c9a6c..476e8151 100644
--- a/items/equip-head/item5392_SunshroomHat.xml
+++ b/items/equip-head/item5392_SunshroomHat.xml
@@ -1,6 +1,7 @@
-
+ graphics/particles/monster-mushroom-sun.particle.xml
equipment/head/sunshroomhat.xml
equipment/head/sunshroomhat-female.xml
diff --git a/items/equip-head/item5396_SnowshroomHat.xml b/items/equip-head/item5396_SnowshroomHat.xml
index 8b6e7924..8eb7819b 100644
--- a/items/equip-head/item5396_SnowshroomHat.xml
+++ b/items/equip-head/item5396_SnowshroomHat.xml
@@ -1,6 +1,7 @@
-
+ graphics/particles/monster-mushroom-snow.particle.xml
equipment/head/snowshroomhat.xml
equipment/head/snowshroomhat-female.xml
diff --git a/items/equip-head/item5407_RainshroomHat.xml b/items/equip-head/item5407_RainshroomHat.xml
new file mode 100644
index 00000000..658572ff
--- /dev/null
+++ b/items/equip-head/item5407_RainshroomHat.xml
@@ -0,0 +1,11 @@
+
+
+
-
+ 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 4161a867..4df67df7 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/item5285_DragonShield.xml b/items/equip-shield/item5285_DragonShield.xml
index 642ae392..8f0a76ff 100644
--- a/items/equip-shield/item5285_DragonShield.xml
+++ b/items/equip-shield/item5285_DragonShield.xml
@@ -4,7 +4,6 @@
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-torso/item0645_GoldenPlatemail.xml b/items/equip-torso/item0645_GoldenPlatemail.xml
index f754bcdb..30da7a0b 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 e11fed4b..fd425941 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/generic/_include.xml b/items/generic/_include.xml
index 382e2abd..2c9418dc 100644
--- a/items/generic/_include.xml
+++ b/items/generic/_include.xml
@@ -299,4 +299,10 @@
+
+
+
+
+
+
diff --git a/items/generic/item5279_LegendaryCarrot.xml b/items/generic/item5279_LegendaryCarrot.xml
index c5ef1bd0..78abefa3 100644
--- a/items/generic/item5279_LegendaryCarrot.xml
+++ b/items/generic/item5279_LegendaryCarrot.xml
@@ -1,4 +1,4 @@
-
diff --git a/items/generic/item5410_WonderWood.xml b/items/generic/item5410_WonderWood.xml
new file mode 100644
index 00000000..e851154a
--- /dev/null
+++ b/items/generic/item5410_WonderWood.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/items/usable/item1283_ArrowBundle.xml b/items/usable/item1283_ArrowBundle.xml
new file mode 100644
index 00000000..65e79c44
--- /dev/null
+++ b/items/usable/item1283_ArrowBundle.xml
@@ -0,0 +1,4 @@
+
+
+ -
+
+
+
+
+
+
diff --git a/items/usable/item5406_LegendaryTreasureMap.xml b/items/usable/item5406_LegendaryTreasureMap.xml
new file mode 100644
index 00000000..d4c9a076
--- /dev/null
+++ b/items/usable/item5406_LegendaryTreasureMap.xml
@@ -0,0 +1,11 @@
+
+
+