From 5a597ebb8adeeb524b650b482a5835f0b90b7259 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 16 Oct 2018 22:45:22 -0300 Subject: Create a get_race() function. This way, if l() breaks stuff, I can remove it. --- npc/021-1/yeti.txt | 12 ++++++------ npc/functions/main.txt | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/npc/021-1/yeti.txt b/npc/021-1/yeti.txt index b3b877165..b5c6181f6 100644 --- a/npc/021-1/yeti.txt +++ b/npc/021-1/yeti.txt @@ -40,17 +40,17 @@ L_Walking: mesq l("Grr, where's Mercury... He was supposed to keep watch over this spot... It was meant to be my free time!"); next; mesn; - mesq l("And you, @@... You better get walking. Soon.", l($@allraces$[Class])); + mesq l("And you, @@... You better get walking. Soon.", get_race()); close; L_Disrupt: mesn; - mesq l("Grrr... Why are @@ on this cave?! What Mercury was doing?!", l($@allraces$[Class])); + mesq l("Grrr... Why are @@ on this cave?! What Mercury was doing?!", get_race()); close; L_Warning: mesn; - mesq l("Stupid @@, get out of this cave before I lose my patience!", l($@allraces$[Class])); + mesq l("Stupid @@, get out of this cave before I lose my patience!", get_race()); close; L_Hit: @@ -81,17 +81,17 @@ OnInit: L_Walking: mesn; - mesq l("You, @@... You better get walking. Soon.", l($@allraces$[Class])); + mesq l("You, @@... You better get walking. Soon.", get_race()); close; L_Disrupt: mesn; - mesq l("Grrr... Why are @@ on this cave?! Begone, before I lose my patience!", l($@allraces$[Class])); + mesq l("Grrr... Why are @@ on this cave?! Begone, before I lose my patience!", get_race()); close; L_Warning: mesn; - mesq l("Stupid @@, get out of this cave before I lose my patience!", l($@allraces$[Class])); + mesq l("Stupid @@, get out of this cave before I lose my patience!", get_race()); close; L_Hit: diff --git a/npc/functions/main.txt b/npc/functions/main.txt index 9446d218b..b1777cb3d 100644 --- a/npc/functions/main.txt +++ b/npc/functions/main.txt @@ -92,6 +92,11 @@ function script mesc { return; } +function script get_race { + .@g=getarg(0, Class); + return l($@allraces$[.@g]); +} + // Function to show narrator text. Accepts string args. // If first arg is a number N, then it represents bit flags. // Bit flags : -- cgit v1.2.3-60-g2f50