Merge branch 'hocus/deprecate_lg' into 'master'

Prepare serverdata for evol-hercules!31

See merge request evol/serverdata!284

4 files changed, 8 insertions, 8 deletions

diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index 54402750..d5a330f2 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -171,7 +171,7 @@ function	script	BarberChangeRace	{
 function	script	Barber	{
     if (getarg(0, true)) {
         mesn;
-        mesq lg("Hello, young lady.", "Hello, young man.");
+        mesq l("Hello.");
         next;
     }
     mesq l("What would you like me to do?");
diff --git a/npc/functions/legiontalk.txt b/npc/functions/legiontalk.txt
index fbc35e1f..25004c07 100644
--- a/npc/functions/legiontalk.txt
+++ b/npc/functions/legiontalk.txt
@@ -46,10 +46,10 @@ function	script	legiontalk	{
             npctalkonce(l("I can't stay here and talk all day. I have a job to do."));
             break;
         case 10:
-            npctalkonce(lg("Keep moving girl.", "Keep moving boy."));
+            npctalkonce(l("Keep moving!"));
             break;
         case 11:
-            npctalkonce(lg("So you think you're tough? A warrior must also be loyal and patient."));
+            npctalkonce(l("So you think you're tough? A warrior must also be loyal and patient."));
             break;
         case 12:
             emotion E_LOOKAWAY;
diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index 28b61c7c..8029f3eb 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -54,8 +54,8 @@ function	script	mesq	{
 }
 
 function	script	g	{
-    // TODO: remove gendered lines from NPCs, or use any(getarg(0), getarg(1)) to make it random
-    return BodyType == 0 ? getarg(0) : getarg(1);
+    consolemes(CONSOLEMES_ERROR, "Deprecated function \"g\" used, results are not reliable.");
+    return rand(1000) % 2 ? getarg(0) : getarg(1);
 }
 
 function	script	b	{
diff --git a/npc/functions/resetstatus.txt b/npc/functions/resetstatus.txt
index bb4b22b4..d5d4fdda 100644
--- a/npc/functions/resetstatus.txt
+++ b/npc/functions/resetstatus.txt
@@ -64,9 +64,9 @@ function	script	ConfirmStatusReset	{
     //mesc l("WARNING: Permanent boosts will return to their fruit form."), 1;
     mesc l("WARNING: Status resets cannot be reverted!"), 1;
 
-    switch (select(lg("Yes, I am sure. Please reset my status!"),
-                   lg("I need to think about it..."),
-                   lg("I won't need it, thank you.")))
+    switch (select(l("Yes, I am sure. Please reset my status!"),
+                   l("I need to think about it..."),
+                   l("I won't need it, thank you.")))
     {
         case 1:
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,