diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b003594a..3bc728a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
stages:
- test
-image: debian:bullseye
+image: debian:buster
before_script:
- uname -a
@@ -17,26 +17,11 @@ imagemagiccheck:
- ./.tools/imagemagiccheck.sh
allow_failure: true
-manaverse:
+manaplus:
stage: test
- image: ubuntu:20.04
- variables:
- GIT_SUBMODULE_STRATEGY: recursive
script:
- - ./.tools/manaplus.sh master deb_pkg manaverse.log
- artifacts:
- paths:
- - shared
- when: always
- expire_in: 3 week
-
-old_manaplus:
- stage: test
- image: ubuntu:20.04
- variables:
- GIT_SUBMODULE_STRATEGY: recursive
- script:
- - ./.tools/manaplus.sh master4old deb_pkg_old manaplus.log
+ - ./.tools/manaplus.sh
+ image: debian:unstable
artifacts:
paths:
- shared
diff --git a/.tools/downloadlib.sh b/.tools/downloadlib.sh
new file mode 100755
index 00000000..2e27ba80
--- /dev/null
+++ b/.tools/downloadlib.sh
@@ -0,0 +1,26 @@
+#!/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 15f096d9..01a6d3d5 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 -y -qq update
+ retry_with_increasing_wait apt-get update
check_error $?
}
@@ -80,9 +80,7 @@ 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 d7ffc469..239696c9 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 \
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/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..5f6b20d3 100644
--- a/effects.xml
+++ b/effects.xml
@@ -101,7 +101,6 @@
-
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/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/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/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/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/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/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
index a772f494..e5da0996 100644
--- a/graphics/particles/monster-mushroom-snow-attack.particle.xml
+++ b/graphics/particles/monster-mushroom-snow-attack.particle.xml
@@ -7,15 +7,14 @@ Small white particles (spores/snowflakes) which float to the ground and is shot
-
-
+
-
+
@@ -28,15 +27,14 @@ Small white particles (spores/snowflakes) which float to the ground and is shot
-
+
-
-
+
-
+
-
+
@@ -45,15 +43,14 @@ Small white particles (spores/snowflakes) which float to the ground and is shot
-
-
+
-
+
@@ -66,15 +63,14 @@ 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 e2f50129..7eed52c8 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 ec0611b9..5be6f448 100644
--- a/graphics/particles/monster-mushroom-sun-attack.particle.xml
+++ b/graphics/particles/monster-mushroom-sun-attack.particle.xml
@@ -4,7 +4,6 @@ Small yellow particles (spores/sundust) which float to the ground and start to b
-->
-
@@ -15,9 +14,9 @@ Small yellow particles (spores/sundust) which float to the ground and start to b
-
-
-
+
+
+
@@ -33,34 +32,32 @@ Small yellow particles (spores/sundust) which float to the ground and start to b
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
@@ -71,9 +68,9 @@ Small yellow particles (spores/sundust) which float to the ground and start to b
-
+
-
+
@@ -86,12 +83,12 @@ Small yellow particles (spores/sundust) which float to the ground and start to b
-
+
-
-
-
-
+
+
+
+
@@ -100,15 +97,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 4f11949b..46eeb309 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/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/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/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/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/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/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/ml/cabana_in_fada.png b/graphics/tiles/cabana_in_fada.png
similarity index 100%
rename from graphics/tiles/ml/cabana_in_fada.png
rename to graphics/tiles/cabana_in_fada.png
diff --git a/graphics/tiles/christmas.tsx b/graphics/tiles/christmas.tsx
new file mode 100644
index 00000000..b46fd9d0
--- /dev/null
+++ b/graphics/tiles/christmas.tsx
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/graphics/tiles/lof/woodland_indoor.tsx b/graphics/tiles/lof/woodland_indoor.tsx
new file mode 100644
index 00000000..265c9997
--- /dev/null
+++ b/graphics/tiles/lof/woodland_indoor.tsx
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/graphics/tiles/lof/woodland_indoor_extra.tsx b/graphics/tiles/lof/woodland_indoor_extra.tsx
new file mode 100644
index 00000000..073ad872
--- /dev/null
+++ b/graphics/tiles/lof/woodland_indoor_extra.tsx
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/graphics/tiles/snow_village2.png b/graphics/tiles/snow_village2.png
index bc93774b..16f9ff42 100644
Binary files a/graphics/tiles/snow_village2.png and b/graphics/tiles/snow_village2.png differ
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-head/_include.xml b/items/equip-head/_include.xml
index f36c30eb..f5bb2d41 100644
--- a/items/equip-head/_include.xml
+++ b/items/equip-head/_include.xml
@@ -241,5 +241,4 @@
-
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/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
index 476e8151..cc4c9a6c 100644
--- a/items/equip-head/item5392_SunshroomHat.xml
+++ b/items/equip-head/item5392_SunshroomHat.xml
@@ -1,7 +1,6 @@
-
- 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 8eb7819b..8b6e7924 100644
--- a/items/equip-head/item5396_SnowshroomHat.xml
+++ b/items/equip-head/item5396_SnowshroomHat.xml
@@ -1,7 +1,6 @@
-
- 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
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/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-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/generic/_include.xml b/items/generic/_include.xml
index 2c9418dc..382e2abd 100644
--- a/items/generic/_include.xml
+++ b/items/generic/_include.xml
@@ -299,10 +299,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/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 @@
-
-
-