summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/025-2/phoenix.txt2
-rw-r--r--npc/functions/aurora.txt16
-rw-r--r--npc/functions/mkbot.txt2
-rw-r--r--npc/functions/siege.txt5
4 files changed, 11 insertions, 14 deletions
diff --git a/npc/025-2/phoenix.txt b/npc/025-2/phoenix.txt
index 74805389d..0989300ca 100644
--- a/npc/025-2/phoenix.txt
+++ b/npc/025-2/phoenix.txt
@@ -91,7 +91,7 @@
warp "005-1", 40, 117;
LOCATION$="Candor";
kamibroadcast(strcharinfo(0)+" has been reborn.");
- $MOST_HEROIC$=strcharinfo(0);
+ //$MOST_HEROIC$=strcharinfo(0);
StatusResetReinvest();
// Open a new dialog
clear;
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index 44b0c4ebb..24e0698a2 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -23,12 +23,12 @@ function script FYNewEvent {
kamibroadcast("Kamelot Season is now open!", "Aurora Events");
break;
case 2:
+ break;
+ case 3:
$EVENT$="Regnum";
callfunc("FYE_Regnum");
kamibroadcast("Regnum's Blessing: "+$@REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events");
break;
- case 3:
- break;
case 4:
break;
case 5:
@@ -38,12 +38,12 @@ function script FYNewEvent {
break;
case 6:
// FIXME: PLACEHOLDER
- $EVENT$="Regnum";
- callfunc("FYE_Regnum");
- kamibroadcast("Regnum's Blessing: "+$@REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events");
break;
case 7:
// FIXME: PLACEHOLDER
+ $EVENT$="Regnum";
+ callfunc("FYE_Regnum");
+ kamibroadcast("Regnum's Blessing: "+$@REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events");
break;
case 8:
// FIXME: PLACEHOLDER
@@ -55,12 +55,12 @@ function script FYNewEvent {
break;
case 10:
// FIXME: PLACEHOLDER
- $EVENT$="Regnum";
- callfunc("FYE_Regnum");
- kamibroadcast("Regnum's Blessing: "+$@REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events");
break;
case 11:
// FIXME: PLACEHOLDER
+ $EVENT$="Regnum";
+ callfunc("FYE_Regnum");
+ kamibroadcast("Regnum's Blessing: "+$@REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events");
break;
case 12:
// FIXME: PLACEHOLDER
diff --git a/npc/functions/mkbot.txt b/npc/functions/mkbot.txt
index a5638484a..5ad43d3ea 100644
--- a/npc/functions/mkbot.txt
+++ b/npc/functions/mkbot.txt
@@ -41,7 +41,7 @@ OnBourneAgain:
dispbottom l("The real Monster King is probably on his fortress. It'll take more than that to take him down.");
getexp BaseLevel**3, 0;
Mobpt = Mobpt + 165;
- $MOST_HEROIC$=strcharinfo(0);
+ //$MOST_HEROIC$=strcharinfo(0);
}
// We need to start over
.bar=true;
diff --git a/npc/functions/siege.txt b/npc/functions/siege.txt
index 10dd96a9d..6e6a48717 100644
--- a/npc/functions/siege.txt
+++ b/npc/functions/siege.txt
@@ -503,10 +503,8 @@ OnCaptainDeath:
end;
OnColonelDeath:
- if ($GAME_STORYLINE == 2) {
+ if ($GAME_STORYLINE == 2)
$MK_TEMPVAR+=7;
- $MOST_HEROIC$=strcharinfo(0);
- }
getitem StrangeCoin, rand2(15,20);
announce("##2The Monster Colonel was defeated by "+strcharinfo(0)+"!", bc_all);
$@EXP_EVENT=rand2(10, 12);
@@ -518,7 +516,6 @@ OnGeneralDeath:
if ($GAME_STORYLINE == 2)
$MK_TEMPVAR+=9;
getitem StrangeCoin, rand2(20,25);
- $MOST_HEROIC$=strcharinfo(0);
announce("##2The Monster General was defeated by "+strcharinfo(0)+"!", bc_all);
$@EXP_EVENT=rand2(13, 15);
$@EXP_EVENT_TIME=1;