Replace g(l(), l()) to lg()

6 files changed, 57 insertions, 41 deletions

diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index ef0fd127..0966afcb 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -7,16 +7,18 @@
 000-0-0.gat,22,17,0,1	script	Elmo	309,{
 OnTalk:
     mesn "Elmo";
-    mes g(l("This girl is lucky, that we found her before a shark did. I have no idea where this came from. By the way, did you see the logo on her raft?"), l("This guy is lucky, that we found him before a shark did. I have no idea where this came from. By the way, did you see the logo on his raft?"));
+    mes g(l("This girl is lucky, that we found her before a shark did. I have no idea where this came from. By the way, did you see the logo on her raft?"),
+          l("This guy is lucky, that we found him before a shark did. I have no idea where this came from. By the way, did you see the logo on his raft?"));
     next;
     mesn "Magic Arpan";
-    mes g(l("Yeye, it's the logo of the warrior guild of Esperia, I wonder what this yoiis was doing so far away from the coast.#1"), l("Yeye, it's the logo of the warrior guild of Esperia, I wonder what this yoiis was doing so far away from the coast.#2"));
+    mes lg("Yeye, it's the logo of the warrior guild of Esperia, I wonder what this yoiis was doing so far away from the coast.");
     next;
     mesn "Elmo";
     mes l("I wonder too...");
     next;
     mesn "Magic Arpan";
-    mes g(l("Maybe she was one of these who got lost last month? The yoiis that got a secret quest from the Warrior guild, and from Esperia!"), l("Maybe he was one of these who got lost last month? The yoiis that got a secret quest from the Warrior guild, and from Esperia!"));
+    mes g(l("Maybe she was one of these who got lost last month? The yoiis that got a secret quest from the Warrior guild, and from Esperia!"),
+          l("Maybe he was one of these who got lost last month? The yoiis that got a secret quest from the Warrior guild, and from Esperia!"));
     next;
     mesn "Elmo";
     mes l("It makes sense, do you think we should inform the capt'n about it?");
@@ -25,13 +27,15 @@ OnTalk:
     mes l("Yeye.");
     next;
     mesn "Elmo";
-    mes g(l("Ok, I'm going to his room, keep an eye on her, we still don't know if she is an enemy or an ally..."), l("Ok, I'm going to his room, keep an eye on him, we still don't know if he is an enemy or an ally..."));
+    mes g(l("Ok, I'm going to his room, keep an eye on her, we still don't know if she is an enemy or an ally..."),
+          l("Ok, I'm going to his room, keep an eye on him, we still don't know if he is an enemy or an ally..."));
     next;
     mesn "Magic Arpan";
     mes l("I will yaying do.");
     next;
     mesn "Elmo";
-    mes g(l("Oh, and give her some basic coats, poor girl, the one she had was much in worse condition that the ones we have!"), l("Oh, and give him some basic coats, poor guy, the one he had was much in worse condition that the ones we have!"));
+    mes g(l("Oh, and give her some basic coats, poor girl, the one she had was much in worse condition that the ones we have!"),
+          l("Oh, and give him some basic coats, poor guy, the one he had was much in worse condition that the ones we have!"));
     next;
     mesn "Magic Arpan";
     mes l("Yayayaya, for the first time someone is dressed worse then us!");
@@ -40,10 +44,12 @@ OnTalk:
     mes l("He he... OK, I'm going to the upper level, to inform the captain.");
     next;
     mesn "Magic Arpan";
-    mes g(l("I will give her everything she needs, don't worry."), l("I will give him everything he needs, don't worry."));
+    mes g(l("I will give her everything she needs, don't worry."),
+          l("I will give him everything he needs, don't worry."));
     next;
     mesn "Elmo";
-    mes g(l("OK, I think she's waking up, go see her."), l("OK, I think he's waking up, go see him."));
+    mes g(l("OK, I think she's waking up, go see her."),
+          l("OK, I think he's waking up, go see him."));
     next;
     warp "000-2-1.gat", 40, 38;
     savepoint "000-2-1.gat",40,38;
diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt
index af24f246..c5c3d9ab 100644
--- a/npc/000-2-0/billybons.txt
+++ b/npc/000-2-0/billybons.txt
@@ -16,7 +16,7 @@
     mesn l("The sailor chugs his beer");
 
     menu
-        g(l("Excuse me? Do you know who I am?#0"), l("Excuse me? Do you know who I am?#1")), -;
+        lg("Excuse me? Do you know who I am?"), -;
 
     mesn;
     mesq l("Don't do do theee... *hick* with me eh!");
@@ -26,7 +26,7 @@
         l("Alright, bye!"), -;
 
     mesn;
-    mesq g(l("NO and *hick* NO, you and you and your... *burp* stupi*hick* guild!#0"), l("NO and *hick* NO, you and you and your... *burp* stupi*hick* guild!#1"));
+    mesq lg("NO and *hick* NO, you and you and your... *burp* stupi*hick* guild!");
     mesq l("You tried to get ride of me, eeh?? But suprise! I'm still here...*hick* Or there....");
     next;
 
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index ae3ba837..6023c69b 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -20,7 +20,7 @@
   set @s$, l("I don't want to change my language, sorry.");
   l_Menu:
   menu
-    g(l("I made a mistake, I would like to change my language.#0"), l("I made a mistake, I would like to change my language.#1")), l_ChooseLang,
+    lg("I made a mistake, I would like to change my language."), l_ChooseLang,
     l("Could you explain to me where I am?"), l_WhereIam,
     l("What happened to me?"), l_What,
     l("Nothing, sorry."), l_Close;
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 7f2fe7bd..2d4461d4 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -95,66 +95,67 @@ OnTalk:
     set @q, geta2(ShipQuests, ShipQuests_Arpan);
     mesn;
     if (@q > 0) goto l_Menu;
-    mes g(l("Yeye, you are really lucky to be alive. You are in good enough shape for walking - do you remember what happened?#0"), l("Yeye, you are really lucky to be alive. You are in good enough shape for walking - do you remember what happened?#1"));
+    mes lg("Yeye, you are really lucky to be alive. You are in good enough shape for walking - do you remember what happened?");
     seta2 ShipQuests, ShipQuests_Arpan, 1;
     menu
-        g(l("I only remember I was rescued by you.#0"), l("I only remember I was rescued by you.#1")), l_Story,
-        g(l("I can't remember anything.#0"), l("I don't remember anything.#1")), l_OhWell;
+        lg("I only remember I was rescued by you."), l_Story,
+        lg("I can't remember anything."), l_OhWell;
     close;
 
 OnClothNotTaken:
     mesn;
-    mes g(l("Yeye, you still did not get your clothes!#0"), l("Yeye, you still did not get your clothes!#1"));
+    mes lg("Yeye, you still did not get your clothes!");
     close;
 
 OnEquip:
     mesn l("Narrator");
-    mes g(l("##9Open your inventory (F3 key), select the clothes one by one and equip them.##0#0"), l("##9Open your inventory (F3 key), select the clothes one by one and equip them.#1##0"));
+    mes col(lg("Open your inventory (F3 key), select the clothes one by one and equip them."), 9);
     close;
 
 l_OhWell:
-    mes g(l("Oh well, we rescued you when you were yaying adrift on sea.#0"), l("Oh well, we rescued you when you were yaying adrift on sea.#1"));
+    mes lg("Oh well, we rescued you when you were yaying adrift on sea.");
 
 l_Story:
-    mes g(l("You were yaying sleeping for quite some days there, our shipkeeper, Julia, was here with you, she did her best to fix your injuries during this time.#0"), l("You were yaying sleeping for quite some days there, our shipkeeper, Julia, was here with you, she did her best to fix your injuries during this time.#1"));
+    mes lg("You were yaying sleeping for quite some days there, our shipkeeper, Julia, was here with you, she did her best to fix your injuries during this time.");
     next;
-    mes g(l("Yaya, you should go see her! She will be happy to see you.#0"), l("Yaya, you should go see her! She will be happy to see you.#1"));
+    mes lg("Yaya, you should go see her! She will be happy to see you.");
     next;
-    mes g(l("Also, we took your yayed clothes, as they were... Yeyeye... In bad condition, go check the box by your bed, there is some new ones inside.#0"), l("Also, we took your yayed clothes, as they were... Yeyeye... In bad condition, go check the box around your bed, there is some new ones inside.#1"));
+    mes lg("Also, we took your yayed clothes, as they were... Yeyeye... In bad condition, go check the box around your bed, there is some new ones inside.");
 l_Menu:
     mes l("What yeye could I do for you today?");
     set @equipped, getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200;
     menu
-        g(l("Could you tell me where I am?#0"), l("Could you tell me where I am?#1")), l_Where,
-        g(l("Where can I find Julia?#0"), l("Where can I find Julia?#1")), l_Julia,
+        lg("Could you tell me where I am?"), l_Where,
+        lg("Where can I find Julia?"), l_Julia,
         l("Who are you?"), l_Who,
         rif(geta(ShipQuests, ShipQuests_ArpanMoney) == 0, l("Where are my old cloths?")), l_WhereOldClothes,
-        rif(!@equipped, g(l("What should I add after taking these clothes?#0"), l("What should I add after taking these clothes?#1"))), l_WhatCloth,
+        rif(!@equipped, lg("What should I add after taking these clothes?")), l_WhatCloth,
         rif(!@equipped, l("Thank you, I'll take them."), l("Nothing, sorry.")), l_Quit;
     close;
 
 l_Where:
     mesn;
-    mes g(l("You are on our ship, we are actually yeyending our long merchant traveling adventure to the city of Artis.#0"), l("You are on our ship, we are actually yeyending our long merchant traveling adventure to the city of Artis.#1"));
+    mes lg("You are on our ship, we are actually yeyending our long merchant traveling adventure to the city of Artis.");
     next;
-    mes g(l("We will be yaying there in a few days, so we will drop you off there. You will see, citizens are polite and you can still ask for help in the warrior guild. They can help find a job for you or maybe help you find out what happened to you out at sea!#0"), l("We will be yaying there in a few days, so we will drop you off there. You will see, citizens are polite and you can still ask for help in the warrior guild. They can help find a job for you or maybe help you find out what happened to you out atsea!#1"));
+    mes lg("We will be yaying there in a few days, so we will drop you off there. You will see, citizens are polite and you can still ask for help in the warrior guild. They can help find a job for you or maybe help you find out what happened to you out at sea!");
     next;
     goto l_Menu;
 
 l_WhereOldClothes:
     mesn;
-    mes g(l("We tried to clean them but the sea water mostly killed them. It's why we gave you these cloths, they are not very good but it's all that we got."),  l("We tried to clean them but the sea water mostly killed them. It's why we gave you these cloths, they are not very good but it's all that we got."));
+    mes lg("We tried to clean them but the sea water mostly killed them. It's why we gave you these cloths, they are not very good but it's all that we got.");
     next;
-    mes g(l("Oh, now that I remember, we also find some money on your pockets, here they are!"), l("Oh, now that I remember, we also find some money on your pockets, here they are!"));
+    mes lg("Oh, now that I remember, we also find some money on your pockets, here they are!");
     seta ShipQuests, ShipQuests_ArpanMoney, 1;
     set zeny, zeny+25;
     next;
     goto l_Menu;
 
 l_Julia:
-    mes g(l("She is on the upper level, yeye can't miss her. She is the only girl in this crew, oh well, except for you now yeyeye!"), l("She is on the upper level, yeye can't miss her. She is the only girl in this crew."));
+    mes g(l("She is on the upper level, yeye can't miss her. She is the only girl in this crew, oh well, except for you now yeyeye!"),
+          l("She is on the upper level, yeye can't miss her. She is the only girl in this crew."));
     next;
-    mes g(l("You can go to your right to go on this upper level.#0"), l("You can go to your right to go on this upper level.#1"));
+    mes lg("You can go to your right to go on this upper level.");
     next;
     goto l_Menu;
 
@@ -164,10 +165,10 @@ l_Who:
     goto l_Menu;
 
 l_WhatCloth:
-    mes g(l("Oh yeyeye, as they are not eatable, you can try to equip them!#0"), l("Oh yeyeye, as they are not eatable, you can try to equip them!#1"));
+    mes lg("Oh yeyeye, as they are not eatable, you can try to equip them!");
     next;
     mesn l("Narrator");
-    mes g(l("##9Open your inventory (F3 key), select the clothes one by one and equip them.##0#0"), l("##9Open your inventory (F3 key), select the clothes one by one and equip them.#1##0"));
+    mes col(lg("Open your inventory (F3 key), select the clothes one by one and equip them."), 9);
     next;
     goto l_Menu;
 
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index f0eec4f9..f558387f 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -63,7 +63,7 @@
 
   OnTooWeak:
     mesn;
-    mesq g(l("I need help for cleaning the wedge of the ship, but you aren't strong enough to help me.#0"), l("I need help for cleaning the wedge of the ship, but you aren't strong enough to help me.#1"));
+    mesq lg("I need help for cleaning the wedge of the ship, but you aren't strong enough to help me.");
     close;
 
   OnStop:
@@ -123,7 +123,7 @@
     mesn;
     mesq l("I will give you @@gp.", 500);
     menu
-      g(l("Okay, I'm ready to work!#0"), l("Okay, I'm ready to work!#1")), -,
+      lg("Okay, I'm ready to work!"), -,
       l("What? This reward is too small!"), l_Close;
     if ($@RAT_SAILOR_HELPER != "") goto OnDontNeedHelp;
     seta4 ShipQuests, ShipQuests_Peter, 2;
diff --git a/npc/000-2-3/sailors.txt b/npc/000-2-3/sailors.txt
index f94a74c4..a556b170 100644
--- a/npc/000-2-3/sailors.txt
+++ b/npc/000-2-3/sailors.txt
@@ -10,10 +10,12 @@ OnTouch:
     if (geta(ShipQuests, ShipQuests_Door) == 1) end;
     seta ShipQuests, ShipQuests_Door, 1;
     mesn "Elmo";
-    mesq g(l("So it's why we wanted to warn you, maybe she comes from this guild, as the sign was on her raft."), l("So it's why we wanted to warn you, maybe he comes from this guild, as the sign was on his raft."));
+    mesq g(l("So it's why we wanted to warn you, maybe she comes from this guild, as the sign was on her raft."),
+           l("So it's why we wanted to warn you, maybe he comes from this guild, as the sign was on his raft."));
     next;
     mesn "Captain Nard";
-    mesq g(l("I see, warn other sailors about this. But if she is a part of Guild, then she is also our ally."), l("I see, warn other sailors about this. But if he is a part of Guild, then he is also our ally."));
+    mesq g(l("I see, warn other sailors about this. But if she is a part of Guild, then she is also our ally."),
+           l("I see, warn other sailors about this. But if he is a part of Guild, then he is also our ally."));
     next;
     mesn "Elmo";
     mesq l("I will.");
@@ -21,7 +23,8 @@ OnTouch:
     mesq l("About the Guild of Esperia, I wonder what we can think abou them if I can say my opinion. Some rumors say that they did some monstruos things and that they are hidding us a lot of things.");
     next;
     mesn "Captain Nard";
-    mesq l("This kind of talk could be punished, but I agree that I don't specially like them too, ") + g(l("keep an eye on her.#0"), l("keep an eye on him.#1"));
+    mesq g(l("This kind of talk could be punished, but I agree that I don't specially like them too, keep an eye on her."),
+           l("This kind of talk could be punished, but I agree that I don't specially like them too, keep an eye on him."));
     next;
     mesq l("But if he is amnesic as said Julia, we won't need to worry about him.");
     next;
@@ -35,10 +38,12 @@ OnTouch:
     if (geta(ShipQuests, ShipQuests_Door) == 1) end;
     seta ShipQuests, ShipQuests_Door, 1;
     mesn "Elmo";
-    mesq g(l("So it's why we wanted to warn you, maybe she comes from this guild, as the sign was on her raft."), l("So it's why we wanted to warn you, maybe he comes from this guild, as the sign was on his raft."));
+    mesq g(l("So it's why we wanted to warn you, maybe she comes from this guild, as the sign was on her raft."),
+           l("So it's why we wanted to warn you, maybe he comes from this guild, as the sign was on his raft."));
     next;
     mesn "Captain Nard";
-    mesq g(l("I see, warn other sailors about this. But if she is a part of Guild, then she is also our ally."), l("I see, warn other sailors about this. But if he is a part of Guild, then he is also our ally."));
+    mesq g(l("I see, warn other sailors about this. But if she is a part of Guild, then she is also our ally."),
+           l("I see, warn other sailors about this. But if he is a part of Guild, then he is also our ally."));
     next;
     mesn "Elmo";
     mesq l("I will.");
@@ -46,7 +51,8 @@ OnTouch:
     mesq l("About the Guild of Esperia, I wonder what we can think abou them if I can say my opinion. Some rumors say that they did some monstruos things and that they are hidding us a lot of things.");
     next;
     mesn "Captain Nard";
-    mesq l("This kind of talk could be punished, but I agree that I don't specially like them too, ") + g(l("keep an eye on her.#0"), l("keep an eye on him.#1"));
+    mesq g(l("This kind of talk could be punished, but I agree that I don't specially like them too, keep an eye on her."),
+           l("This kind of talk could be punished, but I agree that I don't specially like them too, keep an eye on him."));
     next;
     mesq l("But if he is amnesic as said Julia, we won't need to worry about him.");
     next;
@@ -60,10 +66,12 @@ OnTouch:
     if (geta(ShipQuests, ShipQuests_Door) == 1) end;
     seta ShipQuests, ShipQuests_Door, 1;
     mesn "Elmo";
-    mesq g(l("So it's why we wanted to warn you, maybe she comes from this guild, as the sign was on her raft."), l("So it's why we wanted to warn you, maybe he comes from this guild, as the sign was on his raft."));
+    mesq g(l("So it's why we wanted to warn you, maybe she comes from this guild, as the sign was on her raft."),
+           l("So it's why we wanted to warn you, maybe he comes from this guild, as the sign was on his raft."));
     next;
     mesn "Captain Nard";
-    mesq g(l("I see, warn other sailors about this. But if she is a part of Guild, then she is also our ally."), l("I see, warn other sailors about this. But if he is a part of Guild, then he is also our ally."));
+    mesq g(l("I see, warn other sailors about this. But if she is a part of Guild, then she is also our ally."),
+           l("I see, warn other sailors about this. But if he is a part of Guild, then he is also our ally."));
     next;
     mesn "Elmo";
     mesq l("I will.");
@@ -71,7 +79,8 @@ OnTouch:
     mesq l("About the Guild of Esperia, I wonder what we can think abou them if I can say my opinion. Some rumors say that they did some monstruos things and that they are hidding us a lot of things.");
     next;
     mesn "Captain Nard";
-    mesq l("This kind of talk could be punished, but I agree that I don't specially like them too, ") + g(l("keep an eye on her.#0"), l("keep an eye on him.#1"));
+    mesq g(l("This kind of talk could be punished, but I agree that I don't specially like them too, keep an eye on her."),
+           l("This kind of talk could be punished, but I agree that I don't specially like them too, keep an eye on him."));
     next;
     mesq l("But if he is amnesic as said Julia, we won't need to worry about him.");
     next;