Bugs in @toevent

2 files changed, 51 insertions, 2 deletions

diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index c3d21b329..f8641f83b 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -157,8 +157,18 @@ OnCall:
         dispbottom l("You are already at the Mana Plane of Existence.");
     else if (getmapname() == "boss" || getmapname() == "sec_pri" || getmapname() ~= "000-*")
         dispbottom l("The Mana Plane is currently out of reach.");
-    else
-        warp "001-1", 235, 26;
+    else {
+        .@gt=$@AEROS_SPWN;
+        if (.@gt == 2)
+            .@gt=rand(0,1);
+        switch (.@gt) {
+        case 0:
+            warp "001-1", 235, 26; break;
+        case 1:
+            warp "001-1", 23, 108; break;
+        }
+        specialeffect(63, AREA, getcharid(3));
+    }
     end;
 
 OnInit:
diff --git a/npc/functions/news.txt b/npc/functions/news.txt
index eecd4f56c..2b22f3658 100644
--- a/npc/functions/news.txt
+++ b/npc/functions/news.txt
@@ -8,6 +8,45 @@ function	script	GameNews	{
     .@entry=getarg(0, 0);
     switch(.@entry) {
     case 0:
+    case 20180630:
+        mes "";
+        mesc l("Release 5.0 - Greenland Players");
+        next;
+        mes "";
+        if (!$HURNS_LIBDATE) {
+            mesc l("The Monster King left Hurnscald! This is our chance! Saulc GM is assembling a team to TAKE OVER HURNSCALD!!");
+        } else {
+            mesc l("Hurnscald was liberated by the players @@ ago.", FuzzyTime($HURNS_LIBDATE));
+            mesc l("Many rejoiced. The damage was very big, and all players help is required, to make Hurnscald prosper again.");
+        }
+        next;
+        mesc l("This server's Sponsors bought the area above Hurscald's Inn. Nobody else is being allowed there.");
+        mesc l("However, they allowed everyone to use @@ command to rapidly reach Aeros during events.", "##B@toevent##b");
+        next;
+        mesc l("Tulimshar Guards bought a Slot Machine to play, but that was done unofficialy.");
+        mesc l("There are rumors of a grand prize to whoever gets lucky on that machine.");
+        next;
+        mesc l("Tulimshar Jewerly is once again open. Cyndala and Tamiloc rented a shop south of Tulimshar.");
+        mesc l("The Tulimshar Forge is also dealing with more complex materials, and not just Iron.");
+        next;
+        mesc l("Nard's ship is not capable to do Tulimshar<->Candor route instantly anymore: His magic sail broke.");
+        mesc l("Ishi also rewrote his rewards table. More items for lower prices!");
+        next;
+        mesc l("Zitoni announces he can now craft really good potions to improve attack speed and damage!");
+        mesc l("Saulc and Cherry married in Halinarzo, and stayed like this for perhaps 20 seconds, before Cherry asked for divorce.");
+        mesc l("After paying the divorce fee, she said: \"Blame Saulc for this one.\"");
+        next;
+        mesc l("The Alliance announces a great new way to keep adventurers killing monsters.");
+        mesc l("The Grand Hunter quest is available with Aidan. It's an experiment by the High Council,");
+        mesc l("and may change later without notice.");
+        next;
+        mesc l("Some adventurer broke what was previously thought as maximum level, and is now level 45!");
+        mesc l("Somebody else also got huge stats bonuses because reached the unbelievable job level 25.");
+        next;
+        mesc l("The Alliance High Council informs that Super Players and above are capable to try ##B @toevent ##b for free event warps.");
+        mesc l("This was caused because changes on the Mana Bridge. They hope that for next release, everyone will be able to use these magic words, instead of needing to talk to the Soul Menhir.");
+        next;
+        break;
     case 20180531:
         mes "";
         mesc l("Release 4.0 - Quest Giver's Handbook");