summaryrefslogtreecommitdiff
path: root/npc/015-8-1
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-06-06 17:50:20 -0300
committerJesusaves <cpntb1@ymail.com>2019-06-06 17:50:20 -0300
commit59148250592f648e480ec2d42c442d7a3fa20e31 (patch)
tree0169b12ef533d75d5c68f5a64acad7660cc2ef6d /npc/015-8-1
parent69a12bcf1d5e4bf45bafbef173397e2d84debc8d (diff)
downloadserverdata-59148250592f648e480ec2d42c442d7a3fa20e31.tar.gz
serverdata-59148250592f648e480ec2d42c442d7a3fa20e31.tar.bz2
serverdata-59148250592f648e480ec2d42c442d7a3fa20e31.tar.xz
serverdata-59148250592f648e480ec2d42c442d7a3fa20e31.zip
Fixes and details
Diffstat (limited to 'npc/015-8-1')
-rw-r--r--npc/015-8-1/campaign.txt15
1 files changed, 6 insertions, 9 deletions
diff --git a/npc/015-8-1/campaign.txt b/npc/015-8-1/campaign.txt
index af4f01c22..3e4ed6655 100644
--- a/npc/015-8-1/campaign.txt
+++ b/npc/015-8-1/campaign.txt
@@ -16,7 +16,7 @@
OnBegin:
.@m$=getmap();
.@n$=instance_npcname(.name$);
- .MAPID=getmap();
+ .PLAYERID=getcharid(3);
// 255 = PCBLOCK_ATTACK|PCBLOCK_SKILL|PCBLOCK_USEITEM|PCBLOCK_COMMANDS|PCBLOCK_SITSTAND|PCBLOCK_IMMUNE|PCBLOCK_CHAT|PCBLOCK_MOVE
setpcblock(255, true);
@@ -48,9 +48,6 @@ OnS02:
.@m$=getmap();
.@n$=instance_npcname(.name$);
- unitstop(.SAGRATHA);
- unitstop(.BOSS);
-
unittalk(.SAGRATHA, l("I don't need help!"));
unittalk(.BOSS, l("Die already!"));
@@ -61,9 +58,6 @@ OnS03:
.@m$=getmap();
.@n$=instance_npcname(.name$);
- unitstop(.SAGRATHA);
- unitstop(.BOSS);
-
unittalk(.SAGRATHA, l("If you don't want to die, fight!"));
unittalk(.BOSS, lg("Murder her too!", "Murder him too!"));
@@ -89,6 +83,7 @@ OnS04:
unitstop(.BOSS);
// Objective announce
+ mapannounce(.@m$, "##2"+l("Victory Conditions: Protect Sagratha!"), 0);
mapannounce(.@m$, "##2"+l("Victory Conditions: Defeat the assassin!"), 0);
mapannounce(.@m$, "##1"+l("Defeat Conditions: Your death!"), 0);
mapannounce(.@m$, "##1"+l("Defeat Conditions: Time run out!"), 0);
@@ -158,7 +153,7 @@ OnW04:
// Mouboo, ForestMushroom, Fluffy, Sagratha (boss)
OnSagrathaDie:
.@n$=instance_npcname(.name$);
- maptimer(.MAPID, 70, .@n$+"::OnSagrathaReallyDie");
+ addtimer(70, .@n$+"::OnSagrathaReallyDie", .PLAYERID);
end;
OnSagrathaReallyDie:
@@ -169,6 +164,7 @@ OnSagrathaReallyDie:
deltimer(.@n$+"::OnW02");
deltimer(.@n$+"::OnW03");
killmonster(.@m$, .@n$+"::OnError");
+ unitkill(.BOSS);
mapannounce(.@m$, "##2"+l("You lose!"), 0);
dispbottom l("You failed to protect Sagratha..."); // and will need to start the quest again...");
@@ -179,7 +175,7 @@ OnSagrathaReallyDie:
OnSagrathaWin:
.@n$=instance_npcname(.name$);
- maptimer(.MAPID, 70, .@n$+"::OnSagrathaReallyWin");
+ addtimer(70, .@n$+"::OnSagrathaReallyWin", .PLAYERID);
end;
OnSagrathaReallyWin:
@@ -191,6 +187,7 @@ OnSagrathaReallyWin:
deltimer(.@n$+"::OnW03");
killmonster(.@m$, .@n$+"::OnError");
mapannounce(.@m$, "##2"+l("You win!"), 0);
+ mapannounce(.@m$, "##2"+l("You must go talk with the Obelisk!"), 0);
npctalk l("YOU WHO DEFILE THIS PLACE...");
// How does she even knows your name?