r13.0 update notice

9 files changed, 26 insertions, 39 deletions

diff --git a/update/commit.txt b/update/commit.txt
index e56e858..652fd1b 100644
--- a/update/commit.txt
+++ b/update/commit.txt
@@ -1 +1 @@
-5ebf13dc0512c77dd5046d92c851062b6040e4a7
+2b90b8051698ab0e962dab6e338e6894e4a7cd21
diff --git a/update/commit_old.txt b/update/commit_old.txt
index 55a0dbb..652fd1b 100644
--- a/update/commit_old.txt
+++ b/update/commit_old.txt
@@ -1 +1 @@
-f7d68f97d292a59ef3592ad800532448a4303ce6
+2b90b8051698ab0e962dab6e338e6894e4a7cd21
diff --git a/update/createnew.sh b/update/createnew.sh
index 26828ef..6c5bc90 100755
--- a/update/createnew.sh
+++ b/update/createnew.sh
@@ -36,3 +36,5 @@ cp TMW2.zip ../upload/
 cp resources2.txt ../upload/
 cp resources.xml ../upload/
 cp ../news.txt ../upload/
+
+
diff --git a/update/files/TMW2.zip b/update/files/TMW2.zip
index 5bed7a0..d8fa730 100644
--- a/update/files/TMW2.zip
+++ b/update/files/TMW2.zip
diff --git a/update/files/resources.xml b/update/files/resources.xml
index dc8ffdb..f9777f5 100644
--- a/update/files/resources.xml
+++ b/update/files/resources.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0"?>
 <updates>
-    <update type="data" file="TMW2.zip" hash="90e39f68" />
-    <update type="data" file="TMW2-e478ac2..f7d68f9.zip" hash="35a5f95c" />
-    <update type="data" file="TMW2-f7d68f9.zip" hash="6ccb2b08" />
+    <update type="data" file="TMW2.zip" hash="918c5c20" />
     <update type="music" required="no" file="music.zip" hash="eb5f8043" description="TMW-2 music" />
     <update type="music" required="no" file="musicv2.zip" hash="3e6602ae" description="TMW2 extra music" />
     <update type="music" required="no" file="musicv3.zip" hash="ce08a620" description="TMW2 extra music" />
     <mod type="data" group="alcohol" file="mod-alcohol.zip" hash="bdbd3ec2" />
     <mod type="data" group="gore" file="mod-gore.zip" hash="daa5897e" />
     <mod type="data" group="lightcave" file="mod-lightcave.zip" hash="1fa2ec7d" />
-    <mod type="data" group="nudity" file="mod-nudity.zip" hash="while" />
     <mod type="data" group="oldstuff" file="mod-oldstuff.zip" hash="e22d0084" />
 </updates>
diff --git a/update/files/resources2.txt b/update/files/resources2.txt
index 03c9e3a..28b6d4a 100644
--- a/update/files/resources2.txt
+++ b/update/files/resources2.txt
@@ -1,3 +1 @@
-TMW2.zip 90e39f68
-TMW2-e478ac2..f7d68f9.zip 1095ac52
-TMW2-f7d68f9.zip 6ccb2b08
+TMW2.zip 918c5c20
diff --git a/update/news.txt b/update/news.txt
index 44c7b53..6afe4ee 100644
--- a/update/news.txt
+++ b/update/news.txt
@@ -1,4 +1,4 @@
-##0 Actual Release: ##1 12.5+1 The Pinkie Sovereign Bugfix
+##0 Actual Release: ##1 13.0 The Fortress Town
 ##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,41 +9,31 @@
 ##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: ##B2020-10-18##b
+##7 Latest release: ##B2021-01-16##b
 ##7 Never miss a release! Follow our [@@https://discord.gg/BQNTe68|Discord Channel@@]!
 
-##1 Pinkie Sovereign Bugfix contents:
-##0 - Political system tweaked
-##0 - Holy Light splash damage improved
-##0 - Aurora, Tolchi, recipe books, pirates and many other bugfixes
-##0 - You can now gain Research Points by frequently switching skills
+##0 After 12.5 being extended four times (+1, +2, +3 and +4), we are proud to
+##0 announce release 13.0, ##BThe Fortress Town##b, which is the endgame town,
+##0 and last civilized area of Moubootaur Legends.
 
-##1 This is 12.5 The Pinkie Sovereign update.
-##1 As announced on our [@@https://patreon.com/TMW2|Patreon@@], this is a small
-##1 update, born in cooperation with The Mana World staff.
+##0 Following up 12.5+4, we have updated all gift lists, besides optimizing some
+##0 code and fixing several bugs (while creating a thousand new ones just because)
+##0 We have also extended ##BCandor difficulty modes##b and added a new map ailment
+##0 called "Cursed Lands", which can be found in Candor Underground.
 
-##0 Previously, in 12.4+1 (Sep 1st), we fixed thousand of bugs, and extended
-##0 ##BCandor Battle##b, as well as adding an event just for it.
-##0 We also improved Research Points, so using the skill lower the RP cost.
-
-##0 In 12.5, we added a proof of concept gambler for Land Of Fire.
-##0 Several bugfixes were made (including in the server engine code, eugh)
-##0 The alchemy table can now ##Bproduce recipes in bulk##b, as a preparative for
-##0 the alchemy rewrite which will eventually happen, sooner or later.
-
-##0 Level cap was ##BRaised to 130##b (no changes to job level).
-##0 Finally, a new high level map area was added: The Pinkie Domains.
-##0 Be careful, though : Pinkies exposed to the Monster King evilness are
-#0 extremely vicious!
-##0 This is experimental and bugs may happen - a lot of them, actually.
+##0 The spotlight of this release is the release of Fortress Town.
+##0 Join with the world hero and retake the town from monsters, before they invade!
+##0 Take this chance to attempt to raid the Impregnable Fortress, and enjoy the
+##0 Alliance's support with the best craftsmasters in the world!
+##0 Learn a little more about the world, and march toward - or away - the place
+##0 from where the Monster King rules over all the world.
 
 ##0 Ready to become a Moubootaur Legend now?
 ##0 TMW2 Team
 
-##7 We want to express our gratitude here to ##BSaulc##b, ##BWoody##b and ##BSharli##b, for sponsoring this server.
+##7 We want to express our gratitude here to ##BSaulc##b, ##BWoody##b, ##BSharli##b and ##BPovo##b, for sponsoring this server.
 ##7 And by last, our gratitude to every developer and contributor who made this
 ##7 possible!
-##7 Shout out for Micksha and Hocus from The Mana World. Thanks for assistance o/
 
 ----
 
@@ -54,7 +44,7 @@
 ##0 Enjoy gaming, and leave feedback!
 
 ##9 -- Your TMW2 Team
-##9 October 2020
+##9 January 2021
 
 ##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 01d764b..32ed541 100755
--- a/update/pseudo_update.sh
+++ b/update/pseudo_update.sh
@@ -6,7 +6,7 @@
 dir=`pwd`
 
 previous=`cat commit.txt`
-rm ../tools/update/upload/Bugfix-TMW2.zip
+rm upload/Bugfix-TMW2.zip
 
 cd ../../client-data
 head=`git log --pretty=oneline -n 1 | awk '{print $1}'`
diff --git a/update/update.sh b/update/update.sh
index 4a01732..020b96d 100755
--- a/update/update.sh
+++ b/update/update.sh
@@ -23,8 +23,8 @@ git diff --name-status ${previous} HEAD | awk '/^(A|M)\t/ {print $2}; /^(R...)\t
 
 cd $dir/files
 if [ -f TMW2-${u1}.zip ]; then
-    mv ../commit.txt ../commit_old.txt
-    echo ${head} >../commit.txt
+    #mv ../commit.txt ../commit_old.txt
+    #echo ${head} >../commit.txt
     sum=`adler32 TMW2-${u1}.zip | awk '{print $2}'`
     echo "TMW2-${u1}.zip ${sum}" >>resources2.txt
     echo "    <update type=\"data\" file=\"TMW2-${u1}.zip\" hash=\"${sum}\" />" >> xml_header.txt