From 86cfad9a26d76772af47e4222a803d6726cf57a8 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Thu, 18 Mar 2021 21:36:07 -0300 Subject: If Andrei Sakar dies... Well, then he is dead? Game World should react at least a bit to this fact. --- npc/003-0/trickmaster.txt | 8 +++++--- npc/003-1/swezanne.txt | 5 ++++- npc/012-1/andrei.txt | 2 ++ npc/024-16/king.txt | 5 ++++- npc/027-2/colin.txt | 8 +++++--- npc/027-3/luca.txt | 8 +++++--- npc/027-4/saves.txt | 8 +++++--- npc/029-0/elora.txt | 2 ++ npc/029-0/sakar.txt | 6 +++++- npc/029-9/boss.txt | 4 ++++ 10 files changed, 41 insertions(+), 15 deletions(-) diff --git a/npc/003-0/trickmaster.txt b/npc/003-0/trickmaster.txt index d3e1e1c29..14885874c 100644 --- a/npc/003-0/trickmaster.txt +++ b/npc/003-0/trickmaster.txt @@ -48,9 +48,11 @@ L_NoMagic: mesn; mesq l("You do not have enough magic power for these classes."); next; - mesn; - mesq l("Besides the Magic Council, Andrei Sakar have his own Mana Stone, but I doubt he would train the likes of you, or share his Mana Stone."); - next; + if ($FIRESOFSTEAM < 9) { + mesn; + mesq l("Besides the Magic Council, Andrei Sakar have his own Mana Stone, but I doubt he would train the likes of you, or share his Mana Stone."); + next; + } mesn; mesq l("Perhaps, in the city, someone knows rumors about Mana Stones and can teach you. Other than that, you're on your own."); close; diff --git a/npc/003-1/swezanne.txt b/npc/003-1/swezanne.txt index a16272921..8e40d6393 100644 --- a/npc/003-1/swezanne.txt +++ b/npc/003-1/swezanne.txt @@ -22,7 +22,10 @@ if (.@q == 0) goto L_Quest; else if (.@q == 3) goto L_Silvia; else if (.@q2 < santime()) goto L_Repeat; - mesq l("I fight every day in hopes to meet Andrei, the famous hero who prevented Hurnscald from total destruction against a horde of monsters alone."); + if ($FIRESOFSTEAM < 10) + mesq l("I fight every day in hopes to meet Andrei, the famous hero who prevented Hurnscald from total destruction against a horde of monsters alone."); + else + mesq l("I fight every day in hopes to be like Andrei, the famous hero who prevented Hurnscald from total destruction against a horde of monsters alone."); if ($MOST_HEROIC$ != "") goto L_Heroics; close; diff --git a/npc/012-1/andrei.txt b/npc/012-1/andrei.txt index 2a2f74e02..046665b28 100644 --- a/npc/012-1/andrei.txt +++ b/npc/012-1/andrei.txt @@ -163,6 +163,8 @@ OnInit: setarray $@NLIBmr3; setarray $@NLIBmr4; */ + if ($FIRESOFSTEAM >= 10) + disablenpc .name$; end; } diff --git a/npc/024-16/king.txt b/npc/024-16/king.txt index c021794c2..12aa980d3 100644 --- a/npc/024-16/king.txt +++ b/npc/024-16/king.txt @@ -137,7 +137,10 @@ L_Campaign: close; case 2: mesn l("King Gelid Frozenheart"); - mesq l("I tried. He asked for too much money."); + if ($FIRESOFSTEAM < 10) + mesq l("I tried. He asked for too much money."); + else + mesq l("Where have you been, pal? He perished."); next; break; case 3: diff --git a/npc/027-2/colin.txt b/npc/027-2/colin.txt index ce4ad4b4c..f0384c736 100644 --- a/npc/027-2/colin.txt +++ b/npc/027-2/colin.txt @@ -64,9 +64,11 @@ L_NoMagic: mesn; mesq l("You do not have enough magic power for these classes."); next; - mesn; - mesq l("Besides the Magic Council, Andrei Sakar have his own Mana Stone, but I doubt he would train the likes of you, or share his Mana Stone."); - next; + if ($FIRESOFSTEAM < 9) { + mesn; + mesq l("Besides the Magic Council, Andrei Sakar have his own Mana Stone, but I doubt he would train the likes of you, or share his Mana Stone."); + next; + } mesn; mesq l("Perhaps, in the city, someone knows rumors about Mana Stones and can teach you. Other than that, you're on your own."); close; diff --git a/npc/027-3/luca.txt b/npc/027-3/luca.txt index d92fbb6dd..9c4d035e0 100644 --- a/npc/027-3/luca.txt +++ b/npc/027-3/luca.txt @@ -51,9 +51,11 @@ L_NoMagic: mesn; mesq l("You do not have enough magic power for these classes."); next; - mesn; - mesq l("Besides the Magic Council, Andrei Sakar have his own Mana Stone, but I doubt he would train the likes of you, or share his Mana Stone."); - next; + if ($FIRESOFSTEAM < 9) { + mesn; + mesq l("Besides the Magic Council, Andrei Sakar have his own Mana Stone, but I doubt he would train the likes of you, or share his Mana Stone."); + next; + } mesn; mesq l("Perhaps, in the city, someone knows rumors about Mana Stones and can teach you. Other than that, you're on your own."); close; diff --git a/npc/027-4/saves.txt b/npc/027-4/saves.txt index 1ed1398ea..61cb5c576 100644 --- a/npc/027-4/saves.txt +++ b/npc/027-4/saves.txt @@ -109,9 +109,11 @@ L_NoMagic: mesn; mesq l("You do not have enough magic power for these classes."); next; - mesn; - mesq l("Besides the Magic Council, Andrei Sakar have his own Mana Stone, but I doubt he would train the likes of you, or share his Mana Stone."); - next; + if ($FIRESOFSTEAM < 9) { + mesn; + mesq l("Besides the Magic Council, Andrei Sakar have his own Mana Stone, but I doubt he would train the likes of you, or share his Mana Stone."); + next; + } mesn; mesq l("Perhaps, in the city, someone knows rumors about Mana Stones and can teach you. Other than that, you're on your own."); close; diff --git a/npc/029-0/elora.txt b/npc/029-0/elora.txt index 4bbafdd27..3ca707244 100644 --- a/npc/029-0/elora.txt +++ b/npc/029-0/elora.txt @@ -52,6 +52,8 @@ OnInit: .distance=5; .sex=G_FEMALE; + if ($FIRESOFSTEAM >= 10) + disablenpc .name$; end; } diff --git a/npc/029-0/sakar.txt b/npc/029-0/sakar.txt index 2373698a5..eac3dcc18 100644 --- a/npc/029-0/sakar.txt +++ b/npc/029-0/sakar.txt @@ -26,12 +26,14 @@ close; OnInit: .distance=5; + if ($FIRESOFSTEAM >= 10) + setnpcdisplay("Andrei Sakar#FoS298", "Elora#FoS298", NPC_HUMAN_FEMALE_NOOB); end; } 029-0,88,33,0 script Andrei Sakar#FoS290 NPC_ANDREI,{ function prologue; - if (!FIRESOFSTEAM_CD) + if (!FIRESOFSTEAM_CD && $FIRESOFSTEAM < 10) prologue(); mesn; mesq l("Do you want to advance?"); @@ -78,6 +80,8 @@ function prologue { OnInit: .distance=5; + if ($FIRESOFSTEAM >= 10) + setnpcdisplay("Andrei Sakar#FoS290", "Elora#FoS290", NPC_HUMAN_FEMALE_NOOB); end; } diff --git a/npc/029-9/boss.txt b/npc/029-9/boss.txt index c77b98fa8..e04e7a5e5 100644 --- a/npc/029-9/boss.txt +++ b/npc/029-9/boss.txt @@ -337,6 +337,10 @@ OnEventEnd: $MANA_BLVL-=5; // Set level to 15~25 $MANA_JLVL-=5; // Set job level to 10 $MANA_BINT-=15; // Set min. int to 15 + disablenpc "Andrei Sakar"; + setnpcdisplay("Andrei Sakar#FoS290", "Elora#FoS290", NPC_HUMAN_FEMALE_NOOB); + setnpcdisplay("Andrei Sakar#FoS298", "Elora#FoS298", NPC_HUMAN_FEMALE_NOOB); + disablenpc "Elora"; } end; -- cgit v1.2.3-70-g09d2