summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-06-04 11:20:33 -0300
committerJesusaves <cpntb1@ymail.com>2019-06-04 11:20:33 -0300
commit4bd4363c1fce21fa1223ab9652e49b07c66d3f13 (patch)
tree9dd8469d34541188e7cd3419a6610dc1bb9d883d
parent9427aca19a8d03fdc308d974d85de52ebfdaf98e (diff)
downloadserverdata-4bd4363c1fce21fa1223ab9652e49b07c66d3f13.tar.gz
serverdata-4bd4363c1fce21fa1223ab9652e49b07c66d3f13.tar.bz2
serverdata-4bd4363c1fce21fa1223ab9652e49b07c66d3f13.tar.xz
serverdata-4bd4363c1fce21fa1223ab9652e49b07c66d3f13.zip
Okay, this should clear up the campaign fight
-rw-r--r--npc/015-8-1/campaign.txt20
1 files changed, 11 insertions, 9 deletions
diff --git a/npc/015-8-1/campaign.txt b/npc/015-8-1/campaign.txt
index 074a59431..bd79a73bf 100644
--- a/npc/015-8-1/campaign.txt
+++ b/npc/015-8-1/campaign.txt
@@ -63,8 +63,8 @@ OnS04:
.@n$=instance_npcname(.name$);
// Assassin's Army
- areamonster .@m$, 44, 40, 55, 50, strmobinfo(1, HoodedNinja), HoodedNinja, 4;
- areamonster .@m$, 44, 40, 55, 50, strmobinfo(1, Assassin), Assassin, 7;
+ areamonster .@m$, 44, 40, 55, 50, strmobinfo(1, HoodedNinja), HoodedNinja, 4, .@n$+"::OnError";
+ areamonster .@m$, 44, 40, 55, 50, strmobinfo(1, Assassin), Assassin, 7, .@n$+"::OnError";
// Sagratha's Army
areamonster .@m$, 44, 40, 55, 50, strmobinfo(1, Mouboo), Mouboo, 2, .@n$+"::OnError", Size_Medium, 2;
@@ -97,11 +97,11 @@ OnW01:
unittalk(.BOSS, l("Kill 'em all!"));
- monster .@m$, 39, 39, strmobinfo(1, HoodedNinja), HoodedNinja, 1;
- monster .@m$, 60, 39, strmobinfo(1, HoodedNinja), HoodedNinja, 1;
+ monster .@m$, 39, 39, strmobinfo(1, HoodedNinja), HoodedNinja, 1, .@n$+"::OnError";
+ monster .@m$, 60, 39, strmobinfo(1, HoodedNinja), HoodedNinja, 1, .@n$+"::OnError";
- monster .@m$, 39, 54, strmobinfo(1, Assassin), Assassin, 1;
- monster .@m$, 60, 54, strmobinfo(1, Assassin), Assassin, 1;
+ monster .@m$, 39, 54, strmobinfo(1, Assassin), Assassin, 1, .@n$+"::OnError";
+ monster .@m$, 60, 54, strmobinfo(1, Assassin), Assassin, 1, .@n$+"::OnError";
addtimer(rand(10000,15000), .@n$+"::OnW02");
end;
@@ -125,8 +125,8 @@ OnW03:
unittalk(.BOSS, l("You'll all die here!"));
monster .@m$, 49, 34, strmobinfo(1, Mouboo), Mouboo, 1, .@n$+"::OnError", Size_Medium, 2;
- monster .@m$, 47, 36, strmobinfo(1, Assassin), Assassin, 1;
- monster .@m$, 52, 36, strmobinfo(1, Assassin), Assassin, 1;
+ monster .@m$, 47, 36, strmobinfo(1, Assassin), Assassin, 1, .@n$+"::OnError";
+ monster .@m$, 52, 36, strmobinfo(1, Assassin), Assassin, 1, .@n$+"::OnError";
end;
// Assassin, HoodedNinja, HoodedAssassin (boss)
@@ -153,9 +153,11 @@ OnSagrathaWin:
deltimer(.@n$+"::OnW01");
deltimer(.@n$+"::OnW02");
deltimer(.@n$+"::OnW03");
+ killmonster(.@m$, .@n$+"::OnError");
npctalk l("YOU WHO DEFILE THIS PLACE...");
- unittalk(.SAGRATHA, l("@@, watch out! The obelisk - it is talking!"));
+ // How does she even knows your name?
+ unittalk(.SAGRATHA, l("@@, watch out! The obelisk - it is talking!", strcharinfo(0)));
unitstop(.SAGRATHA);
addtimer(300, .@n$+"::OnSW01");