diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b003594a..852e7cd4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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/effects.xml b/effects.xml
index 332c54f9..5f6b20d3 100644
--- a/effects.xml
+++ b/effects.xml
@@ -101,7 +101,6 @@
-
diff --git a/elementals.xml b/elementals.xml
deleted file mode 100644
index e7d1dfd2..00000000
--- a/elementals.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
diff --git a/graphics/items/equipment/head/rainshroomhat.png b/graphics/items/equipment/head/rainshroomhat.png
index 69c462e0..4c16214f 100644
Binary files a/graphics/items/equipment/head/rainshroomhat.png and b/graphics/items/equipment/head/rainshroomhat.png 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/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/sprites/equipment/head/rainshroomhat.png b/graphics/sprites/equipment/head/rainshroomhat.png
index 48b8e336..f3365195 100644
Binary files a/graphics/sprites/equipment/head/rainshroomhat.png and b/graphics/sprites/equipment/head/rainshroomhat.png differ
diff --git a/graphics/sprites/monsters/mushroom-rain.png b/graphics/sprites/monsters/mushroom-rain.png
index d3f41eb5..3f462298 100644
Binary files a/graphics/sprites/monsters/mushroom-rain.png and b/graphics/sprites/monsters/mushroom-rain.png differ
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/homunculuses.xml b/homunculuses.xml
deleted file mode 100644
index 0b18882c..00000000
--- a/homunculuses.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
diff --git a/horses.xml b/horses.xml
deleted file mode 100644
index 1777f5fb..00000000
--- a/horses.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
diff --git a/itemoptions.xml b/itemoptions.xml
deleted file mode 100644
index c416d3b4..00000000
--- a/itemoptions.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
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-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..d343f82c 100644
--- a/items/generic/_include.xml
+++ b/items/generic/_include.xml
@@ -300,9 +300,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/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 @@
-
-
-