r9.0 update

13 files changed, 38 insertions, 99 deletions

diff --git a/update/addmods.sh b/update/addmods.sh
index 6d6f146..9e3f4db 100755
--- a/update/addmods.sh
+++ b/update/addmods.sh
@@ -5,13 +5,8 @@
 
 dir=`pwd`
 
-rm adler32
-gcc -lz adler32.c -o adler32
-
-mkdir files
-mkdir upload
-
 previous=`cat commit.txt`
+rm files/xml_mods.txt
 
 cd ../../client-data/mods
 
@@ -19,12 +14,14 @@ FILES=`ls`
 
 for file in $FILES; do
     cd $file
-    find . -type f | xargs zip -9 -r ../../../../TMW2-tools/update/files/mod-$file.zip
+    find . -type f | xargs zip -9 -r ../../../tools/update/files/mod-$file.zip
     cd $dir/files
-    sum=`adler32 1 mod-$file.zip`
-    echo "    <update type=\"data\" group=\"$file\" file=\"mod-$file.zip\" hash=\"${sum}\" />" >> xml_header.txt
+    sum=`adler32 mod-$file.zip | awk '{print $2}'`
+    echo "    <update type=\"data\" file=\"mod-$file.zip\" hash=\"${sum}\" />" >> xml_mods.txt
     cp xml_header.txt resources.xml
     cat xml_footer.txt >>resources.xml
+    cat xml_mods.txt >>resources.xml
+    echo '</updates>' >>resources.xml
     cp mod-$file.zip ../upload/
     cp resources2.txt ../upload/
     cp resources.xml ../upload/
diff --git a/update/commit.txt b/update/commit.txt
index 7b371f8..11f34da 100644
--- a/update/commit.txt
+++ b/update/commit.txt
@@ -1 +1 @@
-03d6c8c79c2b072403b8f0d8eba21727fd9bbbd4
+d21a310ddc1358c7297aac732665f0fb1d6b7868
diff --git a/update/createnew.sh b/update/createnew.sh
index b48b851..26828ef 100755
--- a/update/createnew.sh
+++ b/update/createnew.sh
@@ -24,10 +24,12 @@ echo "TMW2.zip ${sum}" >resources2.txt
 echo '<?xml version="1.0"?>
 <updates>' >xml_header.txt
 touch xml_footer.txt
+touch xml_mods.txt
 
 echo "    <update type=\"data\" file=\"TMW2.zip\" hash=\"${sum}\" />" >> xml_header.txt
 cp xml_header.txt resources.xml
 cat xml_footer.txt >>resources.xml
+cat xml_mods.txt >>resources.xml
 echo '</updates>' >>resources.xml
 
 cp TMW2.zip ../upload/
diff --git a/update/files/TMW2.zip b/update/files/TMW2.zip
index 57c138e..e571a8f 100644
--- a/update/files/TMW2.zip
+++ b/update/files/TMW2.zip
diff --git a/update/files/mouboo.zip b/update/files/mouboo.zip
deleted file mode 100644
index 28dce37..0000000
--- a/update/files/mouboo.zip
+++ /dev/null
diff --git a/update/files/resources.xml b/update/files/resources.xml
index f9c3bcc..b8bdd56 100755..100644
--- a/update/files/resources.xml
+++ b/update/files/resources.xml
@@ -1,21 +1,6 @@
 <?xml version="1.0"?>
 <updates>
-    <update type="data" file="TMW2.zip" hash="545f77a1" />
-    <update type="data" file="TMW2-3af0874..4d623de.zip" hash="bff899af" />
-    <update type="data" file="TMW2-4d623de..45a72d0.zip" hash="fda4dcb4" />
-    <update type="data" file="TMW2-45a72d0..e09c7dc.zip" hash="fda0685f" />
-    <update type="data" file="TMW2-e09c7dc..1b8c548.zip" hash="df6b1ae9" />
-    <update type="data" file="TMW2-1b8c548..7fe64bf.zip" hash="3d58adef" />
-    <update type="data" file="TMW2-7fe64bf..94bb36f.zip" hash="8275eea6" />
-    <update type="data" file="TMW2-94bb36f..05e9e5c.zip" hash="8256cd0f" />
-    <update type="data" file="TMW2-05e9e5c..eb18076.zip" hash="f44fb673" />
-    <update type="data" file="TMW2-eb18076..c96b1a9.zip" hash="edec2960" />
-    <update type="data" file="TMW2-c96b1a9..76afc77.zip" hash="ce846f2e" />
-    <update type="data" file="TMW2-76afc77..1142e3e.zip" hash="18364d21" />
-    <update type="data" file="TMW2-1142e3e..ac0abb5.zip" hash="537c2b5d" />
-    <update type="data" file="TMW2-ac0abb5..cd40529.zip" hash="6467906" />
-    <update type="data" file="TMW2-cd40529..03d6c8c.zip" hash="6b1c6cdb" />
-    <update type="music" required="no" file="music.zip" hash="d69e8570" description="TMW-2 music" />
-    <update type="music" required="no" file="music-20190210.zip" hash="e00ef1e6" description="TMW-2 extra music" />
-
+    <update type="data" file="TMW2.zip" hash="159ae957" />
+    <update type="music" required="no" file="music.zip" hash="eb5f8043" description="TMW-2 music" />
+    <update type="data" group="mouboo" file="mod-mouboo.zip" hash="30360b18" />
 </updates>
diff --git a/update/files/resources2.txt b/update/files/resources2.txt
index 9650a8d..589c48c 100644
--- a/update/files/resources2.txt
+++ b/update/files/resources2.txt
@@ -1,14 +1 @@
-TMW2.zip 545f77a1
-TMW2-3af0874..4d623de.zip bff899af
-TMW2-4d623de..45a72d0.zip fda4dcb4
-TMW2-45a72d0..e09c7dc.zip fda0685f
-TMW2-e09c7dc..1b8c548.zip df6b1ae9
-TMW2-1b8c548..7fe64bf.zip 3d58adef
-TMW2-7fe64bf..94bb36f.zip 8275eea6
-TMW2-94bb36f..05e9e5c.zip 8256cd0f
-TMW2-05e9e5c..eb18076.zip f44fb673
-TMW2-eb18076..c96b1a9.zip edec2960
-TMW2-c96b1a9..76afc77.zip ce846f2e
-TMW2-1142e3e..ac0abb5.zip 537c2b5d
-TMW2-ac0abb5..cd40529.zip 6467906
-TMW2-cd40529..03d6c8c.zip 6b1c6cdb
+TMW2.zip 159ae957
diff --git a/update/files/xml_footer.txt b/update/files/xml_footer.txt
index 9b77d97..9bda233 100644
--- a/update/files/xml_footer.txt
+++ b/update/files/xml_footer.txt
@@ -1,4 +1 @@
-    <update type="music" required="no" file="music.zip" hash="d69e8570" description="TMW-2 music" />
-    <update type="music" required="no" file="music-20190210.zip" hash="e00ef1e6" description="TMW-2 extra music" />
-    <mod type="data" group="mouboo" file="mouboo.zip" hash="278b2263" />
-
+    <update type="music" required="no" file="music.zip" hash="eb5f8043" description="TMW-2 music" />
diff --git a/update/musiccommit.txt b/update/musiccommit.txt
index 65e7318..58369c4 100644
--- a/update/musiccommit.txt
+++ b/update/musiccommit.txt
@@ -1 +1 @@
-4d350c67001caf7536be1bb3e7ca539ba7c7deff
+39e9aec960bd515ba0c458e39117edcc2f0d3079
diff --git a/update/news.txt b/update/news.txt
index d221467..cdd2b13 100644
--- a/update/news.txt
+++ b/update/news.txt
@@ -1,4 +1,4 @@
-##0 Actual Release: ##1 8.9 - Easter Event
+##0 Actual Release: ##1 9.0 The Promised Release
 ##0 Welcome to ##BTMW-2: Moubootaur Legends##b!
 ##0 By playing you agree and abide to the ##1##BTerms of Service##b##0, available at:
 ##1 [@@https://tmw2.org/legal|https://tmw2.org/legal@@]
@@ -9,36 +9,28 @@
 ##2 Please enjoy our server, and have fun!
 ##0 (If you want, it's possible to skip music download under Settings > Audio)
 
-##7 Latest release: ##B2018-04-16##b
+##7 Latest release: ##B2019-05-04##b
 ##7 Never miss a release! Follow our [@@https://discord.gg/BQNTe68|Discord Channel@@]!
 
-##3 This is 9.0 release without Leather Trousers and AFK Cap. Once we add these two,
-##3 we should have 9.0 release, estimated to be deployed after Easter ends.
+##3 AFK Cap was removed from 9.0 scheduled plans so we could push it already.
 
-##0 Besides a quasi-infinite number of bugfixes our players are very well aware...
-##0 We did NOT finish Frostia and Lilit, they are still boring towns for vacations.
-##0 But now, equipping a ##Bfull equipment set##b will give you a bonus (check wiki)!
-##0 Ship travel price was halved, and it can go as low as 10 GP. Also, by request,
-##1 Soul Menhir are auto-touched, ##BBUT##b you can disable it using ##B@ucp##b.
-##0 We also have a Daily Login screen with the same way to disable! Also, ##BGuilds##b
-##0 can go from 16 to 56 max members by buying the guild expansion on Logs. In fact,
-##0 Guild can now craft up to 24 new potions. Better get a guild ASAP, ya?
+##0 I gave up in logging everything which happened after the 8.99 JESUSALVA IS LAZY
+##0 pseudo-release fiasco. Anyway, if you are wondering why we are bigger than TMW.
+##0 We now have a [@@https://gitlab.com/TMW2/Docs/wikis/Features|Features Page@@]
 
-##0 When planting acorns, a ##BSpring Squirrel##b may show up, be careful! No effect
-##0 with Death Acorns. Thanks to Micksha, ##BManana Tree##b will not pop out of
-##0 nothing anymore, either. In Tulimshar, more Empty Boxes and Crocotrees are
-##0 available. Several improvements, and Priests gained a new power healing skill.
-##0 If you are with suicide tendencies, you can challenge the ##BTerranite King##b.
-##0 In hopes to bring old players back, we add a few extra levels to level table.
-##0 Knockback effect from old weapons have expired, and item sell price & weight
-##0 was tweaked. You can craft the ##BBraknar Shield##b, and arrows can be found
-##0 on present boxes in a better way. Candor Fight (Crazyfefe) was remastered.
+##0 Since 8.9 we did several improvements and fixes. Alcohol System should be fixed.
+##0 Main World Storyline got a huge spotlight and is now being handled by server.
+##0 This have nearly no effect now, but this is part of the grand plan - A world
+##0 story which moves without supernatural (ie. GMs) intervention. Players actions
+##0 - or lack of them - are the sole responsible to determine how the world story
+##0 will unfold, and these changes ensure that is currently happening.
 
-##0 Every Sunday at 18:00 is the ##BServer Happy Hour##b (exp up), but beware, the
-##0 Monster King hated it and will now lay siege to whole towns - automatically!
-##0 Ah, don't forget to ##BDrink with your Friends##b for EXP boost! EXP Penalty
-##0 should have been disabled in towns and indoors (except Saxso's House, basements,
-##0 caves and undergrounds), and ##2##BEASTER IS LIVE!##b##0
+##0 Besides that, Easter and Worker Day events finished without incidents. Nahrec
+##0 in LoF can make Chainmails and Platemails. ##BLeather Trousers##b quest is now
+##0 available. Cindy Cave yeti amount was capped. A Mouboo Mod should be available.
+##0 ##BNew players get an EXP Bonus##b which can be triggered by talking to ##BElmo##b.
+##0 Several remasters, and old players can, besides the new quest, redo part from
+##0 player story to get some neat goods which are still being worked on.
 
 ##0 Come meet us, and become a Moubootaur Legend!
 ##0 TMW2 Team
@@ -47,31 +39,7 @@
 ##7 And by last, our gratitude to every developer and contributor who made this
 ##7 possible! Jesusalva, Arthur, Saulc et al.
 
------
-
-##B ##3 Release 8.5 A Place To Spend Vacations Changelog ##0 ##b
-
-##3 Besides a quasi-infinite number of bugfixes our players are very well aware,
-##3 This release spotlight is ##BFrostia##b and ##BLilit##b. Two new towns! BUT,
-##3 unfortunately for everyone, the ##BNPCs##b are slowly arriving, meaning it
-##3 will be a wasted voyage, unless you are so desesperate to see a new map, I guess...
-##3 You'll see some awful maps on the way, because lack of polishing - all of those
-##3 will be fixed on next release however.
-##3 Another great spotlight is the ##BGuild Hall##b. It is in the Land Of Fire
-##3 Village, and contains the Guild Storage and other amazing guild features.
-##3 We also prepare to introduce ##BAlchemy##b and ##BSmith##b systems, but meh,
-##3 where are the recipes? A good thing we have John H to blame Saulc for us!
-##3 Since a while ago, we have ##BVariable EXP##b depending on monster level difference
-##3 to yours. If you kill a strong mob, you'll get more exp! But if you decide
-##3 to level up on MAGGOTS, they'll give you less experience, to discourage botting.
-##3 which is allowed, as long that not AFK. You can also use ##B@tutorial##b to
-##3 learn the stuff you skipped, ##BBlacksmith Axe##b was remastered, several quests
-##3 were polished and there is a couple of new ones. Lots of ##BPolishing##b was
-##3 done. You can now learn ##Bparum##b as soon as you get magic, there is a crocotree
-##3 in tulimshar which looks buggy, Estate Doorbells are working again, Peter
-##3 ##Bserver crashing bug##b should be dead, and ##BMarius the Bard##b learnt a
-##3 new song, generous contribution of Xanthem. Once we finish these stuff, and
-##3 present players release 9.0 hopefully by the end of the month, you'll say: WOW!
+----
 
 ##0 [@@https://transifex.com/akaras/saulc-tmw-fork|Translators@@] are always welcome.
 ##0 This is a beta. Bugs and balance errors are everywhere. Please send us feedback on
@@ -80,7 +48,7 @@
 ##0 Enjoy gaming, and leave feedback!
 
 ##9 -- Your TMW2 Team
-##9 April 2019
+##9 May 2019
 
 ##0 You can check out this page for older entries:
 ##9 [@@https://tmw2.org/news|https://tmw2.org/news@@]
diff --git a/update/pseudo_update.sh b/update/pseudo_update.sh
index fa4e255..03b287c 100755
--- a/update/pseudo_update.sh
+++ b/update/pseudo_update.sh
@@ -25,5 +25,6 @@ echo "Bugfix-${u1}..${u2}.zip ${sum}" >>resources2.txt
 cp ../files/xml_header.txt resources.xml
 echo "    <update type=\"data\" file=\"Bugfix-${u1}..${u2}.zip\" hash=\"${sum}\" />" >> resources.xml
 cat ../files/xml_footer.txt >>resources.xml
+cat ../files/xml_mods.txt >>resources.xml
 echo '</updates>' >>resources.xml
 
diff --git a/update/update.sh b/update/update.sh
index 3d30f8f..820954e 100755
--- a/update/update.sh
+++ b/update/update.sh
@@ -30,6 +30,7 @@ if [ -f TMW2-${u1}..${u2}.zip ]; then
     echo "    <update type=\"data\" file=\"TMW2-${u1}..${u2}.zip\" hash=\"${sum}\" />" >> xml_header.txt
     cp xml_header.txt resources.xml
     cat xml_footer.txt >>resources.xml
+    cat xml_mods.txt >>resources.xml
     echo '</updates>' >>resources.xml
 
     cp TMW2-${u1}..${u2}.zip ../upload/
diff --git a/update/update_music.sh b/update/update_music.sh
index 9bbf833..a99f5c6 100755
--- a/update/update_music.sh
+++ b/update/update_music.sh
@@ -32,6 +32,7 @@ if [ -f music-${u1}..${u2}.zip ]; then
     echo "    <update type=\"music\" required=\"no\" file=\"music-${u1}..${u2}.zip\" hash=\"${sum}\" description=\"TMW2 extra music\" />" >> xml_footer.txt
     cp xml_header.txt resources.xml
     cat xml_footer.txt >>resources.xml
+    cat xml_mods.txt >>resources.xml
     echo '</updates>' >>resources.xml
 
     cp music-${u1}..${u2}.zip ../upload/