summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2023-10-08 15:08:29 -0300
committerJesusaves <cpntb1@ymail.com>2023-10-08 15:08:29 -0300
commite5f5c9aa111051b36de7796843d730ced43edf92 (patch)
tree4958d5908619fad9eee35d5e0c4f7db818574cc2
parent40c33399ecb674c6323e44b00dd085065029c749 (diff)
downloadserverdata-e5f5c9aa111051b36de7796843d730ced43edf92.tar.gz
serverdata-e5f5c9aa111051b36de7796843d730ced43edf92.tar.bz2
serverdata-e5f5c9aa111051b36de7796843d730ced43edf92.tar.xz
serverdata-e5f5c9aa111051b36de7796843d730ced43edf92.zip
Unlock Impregnable Fortress B5F
-rw-r--r--npc/026-4/ctrl.c11
-rw-r--r--npc/026-5/ctrl.c10
2 files changed, 17 insertions, 4 deletions
diff --git a/npc/026-4/ctrl.c b/npc/026-4/ctrl.c
index 424f1b8cc..72520315f 100644
--- a/npc/026-4/ctrl.c
+++ b/npc/026-4/ctrl.c
@@ -147,8 +147,15 @@ L_Warp:
mesc l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B5F), 1;
close;
}
- //warp "026-5", 40, 40; // TODO: These coords actually NOT OK
- dispbottom l("Coming Soon, in Moubootaur Legends!");
+ // This is a more complex warp
+ .@e = 0;
+ do {
+ if (.@e >= 30) break;
+ .@x = rand2(20, 40);
+ .@y = rand2(20, 40);
+ .@e+=1;
+ } while (!checknpccell("026-5", .@x, .@y, cell_chkpass));
+ warp "026-5", .@x, .@y;
end;
OnInit:
diff --git a/npc/026-5/ctrl.c b/npc/026-5/ctrl.c
index cf1dcc910..3879357cf 100644
--- a/npc/026-5/ctrl.c
+++ b/npc/026-5/ctrl.c
@@ -48,6 +48,10 @@ OnClock1843:
_moveNpc("026-5");
unitwarp(getnpcid("#026-5Switch_5"), "026-5", .npc_x, .npc_y);
_moveNpc("026-5");
+ unitwarp(getnpcid("#026-5Switch_6"), "026-5", .npc_x, .npc_y);
+ _moveNpc("026-5");
+ unitwarp(getnpcid("#026-5Switch_7"), "026-5", .npc_x, .npc_y);
+ _moveNpc("026-5");
unitwarp(getnpcid("#026-5Gate"), "026-5", .npc_x, .npc_y);
end;
@@ -119,16 +123,18 @@ OnInit:
000-0,0,0,0 duplicate(#026-5Switch_1) #026-5Switch_3 NPC_SWITCH_OFFLINE
000-0,0,0,0 duplicate(#026-5Switch_1) #026-5Switch_4 NPC_SWITCH_OFFLINE
000-0,0,0,0 duplicate(#026-5Switch_1) #026-5Switch_5 NPC_SWITCH_OFFLINE
+000-0,0,0,0 duplicate(#026-5Switch_1) #026-5Switch_6 NPC_SWITCH_OFFLINE
+000-0,0,0,0 duplicate(#026-5Switch_1) #026-5Switch_7 NPC_SWITCH_OFFLINE
// The main NPC which lets you out of here
000-0,0,0,0, script #026-5Gate NPC_ICE_CAGE,0,0,{
if (getq(General_Fortress) > 6) goto L_Warp;
- dispbottom l("After flipping all %s switches, I should go there.", l("five"));
+ dispbottom l("After flipping all %s switches, I should go there.", l("seven"));
end;
OnTouch:
if (getq(General_Fortress) > 6) goto L_Warp;
mesc l(".:: Impregnable Fortress, %sF ::.", "B5"), 3;
- msObjective(getq(General_Fortress) == 7, l("* Flip all five switches"));
+ msObjective(getq(General_Fortress) == 7, l("* Flip all seven switches"));
msObjective($MK_TEMPVAR >= MKIF_LV_B6F, l("Minimum wins: %d/%d", $MK_TEMPVAR, MKIF_LV_B6F));
mes "";
mesc l("Hint: The Riddled Switches.");