Fix some bugs and code a prototype for the storage

1 files changed, 17 insertions, 1 deletions

diff --git a/npc/034-3/gemini.txt b/npc/034-3/gemini.txt
index 6d9ec0d67..5f195ba43 100644
--- a/npc/034-3/gemini.txt
+++ b/npc/034-3/gemini.txt
@@ -4,6 +4,16 @@
 // Description:
 //    Gemini Sisters Quest - Outside the Building
 
+034-3,23,50,0	script	#GeminiBack2	NPC_HIDDEN,0,0,{
+    end;
+OnTouch:
+    if (instance_id() < 0 || getcharid(1) < 1) end;
+    GeminiCheck(8);
+    .@p=getcharid(1);
+    warp "val2@"+.@p, 37, 25;
+    end;
+}
+
 034-3,57,29,0	script	#GeminiDoor	NPC_HIDDEN,0,0,{
     end;
 
@@ -108,12 +118,14 @@ OnTimer2000:
 
     if (!attachrid(.aid)) {
         npctalk "The caster ceased to exist!";
+        stopnpctimer;
         end;
     }
 
     getmapxy(.@m$, .@x, .@y, 0, .aid);
-    if (.@m$ != .@mp$) {
+    if (.@m$ != .mp$) {
         npctalk "The caster is gone!";
+        stopnpctimer;
         end;
     }
     if (.@x < 52 ||
@@ -123,6 +135,7 @@ OnTimer2000:
         npctalk "The caster left the power circle!";
         dispbottom l("The magic accumulated backfires at you!");
         heal -(.power), -(.power/2);
+        stopnpctimer;
         end;
     }
 
@@ -132,10 +145,12 @@ OnTimer2000:
 
     if (ispcdead()) {
         npctalk "The caster is dead!";
+        stopnpctimer;
         end;
     }
     if (Sp <= 0) {
         npctalk "The caster ran out of mana!";
+        stopnpctimer;
         end;
     }
 
@@ -173,6 +188,7 @@ OnTimer2000:
             .mp$="";
             .aid=0;
         }
+        stopnpctimer;
         end;
     }
     detachrid();