Miscellaneous changes

- Disable TMW Classic portal for non-staff (not being cleaned up properly)
- First sign is now a warp portal (for convenience)
- Reduce amount of summons to half, and increase their duration

2 files changed, 17 insertions, 2 deletions

diff --git a/npc/033-1/misc.txt b/npc/033-1/misc.txt
index e76fc12..0627d85 100644
--- a/npc/033-1/misc.txt
+++ b/npc/033-1/misc.txt
@@ -39,6 +39,19 @@ OnTouch:
 033-1,118,190,0	script	Sign#0331A	NPC_SWORDS_SIGN,{
     mesc "↑ "+l("Porthos");
     mesc "↓ "+l("Dead end");
+    select
+        l("[Leave]"),
+        l("Warp to Town Center"),
+        l("Warp to Event Area"),
+        rif(is_sponsor(), l("Warp to Grandmaster's Residence")),
+        l("Stay here");
+    mes "";
+    closeclientdialog;
+    switch (@menu) {
+    case 2: slide 166, 103; break;
+    case 3: slide  49, 193; break;
+    case 4: slide 106, 150; break;
+    }
 	close;
 }
 
@@ -160,6 +173,8 @@ function	script	SetPorthosPortal	{
 033-1,85,227,0	script	#Porthos07	NPC_NO_SPRITE,0,0,{
     end;
 OnTouch:
+    // FIXME: Portal is broken!
+    if (!is_staff()) { dispbottom l("This is The Mana World: Classic's portal, but it seems to have been barred."); end; }
     slide 85, 228;
     mes l("Do you want to visit The Mana World: Classic?");
     next;
diff --git a/npc/033-2/magic.txt b/npc/033-2/magic.txt
index 0ee0dc2..e597b40 100644
--- a/npc/033-2/magic.txt
+++ b/npc/033-2/magic.txt
@@ -235,8 +235,8 @@ function	script	Crossroads_Magic	{
         case Ele_Ghost:     .@MB = MisterPrickel; break;
         default:            .@MB = Assassin; break; // ???
         }
-        .@t = 10 + (min(readparam2(bInt), 150) / 15) + (.@PW/5);
-        .@a = 1 + (.@PW/25) + (.@RG/2); // Amount of spawns
+        .@t = 10 + (min(readparam2(bInt), 150) / 15) + (.@PW/5) + .@RG;
+        .@a = 1 + ((.@PW/25) + (.@RG/2)) / 2; // Amount of spawns
         // Actual summoning core
         for (.@i=0; .@i < .@a; .@i++) {
             .@m = summon("Summoned Monster", .@MB, .@t);