summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-03-20 11:49:24 -0300
committerJesusaves <cpntb1@ymail.com>2021-03-20 11:49:24 -0300
commitad6dbe3a178088240fd0425b75b11b79c098eb84 (patch)
tree49cf461055e2e98f74e200f795c23e5305255f83 /npc
parent146b072409f946c996d362c0b6e463a33ca37d27 (diff)
downloadserverdata-ad6dbe3a178088240fd0425b75b11b79c098eb84.tar.gz
serverdata-ad6dbe3a178088240fd0425b75b11b79c098eb84.tar.bz2
serverdata-ad6dbe3a178088240fd0425b75b11b79c098eb84.tar.xz
serverdata-ad6dbe3a178088240fd0425b75b11b79c098eb84.zip
Artis Warp Crystal & Registry
Diffstat (limited to 'npc')
-rw-r--r--npc/024-15/lilanna.txt4
-rw-r--r--npc/029-0/sakar.txt3
-rw-r--r--npc/029-9/boss.txt6
3 files changed, 9 insertions, 4 deletions
diff --git a/npc/024-15/lilanna.txt b/npc/024-15/lilanna.txt
index 180098369..bfedb40c1 100644
--- a/npc/024-15/lilanna.txt
+++ b/npc/024-15/lilanna.txt
@@ -115,7 +115,8 @@ function FixSelect {
rif(TELEPORTERS & TP_FROST|TP_HALIN, l("Land Of Fire - @@ GP", fnum(.@lbase))),
rif(TELEPORTERS & TP_HALIN, l("Halinarzo - @@ GP", fnum(.@fbase))),
rif(TELEPORTERS & TP_FROST, l("Frostia - @@ GP", fnum(.@fbase))),
- rif(TELEPORTERS & TP_LILIT, l("Lilit - @@ GP (not exchangeable)", fnum(.@kbase)));
+ rif(TELEPORTERS & TP_LILIT, l("Lilit - @@ GP (not exchangeable)", fnum(.@kbase))),
+ rif(TELEPORTERS & TP_ARTIS, l("Artis - @@ GP (not exchangeable)", fnum(.@kbase)));
mes "";
switch (@menu) {
case 1: return;
@@ -127,6 +128,7 @@ function FixSelect {
case 7: FixCrystal(HalinWarpCrystal, .@fbase); break;
case 8: FixCrystal(FrostiaWarpCrystal, .@fbase); break;
case 9: FixCrystal(LilitWarpCrystal, .@kbase); break;
+ case 10: FixCrystal(ArtisWarpCrystal, .@kbase); break;
}
} while (countitem(BrokenWarpCrystal));
return;
diff --git a/npc/029-0/sakar.txt b/npc/029-0/sakar.txt
index 3967f313b..06b990feb 100644
--- a/npc/029-0/sakar.txt
+++ b/npc/029-0/sakar.txt
@@ -8,6 +8,9 @@
// Andrei Sakar Instances
029-8,50,173,0 script Andrei Sakar#FoS298 NPC_ANDREI,{
+ if (!(TELEPORTERS & TP_ARTIS)) {
+ TELEPORTERS=TELEPORTERS|TP_ARTIS;
+ }
mesn;
mesq l("Do you want to return?");
next;
diff --git a/npc/029-9/boss.txt b/npc/029-9/boss.txt
index 8d89513c0..6da8083aa 100644
--- a/npc/029-9/boss.txt
+++ b/npc/029-9/boss.txt
@@ -12,7 +12,6 @@ Level of difficulty setting (100/130/160/190/220)
//////////////////////////////////////////
// Boss Room
-
029-9,96,22,0 script Book#FoS NPC_NO_SPRITE,{
if (!is_staff() && strcharinfo(0) != $MOST_HEROIC$) end;
if ($@FIRESOFSTEAM_BOSS) end;
@@ -298,6 +297,7 @@ OnProlEnd:
initnpctimer;
end;
+////////////// Player's Victory //////////////
OnEventEnd:
stopnpctimer;
enablenpc "#029-9_97_49"; // Exit
@@ -362,7 +362,7 @@ OnMFAndreiMagic:
.@stat=max(1, 5-((100-$@FIRESOFSTEAM_DIFF)/30));
dispbottom col(l("Enemies stunned!"), 3);
dispbottom col(l("All Stats temporarily raised!"), 2);
- dispbottom l("Andrei Sakar used magic: Triumph of the Eternals");
+ dispbottom l("Andrei Sakar used magic: %s", b(l("Triumph of the Eternals")));
sc_start(SC_INCALLSTATUS, .boostime, .@stat, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK);
end;
@@ -501,7 +501,7 @@ OnTimer15000:
initnpctimer;
end;
-// Defeat
+////////////// Player's Defeat //////////////
L_Defeat:
$@FIRESOFSTEAM_BOSS=0;
$@FIRESOFSTEAM_DIFF=0;