From 4e24e1226870c7f3b25a849b7ff0c2b1a9217957 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 6 Jul 2019 16:42:42 -0300
Subject: I forgot these important, critical checks

---
 npc/023-3-1/logic.txt  | 12 ++++++++++++
 npc/commands/event.txt |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'npc')

diff --git a/npc/023-3-1/logic.txt b/npc/023-3-1/logic.txt
index d2ccb8a56..4adf97ea1 100644
--- a/npc/023-3-1/logic.txt
+++ b/npc/023-3-1/logic.txt
@@ -56,6 +56,12 @@ OnTouch:
 
 023-3-1,45,63,0	script	#Ambush02331	NPC_HIDDEN,10,0,{
 OnTouch:
+    .@q=getq(FrostiaQuest_Homunculus);
+    if (.@q < 3) {
+        dispbottom l("Error, cheater detected");
+        percentheal -100, -100;
+        end;
+    }
     .@q=getq3(FrostiaQuest_Homunculus);
     if (!.@q) {
         .@m$=getmap();
@@ -81,6 +87,12 @@ OnTouch:
 OnTouch:
     if (instance_id() < 0)
         end;
+    .@q=getq(FrostiaQuest_Homunculus);
+    if (.@q < 3) {
+        dispbottom l("Error, cheater detected");
+        percentheal -100, -100;
+        end;
+    }
     .@n$=instance_npcname(.name$);
     .@q=getq3(FrostiaQuest_Homunculus);
     if (.@q == 1) {
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index e3d9e3b21..c173f8090 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -262,7 +262,7 @@ OnEffect:
         dispbottom l("You cannot be fighting to do this trip.");
         atcommand "@refresh";
         end;
-    } else if (getmapname() ~= "001-*") {
+    } else if (getmapname() ~= "001-*" || (getmapinfo(MAPINFO_ZONE, getmap())) == "MMO") {
         dispbottom l("You are already at the Mana Plane of Existence.");
         atcommand "@refresh";
         end;
-- 
cgit v1.2.3-60-g2f50