From 26355ca9731da1e0dba1b0a631dd00294b9bd6bc Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Tue, 17 Jul 2018 14:50:51 -0400
Subject: update news

---
 .gitlab-ci.yml                      |  2 +-
 .travis.yml                         |  2 +-
 tools                               |  2 +-
 world/map/news.d/71-v2018.03.23.txt | 15 +++------------
 world/map/npc/functions/ghost.txt   |  5 ++++-
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ecaae6c..2cb15999 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ pages:
   - make updates
   - make news
   - cp -v world/map/news.txt public/
-  - echo '<title>static update server</title><a href="Legacy.zip">Legacy.zip</a><br><a href="Legacy-music.zip">Legacy-music.zip</a><br><a href="news.txt">news.txt</a><br><a href="resources.xml">resources.xml</a>' > public/index.html
+  - echo '<title>static update server</title><a href="TMW.zip">TMW.zip</a><br><a href="TMW-music.zip">TMW-music.zip</a><br><a href="news.txt">news.txt</a><br><a href="resources.xml">resources.xml</a>' > public/index.html
   # path for legacy compatibility
   - mkdir -p public/updates
   - cp -v public/*.* public/updates/
diff --git a/.travis.yml b/.travis.yml
index a7645cdc..f6e21327 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ script:
   - make news
   - cp -v world/map/news.txt public/
   - cp -v world/map/news.html public/
-  - echo '<title>static update server</title><a href="Legacy.zip">Legacy.zip</a><br><a href="Legacy-music.zip">Legacy-music.zip</a><br><a href="news.txt">news.txt</a><br><a href="resources.xml">resources.xml</a>' > public/index.html
+  - echo '<title>static update server</title><a href="TMW.zip">TMW.zip</a><br><a href="TMW-music.zip">TMW-music.zip</a><br><a href="news.txt">news.txt</a><br><a href="resources.xml">resources.xml</a>' > public/index.html
 
 deploy:
   provider: pages
diff --git a/tools b/tools
index 4f3c3825..ef69e2f0 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit 4f3c38251baf10e1ed36ac487c8f26c0021e4e69
+Subproject commit ef69e2f046022ea7a97e70aca7292b7e45907585
diff --git a/world/map/news.d/71-v2018.03.23.txt b/world/map/news.d/71-v2018.03.23.txt
index 621a0e35..2c92d5f5 100644
--- a/world/map/news.d/71-v2018.03.23.txt
+++ b/world/map/news.d/71-v2018.03.23.txt
@@ -1,15 +1,6 @@
-{title:Legacy Server}
-{date:2018-03-23}
+{title:Quick patch}
+{date:2018-07-17}
 
-Bug patches & misc improvements.
-
-Release Notes v2018.03.23
-{ul}
-{li}Fixed the freeze bug that affected easter eggs, amongst other things.{/li}
-{li}Fixed the weird blue face that sometimes appeared when using the Undead species.{/li}
-{li}Fixed the Eskimo Hat so it looks less weird with bulky hairstyles.{/li}
-{li}Fixed the yellow towel not pointing to the right place (old bug).{/li}
-{li}Fixed Anne and SUSAN (mobs) giving non-existent items.{/li}
-{/ul}
+Made the ghosts that spawn in the graveyard less exploitable.
 
 {author:TMW/Evol Development Team}
diff --git a/world/map/npc/functions/ghost.txt b/world/map/npc/functions/ghost.txt
index 09a10680..921b8b79 100644
--- a/world/map/npc/functions/ghost.txt
+++ b/world/map/npc/functions/ghost.txt
@@ -1,7 +1,7 @@
 function|script|SpawnGhost
 {
     if ($GHOSTS_DISABLED)
-        return;
+        goto L_Return;
 
     if (BaseLevel >= 40 &&
        (getmap() == "026-1" ||
@@ -30,4 +30,7 @@ L_Spawn:
     specialeffect2 39;
     monster getmap(), .@x, .@y, strcharinfo(0), 1136, 1, "~GH~" + getcharid(0);
     return;
+
+L_Return:
+    return;
 }
-- 
cgit v1.2.3-60-g2f50