summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-06-24 12:28:42 -0500
committerWushin <pasekei@gmail.com>2015-06-24 12:28:42 -0500
commit9c42e7f35fc15a8424742593c09282aaeeec69a9 (patch)
tree7a18c6593fc8fdf5b0d330b824b4ac9dcec626e7
parent49b85f23157c2bd7e6919bf2a809e0893276f749 (diff)
parent9c80735ee437f90b2baefbbfcdf6c5829234c908 (diff)
downloadserverdata-9c42e7f35fc15a8424742593c09282aaeeec69a9.tar.gz
serverdata-9c42e7f35fc15a8424742593c09282aaeeec69a9.tar.bz2
serverdata-9c42e7f35fc15a8424742593c09282aaeeec69a9.tar.xz
serverdata-9c42e7f35fc15a8424742593c09282aaeeec69a9.zip
Merge pull request #403 from mekolat/npctalk
allow to specify emitter and receiver in npctalk
-rw-r--r--world/map/npc/002-1/itka.txt2
-rw-r--r--world/map/npc/006-1/miriam.txt2
-rw-r--r--world/map/npc/007-1/witch.txt26
-rw-r--r--world/map/npc/009-7/debug.txt6
-rw-r--r--world/map/npc/009-7/rouge.txt14
-rw-r--r--world/map/npc/010-2/band.txt2
-rw-r--r--world/map/npc/011-1/oscar.txt14
-rw-r--r--world/map/npc/011-6/crastur.txt2
-rw-r--r--world/map/npc/029-2/sorfina.txt7
-rw-r--r--world/map/npc/029-2/tanisha.txt12
-rw-r--r--world/map/npc/029-3/parua.txt6
-rw-r--r--world/map/npc/030-4/mana_battery.txt2
-rw-r--r--world/map/npc/031-4/cindyCave.txt2
-rw-r--r--world/map/npc/033-1/kimarr.txt30
-rw-r--r--world/map/npc/051-1/desert.txt4
-rw-r--r--world/map/npc/051-3/ambush.txt8
-rw-r--r--world/map/npc/052-2/lobby.txt32
-rw-r--r--world/map/npc/052-2/partyroom.txt8
18 files changed, 90 insertions, 89 deletions
diff --git a/world/map/npc/002-1/itka.txt b/world/map/npc/002-1/itka.txt
index 54c4a572..3cc8457f 100644
--- a/world/map/npc/002-1/itka.txt
+++ b/world/map/npc/002-1/itka.txt
@@ -10,7 +10,7 @@
close;
OnTimer300000:
- npctalk "Come to The Wizard's Rest!";
+ npctalk strnpcinfo(0), "Come to The Wizard's Rest!";
setnpctimer 0;
end;
diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt
index edcb5b63..5f474784 100644
--- a/world/map/npc/006-1/miriam.txt
+++ b/world/map/npc/006-1/miriam.txt
@@ -239,7 +239,7 @@ L_LetsDoThis:
message strcharinfo(0), "Miriam quickly grabs your arm and pull you to the place where she is sitting.";
// Warp the player to the place where the NPC is defined, so he can't cheat.
warp "032-1",55,21;
- npctalk "Run " +strcharinfo(0)+ ", run!";
+ npctalk strnpcinfo(0), "Run " +strcharinfo(0)+ ", run!";
set QUEST_MIRIAM, 5;
set QUEST_MIRIAM_start, gettimetick(2);
set QUEST_MIRIAM_cheat, 0;
diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index e8eb1ffc..b8cb3850 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -551,18 +551,18 @@ L_ReactToPlayersReturn:
end;
L_SurprisedByHeroWin:
- npctalk "(How is it possible... " + $@ILLIA_HERO$ + " survived...)";
+ npctalk strnpcinfo(0), "(How is it possible... " + $@ILLIA_HERO$ + " survived...)";
emotion EMOTE_SURPRISE;
goto L_EndQuest;
L_Disappoint:
- npctalk "Oh no... It seems " + $@ILLIA_HERO$ + " did not make it... Who will save my sister now?";
+ npctalk strnpcinfo(0), "Oh no... It seems " + $@ILLIA_HERO$ + " did not make it... Who will save my sister now?";
emotion EMOTE_SAD;
goto L_EndQuest;
L_PlayerGaveUp:
close2;
- npctalk "Well... It seems you can't do it " + $@ILLIA_HERO$ + ". I knew it as soon as I saw you!";
+ npctalk strnpcinfo(0), "Well... It seems you can't do it " + $@ILLIA_HERO$ + ". I knew it as soon as I saw you!";
emotion EMOTE_UPSET;
goto L_EndQuest;
@@ -608,30 +608,30 @@ OnTimer3000:
OnTimer2500:
if ($@ILLIA_STATUS != 3)
end;
- npctalk $@ILLIA_HERO$ + ", " + $@ILLIA_HELPER1$ + ", " + $@ILLIA_HELPER2$ + ", " + $@ILLIA_HELPER3$ + ", listen!";
+ npctalk strnpcinfo(0), $@ILLIA_HERO$ + ", " + $@ILLIA_HELPER1$ + ", " + $@ILLIA_HELPER2$ + ", " + $@ILLIA_HELPER3$ + ", listen!";
end;
OnTimer7500:
if ($@ILLIA_STATUS != 3)
end;
- npctalk "I will teleport the 4 of you in a forest that isn't far from the waterfall.";
+ npctalk strnpcinfo(0), "I will teleport the 4 of you in a forest that isn't far from the waterfall.";
end;
OnTimer14000:
if ($@ILLIA_STATUS != 3)
end;
- npctalk "Each of you takes one of these rings. They will allow you to come back here when needed.";
+ npctalk strnpcinfo(0), "Each of you takes one of these rings. They will allow you to come back here when needed.";
end;
OnTimer24000:
if ($@ILLIA_STATUS != 3)
end;
if ($Illia_Luvia_Harvest < 10)
- npctalk "Do your best and save my sister!";
+ npctalk strnpcinfo(0), "Do your best and save my sister!";
if ($Illia_Luvia_Harvest >= 10 && $Illia_Luvia_Harvest < 35)
- npctalk "This will be quite dangerous, but do your best and save my sister!";
+ npctalk strnpcinfo(0), "This will be quite dangerous, but do your best and save my sister!";
if ($Illia_Luvia_Harvest >= 35)
- npctalk "This will be awfully dangerous, but do your best and save my sister!";
+ npctalk strnpcinfo(0), "This will be awfully dangerous, but do your best and save my sister!";
end;
OnTimer34000:
@@ -643,7 +643,7 @@ OnTimer34000:
areatimer "007-1", 66, 73, 92, 88, 3500, "Valia::OnWarpHelper1";
areatimer "007-1", 66, 73, 92, 88, 4000, "Valia::OnWarpHelper2";
areatimer "007-1", 66, 73, 92, 88, 4500, "Valia::OnWarpHelper3";
- npctalk "Spiralis Major!";
+ npctalk strnpcinfo(0), "Spiralis Major!";
misceffect FX_BLUE_MAGIC_CAST;
end;
@@ -662,19 +662,19 @@ OnTimer150000:
if ($@ILLIA_STATUS != 1)
end;
set $@ILLIA_STATUS, 2;
- npctalk $@ILLIA_HERO$ + ", I am ready to cast the teleport spell. You and your comrades should not wait any longer!";
+ npctalk strnpcinfo(0), $@ILLIA_HERO$ + ", I am ready to cast the teleport spell. You and your comrades should not wait any longer!";
end;
OnTimer280000:
if ($@ILLIA_STATUS != 2)
end;
- npctalk "Hurry up " + $@ILLIA_HERO$ + ", I am losing patience.";
+ npctalk strnpcinfo(0), "Hurry up " + $@ILLIA_HERO$ + ", I am losing patience.";
end;
OnTimer300000:
if ($@ILLIA_STATUS != 2)
end;
- npctalk $@ILLIA_HERO$ + ", you and your missing comrades made me lose a precious time! Out of my sight!";
+ npctalk strnpcinfo(0), $@ILLIA_HERO$ + ", you and your missing comrades made me lose a precious time! Out of my sight!";
emotion EMOTE_UPSET;
if (attachrid($@ILLIA_HERO_ID))
goto L_KillHero;
diff --git a/world/map/npc/009-7/debug.txt b/world/map/npc/009-7/debug.txt
index 94735b3e..997d64f1 100644
--- a/world/map/npc/009-7/debug.txt
+++ b/world/map/npc/009-7/debug.txt
@@ -153,14 +153,14 @@ OnInit:
// debug messages below
OnKillerNotInDuel:
- npctalk "WARNING: The victim was not killed by its adversary. Aborting duel...";
+ npctalk strnpcinfo(0), "WARNING: The victim was not killed by its adversary. Aborting duel...";
end;
OnVictimNotInDuel:
- npctalk "WARNING: The victim is not part of the duel";
+ npctalk strnpcinfo(0), "WARNING: The victim is not part of the duel";
end;
OnVictimInDuelNoDuel:
- npctalk "WARNING: The victim is part of the duel but no duel is ongoing at the moment.";
+ npctalk strnpcinfo(0), "WARNING: The victim is part of the duel but no duel is ongoing at the moment.";
end;
}
diff --git a/world/map/npc/009-7/rouge.txt b/world/map/npc/009-7/rouge.txt
index 4ce3be8e..7660683e 100644
--- a/world/map/npc/009-7/rouge.txt
+++ b/world/map/npc/009-7/rouge.txt
@@ -102,30 +102,30 @@ L_End:
//announcements below
OnAnnounceNext:
- npctalk "##0The next battle ("+ $@Duel_Queue_ID[0] +") is ##1" + $@Duel_Queue_Red$[0] + "##0 vs. ##3" + $@Duel_Queue_Blue$[0] + "##0.The battle will start in "+ $@Duel_TimeBeforeWarp +" seconds.";
+ npctalk strnpcinfo(0), "##0The next battle ("+ $@Duel_Queue_ID[0] +") is ##1" + $@Duel_Queue_Red$[0] + "##0 vs. ##3" + $@Duel_Queue_Blue$[0] + "##0.The battle will start in "+ $@Duel_TimeBeforeWarp +" seconds.";
end;
OnAnnounceIntrusion:
- npctalk "Intrusion detected. Annihilation in progress... Done.";
+ npctalk strnpcinfo(0), "Intrusion detected. Annihilation in progress... Done.";
end;
OnAnnounceTimeOut:
- npctalk "Time limit reached! Both player lose!";
+ npctalk strnpcinfo(0), "Time limit reached! Both player lose!";
end;
OnAnnounceRedWins:
- npctalk $@Duel_Queue_Red$[0] + " wins the duel against "+ $@Duel_Queue_Blue$[0] +"!";
+ npctalk strnpcinfo(0), $@Duel_Queue_Red$[0] + " wins the duel against "+ $@Duel_Queue_Blue$[0] +"!";
end;
OnAnnounceRedForfeit:
- npctalk $@Duel_Queue_Red$[0] + " wins by forfeit!";
+ npctalk strnpcinfo(0), $@Duel_Queue_Red$[0] + " wins by forfeit!";
end;
OnAnnounceBlueWins:
- npctalk $@Duel_Queue_Blue$[0] + " wins the duel against "+ $@Duel_Queue_Red$[0] +"!";
+ npctalk strnpcinfo(0), $@Duel_Queue_Blue$[0] + " wins the duel against "+ $@Duel_Queue_Red$[0] +"!";
end;
OnAnnounceBlueForfeit:
- npctalk $@Duel_Queue_Blue$[0] + " wins by forfeit!";
+ npctalk strnpcinfo(0), $@Duel_Queue_Blue$[0] + " wins by forfeit!";
end;
}
diff --git a/world/map/npc/010-2/band.txt b/world/map/npc/010-2/band.txt
index cabc31bc..f1e0632f 100644
--- a/world/map/npc/010-2/band.txt
+++ b/world/map/npc/010-2/band.txt
@@ -18,7 +18,7 @@
}
function|script|DimondBand
{
- npctalk $@SongLyrics$[$@LyricSpot];
+ npctalk strnpcinfo(0), $@SongLyrics$[$@LyricSpot];
set $@LyricSpot, ($@LyricSpot + 1);
if (getarraysize($@SongLyrics$) <= $@LyricSpot)
set $@LyricSpot, 0;
diff --git a/world/map/npc/011-1/oscar.txt b/world/map/npc/011-1/oscar.txt
index 7240f2d0..ad088eff 100644
--- a/world/map/npc/011-1/oscar.txt
+++ b/world/map/npc/011-1/oscar.txt
@@ -340,7 +340,7 @@ L_TimerFunction:
goto L_AllPumpkinsDead;
// A quick "cheer up"
if ($@HalloweenQuest_PumpkinsTimer == 300)
- npctalk "Hurry up " + $@HalloweenQuest_PumpkinHunter$ + "! My farm is being ruined!";
+ npctalk strnpcinfo(0), "Hurry up " + $@HalloweenQuest_PumpkinHunter$ + "! My farm is being ruined!";
// 7 mins max
if ($@HalloweenQuest_PumpkinsTimer > 420)
goto L_PumpkinsRuined;
@@ -365,7 +365,7 @@ OnTimer6000:
if ($@HalloweenQuest_PumpkinsState != 0)
end;
emotion EMOTE_AFRAID;
- npctalk "Oh no, these pumpkins look strange and infested with bugs! Help me get rid of them " + $@HalloweenQuest_PumpkinHunter$ + "!";
+ npctalk strnpcinfo(0), "Oh no, these pumpkins look strange and infested with bugs! Help me get rid of them " + $@HalloweenQuest_PumpkinHunter$ + "!";
set $@HalloweenQuest_PumpkinsState, 1;
setnpctimer 0;
end;
@@ -411,7 +411,7 @@ L_KillBadHunter:
end;
L_PumpkinsRuined:
- npctalk "No! " + $@HalloweenQuest_PumpkinHunter$ + " how could you let that happen? All my farm is a mess now! All my trees are infested with bugs!";
+ npctalk strnpcinfo(0), "No! " + $@HalloweenQuest_PumpkinHunter$ + " how could you let that happen? All my farm is a mess now! All my trees are infested with bugs!";
goto L_Fail;
L_AllPumpkinsDead:
@@ -428,15 +428,15 @@ S_CheckPlayer:
return;
L_PlayerOff:
- npctalk "What? Where is " + $@HalloweenQuest_PumpkinHunter$ + "? Someone, help me!";
+ npctalk strnpcinfo(0), "What? Where is " + $@HalloweenQuest_PumpkinHunter$ + "? Someone, help me!";
goto L_Fail;
L_PlayerLeft:
- npctalk "What the!! " + $@HalloweenQuest_PumpkinHunter$ + " left me alone with all this! Someone, help me!";
+ npctalk strnpcinfo(0), "What the!! " + $@HalloweenQuest_PumpkinHunter$ + " left me alone with all this! Someone, help me!";
goto L_Fail;
L_PlayerDead:
- npctalk "Oh no I can't believe it! " + $@HalloweenQuest_PumpkinHunter$ + " just died! Someone, help me!";
+ npctalk strnpcinfo(0), "Oh no I can't believe it! " + $@HalloweenQuest_PumpkinHunter$ + " just died! Someone, help me!";
goto L_Fail;
L_Fail:
@@ -453,7 +453,7 @@ L_Success:
goto L_PlayerOff;
set Quest_Halloween, 6;
emotion EMOTE_GRIN;
- npctalk "Hurray, " + $@HalloweenQuest_PumpkinHunter$ + " you did it! Thank you thank you! Come here!";
+ npctalk strnpcinfo(0), "Hurray, " + $@HalloweenQuest_PumpkinHunter$ + " you did it! Thank you thank you! Come here!";
goto L_Clean;
L_Clean:
diff --git a/world/map/npc/011-6/crastur.txt b/world/map/npc/011-6/crastur.txt
index bef9f0a7..52298863 100644
--- a/world/map/npc/011-6/crastur.txt
+++ b/world/map/npc/011-6/crastur.txt
@@ -150,7 +150,7 @@ L_Regular:
"\"Ugh, no. I have to leave now. Bye.\"", L_Close;
L_Insult:
- npctalk "Crastur : Die " + strcharinfo(0) + "!";
+ npctalk strnpcinfo(0), "Crastur : Die " + strcharinfo(0) + "!";
heal -10000, 0;
emotion EMOTE_VICIOUS;
mes "[Crastur]";
diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index f083396c..940c61a4 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -312,7 +312,8 @@ L_CloseDis:
end;
L_Block:
- message strcharinfo(0), "Sorfina: Wait a moment! You're not ready to leave.";
+ message strcharinfo(0), "##3Sorfina : ##BWait a moment! ##bYou're not ready to leave.";
+ // FIXME: this should be changed to npctalk with strcharinfo(0) once we increase the view area
end;
}
029-2,23,24,0|script|#GameRules1|32767,0,1
@@ -342,7 +343,7 @@ L_Block:
goto L_Close;
L_KnockBack:
- message strcharinfo(0), "Please Accept the Game rules";
+ message strcharinfo(0), "##1Server : ##BPlease Accept the Game rules";
warp "029-2", 22, 24;
goto L_Close;
@@ -356,7 +357,7 @@ L_Close:
goto L_Close;
L_KnockBack:
- message strcharinfo(0), "Please Accept the Game rules";
+ message strcharinfo(0), "##1Server : ##BPlease Accept the Game rules";
warp "029-2", 22, 24;
goto L_Close;
diff --git a/world/map/npc/029-2/tanisha.txt b/world/map/npc/029-2/tanisha.txt
index 0a594410..012f93ff 100644
--- a/world/map/npc/029-2/tanisha.txt
+++ b/world/map/npc/029-2/tanisha.txt
@@ -211,7 +211,7 @@ L_Next2:
goto L_Fight_Again;
L_Fighting:
- message strcharinfo(0), "Tanisha: I believe in you!";
+ npctalk strnpcinfo(0), "##3I believe in you!", strcharinfo(0);
end;
OnTimer1000:
@@ -238,16 +238,16 @@ OnTick:
if (Hp > 20)
end;
heal MaxHp, 0;
- message strcharinfo(0), "Tanisha: You're doing good!";
+ npctalk strnpcinfo(0), "##3You're doing good!", strcharinfo(0);
end;
OnMaggotDeath:
if (@Maggot_Kills == 1)
- message strcharinfo(0), "Tanisha: Aaahhhh... another one! It will crawl up your legs!";
+ npctalk strnpcinfo(0), "##3Aaahhhh... another one! It will crawl up your legs!", strcharinfo(0);
if (@Maggot_Kills == 2)
- message strcharinfo(0), "Tanisha: Ohh... Irrhk... Eeeeww... They just appear from nowhere!";
+ npctalk strnpcinfo(0), "##3Ohh... Irrhk... Eeeeww... They just appear from nowhere!", strcharinfo(0);
if (@Maggot_Kills == 3)
- message strcharinfo(0), "Tanisha: Yuck... I think I am getting sick.";
+ npctalk strnpcinfo(0), "##3Yuck... I think I am getting sick.", strcharinfo(0);
if (isin("029-2", 98, 84, 106, 89))
set @Maggot_Kills, @Maggot_Kills + 1;
if (@Maggot_Kills < 5)
@@ -283,6 +283,6 @@ L_Warp:
end;
L_Block:
- message strcharinfo(0), "Tanisha: Please come here. I'd like some help!";
+ npctalk "Tanisha", "##3##BPlease come here. ##bI'd like some help!", strcharinfo(0);
end;
}
diff --git a/world/map/npc/029-3/parua.txt b/world/map/npc/029-3/parua.txt
index 1ac59e0a..5ebcc4d7 100644
--- a/world/map/npc/029-3/parua.txt
+++ b/world/map/npc/029-3/parua.txt
@@ -49,7 +49,7 @@ L_Paying:
L_StartFight:
if (getmapusers("029-3") < 5)
goto L_NotEnoughPlayers;
- npctalk "Let the battle begin!";
+ npctalk strnpcinfo(0), "Let the battle begin!";
set $@FIGHT_CAVE_STATUS, 1;
set $@FIGHT_CAVE_LEVEL, 1;
set $@FIGHT_CAVE_PLAYER_COUNT, getmapusers("029-3");
@@ -357,7 +357,7 @@ OnInit:
goto L_CleanUp;
L_CleanUp:
- npctalk "Game Over";
+ npctalk strnpcinfo(0), "Game Over";
set $@candor_npctalk$, "The dungeon is now ready for its next victims.";
donpcevent "#CandorAnnouncer::OnCommandTalk";
areatimer "029-3", 20, 20, 70, 60, 10, "Parua::OnReward";
@@ -373,7 +373,7 @@ L_CleanUp:
end;
L_CleanUp_Announcement:
- npctalk $@SPONSOR$ + " lost the money invested in the fight, since there are less than 5 players in the cave";
+ npctalk strnpcinfo(0), $@SPONSOR$ + " lost the money invested in the fight, since there are less than 5 players in the cave";
set $@SPONSOR$, "";
set $@ANNOUNCE_TIME, 0;
set $@FIGHT_CAVE_STATUS, 0;
diff --git a/world/map/npc/030-4/mana_battery.txt b/world/map/npc/030-4/mana_battery.txt
index 9a198c21..aea601c5 100644
--- a/world/map/npc/030-4/mana_battery.txt
+++ b/world/map/npc/030-4/mana_battery.txt
@@ -123,7 +123,7 @@ L_Start:
next;
mes "it seems like this will not turn out as planned, Look this Guard of Honour is going crazy!";
next;
- npctalk "The Guards are out of control!";
+ npctalk strnpcinfo(0), "The Guards are out of control!";
if ($@XmasBattleStatus)
goto L_BattleAlreadyStarted;
set $@XmasBattleStatus, @xmas_battle_status;
diff --git a/world/map/npc/031-4/cindyCave.txt b/world/map/npc/031-4/cindyCave.txt
index 68bb3f05..377a6b06 100644
--- a/world/map/npc/031-4/cindyCave.txt
+++ b/world/map/npc/031-4/cindyCave.txt
@@ -53,7 +53,7 @@ L_Try_Cage:
mes "You get an uncomfortable feeling and Cindy starts to shiver.";
if ($@FIGHT_YETI_STATUS != 0)
goto L_Yeti;
- npctalk "Oh no, the Yetis...";
+ npctalk strnpcinfo(0), "Oh no, the Yetis...";
// initialize fight
set $@FIGHT_YETI_STATUS, 1;
diff --git a/world/map/npc/033-1/kimarr.txt b/world/map/npc/033-1/kimarr.txt
index e1c26251..6650198f 100644
--- a/world/map/npc/033-1/kimarr.txt
+++ b/world/map/npc/033-1/kimarr.txt
@@ -36,7 +36,7 @@
{
set @halloween_npc_id, $@halloween_npc_kimarr;
callfunc "TrickOrTreat";
-
+
if ($@Fluffy_FighterID == getcharid(3))
goto L_Attention;
@@ -101,7 +101,7 @@ L_Ask:
"Maybe later.",L_Close;
L_AlreadyGotReward:
- npctalk strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and has once again proven to be a good hunter.";
+ npctalk strnpcinfo(0), strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and has once again proven to be a good hunter.";
message strcharinfo(0), "Kimarr: Once again you prove your worth as a hunter! You killed " + $@Fluffy_Kills + " Fluffies.";
callsub S_Clean;
goto L_Close;
@@ -112,7 +112,7 @@ L_Reward1:
if (@state >= 2)
goto L_AlreadyGotReward;
- npctalk "Hooray! " + strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and is now a worthy hunter.";
+ npctalk strnpcinfo(0), "Hooray! " + strcharinfo(0) + " killed " + $@Fluffy_Kills + " Fluffies and is now a worthy hunter.";
// as far as I can tell, this fails because it won't resume from the "next"
// when the script is executed via the "OnFluffyDeath" callback
@@ -199,19 +199,19 @@ L_Action:
areatimer "033-1", 79, 28, 88, 42, 10, "Kimarr::OnTooMany";
if ($@Fluffy_Time == 180)
- npctalk strcharinfo(0) + ", you have 3 minutes.";
+ npctalk strnpcinfo(0), strcharinfo(0) + ", you have 3 minutes.";
if ($@Fluffy_Time == 120)
- npctalk "You have 2 minutes left.";
+ npctalk strnpcinfo(0), "You have 2 minutes left.";
if ($@Fluffy_Time == 60)
- npctalk "You have 1 minute left.";
+ npctalk strnpcinfo(0), "You have 1 minute left.";
if ($@Fluffy_Time == 30)
- npctalk "You have 30 seconds left.";
+ npctalk strnpcinfo(0), "You have 30 seconds left.";
if ($@Fluffy_Time == 15)
- npctalk "You have 15 seconds left.";
+ npctalk strnpcinfo(0), "You have 15 seconds left.";
if ($@Fluffy_Time == 10)
- npctalk "You have 10 seconds left.";
+ npctalk strnpcinfo(0), "You have 10 seconds left.";
if ($@Fluffy_Time == 5)
- npctalk "You have 5 seconds left.";
+ npctalk strnpcinfo(0), "You have 5 seconds left.";
set $@Fluffy_Time, $@Fluffy_Time - 1;
if ($@Fluffy_Time < 0)
goto L_TimeOver;
@@ -222,21 +222,21 @@ L_ContinueTimer:
end;
L_GotOut:
- npctalk "What a strange thing... " + $@Fluffy_Fighter$ + " just disappeared!";
+ npctalk strnpcinfo(0), "What a strange thing... " + $@Fluffy_Fighter$ + " just disappeared!";
callsub S_Clean;
end;
OnTooMany:
if (getcharid(3) == $@Fluffy_FighterID)
end;
- npctalk "Hey " + strcharinfo(0) + "! What are you doing there? This hunt is for " + $@Fluffy_Fighter$ + " alone!";
+ npctalk strnpcinfo(0), "Hey " + strcharinfo(0) + "! What are you doing there? This hunt is for " + $@Fluffy_Fighter$ + " alone!";
warp "033-1", 77, 34;
end;
L_Died:
warp "033-1", 77, 34;
message strcharinfo(0), "You are dead.";
- npctalk "Oh no! " + $@Fluffy_Fighter$ + " got overwhelmed!";
+ npctalk strnpcinfo(0), "Oh no! " + $@Fluffy_Fighter$ + " got overwhelmed!";
callsub S_Clean;
end;
@@ -329,7 +329,7 @@ L_Punish:
if (@MobID == 1072)
areamonster "033-1", 79, 29, 88, 42, "", 1072, 1, "Kimarr::OnYetiDeath";
- npctalk strcharinfo(0) + "! This hunt is for " + $@Fluffy_Fighter$ + " alone!";
+ npctalk strnpcinfo(0), strcharinfo(0) + "! This hunt is for " + $@Fluffy_Fighter$ + " alone!";
heal -Hp, 0;
set @MobID, 0;
end;
@@ -407,7 +407,7 @@ L_FinallyInsertMe:
goto L_Reward1;
L_NotGoodEnough:
- npctalk "What a disappointment, " + strcharinfo(0) + " hunted only " + $@Fluffy_Kills + " Fluffies.";
+ npctalk strnpcinfo(0), "What a disappointment, " + strcharinfo(0) + " hunted only " + $@Fluffy_Kills + " Fluffies.";
message strcharinfo(0), "Kimarr: What a disappointment, you hunted only " + $@Fluffy_Kills + " Fluffies.";
callsub S_Clean;
end;
diff --git a/world/map/npc/051-1/desert.txt b/world/map/npc/051-1/desert.txt
index 02289bf4..73dc7c9a 100644
--- a/world/map/npc/051-1/desert.txt
+++ b/world/map/npc/051-1/desert.txt
@@ -36,7 +36,7 @@
"No", L_Close;
OnTimer1000:
- npctalk "Youuuuuuu... Bring me souls... " + $@illia_num_sealed_souls + " fresh souls... Nooooow. And you shall paaass.";
+ npctalk strnpcinfo(0), "Youuuuuuu... Bring me souls... " + $@illia_num_sealed_souls + " fresh souls... Nooooow. And you shall paaass.";
end;
OnTimer4750:
@@ -44,7 +44,7 @@ OnTimer4750:
end;
OnTimer6500:
- npctalk "Nooooo... Do not let these things take them from youuuuuu!";
+ npctalk strnpcinfo(0), "Nooooo... Do not let these things take them from youuuuuu!";
stopnpctimer;
setnpctimer 0;
end;
diff --git a/world/map/npc/051-3/ambush.txt b/world/map/npc/051-3/ambush.txt
index 305423ca..da12b306 100644
--- a/world/map/npc/051-3/ambush.txt
+++ b/world/map/npc/051-3/ambush.txt
@@ -150,11 +150,11 @@ OnCommandTalk:
end;
OnTimer100:
- npctalk "Did you think you could sneak in our den without a problem?";
+ npctalk strnpcinfo(0), "Did you think you could sneak in our den without a problem?";
end;
OnTimer3600:
- npctalk "Drop your weapons, and come with us!";
+ npctalk strnpcinfo(0), "Drop your weapons, and come with us!";
stopnpctimer;
setnpctimer 0;
end;
@@ -170,11 +170,11 @@ OnCommandTalk:
end;
OnTimer1500:
- npctalk "W00t! More slaves!";
+ npctalk strnpcinfo(0), "W00t! More slaves!";
end;
OnTimer5500:
- npctalk "Ahaha, that was easy! Ok, knock them out!";
+ npctalk strnpcinfo(0), "Ahaha, that was easy! Ok, knock them out!";
stopnpctimer;
setnpctimer 0;
end;
diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index a8a2dfa2..efc0a20a 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -154,7 +154,7 @@ L_Continue:
end;
OnCommandTalk:
- npctalk $@illia_lobby_voices$[$@illia_lobby_voices_index];
+ npctalk strnpcinfo(0), $@illia_lobby_voices$[$@illia_lobby_voices_index];
end;
}
@@ -189,50 +189,50 @@ L_TalkToHero:
OnTimer1500:
if ($@illia_level_5_progress != 4)
end;
- npctalk "Yes " + $@ILLIA_HERO$ + ", I am Luvia.";
+ npctalk strnpcinfo(0), "Yes " + $@ILLIA_HERO$ + ", I am Luvia.";
end;
OnTimer4500:
if ($@illia_level_5_progress != 4)
end;
- npctalk "How nice of all of you to have come to save me!";
+ npctalk strnpcinfo(0), "How nice of all of you to have come to save me!";
end;
OnTimer7500:
if ($@illia_level_5_progress != 4)
end;
- npctalk "But I fear...";
+ npctalk strnpcinfo(0), "But I fear...";
end;
OnTimer10500:
if ($@illia_level_5_progress != 4)
end;
- npctalk "... that you are mistaken about who has to be saved!";
+ npctalk strnpcinfo(0), "... that you are mistaken about who has to be saved!";
end;
OnTimer13500:
if ($@illia_level_5_progress != 4)
end;
- npctalk "Don't make these faces...";
+ npctalk strnpcinfo(0), "Don't make these faces...";
end;
OnTimer16500:
if ($@illia_level_5_progress != 4)
end;
- npctalk "Valia is just helping me by sending new soldiers for my personal army!";
+ npctalk strnpcinfo(0), "Valia is just helping me by sending new soldiers for my personal army!";
end;
OnTimer21500:
if ($@illia_level_5_progress != 4)
end;
- npctalk "So, if I may... Let's see what you are made of!";
+ npctalk strnpcinfo(0), "So, if I may... Let's see what you are made of!";
end;
// Monster invokes timers
OnTimer24500:
if ($@illia_level_5_progress != 4)
end;
- npctalk "Demonotis!";
+ npctalk strnpcinfo(0), "Demonotis!";
misceffect FX_EVIL_SUMMON;
callsub S_GetHeroRect;
areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
@@ -242,7 +242,7 @@ OnTimer24500:
OnTimer44000:
if ($@illia_level_5_progress != 4)
end;
- npctalk "Demonotis!";
+ npctalk strnpcinfo(0), "Demonotis!";
misceffect FX_EVIL_SUMMON;
callsub S_GetHeroRect;
areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
@@ -252,7 +252,7 @@ OnTimer44000:
OnTimer77000:
if ($@illia_level_5_progress != 4)
end;
- npctalk "Demonotis!";
+ npctalk strnpcinfo(0), "Demonotis!";
misceffect FX_EVIL_SUMMON;
callsub S_GetHeroRect;
areamonster "052-2", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::OnDSDeath";
@@ -266,25 +266,25 @@ OnTimer77000:
OnTimer6500:
if ($@illia_level_5_progress != 6)
end;
- npctalk "Okay. You have some skill.";
+ npctalk strnpcinfo(0), "Okay. You have some skill.";
end;
OnTimer10000:
if ($@illia_level_5_progress != 6)
end;
- npctalk "But that was only the beginning!";
+ npctalk strnpcinfo(0), "But that was only the beginning!";
end;
OnTimer13000:
if ($@illia_level_5_progress != 6)
end;
- npctalk "I'll leave you in the good hands of your predecessors. Farewell!";
+ npctalk strnpcinfo(0), "I'll leave you in the good hands of your predecessors. Farewell!";
end;
OnTimer18500:
if ($@illia_level_5_progress != 6)
end;
- npctalk "Demonotis Major!";
+ npctalk strnpcinfo(0), "Demonotis Major!";
misceffect FX_EVIL_SUMMON;
misceffect FX_MAGIC_DARK_EXPLOSION;
callsub S_GetHeroRect;
@@ -309,7 +309,7 @@ OnTimer2000:
setnpctimer 0;
// Mock players randomly (more or less once every 40 secs) and if still enough mobs running after them
if ($@illia_level_5_progress == 5 && rand(20) == 0 && (mobcount("052-2", "Luvia?::OnDSDeath") > 20))
- npctalk "Ahaha! Run... Run!";
+ npctalk strnpcinfo(0), "Ahaha! Run... Run!";
if ($@illia_level_5_progress == 5 && (mobcount("052-2", "Luvia?::OnDSDeath") < 0))
goto L_AllWavesClear;
if ($@illia_level_5_progress == 7 && (mobcount("052-2", "Luvia?::OnWGDeath") < 0))
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index a602704e..02d7a7ac 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -63,19 +63,19 @@ L_ShouldNotBeHere:
end;
OnTimer1000:
- npctalk "Oh well, who thought you would survive so far?";
+ npctalk strnpcinfo(0), "Oh well, who thought you would survive so far?";
end;
OnTimer5000:
- npctalk "All this way, for nothing, only to die from my hands...";
+ npctalk strnpcinfo(0), "All this way, for nothing, only to die from my hands...";
end;
OnTimer10000:
- npctalk "Don't worry, you will continue to live, for my sake.";
+ npctalk strnpcinfo(0), "Don't worry, you will continue to live, for my sake.";
end;
OnTimer15000:
- npctalk "One piece of advice: get prepared!";
+ npctalk strnpcinfo(0), "One piece of advice: get prepared!";
stopnpctimer;
setnpctimer 0;
donpcevent "#LuviaDaemon::OnCommandInvoke";