summaryrefslogtreecommitdiff
path: root/npc/026-6/ctrl.c
diff options
context:
space:
mode:
Diffstat (limited to 'npc/026-6/ctrl.c')
-rw-r--r--npc/026-6/ctrl.c31
1 files changed, 20 insertions, 11 deletions
diff --git a/npc/026-6/ctrl.c b/npc/026-6/ctrl.c
index cdf64f0f9..9e961ba56 100644
--- a/npc/026-6/ctrl.c
+++ b/npc/026-6/ctrl.c
@@ -13,6 +13,7 @@
// TODO: The main NPC which lets you get out of the platform
026-6,21,70,0, script #026-6Gate NPC_FANCY_CIRCLE,1,0,{
if (getq(General_Fortress) < 6) { die(); end; }
+ if ($MK_TEMPVAR >= MKIF_LV_B7F) goto L_Warp;
mesc l(".:: Impregnable Fortress, %sF ::.", "B6"), 3;
msObjective($MK_TEMPVAR >= MKIF_LV_B7F, l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B7F));
mes "";
@@ -20,8 +21,8 @@
close;
L_Warp:
- // Not unlocked
- if ($GAME_STORYLINE >= 3 && $MK_TEMPVAR < MKIF_LV_B7F) {
+ // Not unlocked (this time, require Andrei Sakar mission completion)
+ if ($GAME_STORYLINE < 4 || $MK_TEMPVAR < MKIF_LV_B7F) {
mesc l("The gate is sealed shut."), 1;
mesc l("The monster army is still strong on this floor!"), 1;
mesc l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B7F), 1;
@@ -37,7 +38,7 @@ L_Warp:
dispbottom l("I should wait for %s or one of the heroes to challenge the Monster King.", $MOST_HEROIC$);
end;
}
- doevent "#DungeonCore::OnBlood";
+ doevent "#DungeonCore::OnBleed";
slide any(21, 22), 63;
end;
@@ -83,8 +84,8 @@ OnInit:
do {
if (.@e >= 30)
break;
- .@x = rand2(21, 60);
- .@y = rand2(21, 60);
+ .@x = rand2(21, 140);
+ .@y = rand2(21, 120);
.@e+=1;
} while (!checknpccell("026-6", .@x, .@y, cell_chkpass));
movenpc .name$, .@x, .@y;
@@ -92,12 +93,20 @@ OnInit:
}
// Create more traps
-026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap02 NPC_TRAP,0,0
-026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap03 NPC_TRAP,0,0
-026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap04 NPC_TRAP,0,0
-026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap05 NPC_TRAP,0,0
-026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap06 NPC_TRAP,0,0
-026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap07 NPC_TRAP,0,0
+026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap02 NPC_TRAP_ONLINE,0,0
+026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap03 NPC_TRAP_ONLINE,0,0
+026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap04 NPC_TRAP_ONLINE,0,0
+026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap05 NPC_TRAP_ONLINE,0,0
+026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap06 NPC_TRAP_ONLINE,0,0
+026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap07 NPC_TRAP_ONLINE,0,0
+026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap08 NPC_TRAP_ONLINE,0,0
+026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap09 NPC_TRAP_ONLINE,0,0
+026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap10 NPC_TRAP_ONLINE,0,0
+026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap11 NPC_TRAP_ONLINE,0,0
+026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap12 NPC_TRAP_ONLINE,0,0
+026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap13 NPC_TRAP_ONLINE,0,0
+026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap14 NPC_TRAP_ONLINE,0,0
+026-6,0,0,0 duplicate(#0266_Trap01) #0266_Trap15 NPC_TRAP_ONLINE,0,0
// Storage master (18, 57), healer (25, 57), etc. (125, 66)
026-6,18,57,0 script Barzil#FT NPC_LLOYD,{