From 9f0dbbad202cb768f187264296dfb84f4881f473 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 18 Jun 2019 12:37:05 -0300 Subject: Okay, now we only have one problem... CleanUp. --- npc/023-3-1/logic.txt | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/npc/023-3-1/logic.txt b/npc/023-3-1/logic.txt index 10338f58a..5442827d0 100644 --- a/npc/023-3-1/logic.txt +++ b/npc/023-3-1/logic.txt @@ -10,6 +10,7 @@ end; OnTouch: + .@m$=getmap(); .@n=getq(General_Narrator); .@q=getq(FrostiaQuest_Homunculus); // Cheater Detected @@ -22,6 +23,10 @@ OnTouch: dispbottom l("The magic power outflowing in the room prevents you from leaving."); end; } + if (mobcount(.@m$, "#Core02331::OnMobDie")) { + dispbottom l("These assassins will catch to me if I do that now!"); + end; + } .@mapn$="023-3-2"; warp .@mapn$, any(39,40), 58; @@ -88,11 +93,11 @@ OnEvent01: .@n$=instance_npcname(.name$); slide 45, 45; - @ISBAMUTH=monster(.@m$, 45, 34, l("Isbamuth"), Isbamuth, 1, .@n$+"::OnMobDie"); - .@g1=monster(.@m$, 42, 37, l("Assassin"), HoodedNinja, 1, .@n$+"::OnMobDie"); - .@g2=monster(.@m$, 48, 37, l("Assassin"), HoodedNinja, 1, .@n$+"::OnMobDie"); - .@g3=monster(.@m$, 39, 40, l("Assassin"), Assassin, 1, .@n$+"::OnMobDie"); - .@g4=monster(.@m$, 51, 40, l("Assassin"), Assassin, 1, .@n$+"::OnMobDie"); + @ISBAMUTH=monster(.@m$, 45, 34, l("Isbamuth"), Isbamuth, 1, .name$+"::OnMobDie"); + .@g1=monster(.@m$, 42, 37, l("Assassin"), HoodedNinja, 1, .name$+"::OnMobDie"); + .@g2=monster(.@m$, 48, 37, l("Assassin"), HoodedNinja, 1, .name$+"::OnMobDie"); + .@g3=monster(.@m$, 39, 40, l("Assassin"), Assassin, 1, .name$+"::OnMobDie"); + .@g4=monster(.@m$, 51, 40, l("Assassin"), Assassin, 1, .name$+"::OnMobDie"); // Block everyone for cutscene (includes invencibility boost) setpcblock(255, true); @@ -160,7 +165,7 @@ OnE07: .@m$=getmap(); .@n$=instance_npcname(.name$); - @SCOUT=monster(.@m$, 43, 29, l("Assassin"), HoodedNinja, 1, .@n$+"::OnMobDie"); + @SCOUT=monster(.@m$, 43, 29, l("Assassin"), HoodedNinja, 1, .name$+"::OnMobDie"); sc_start(SC_STUN, 12000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, @SCOUT); unitemote(@SCOUT, E_KITTY); @@ -219,6 +224,7 @@ OnE12: unitkill(@ISBAMUTH); unitkill(@SCOUT); @ISBAMUTH=0; + setq1 FrostiaQuest_Homunculus, 3; mapannounce(.@m$, "##2"+l("Victory Conditions: Defeat all enemies!"), 0); mapannounce(.@m$, "##1"+l("Defeat Conditions: Your death!"), 0); end; @@ -239,10 +245,10 @@ OnW02: .@n$=instance_npcname(.name$); unittalk(@ISBAMUTH, l("Come to my aid! Vanish this fool!")); - monster(.@m$, 42, 37, l("Assassin"), any(Assassin,Bandit,RobinBandit), 1, .@n$+"::OnMobDie"); - monster(.@m$, 48, 37, l("Assassin"), HoodedNinja, 1, .@n$+"::OnMobDie"); - monster(.@m$, 39, 40, l("Assassin"), any(Assassin,Bandit,RobinBandit), 1, .@n$+"::OnMobDie"); - monster(.@m$, 51, 40, l("Assassin"), Assassin, 1, .@n$+"::OnMobDie"); + monster(.@m$, 42, 37, l("Assassin"), any(Assassin,Bandit,RobinBandit), 1, .name$+"::OnMobDie"); + monster(.@m$, 48, 37, l("Assassin"), HoodedNinja, 1, .name$+"::OnMobDie"); + monster(.@m$, 39, 40, l("Assassin"), any(Assassin,Bandit,RobinBandit), 1, .name$+"::OnMobDie"); + monster(.@m$, 51, 40, l("Assassin"), Assassin, 1, .name$+"::OnMobDie"); addtimer(60000, .@n$+"::OnW02"); end; -- cgit v1.2.3-60-g2f50