summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/014-2-2/gemini.txt4
-rw-r--r--npc/034-4/exit.txt2
-rw-r--r--npc/034-4/lobby.txt2
3 files changed, 4 insertions, 4 deletions
diff --git a/npc/014-2-2/gemini.txt b/npc/014-2-2/gemini.txt
index 445d72df1..eca622ecb 100644
--- a/npc/014-2-2/gemini.txt
+++ b/npc/014-2-2/gemini.txt
@@ -94,6 +94,8 @@ OnCore:
break;
case 9: // Door seal broken
getexp 128000, 3200;
+ break;
+ case 10: // Luvia first cutscene
// Limit exports of Lazurite outside the area
if (countitem(LazuriteShard) > 2)
delitem LazuriteShard, countitem(LazuriteShard)/2;
@@ -103,8 +105,6 @@ OnCore:
if (countitem(LazuriteHeart))
delitem LazuriteHeart, countitem(LazuriteHeart);
break;
- case 10: // Luvia first cutscene
- break;
case 11: // Survived cutscene
getexp 256000, 6400;
break;
diff --git a/npc/034-4/exit.txt b/npc/034-4/exit.txt
index 1487f4898..1f9730908 100644
--- a/npc/034-4/exit.txt
+++ b/npc/034-4/exit.txt
@@ -210,7 +210,7 @@ OnSick:
inventoryplace Iten, 1;
@mystatus = 99;
// Non party leaders receive "less"
- if (strcharinfo(0) != getpartyleader(.@p)) {
+ if (strcharinfo(0) != getpartyleader(getcharid(1))) {
Mobpt+=7500;
getexp 96000, 900;
dispbottom l("I found %s and %s!", "7,500 "+l("monster points"), "96,000 "+l("experience points"));
diff --git a/npc/034-4/lobby.txt b/npc/034-4/lobby.txt
index f0a5e6740..1c634d1f4 100644
--- a/npc/034-4/lobby.txt
+++ b/npc/034-4/lobby.txt
@@ -10,7 +10,7 @@ OnTouch:
if (instance_id() < 0 || getcharid(1) < 1) end;
GeminiCheck(13);
.@p=getcharid(1);
- if ($@VALIA_STATUS[.@p] < 15) {
+ if ($@VALIA_STATUS[.@p] < 14 || mobcount(getmap(), "#GeminiShowdown::OnABC")) {
dispbottom l("Luvia is too dangerous to be left alone.");
end;
}