summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/014-5-1/sagratha.txt13
-rw-r--r--npc/015-8-1/campaign.txt15
2 files changed, 19 insertions, 9 deletions
diff --git a/npc/014-5-1/sagratha.txt b/npc/014-5-1/sagratha.txt
index 7c565dfa9..c06615f2f 100644
--- a/npc/014-5-1/sagratha.txt
+++ b/npc/014-5-1/sagratha.txt
@@ -96,6 +96,7 @@ function script SaggyMobCount {
l("I would like some Mouboo Milk."),
l("Can you teach me magic? Pretty please?"),
l("Can I help you with something?"),
+ l("What can you tell me about the Moubootaur?"),
l("Good bye.");
mes "";
switch (@menu) {
@@ -172,6 +173,18 @@ function script SaggyMobCount {
else
requireHelp();
break;
+ // XXX: Moubootaur
+ case 5:
+ mesn;
+ mesq l("It's a scary legend of old. It's truth, but I don't know how much it is.");
+ next;
+ mesn;
+ mesq l("Anyway, the Moubootaur certainly existed, and probably is still alive.");
+ next;
+ mesn;
+ mesq l("How powerful they were or are, their cruelty, their judgment against the Terranite Civilization and the other bloody details of the legend... I cannot confirm them to you.");
+ next;
+ break;
default:
closeclientdialog;
goodbye;
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?