summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/018-6-3/main.txt13
1 files changed, 7 insertions, 6 deletions
diff --git a/npc/018-6-3/main.txt b/npc/018-6-3/main.txt
index 19c5feafc..55bfe6a4a 100644
--- a/npc/018-6-3/main.txt
+++ b/npc/018-6-3/main.txt
@@ -202,14 +202,12 @@ OnFinalRoom:
.@y2=97;
.@id=256;
mapannounce getmap(), l("BOSS FIGHT!"), bc_map|bc_pc;
- // TODO the boss: A night dragon or a Black Cat?
- // Both summon Energy Balls against players
- // Night dragon summoning EB/Black Cat depending on player style?
- .@mi=FafiDragon; // TODO
+ .@mi=NightDragon;
.@boss=monster(.@m$, 90, 89, strmobinfo(1, .@mi), .@mi, 1, instance_npcname(.name$)+"::OnKillBoss");
// Spawn reinforcements based on difficulty
AreaMonsterB(getmap(), .@x1, .@y1, .@x2, .@y2, MagicGoblin, (@difficulty_modulus ? 4 : 2));
+ AreaMonsterB(getmap(), .@x1, .@y1, .@x2, .@y2, DeathCat, (@difficulty_modulus ? 2 : 0));
end;
// Kill boss will use setq3 and also erase any remaining monster
@@ -268,6 +266,10 @@ OnKill256:
killmonsterall(getmap());
end;
+OnKillBoss:
+ Exception("Could not finish the Boss Fight!");
+ end;
+
}
////////// Warp System below this file
@@ -946,9 +948,8 @@ OnInstanceInit:
mesq l("I am the Judge, and I shall make Judgment upon you!");
mesc l("WARNING: ")+l("If you die or logout here, the quest will be reset!"), 1;
next;
- Exception("Could not begin the Boss Fight!", RB_SPEECH|RB_ISFATAL);
01863_DisableAllWarps();
- //doevent
+ doevent instance_npcname("#01863_InstCtrl")+"::OnFinalRoom";
disablenpc instance_npcname(.name$);
close;