diff options
| author | Jesusaves <cpntb1@ymail.com> | 2021-01-09 22:18:14 +0000 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2021-01-09 22:18:14 +0000 |
| commit | 94d1b1895a4a746e791f5c0a7dbba9405b36a85d (patch) | |
| tree | 67d1ead1ca74456f9ba1ed6f815e066148e9f403 | |
| parent | b12c37346ced0014d3900b2b86c1319cd7d1db80 (diff) | |
| parent | 2283d32a1cf2961253a6dc63979f5c80e8175f8a (diff) | |
| download | serverdata-94d1b1895a4a746e791f5c0a7dbba9405b36a85d.tar.gz serverdata-94d1b1895a4a746e791f5c0a7dbba9405b36a85d.tar.bz2 serverdata-94d1b1895a4a746e791f5c0a7dbba9405b36a85d.tar.xz serverdata-94d1b1895a4a746e791f5c0a7dbba9405b36a85d.zip | |
Merge branch 'hocus/deprecate_lg' into 'master'
Prepare serverdata for evol-hercules!31
See merge request evol/serverdata!284
88 files changed, 260 insertions, 262 deletions
diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt index 243b13d0..d72d55f2 100644 --- a/npc/000-0-0/sailors.txt +++ b/npc/000-0-0/sailors.txt @@ -12,11 +12,11 @@ OnTalk: deltimer("Elmo#sailors::OnSlow"); setcamnpc; mesn "Elmo"; - mesq lg("This girl is lucky we found her before a shark did. I have no idea where she comes from. By the way, did you see the logo on her raft?", "This guy is lucky we found him before a shark did. I have no idea where he comes from. By the way, did you see the logo on his raft?"); + mesq l("Poor thing. Fortunately we were more attentive than the sharks in these waters. I wonder where this tragic journey started. By the way, did you see the logo on that raft?"); next; mesn "Magic Arpan"; - mesq lg("Yeye, it's the logo of the Legion of Aemil in Esperia! I wonder what this yoiis was doing so far away from the coast."); + mesq l("Yeye, it's the logo of the Legion of Aemil in Esperia! I wonder what this yoiis was doing so far away from the coast."); next; mesn "Elmo"; @@ -24,7 +24,7 @@ OnTalk: next; mesn "Magic Arpan"; - mesq lg("Maybe she was one of those who got lost last month. She could be the yoiis from Esperia who got a secret diplomatic mission from the Legion of Aemil!", "Maybe he was one of those who got lost last month? He could be the yoiis from Esperia who got a secret diplomatic mission from the Legion of Aemil!"); + mesq l("Did you hear about all those missing people last month? Maybe this is the yoiis from Esperia who got a secret diplomatic mission from the Legion of Aemil!"); next; mesn "Elmo"; @@ -36,7 +36,7 @@ OnTalk: next; mesn "Elmo"; - mesq lg("Alright, I'm going to his room, keep an eye on her, we still don't know if she's friend or foe...", "Alright, I'm going to his room, keep an eye on him, we still don't know if he's friend or foe..."); + mesq l("Alright, I'm going to his room. Keep watch, not that our new friend turns out to be a foe after all..."); next; mesn "Magic Arpan"; @@ -44,7 +44,7 @@ OnTalk: next; mesn "Elmo"; - mesq lg("Oh, and give her some clothes, the poor girl, the ones she had were in an even worse condition than the ones we have.", "Oh, and give him some clothes, the poor guy, the ones he had were in an even worse condition than the ones we have."); + mesq l("Oh, and give our friend - or foe - some clothes, that shabby rags are in even worse condition than ours."); next; mesn "Magic Arpan"; @@ -56,11 +56,11 @@ OnTalk: next; mesn "Magic Arpan"; - mesq lg("I'll give her everything she needs, don't worry.", "I'll give him everything he needs, don't worry."); + mesq l("I'll bring everything that is needed, don't worry."); next; mesn "Elmo"; - mesq lg("Ok, I think she's waking up, go see her.", "Ok, I think he's waking up, go see him."); + mesq l("Oh, look who is waking up!"); next; restorecam; diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt index 265d86a4..d19d4f39 100644 --- a/npc/000-0/sailors.txt +++ b/npc/000-0/sailors.txt @@ -31,22 +31,22 @@ OnTouch: setcamnpc "Sailors", -64, -32; mesn l("Kralog Voice"); - mesq lg("Hey Frenchy!"); + mesq l("Hey Frenchy!"); next; setcamnpc "Sailors", 0, -32; mesn l("Human Voice"); - mesq lg("I think he's from the East..."); + mesq l("Nah, clearly from the East..."); next; setcamnpc "Sailors", 144, -80; mesn l("Tritan Voice"); - mesq lg("What are you guys saying ? It's a Yoiis!"); + mesq l("What are you guys saying ? It's a Yoiis!"); next; setcamnpc; mesn l("Raijin Voice"); - mesq lg("You think she's from the East? As in... Ancea?", "You think he's from the East? As in... Ancea?"); + mesq l("From the East? As in... Ancea?"); next; mesq l("Hey you! Can you hear us? Are you okay?"); next; @@ -68,10 +68,10 @@ OnTouch: setcamnpc; mes ""; mesn; - mesq lg("Oh, she's still alive!", "Oh, he's still alive!"); + mesq l("Oh, still alive? What a relive!"); next; setcamnpc "Sailors", 144, -80; - mesq lg("This girl needs help, we need to rescue her!", "This guy needs help, we need to rescue him!"); + mesq l("This castaway needs help, on to the rescue!"); next; restorecam; diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt index 448895d2..d7c6fed7 100644 --- a/npc/000-1/ale.txt +++ b/npc/000-1/ale.txt @@ -25,7 +25,7 @@ next; menu - lg("Gugli sent me down here to help you."), -, + l("Gugli sent me down here to help you."), -, l("See you aboard."), L_Quit; mes ""; diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt index 50640fd4..f28d7422 100644 --- a/npc/000-1/astapolos.txt +++ b/npc/000-1/astapolos.txt @@ -24,7 +24,7 @@ next; select - lg("Actually, I came here to work on my task."); + l("Actually, I came here to work on my task."); mes ""; mesn; @@ -34,7 +34,7 @@ next; menu - lg("I'm sorry for your situation. They should alternate shifts with other sailors from time to time."), -, + l("I'm sorry for your situation. They should alternate shifts with other sailors from time to time."), -, l("Well if you are whining like that all the time, then I think there is a reason behind their choice."), L_Whyning; mes ""; @@ -50,17 +50,17 @@ mesn; mesq l("You like them, don't you? Just speak with Peter then. He is on the second deck of the ship. He will send you downstairs to the hold, where you will find a furry meal!"); next; - mesq lg("Oh, but you didn't come here to talk about that, am I right?"); + mesq l("Oh, but you didn't come here to talk about that, am I right?"); next; select - lg("Actually, I was here to help you with those boxes. Can I bring one of them back to Gugli?"); + l("Actually, I was here to help you with those boxes. Can I bring one of them back to Gugli?"); mes ""; mesn; mesq l("Usually I don't allow anyone to touch my boxes but..."); next; - mesq lg("You have been so nice to me. So please, take one."); + mesq l("You have been so nice to me. So please, take one."); next; inventoryplace CroconutBox, 1; diff --git a/npc/000-1/fexil.txt b/npc/000-1/fexil.txt index 41462045..7740263c 100644 --- a/npc/000-1/fexil.txt +++ b/npc/000-1/fexil.txt @@ -6,13 +6,13 @@ 000-1,83,98,0 script Fexil NPC_ELVEN_MAN_TRADER,{ mesn; - mesq lg("Greetings traveler."); + mesq l("Greetings traveler."); next; mesq l("I have some clothes and other things for you at a fine price!"); next; mesq l("What I sell comes from every corner of Gasaron. From Esperia to the Land of Fire!"); next; - mesq lg("Interested?"); + mesq l("Interested?"); next; switch (select("Yes, why not.:I would rather sell some stuff.:No, Sorry.")) @@ -33,7 +33,7 @@ mesn; mesq l("Oh... Well, I just started to trade... Thus my technique may not be the best."); next; - mesq lg("Anyway, if you ever feel interested, just check my bag!"); + mesq l("Anyway, if you ever feel interested, just check my bag!"); close; } diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt index dc1ef725..265deae6 100644 --- a/npc/000-1/gugli.txt +++ b/npc/000-1/gugli.txt @@ -46,7 +46,7 @@ OnTalk: if (.@nard > 1 || .@gugli == 2) goto L_TaskCompleted; if (.@gugli == 1) goto L_TaskGiven; - mesq lg("Hi @@, I heard the captain sent you down here, uh?", "Hi @@, I heard the captain sent you down here, uh?", strcharinfo(0)); + mesq l("Hi @@, I heard the captain sent you down here, uh?", strcharinfo(0)); next; mesq l("What an unexpected pleasure, your help is always welcome!"); next; @@ -58,7 +58,7 @@ OnTalk: mes ""; mesn; - mesq lg("Well, even though you have been rescued by us, it doesn't make you an expert sailor, am I right?"); + mesq l("Well, even though you have been rescued by us, it doesn't make you an expert sailor, am I right?"); next; mesq l("But let's talk about this island. We're docking here to find some fine quality goods."); next; @@ -226,7 +226,7 @@ L_TaskCompleted: L_AllComplete: mesq l("Elmo told me what Nard said, congrats!"); next; - mesq lg("You're one of us now, that's great! I was sure that you were a kind lady when I first saw you!", "You're one of us now, that's great! I was sure that you were a good man when I first saw you!"); + mesq l("You're one of us now, that's great! I was sure that you were a good person the first time I saw you!"); next; goto L_Menu; diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt index 2499160b..0d80c932 100644 --- a/npc/000-1/gulukan.txt +++ b/npc/000-1/gulukan.txt @@ -43,11 +43,11 @@ L_Continue: mesn; L_Continue2: - mesq lg("Are you yaying here to explore the island?"); + mesq l("Are you yaying here to explore the island?"); next; menu - lg("Actually Gugli asked me if I would help you bring him some of your boxes."), -, + l("Actually Gugli asked me if I would help you bring him some of your boxes."), -, l("Yes, indeed. I prefer to explore places I have never been to, before doing anything else."), L_Quit; mes ""; @@ -64,7 +64,7 @@ L_Continue2: mes ""; mesn; - mesq lg("Thank you my friend."); + mesq l("Thank you my friend."); close; @@ -88,7 +88,7 @@ L_RandomA: mes ""; mesn; - mesq lg("Yeye sure? I'll yaye some more food in the next box then."); + mesq l("Yeye sure? I'll yaye some more food in the next box then."); close; @@ -155,7 +155,7 @@ L_NoTask: L_TaskDone: mes ""; mesn; - mesq lg("That's perfect, yoiis."); + mesq l("That's perfect, yoiis."); close; diff --git a/npc/000-1/maxe.txt b/npc/000-1/maxe.txt index f7e03fc7..f628c8c0 100644 --- a/npc/000-1/maxe.txt +++ b/npc/000-1/maxe.txt @@ -16,7 +16,7 @@ .@knife = getq(ShipQuests_Knife); mesn; - mesq lg("We are glad captain Nard has let you join us down here!"); + mesq l("We are glad captain Nard has let you join us down here!"); next; mesq l("Living inside a ship is great, but we sometimes need some fresh air."); next; @@ -25,7 +25,7 @@ menu rif(.@gugli == 0, l("Well, is there anything I can do here to help?")), L_Help, - rif(.@gugli == 1, lg("Gugli asked me to help the sailors to gather food. Do you know where I can find them?")), L_Sailors, + rif(.@gugli == 1, l("Gugli asked me to help the sailors to gather food. Do you know where I can find them?")), L_Sailors, rif(.@gugli > 1, l("Seems I've helped everyone here. I don't know what to do now!")), L_Annoyed, rif(.@knife == 0, l("It looks like you are an expert of the life inside 'La Johanne'. Do you know any hidden secrets nobody knows?")), L_Secrets, l("No thanks, not at the moment."), L_Quit; diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt index 1d3ec501..0d13ff0d 100644 --- a/npc/000-1/muller.txt +++ b/npc/000-1/muller.txt @@ -40,7 +40,7 @@ next; select - lg("I am sure that I can run with one of them on my shoulder."); + l("I am sure that I can run with one of them on my shoulder."); mes ""; mesn; diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt index c65bf692..5e33a086 100644 --- a/npc/000-1/sapartan.txt +++ b/npc/000-1/sapartan.txt @@ -12,19 +12,19 @@ setcamnpc "Maxe"; mesn "Maxe"; - mesq lg("@@? Welcome my dear!", "@@? Welcome my dear!", strcharinfo(0)); + mesq l("@@? Welcome my dear!", strcharinfo(0)); next; - mesq lg("Last time I saw you, you were lost at sea on your raft."); + mesq l("Last time I saw you, you were lost at sea on your raft."); next; restorecam; mesn; - mesq lg("True but now she seems pretty fine! Am I right?", "True but now he seems pretty fine! Am I right?"); + mesq l("True but now all seems pretty fine! Am I right?"); next; menu l("Thank you, sir, for your kind words. I am feeling better now."), -, - lg("I'm still a bit weak at the moment. We should probably talk later."), L_Quit; + l("I'm still a bit weak at the moment. We should probably talk later."), L_Quit; mes ""; mesn; @@ -39,16 +39,16 @@ setcamnpc "Maxe"; mes ""; mesn "Maxe"; - mesq lg("Come on, Sap! You are scaring her with your stories.", "Come on, Sap! You are scaring him with your stories."); + mesq l("Come on, Sap! Do not always scare others with your horror stories."); next; - mesq lg("I'm sure she will soon be able to fight all of the creatures living here without any problem.", "I'm sure he will soon be able to fight all of the creatures living here without any problem."); + mesq l("I'm sure this brave fellow will soon be able to fight all of the creatures living here without any problem."); next; restorecam; mes ""; mesn; - mesq lg("Maybe... But I prefer having well-trained people around me when it comes to fighting against dangerous creatures. Do you already feel adept fighting enemies?"); + mesq l("Maybe... But I prefer having well-trained people around me when it comes to fighting against dangerous creatures. Do you already feel adept fighting enemies?"); next; menu diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt index 5d397b15..ec5669d3 100644 --- a/npc/000-1/silvio.txt +++ b/npc/000-1/silvio.txt @@ -9,7 +9,7 @@ mesn; mesq l("Hey!"); next; - mesq lg("How are you doing, cutie?", "How are you doing, dude?"); + mesq l("How are you doing?"); next; menu @@ -19,19 +19,19 @@ mes ""; mesn; - mesq lg("Hehe, no. But I'm sure a fox like you would love to meet a catch like me!", "Hehe, no. But I'm sure a noob like you would like to meet an idol like me."); + mesq l("Hehe, no. But I'm sure somebody like you would love to meet somebody like me! Women want me, men want to be like me!"); next; - mesq lg("So, what good wind brought you here? Were you on your raft to meet me? Or is it because you've heard of my feats in Artis?", "So, what good wind brought you here? Were you on your raft to meet my Julia? Or is it because you wanted to see the beautiful waitresses of Artis?"); + mesq l("So, what good wind brought you here? Were you on your raft to meet me or Julia? Or is it because you've heard of my feats in Artis?"); next; menu - lg("You're right, it's about you.", "You're right, it's about Julia."), L_Julia, + l("You're right, it's about you."), L_Julia, l("What is Artis?"), L_Artis, l("None of them?"), -; mes ""; mesn; - mesq lg("My beauty. I was not always a sailor, you know, I was once an important individual!", "My friend. I was not always a sailor, you know, I was once an important individual!"); + mesq l("You know that I was not always a sailor, right? I was once a very important Person!"); next; mesq l("Before..."); next; @@ -90,14 +90,14 @@ L_VeryImportantNoob: restorecam; mesn; - mesq lg("Duty calls me, *hic*, see you later, honey.", "Duty calls me, *hic*, see you later, dude."); + mesq l("Duty calls me, *hic*, see you later."); close; L_Julia: mes ""; mesn; - mesq lg("You honor me, my beauty, but I'm already taken by Julia!", "Not to kill your dream, but... Julia is mine!"); + mesq l("Not to kill your dreams, but i fear me and Julia are romantically entangled and there is no room for a third person ... on the other hand *smirks frivolous*"); next; mesq l("She said she will accept me when pious will have teeth. It's just a matter of time, you see?"); next; @@ -146,7 +146,7 @@ L_Sailors: setcamnpc "Gugli"; mes ""; mesn "Gugli"; - mesq lg("Stop heckling her, Silvio, or I'll tell her how you always cry like a little baby during thunderstorms.", "Stop heckling him, Silvio, or I'll tell him how you always cry like a little baby during thunderstorms."); + mesq l("Stop heckling, Silvio, or I'll tell about how you always cry like a little baby during thunderstorms."); next; restorecam; diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt index e736c483..89c82f11 100644 --- a/npc/000-1/tibbo.txt +++ b/npc/000-1/tibbo.txt @@ -34,7 +34,7 @@ next; select - lg("Gugli asked me to help you carrying one of these boxes you are filling."); + l("Gugli asked me to help you carrying one of these boxes you are filling."); mes ""; mesn; @@ -95,8 +95,7 @@ L_Aquada: next; mesq l("You can find them in the ocean, near corals and other sea beings. But the sea is too heavy today, you shouldn't try swimming for now."); next; - mesq lg("Otherwise, if you really want one, and if you feel capable, you can try killing tortugas or crocs if you're strong enough. I'm sure they could drop one or two @@s.", - "Otherwise, if you really want one, and if you feel capable, you can try killing tortugas or crocs if you're strong enough. I'm sure they could drop one or two @@s.", getitemlink(Aquada)); + mesq l("Otherwise, if you really want one, and if you feel capable, you can try killing tortugas or crocs if you're strong enough. I'm sure they could drop one or two @@s.", getitemlink(Aquada)); close; diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt index ca7e5b8a..cfdfd7af 100644 --- a/npc/000-2-0/billybons.txt +++ b/npc/000-2-0/billybons.txt @@ -17,7 +17,7 @@ next; select - lg("Excuse me? Do you know who I am?"); + l("Excuse me? Do you know who I am?"); mes ""; mesn; @@ -30,7 +30,7 @@ mes ""; mesn; - mesq lg("No and *hic*... No, you and you and your... *burp* stup*hic* guild!"); + mesq l("No and *hic*... No, you and you and your... *burp* stup*hic* guild!"); next; mesq l("You tried to get rid of me, eeh? But surprise! I'm still here... *hic* Or there..."); next; diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt index e44705bd..4992f949 100644 --- a/npc/000-2-0/julia.txt +++ b/npc/000-2-0/julia.txt @@ -178,7 +178,7 @@ mesn; mesq l("We thought that you could help us understand this, all we know is that we found you cast in the sea, adrift on your raft."); next; - mesq lg("You were in bad shape, you should be happy we found you before the sea killed you."); + mesq l("You were in bad shape, you should be happy we found you before the sea killed you."); next; mesq l("Oh, and there was this inscription on your raft. It represents the Legion of Aemil, one of the four main guilds of Gasaron. Does that help you remember anything, anything at all?"); next; @@ -219,7 +219,7 @@ rif(.@q2 == 2 && countitem(PoisonedDish), l("Well... No wait, I have something for you but you shouldn't eat it... I'm taking it back to the kitchen.")), rif(.@q2 == 2 && countitem(PoisonedDish), l("I have brought you a tasty present for your delicate mouth.")), rif(getskilllv(NV_BASIC) < 6, l("Something is wrong with me, I can't smile nor sit.")), - lg("I made a mistake, I would like to change my language."), + l("I made a mistake, I would like to change my language."), l("Could you explain to me where I am?"), l("What happened to me?"), l("Can I read these rules again?"), @@ -242,7 +242,7 @@ } mesn; - mesq lg("Hello dear!"); + mesq l("Hello dear!"); next; mesq l("What do you want today?"); next; @@ -260,7 +260,7 @@ OnTouch: next; mesq l("My name is Julia, it is me who took care of you after we found you in the sea."); next; - mesq lg("I'm glad to see you're okay."); + mesq l("I'm glad to see you're okay."); next; mesq l("I'm sure that you've got some questions for me, feel free to ask them, but first I need to tell you the rules of proper social conduct on board."); diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt index c76abbdb..919b712d 100644 --- a/npc/000-2-1/alige.txt +++ b/npc/000-2-1/alige.txt @@ -66,8 +66,8 @@ OnFirstEncounter: restorecam; menu - lg("I am, who are you?"), -, - lg("Indeed, I am not."), L_NeedHelp; + l("I am, who are you?"), -, + l("Indeed, I am not."), L_NeedHelp; mes ""; mesn "Narrator"; @@ -136,7 +136,7 @@ L_Accept: l("I think I should report you to the crew members."), -; setcamnpc; - mesq lg("Growl, sniff, grr! You'd better not tell anyone you saw me!"); + mesq l("Growl, sniff, grr! You'd better not tell anyone you saw me!"); close; @@ -161,7 +161,7 @@ L_Accepted: setcamnpc; mes ""; mesn; - mesq lg("Great, what food do you have for me today?"); + mesq l("Great, what food do you have for me today?"); next; restorecam; @@ -280,7 +280,7 @@ L_IntroMenu: l("I think I should report you to the crew members."), -; setcamnpc; - mesq lg("Growl, sniff, grr! You'd better not tell anyone you saw me!"); + mesq l("Growl, sniff, grr! You'd better not tell anyone you saw me!"); close; diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt index 15bdc30b..106d9aaa 100644 --- a/npc/000-2-1/arpan.txt +++ b/npc/000-2-1/arpan.txt @@ -103,16 +103,16 @@ OnTalk: setq ShipQuests_Arpan, 1; deltimer("Magic Arpan::OnSlow"); - mesq lg("Yeye, you are really lucky to be alive. You are in good enough shape for walking, do you remember what happened?"); + mesq l("Yeye, you are really lucky to be alive. You are in good enough shape for walking, do you remember what happened?"); next; menu - lg("I only remember I was rescued by you."), L_Story, - lg("I can't remember anything."), L_OhWell; + l("I only remember I was rescued by you."), L_Story, + l("I can't remember anything."), L_OhWell; OnClothNotTaken: mesn; - mesq lg("Yeye, you still did not get your new clothes from the chest next to your bed!"); + mesq l("Yeye, you still did not get your new clothes from the chest next to your bed!"); close; @@ -128,7 +128,7 @@ OnEquip: L_OhWell: mes ""; - mesq lg("Oh well, we rescued you when you were yaying adrift in the sea."); + mesq l("Oh well, we rescued you when you were yaying adrift in the sea."); next; select @@ -136,12 +136,12 @@ L_OhWell: L_Story: mes ""; - mesq lg("You were yaying sleeping for quite some time there. Our shipkeeper, Julia, was here with you, and she did her best to heal your injuries."); + mesq l("You were yaying sleeping for quite some time there. Our shipkeeper, Julia, was here with you, and she did her best to heal your injuries."); next; if (.@q_julia == 0) setq ShipQuests_Julia, 1; - mesq lg("Yaya, you should go see her! She'll be happy to see you."); + mesq l("Yaya, you should go see her! She'll be happy to see you."); next; - mesq lg("Also, we took your yayed clothes, as they were... Yeyeye... In a bad shape. Go check the chest near your bed, there are some other ones inside."); + mesq l("Also, we took your yayed clothes, as they were... Yeyeye... In a bad shape. Go check the chest near your bed, there are some other ones inside."); setcamnpc "Chest"; close; @@ -153,13 +153,13 @@ L_Menu: menu rif(.@q_nard == 5 && getq(General_Narrator) < 1, l("What can I do now?")), L_GotoSleep, - lg("Could you tell me where I am?"), L_Where, - lg("Where can I find Julia?"), L_Julia, + l("Could you tell me where I am?"), L_Where, + l("Where can I find Julia?"), L_Julia, l("Who are you?"), L_Who, - rif(getq(ShipQuests_ArpanMoney) == 1, lg("Do you know what happened to the gold I had when you guys saved me?")), L_WhereMoney, + rif(getq(ShipQuests_ArpanMoney) == 1, l("Do you know what happened to the gold I had when you guys saved me?")), L_WhereMoney, rif(getq(ShipQuests_ArpanMoney) < 2, l("Where are my old clothes?")), L_WhereOldClothes, rif(getq(ShipQuests_ArpanMoney) == 2 && islegacyaccount(), l("About my my old clothes...")), L_LegacyClothes, - rif(!.@equipped, lg("What should I do after taking these clothes?")), L_WhatCloth, + rif(!.@equipped, l("What should I do after taking these clothes?")), L_WhatCloth, rif(!.@equipped, l("Thank you, I'll take them and put them on.")), -, l("Nothing, sorry."), -; @@ -169,7 +169,7 @@ L_Menu: L_Where: mes ""; mesn; - mesq lg("You're on our ship, we made port to a little island and we're actually yeyending our long merchant traveling adventure at the city of Artis."); + mesq l("You're on our ship, we made port to a little island and we're actually yeyending our long merchant traveling adventure at the city of Artis."); next; mesq l("We will be yaying there in a few days, so we will drop you off there."); next; @@ -181,7 +181,7 @@ L_Where: L_Julia: mes ""; mesn; - mesq lg("She's on the upper level, yeye can't miss her. She's the only girl in this crew, oh well, except for you now yeyeye!", "She's on the upper level, yeye can't miss her. She's the only girl in this crew."); + mesq l("She's on the upper level, yeye can't miss her. She's the only girl in this crew so far."); next; mesn "Narrator"; @@ -201,9 +201,9 @@ L_Who: L_WhereOldClothes: mes ""; mesn; - mesq lg("We tried to clean them but the sea water mostly destroyed them. It's why we gave you these clothes. They're not very nice, but that's all that we have for you."); + mesq l("We tried to clean them but the sea water mostly destroyed them. It's why we gave you these clothes. They're not very nice, but that's all that we have for you."); next; - mes lg("Oh, now that I remember, we also found some money in your pockets, here it is!"); + mes l("Oh, now that I remember, we also found some money in your pockets, here it is!"); next; setq ShipQuests_ArpanMoney, 2; @@ -220,7 +220,7 @@ L_LegacyClothes: if (islegacyaccount()) { mesn strcharinfo(0); select - lg("But... I remember that my clothes were very dear to me..."), + l("But... I remember that my clothes were very dear to me..."), l("Oh okay."); mes ""; if (@menu == 1) { @@ -248,7 +248,7 @@ L_WhereMoney: L_WhatCloth: mes ""; mesn; - mesq lg("Oh yeyeye... As they are not edible, you can maybe try to equip them?"); + mesq l("Oh yeyeye... As they are not edible, you can maybe try to equip them?"); next; mesn "Narrator"; diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt index 6f57dc95..0e3a71be 100644 --- a/npc/000-2-1/chefgado.txt +++ b/npc/000-2-1/chefgado.txt @@ -90,7 +90,7 @@ L_Rude: mes ""; mesn; - mesq lg("Well, eh-heh... Welcome aboard, cutie!", "Well, eh-heh... Welcome aboard, son!"); + mesq l("Well, eh-heh... Welcome aboard, young fellow!"); next; mesq l("I just realized I am lacking some common things, and one key ingredient, to prepare a... A special recipe."); next; @@ -106,7 +106,7 @@ L_Rude: setq ShipQuests_ChefGado, 1; mes ""; mesn; - mesq lg("Well done! Collect all the ingredients and then come back here. You will be rewarded once I am satisfied that they understand who rules this ship!"); + mesq l("Well done! Collect all the ingredients and then come back here. You will be rewarded once I am satisfied that they understand who rules this ship!"); next; mesq l("Before you go, let me tell you how to get @@s, because you don't look very smart.", getitemlink(HalfCroconut)); @@ -126,8 +126,7 @@ L_QuestAccepted: L_OpenCroconut: mes ""; mesn; - mesq lg("Take a @@ and try opening it using something like a sharp knife. I doubt you'll succeed, you're being so weak in everything.", - "Take a @@ and try opening it using something like a sharp knife. I doubt you'll succeed, you're being so weak in everything.", getitemlink(Croconut)); + mesq l("Take a @@ and try opening it using something like a sharp knife. I doubt you'll succeed, you're being so weak in everything.", getitemlink(Croconut)); next; mesq l("Now move!"); @@ -202,7 +201,7 @@ L_Aborting: mesn; mesq l("Are you mad?!"); next; - mesq lg("Give me back this dish, you dirty liar!"); + mesq l("Give me back this dish, you dirty liar!"); if (countitem(PoisonedDish) > 0) delitem PoisonedDish, 1; @@ -213,7 +212,7 @@ L_Aborting: L_QuestAborted: mesn; - mesq lg("You're like the rest of this filthy crew. Your name is now on the traitors list!"); + mesq l("You're like the rest of this filthy crew. Your name is now on the traitors list!"); close; diff --git a/npc/000-2-1/dan.txt b/npc/000-2-1/dan.txt index 5526bb9c..f336402d 100644 --- a/npc/000-2-1/dan.txt +++ b/npc/000-2-1/dan.txt @@ -35,7 +35,7 @@ L_QuestStory: mesn; mesq l("Oh, it's you."); next; - mesq lg("So, you finally woke up? We all thought you were in something like... You know, one of these long comas."); + mesq l("So, you finally woke up? We all thought you were in something like... You know, one of these long comas."); next; menu @@ -56,7 +56,7 @@ L_QuestStory: mes ""; mesn; - mesq lg("There's nothing to say, don't worry miss.", "There's nothing to say, don't worry sir."); + mesq l("There's nothing to say, don't worry."); close; diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt index 3b9c93d2..499304c4 100644 --- a/npc/000-2-1/peter.txt +++ b/npc/000-2-1/peter.txt @@ -66,7 +66,7 @@ L_Task: if (!.@q) setq ShipQuests_Peter, 1, 0, -1; mesn; - mesq lg("Hey, girl!", "Hey, man!"); + mesq l("Hey there!"); next; mesq l("I need somebody who can rid the hold of the ship of these rattos. Can you help me?"); next; @@ -85,13 +85,13 @@ L_Task: // Friendly reminder that you have about 20 secs to finish OnLowTime: if ((getmap() ~= "000-2-1") || (getmap() ~= "nard*")) - dispbottom lg("I'm starting to feel dizzy... I shouldn't stay here much longer."); + dispbottom l("I'm starting to feel dizzy... I shouldn't stay here much longer."); end; // Minimum Quest Level (any difficulty setting) is on L_Main (and currently is 5) OnTooWeak: mesn; - mesq lg("I need someone to help me clean the edge of the ship, but you aren't strong enough for now."); + mesq l("I need someone to help me clean the edge of the ship, but you aren't strong enough for now."); close; diff --git a/npc/000-2-1/story_save.txt b/npc/000-2-1/story_save.txt index 30cd8cfd..68aacf60 100644 --- a/npc/000-2-1/story_save.txt +++ b/npc/000-2-1/story_save.txt @@ -14,7 +14,7 @@ OnClick: narrator S_LAST_NEXT, l("You lie in the bed."), l("Your head is suddently heavy, your eyes are closing..."), - lg("You fell asleep."); + l("You fell asleep."); warp "000-0-1", 26, 28; } diff --git a/npc/000-2-3/elmo.txt b/npc/000-2-3/elmo.txt index a89d59fe..831b07be 100644 --- a/npc/000-2-3/elmo.txt +++ b/npc/000-2-3/elmo.txt @@ -8,7 +8,7 @@ 000-2-3,27,27,0 script Elmo NPC_ELMO,{ function got_money { speech S_LAST_NEXT, - lg("Be patient a little while longer, in the next few days we will arrive at the port of Artis..."), + l("Be patient a little while longer, in the next few days we will arrive at the port of Artis..."), l("If you feel bored or like running around in circles, you may want to talk with the other sailors around here to get some tasks to do."), l("From what I heard, my brother Gugli needs the help of as many people as possible in order to collect a lot of neat things that can be found on this island."), l("Other than that, I don't know much about what else is going on, so directly asking the Cap'tain about it could be a good idea."); diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt index ae7551fd..05630e05 100644 --- a/npc/000-2-3/nard.txt +++ b/npc/000-2-3/nard.txt @@ -44,7 +44,7 @@ L_Checker: next; mesq l("Let me introduce myself, I am Nard, captain of this ship."); next; - mesq lg("I am pleased to see that you have woken up and are active. Elmo came here to tell me this good news!"); + mesq l("I am pleased to see that you have woken up and are active. Elmo came here to tell me this good news!"); next; setcamnpc "Elmo"; @@ -61,10 +61,10 @@ L_Checker: L_Menu: menu - lg("I feel ok."), L_Ok, + l("I feel ok."), L_Ok, rif(islegacyaccount(), l("I only want to reach Artis, can we skip this?")), L_Skip, l("Who's this Julia?"), L_Julia, - lg("I'm a bit sick..."), -; + l("I'm a bit sick..."), -; mes ""; mesn; @@ -81,7 +81,7 @@ L_MenuQuest: mesn; mesq l("Oh! I like that sort of answer!"); next; - mesq lg("We need manpower on the island... Oh forgive me, women are also welcome, of course.", "We need manpower on the island."); + mesq l("We can use a helping hand on the island."); next; goto L_NeedContent; @@ -132,7 +132,7 @@ L_Julia: next; mesq l("She is the nurse and shipkeeper of this ship."); next; - mesq lg("But most important, she is the one who took care of you when you were unconscious."); + mesq l("But most important, she is the one who took care of you when you were unconscious."); next; L_SpecialTask: @@ -175,7 +175,7 @@ L_Done: L_ChefQuestStart: mesn; - mesq lg("Elmo told me you are now considered family and are numbered among us in our activities on the island. I do so very much appreciate the efforts you did down there."); + mesq l("Elmo told me you are now considered family and are numbered among us in our activities on the island. I do so very much appreciate the efforts you did down there."); next; L_ChefQuestRedir: diff --git a/npc/000-2-3/sailors.txt b/npc/000-2-3/sailors.txt index 968d8c92..9287ed4b 100644 --- a/npc/000-2-3/sailors.txt +++ b/npc/000-2-3/sailors.txt @@ -14,12 +14,12 @@ OnTouch: setcamnpc "Elmo"; mesn "Elmo"; - mesq lg("So that's why we wanted to warn you, maybe she comes from that guild, as that sign was on her raft.", "So that's why we wanted to warn you, maybe he comes from that guild, as that sign was on his raft."); + mesq l("So that's why we wanted to warn you. This sign on the raft indicates some relation to that guild."); next; setcamnpc "Nard"; mesn "Captain Nard"; - mesq lg("I see. Warn the other sailors about this. But if she's part of the Legion of Aemil, then she's also our friend and ally.", "I see. Warn the other sailors about this. But if he's part of the Legion of Aemil, then he's also our friend and ally."); + mesq l("I see. Warn the other sailors about this. But any member of the Legion of Aemil would be our friend and ally."); next; setcamnpc "Elmo"; @@ -33,10 +33,10 @@ OnTouch: setcamnpc "Nard"; mesn "Captain Nard"; - mesq lg("This kind of talk should be taken with a grain of salt, but I agree and admit that I too am skeptical, so keep an eye on her.", "This kind of talk should be taken with a grain of salt, but I agree and admit that I too am skeptical, so keep an eye on him."); + mesq l("This kind of talk should be taken with a grain of salt, but I agree and admit that I too am skeptical, so keep your eyes open."); next; - mesq lg("But... If she has amnesia like Julia said... We don't need to worry about her. At least not yet.", "But... If he has amnesia like Julia said... We don't need to worry about him. At least not yet."); + mesq l("But... If Julia is right with the amnesia ... We don't need to worry. At least not yet."); next; setcamnpc "Elmo"; diff --git a/npc/001-1/chelios.txt b/npc/001-1/chelios.txt index 3641b0b6..84af2de1 100644 --- a/npc/001-1/chelios.txt +++ b/npc/001-1/chelios.txt @@ -26,7 +26,7 @@ { .@enora = getq(ArtisQuests_Enora); select - rif(.@enora == 1, lg("I came to retrieve a package for Enora.")), + rif(.@enora == 1, l("I came to retrieve a package for Enora.")), rif(.@enora == 3, l("I have your black iron.")), rif(.@enora >= 2, l("Where is the Merchant Guild?")), l("What is this building?"), @@ -70,7 +70,7 @@ function give_small_quest { break; case 2: speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("I'll be here, come back when you'll be ready."); + l("I'll be here, come back when you'll be ready."); return; } diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt index fae04dbf..984c02aa 100644 --- a/npc/001-1/cookiemaster.txt +++ b/npc/001-1/cookiemaster.txt @@ -17,7 +17,7 @@ goto L_GetCookie; mesn; - mesq lg("Hey! Adventurer! Are you enjoying your life on Aemil?"); + mesq l("Hey! Adventurer! Are you enjoying your life on Aemil?"); next; select @@ -38,7 +38,7 @@ mes ""; mesn; - mesq lg("Of course you do! Just listen carefully to these words my sweet."); + mesq l("Of course you do! Just listen carefully to these words my sweet."); next; mesq l("Cookies are a source of life."); next; @@ -95,10 +95,9 @@ L_StorySeems: mes ""; mesn; - mesq g(l("It looks like the sweet lady is curious, am I right?"), - l("It seems the gentleman is curious, am I right sweetie?")); + mesq l("It looks like you are curious, am I right?"); next; - mesq lg("Well, if you ever do want to join: 'Ye Merry Club Of Thee Bequeathed With Cookies'..."); + mesq l("Well, if you ever do want to join: 'Ye Merry Club Of Thee Bequeathed With Cookies'..."); next; L_BTaskExpanation: @@ -135,7 +134,7 @@ L_Friends: mesn "Narrator"; mesc(l("This Cookie Master rewards people who contribute and develop this world."), 9); next; - mes col(lg("If you want to be rewarded, help us in making this world a better place."), 9); + mes col(l("If you want to be rewarded, help us in making this world a better place."), 9); next; mesc(l("When you see something that looks more like a bug than a feature, report it on https://forums.themanaworld.org or try to contact a game contributor."), 9); next; @@ -172,7 +171,7 @@ L_Presentation: L_Reward: mesq l("Yes! @@ is written on my cookie list.", strcharinfo(0)); next; - mesq lg("That's quite surprising... You don't look very helpful."); + mesq l("That's quite surprising... You don't look very helpful."); next; mesq l("Anyway, here, have a cookie!"); @@ -183,7 +182,7 @@ L_Reward: npctalk3 l("You receive a @@!", getitemlink(DeliciousCookie)); next; - mesq lg("I'm sure you'll appreciate its effect, but be careful, these cookies are rare, and you'll need to help the community again before being able to receive another one."); + mesq l("I'm sure you'll appreciate its effect, but be careful, these cookies are rare, and you'll need to help the community again before being able to receive another one."); next; goto L_Bye; diff --git a/npc/001-1/elmo.txt b/npc/001-1/elmo.txt index 5f3ecf6e..a8c3fb3d 100644 --- a/npc/001-1/elmo.txt +++ b/npc/001-1/elmo.txt @@ -7,7 +7,7 @@ 001-1,185,107,0 script Elmo#001-1 NPC_ELMO_ARTIS,{ speech l("Oh hey!"), - lg("If you feel bored or anxious, you can always ask some of the people around Artis if they need your help."); + l("If you feel bored or anxious, you can always ask some of the people around Artis if they need your help."); l("It's better than running around in circles doing nothing."); close; diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt index c252b9b0..d676407f 100644 --- a/npc/001-1/enora.txt +++ b/npc/001-1/enora.txt @@ -90,7 +90,7 @@ l("Try doing that now!"); switch (select(l("Okay, but there won't be any explosions."), - lg("Don't get too excited about it..."))) + l("Don't get too excited about it..."))) { case 1: narrator S_FIRST_BLANK_LINE | S_LAST_NEXT, @@ -136,7 +136,7 @@ function enora_first_quest { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You probably don't have much business in this city as you don't remember who you are."), - lg("So I was going to ask if maybe you would be interested in giving me a hand with a few errands."); + l("So I was going to ask if maybe you would be interested in giving me a hand with a few errands."); switch (select(l("I guess so. What's in it for me?"), l("Of course! What do you need?"))) @@ -348,7 +348,7 @@ function enora_paid_potions { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("Are you sure that these are my potions?"); + l("Are you sure that these are my potions?"); if (askyesno() == ASK_YES) { @@ -363,7 +363,7 @@ { speech S_LAST_NEXT, l("Hey! You must be @@.", strcharinfo(0)), - lg("Julia told me how they found you in the sea, on a raft with a logo of..."), + l("Julia told me how they found you in the sea, on a raft with a logo of..."), l("...I mean log! Made of log!"), l("I also heard you lost all your memories? That's a shame."), l("I'm sure you would have some interesting stories to tell!"); diff --git a/npc/001-1/eugene.txt b/npc/001-1/eugene.txt index 407bc395..4f1e25fd 100644 --- a/npc/001-1/eugene.txt +++ b/npc/001-1/eugene.txt @@ -29,7 +29,7 @@ l("Hey, check out my brand new fishing rod. I bought it just today."), l("I was so excited, I wanted to try it as soon as possible."), l("So in a hurry, I forgot to take enough bait for fishing."), - lg("Be a friend and bring me @@ @@.", "Be a friend and bring me @@ @@.", .BaitCount, getitemlink(.BaitID)); + l("Be a friend and bring me @@ @@.", .BaitCount, getitemlink(.BaitID)); switch (select(l("I'll be back in no time."), l("Sorry, I'm doing other things at the moment."))) @@ -60,8 +60,7 @@ L_CheckItems: l("It's not as good as my new one, but still very useful."), l("Just look at that water! There's a whole bunch of fish down there."), l("Oh, and you will need this book too, it will help you learn the basics of fishing."), - lg("You might even get lucky, and get a @@.", - "You might even get lucky, and get a @@.", getitemlink(GrassCarp)), + l("You might even get lucky, and get a @@.", getitemlink(GrassCarp)), l("Have a good time fishing!"); delitem .BaitID, .BaitCount; diff --git a/npc/001-1/fexil.txt b/npc/001-1/fexil.txt index db606092..1122f051 100644 --- a/npc/001-1/fexil.txt +++ b/npc/001-1/fexil.txt @@ -37,13 +37,13 @@ } mesn; - mesq lg("Greetings traveler."); + mesq l("Greetings traveler."); next; mesq l("I have some clothes and other things for you at a fine price!"); next; mesq l("What I sell comes from every corner of Gasaron."); next; - mesq lg("Interested?"); + mesq l("Interested?"); next; if (getq(ArtisQuests_Fexil) == 1) @@ -129,7 +129,7 @@ case 4: speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("Oh... Well, I just started to trade... Thus my technique may not be the best."), - lg("Anyway, if you ever feel interested, just check my bag!"); + l("Anyway, if you ever feel interested, just check my bag!"); break; } diff --git a/npc/001-1/qonan.txt b/npc/001-1/qonan.txt index 9acf1366..f00a2cf3 100644 --- a/npc/001-1/qonan.txt +++ b/npc/001-1/qonan.txt @@ -72,7 +72,7 @@ } L_QuestGiven: - speech S_LAST_NEXT, lg("I asked you to do me a favor, did you forget?"); + speech S_LAST_NEXT, l("I asked you to do me a favor, did you forget?"); select l("What should I do, again?"); speech S_FIRST_BLANK_LINE, l("Please find the small chest, buried somewhere on Artis hill."), @@ -83,7 +83,7 @@ L_QuestGiven: L_ItemFound: speech l("After all this time, it was still there!"), - lg("We are very lucky, my friend."), + l("We are very lucky, my friend."), l("Let me open it with my key."), l("Like I promised, here is your share."), l("I can finally pay off my debts."); diff --git a/npc/001-1/qpid.txt b/npc/001-1/qpid.txt index bfed9967..5976c9cf 100644 --- a/npc/001-1/qpid.txt +++ b/npc/001-1/qpid.txt @@ -98,7 +98,7 @@ l("Do? I don't do them."), l("I'm sure that you already knew the answer, didn't you?"), l("You tried to embarrass me, am I right?!"), - lg("It's Ivan... I'm sure that he sent you to annoy me..."), + l("It's Ivan... I'm sure that he sent you to annoy me..."), l("I'm just a merchant, I trade and make deals, yes \"excuse\" me if I'm not as skilled as that stupid alchemist."), l("But rare are those that receive grants from the Legion itself. For anybody else only a hard work can pay your bills!"); emotion E_UPSET; diff --git a/npc/001-1/rumly.txt b/npc/001-1/rumly.txt index 9c8afd8a..6cc625ff 100644 --- a/npc/001-1/rumly.txt +++ b/npc/001-1/rumly.txt @@ -31,7 +31,7 @@ L_Menu: l("Plushrooms you say?"), l("Who are you?"), rif(.@visited > 0, l("Can you reset my stats please?")), - lg("You are weird, I have to go sorry."); + l("You are weird, I have to go sorry."); switch (@menu) { @@ -42,8 +42,8 @@ L_Menu: goto L_Menu; case 2: speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("Why are you asking? And who are you too? I've never seen you around before..."), - lg("Wait, are you one of those from the Legion of Gasaron? I didn't do anything wrong, I promise!"), + l("Why are you asking? And who are you too? I've never seen you around before..."), + l("Wait, are you one of those from the Legion of Gasaron? I didn't do anything wrong, I promise!"), l("I... I just like to eat the purple and delightful... And natural, and..."); switch (select(l("Chill out I won't say anything."), @@ -65,7 +65,7 @@ L_Menu: select l("Sounds good!"), - rif(countitem(Plushroom) >= .@plush_count, lg("I think I have enough plushrooms on me.")), + rif(countitem(Plushroom) >= .@plush_count, l("I think I have enough plushrooms on me.")), l("We will talk about it later."), l("My stats are too good, I won't need it."); @@ -119,31 +119,31 @@ L_ResetStats: if (.@visited == 1) { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("Changed your mind, uh?"), + l("Changed your mind, uh?"), l("Very good."), l("Status point reset can't be undone. Do you really want this?"), - lg("Are you sure about this?"); + l("Are you sure about this?"); } else { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("Are you sure about this?"); + l("Are you sure about this?"); } L_ConfirmReset: - switch (select(lg("Yes, I am sure."), - lg("I need to think about it..."), - lg("I won't need it, thank you."))) + switch (select(l("Yes, I am sure."), + 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, l("Let me just have a quick look at you. Hm... I will need @@ @@s to reset your stats.", .@plush_count, getitemlink(Plushroom)); select - rif(countitem(Plushroom) >= .@plush_count, lg("Here, take as many as you need, I have plenty!")), - rif(countitem(Plushroom) > 0 && countitem(Plushroom) < .@plush_count, lg("I don't have enough plushrooms...")), - rif(countitem(Plushroom) == 0, lg("Oh no, I don't have any plushroom on me right now.")), - lg("I have to go, sorry."); + rif(countitem(Plushroom) >= .@plush_count, l("Here, take as many as you need, I have plenty!")), + rif(countitem(Plushroom) > 0 && countitem(Plushroom) < .@plush_count, l("I don't have enough plushrooms...")), + rif(countitem(Plushroom) == 0, l("Oh no, I don't have any plushroom on me right now.")), + l("I have to go, sorry."); if (@menu > 1) { @@ -166,15 +166,15 @@ L_ConfirmReset: { speech S_LAST_NEXT, l("It seems that you have no status points to reset!"), - lg("But the plushroom you brought was really awesome you know."), - lg("Come back when you will really need me. And bring more plushrooms with you!"); + l("But the plushroom you brought was really awesome you know."), + l("Come back when you will really need me. And bring more plushrooms with you!"); } else { speech S_LAST_NEXT, l("Let's see... @@ of your status points have just been reset!", StatusPoint - .@wasSP), l("Spend it wisely this time."), - lg("But you are welcome to reset your stats again if you bring me some more plushrooms!"); + l("But you are welcome to reset your stats again if you bring me some more plushrooms!"); } goto L_Quit; @@ -201,7 +201,7 @@ L_Never: } speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("I am sure that you will change your mind."); + l("I am sure that you will change your mind."); goto L_Quit; diff --git a/npc/001-1/sophialla.txt b/npc/001-1/sophialla.txt index c0e9886f..f44ef218 100644 --- a/npc/001-1/sophialla.txt +++ b/npc/001-1/sophialla.txt @@ -57,7 +57,7 @@ } speech - lg("If you don't know it, just go, please."); + l("If you don't know it, just go, please."); close; OnLegionComplete: diff --git a/npc/001-1/trees.txt b/npc/001-1/trees.txt index d6877de6..8e090218 100644 --- a/npc/001-1/trees.txt +++ b/npc/001-1/trees.txt @@ -62,7 +62,7 @@ L_FoundHim: mesn "Bobo"; mesq l("Yes, it's me. It's such a fine view from here!"); next; - select(lg("Your sister sent me to find you. Your mother is worried.")); + select(l("Your sister sent me to find you. Your mother is worried.")); mes ""; mesn "Bobo"; mesq l("Oh, nooooo... If I go home now, my mum will give me chores."); diff --git a/npc/001-2-0/resa.txt b/npc/001-2-0/resa.txt index 202c4c99..160b8351 100644 --- a/npc/001-2-0/resa.txt +++ b/npc/001-2-0/resa.txt @@ -46,7 +46,7 @@ { .@enora = getq(ArtisQuests_Enora); select - rif(.@enora == 5, lg("I came to retrieve a package for Enora.")), + rif(.@enora == 5, l("I came to retrieve a package for Enora.")), menuaction(l("Trade")), l("How can I improve my equipment?"), menuaction(l("Quit")); diff --git a/npc/001-2-11/mona.txt b/npc/001-2-11/mona.txt index 197eb643..f3a65651 100644 --- a/npc/001-2-11/mona.txt +++ b/npc/001-2-11/mona.txt @@ -130,8 +130,7 @@ inventoryplace WoodenSword, 1; speech 0x0, l("Daddy finally came back home! He grabbed a snack and said he would be returning to the sewers."), - lg("He did say that I should give you this @@ as a gift. He says you are very skilled and will make good use of his old weapon.", - "He did say that I should give you this @@ as a gift. He says you are very skilled and will make good use of his old weapon.", + l("He did say that I should give you this @@ as a gift. He says you are very skilled and will make good use of his old weapon.", getitemlink(WoodenSword)), l("He has never been the same since mommy went away..."); getitem WoodenSword, 1; diff --git a/npc/001-2-12/oscar.txt b/npc/001-2-12/oscar.txt index e53f30a5..343a012e 100644 --- a/npc/001-2-12/oscar.txt +++ b/npc/001-2-12/oscar.txt @@ -109,7 +109,7 @@ } .@hour = gettime(GETTIME_HOUR); - speech S_LAST_NEXT, (.@hour > 6 && .@hour < 18) ? l("Good day to you.") : lg("Good night milady.", "Good evening sir."); + speech S_LAST_NEXT, (.@hour > 6 && .@hour < 18) ? l("Good day to you.") : l("Good evening."); do { diff --git a/npc/001-2-19/lloyd.txt b/npc/001-2-19/lloyd.txt index 29888b15..839f9817 100644 --- a/npc/001-2-19/lloyd.txt +++ b/npc/001-2-19/lloyd.txt @@ -26,7 +26,7 @@ l("Let me check in my inventory book..."), l("..."), l("Yes, I have some! \"5x Black Iron Ingots\""), - lg("Is this for you or somebody else? Because you need to be registered to obtain these materials."); + l("Is this for you or somebody else? Because you need to be registered to obtain these materials."); switch (selectd(ArtisQuests_Enora, l("This is for my own use."), @@ -80,7 +80,7 @@ l("Lloyd is searching something in his book."); speech S_LAST_NEXT, l("I see."), - lg("You are new around here, right?"); + l("You are new around here, right?"); if (selectd(l("How do you know?"), l("Yes I am.")) == 1) { diff --git a/npc/001-2-21/julia.txt b/npc/001-2-21/julia.txt index 55890d96..b275d910 100644 --- a/npc/001-2-21/julia.txt +++ b/npc/001-2-21/julia.txt @@ -9,7 +9,7 @@ 001-2-21,27,24,0 script Julia#Artis NPC_JULIA,{ mesn; - mesq lg("Hello dear!"); + mesq l("Hello dear!"); next; mesq l("What do you want today?"); next; @@ -22,7 +22,7 @@ L_Menu: menu rif(getskilllv(1) < 6, l("Something is wrong with me, I can't smile nor sit.")), L_BasicSkill, rif(.@enora == 0, l("Where should I go?")), L_Enora, - lg("I made a mistake, I would like to change my language."), L_ChooseLang, + l("I made a mistake, I would like to change my language."), L_ChooseLang, l("Is it possible to go back to Drasil Island?"), L_Island, l("Could you explain to me where I am?"), L_WhereIam, l("What happened to me?"), L_What, @@ -68,7 +68,7 @@ L_WhereIam: next; mesq l("Somebody is waiting for you outside!"); next; - mesq lg("Like the rest of the crew, you are welcome to come and rest here at anytime during your journey on Artis."); + mesq l("Like the rest of the crew, you are welcome to come and rest here at anytime during your journey on Artis."); next; mesq l("Do you have any other questions for me?"); next; @@ -78,9 +78,9 @@ L_WhereIam: L_What: mes ""; mesn; - mesq lg("We thought that you could help us understand this, all we know is that we found you cast in the sea, adrift on your raft."); + mesq l("We thought that you could help us understand this, all we know is that we found you cast in the sea, adrift on your raft."); next; - mesq lg("You were in bad shape, you should be happy we found you before the sea killed you."); + mesq l("You were in bad shape, you should be happy we found you before the sea killed you."); next; mesq l("Oh, and there was this inscription on your raft. It represents the Legion of Aemil, the largest and biggest guild of the whole new world. Does that make you remember anything, anything at all?"); next; diff --git a/npc/001-2-22/alige.txt b/npc/001-2-22/alige.txt index 9d37a352..4f4fab9d 100644 --- a/npc/001-2-22/alige.txt +++ b/npc/001-2-22/alige.txt @@ -66,8 +66,8 @@ OnFirstEncounter: restorecam; menu - lg("I am, who are you?"), -, - lg("Indeed, I am not."), L_NeedHelp; + l("I am, who are you?"), -, + l("Indeed, I am not."), L_NeedHelp; mes ""; mesn "Narrator"; @@ -136,7 +136,7 @@ L_Accept: l("I think I should report you to the crew members."), -; setcamnpc; - mesq lg("Growl, sniff, grr! You'd better not tell anyone you saw me!"); + mesq l("Growl, sniff, grr! You'd better not tell anyone you saw me!"); close; @@ -165,7 +165,7 @@ L_Accepted: setcamnpc; mes ""; mesn; - mesq lg("Great, what food do you have for me today?"); + mesq l("Great, what food do you have for me today?"); next; restorecam; @@ -284,7 +284,7 @@ L_IntroMenu: l("I think I should report you to the crew members."), -; setcamnpc; - mesq lg("Growl, sniff, grr! You'd better not tell anyone you saw me!"); + mesq l("Growl, sniff, grr! You'd better not tell anyone you saw me!"); close; diff --git a/npc/001-2-22/chefgado.txt b/npc/001-2-22/chefgado.txt index b7b46e17..ae95d408 100644 --- a/npc/001-2-22/chefgado.txt +++ b/npc/001-2-22/chefgado.txt @@ -31,7 +31,7 @@ function foodQuest { // FOOD QUEST: BEGIN .@ally=(getq(ShipQuests_ChefGado) == 4); // TRUE if you helped Gado mesn; - mesq (.@ally ? l("I suppose I could. You helped me, after all.") : lg("Why should I help you, traitor?")); + mesq (.@ally ? l("I suppose I could. You helped me, after all.") : l("Why should I help you, traitor?")); next; // Empty Bowl needed if (!countitem(EmptyBowl)) { diff --git a/npc/001-2-22/peter.txt b/npc/001-2-22/peter.txt index 5dd789fa..dce6982d 100644 --- a/npc/001-2-22/peter.txt +++ b/npc/001-2-22/peter.txt @@ -66,7 +66,7 @@ L_Task: if (!.@q) setq ShipQuests_Peter, 1, 0, -1; mesn; - mesq lg("Hey, girl!", "Hey, man!"); + mesq l("Hey there!"); next; mesq l("I need somebody who can rid the hold of the ship of these rattos. Can you help me?"); next; @@ -85,13 +85,13 @@ L_Task: // Friendly reminder that you have about 20 secs to finish OnLowTime: if ((getmap() ~= "001-2-22") || (getmap() ~= "nard*")) - dispbottom lg("I'm starting to feel dizzy... I shouldn't stay here much longer."); + dispbottom l("I'm starting to feel dizzy... I shouldn't stay here much longer."); end; // Minimum Quest Level (any difficulty setting) is on L_Main (and currently is 5) OnTooWeak: mesn; - mesq lg("I need someone to help me clean the edge of the ship, but you aren't strong enough for now."); + mesq l("I need someone to help me clean the edge of the ship, but you aren't strong enough for now."); close; diff --git a/npc/001-2-24/nard.txt b/npc/001-2-24/nard.txt index 30a2c385..c38081e4 100644 --- a/npc/001-2-24/nard.txt +++ b/npc/001-2-24/nard.txt @@ -27,7 +27,7 @@ checkclientversion; mesn; - mesq g(l("Good day miss."), l("Good day mister.")); + mesq l("Good day sir or madam."); next; mesq l("What can I do for you?"); .@q = getq(ArtisQuests_Enora); @@ -36,10 +36,10 @@ // If the player saw Enora, the menu shows L_Lost at the bottom // Because he shouldn't be lost after having talked to her, so the priority in menu changes menu - rif(.@q == 0, lg("I'm lost, where should I go?")), L_Lost, + rif(.@q == 0, l("I'm lost, where should I go?")), L_Lost, rif(.@q > 0, l("Tell me, where are we right now?")), L_Info, l("How long will you stay here?"), -, - rif(.@q > 0, lg("I'm lost, where should I go?")), L_Lost; + rif(.@q > 0, l("I'm lost, where should I go?")), L_Lost; speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("We just returned from a long journey and Artis is a good city to rest and to conclude our exchange."), diff --git a/npc/001-2-27/don.txt b/npc/001-2-27/don.txt index ff644303..9db092b1 100644 --- a/npc/001-2-27/don.txt +++ b/npc/001-2-27/don.txt @@ -12,7 +12,7 @@ function good_blacksmith; speech S_LAST_NEXT, - lg("Hi, what do you want kiddo?"); + l("Hi, what do you want kiddo?"); do { diff --git a/npc/001-2-27/kaylo.txt b/npc/001-2-27/kaylo.txt index 2bd669d8..805f8dea 100644 --- a/npc/001-2-27/kaylo.txt +++ b/npc/001-2-27/kaylo.txt @@ -6,7 +6,7 @@ 001-2-27,27,28,0 script Kaylo NPC_KAYLO,{ speech S_LAST_NEXT, - lg("Hi customer! What do you want today?"); + l("Hi customer! What do you want today?"); switch (select( l("Let's make a trade."), diff --git a/npc/001-2-27/lydon.txt b/npc/001-2-27/lydon.txt index 9d429185..3fc93178 100644 --- a/npc/001-2-27/lydon.txt +++ b/npc/001-2-27/lydon.txt @@ -6,7 +6,7 @@ 001-2-27,43,28,0 script Lydon NPC_LYDON,{ speech S_LAST_NEXT, - lg("Hi customer! What do you want today?"); + l("Hi customer! What do you want today?"); switch (select( l("Let's make a trade."), diff --git a/npc/001-2-28/plush.txt b/npc/001-2-28/plush.txt index 86a12e70..695bd7c6 100644 --- a/npc/001-2-28/plush.txt +++ b/npc/001-2-28/plush.txt @@ -32,10 +32,9 @@ PC_IS_DEAD = false; speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("I registered you on the 4th room of the upper level.", - "I registered you on the 2nd room of the upper level."), + l("I registered you on one of the rooms of the upper level."), l("You can go upstairs and choose a different room if you want."); - savepoint "001-2-29", 29, g(49, 35); + savepoint "001-2-29", 29, any(49, 35); } } @@ -68,13 +67,13 @@ else if (INN_REGISTER == REDPLUSH_INN) { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("You are already registered here."), + l("You are already registered here."), l("Go on the upper level if you want to change your room or to use it."); } else { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("If you are registered somewhere else you will loose that reservation."), + l("If you are registered somewhere else you will loose that reservation."), l("Do you still want to lodge here?"); if (askyesno() == ASK_YES) diff --git a/npc/001-2-32/serena.txt b/npc/001-2-32/serena.txt index 6b47f2d2..d7d18a41 100644 --- a/npc/001-2-32/serena.txt +++ b/npc/001-2-32/serena.txt @@ -9,7 +9,7 @@ 001-2-32,27,27,0 script Serena NPC_SERENA,{ mesn; - mesq lg("Oh darling, what brought you here?"); // TRANSLATORS: Darling - Expresses familiarity or elderliness in relation to PC. + mesq l("Oh darling, what brought you here?"); // TRANSLATORS: Darling - Expresses familiarity or elderliness in relation to PC. next; select l("I wanna fight."), diff --git a/npc/001-2-33/lozerk.txt b/npc/001-2-33/lozerk.txt index 0603ca46..12a1614f 100644 --- a/npc/001-2-33/lozerk.txt +++ b/npc/001-2-33/lozerk.txt @@ -57,7 +57,7 @@ function send_training { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("Oh, you were sent by Enora!"), + l("Oh, you were sent by Enora!"), l("If Enora thinks this is the right place for you, then she's probably be right. Did you know she's a lieutenant of the Legion?"), l("The rank of lieutenant is granted only to people with proper control of their skill and good judgment, like Enora. Or me, of course."), l("By the way, I'm Lozerk. Lieutenant Lozerk."); @@ -65,9 +65,9 @@ select(l("Pleasure to meet you. I am @@.", strcharinfo(PC_NAME))); speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("Oh, you are that person! You were stranded in the seas for a while, right? You look like it."), + l("Oh, you are that person! You were stranded in the seas for a while, right? You look like it."), l("But don't you worry! I don't know how to get you back your memories, but we can work on your muscles for now!"), - lg("After all, this is the Legion of Aemil! You want to be a great warrior? We'll make you one here!"), + l("After all, this is the Legion of Aemil! You want to be a great warrior? We'll make you one here!"), l("For starters, you should probably do some stretching and practice on some dummies in our training room."), l("That's right, we have our very own training room. The Legion is always well prepared!"); @@ -79,9 +79,9 @@ function send_battle { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("So, did you get your blood boiling? Give the dummies a good lesson? Good!"), + l("So, did you get your blood boiling? Give the dummies a good lesson? Good!"), l("But since it's not dummies that will go after you out there, this training won't be enough."), - lg("If you want to make a formidable foe for anyone, you'll need to train with real living opponents!"), + l("If you want to make a formidable foe for anyone, you'll need to train with real living opponents!"), l("Of course, the Legion of Aemil can easily provide you with such training, even if you're not a member. Just great, isn't it?"), l("We have a special room for this purpose, too. You may test your skills against all kinds of dreadful monsters in there."); @@ -93,8 +93,8 @@ function send_qanon { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("And you won! That means you should be able to handle yourself in battle from now on."), - lg("If you keep it up, you'll eventually become a fearsome warrior, just like me!"), + l("And you won! That means you should be able to handle yourself in battle from now on."), + l("If you keep it up, you'll eventually become a fearsome warrior, just like me!"), l("Or almost like me, at the very least."), l("But if you really want to accomplish something, you should consider joining us."), l("You have talent and the best place to utilize it is in the Legion! You can either pursue your goals with us or without us, but trust me, with us it's much better."), @@ -111,7 +111,7 @@ function forget_direction { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("You are lucky there are no mental faculty requirements to join the Legion!"); + l("You are lucky there are no mental faculty requirements to join the Legion!"); explain_direction; @@ -153,9 +153,9 @@ .@enora = getq(ArtisQuests_Enora); consolemes(CONSOLEMES_DEBUG, .@legion_progress + " " + .@enora); select - rif((.@legion_progress == 0) && (.@enora == 11), lg("Enora sent me here.")), - rif(.@legion_progress == 2, lg("I'm done with my training.")), - rif(.@legion_progress == 4, lg("I'm back from battle!")), + rif((.@legion_progress == 0) && (.@enora == 11), l("Enora sent me here.")), + rif(.@legion_progress == 2, l("I'm done with my training.")), + rif(.@legion_progress == 4, l("I'm back from battle!")), rif(.@legion_progress == 1 || .@legion_progress == 3 || .@legion_progress == 5, l("Where should I go?")), l("What can you tell me about the legion?"), l("That's a nice sword you have there."), diff --git a/npc/001-2-34/samantha.txt b/npc/001-2-34/samantha.txt index 0ae51de0..b69e87ed 100644 --- a/npc/001-2-34/samantha.txt +++ b/npc/001-2-34/samantha.txt @@ -7,7 +7,7 @@ 001-2-34,29,27,0 script Samantha NPC_SAMANTHA,{ mesn; - mesq lg("Look who we have here, did you come for a training session?"); + mesq l("Look who we have here, did you come for a training session?"); close; // <scratch> diff --git a/npc/001-2-39/qanon.txt b/npc/001-2-39/qanon.txt index d9519d8d..e0c8d26b 100644 --- a/npc/001-2-39/qanon.txt +++ b/npc/001-2-39/qanon.txt @@ -20,7 +20,7 @@ function notaMember; .@q=getq(Artis_Legion_Progress); mesn; - mesq lg("It's been a while, girl!", "It's been a while, boy!"); + mesq l("It's been a while."); next; if (.@q < 5) notaMember(); @@ -46,7 +46,7 @@ break; case 3: mesn; - mesq lg("Make me proud, girl.", "Make me proud, boy."); + mesq l("Make me proud!"); break; } close; @@ -72,7 +72,7 @@ function legionState { mesq l("Oh? And do you think you have what it takes to be a proud Legion Member?"); next; mesn; - mesq lg("Listen, kid. Being a legion member is not a joke."); + mesq l("Listen, kid. Being a legion member is not a joke."); next; mesn; mesq l("Hmm, why don't you go train a little more? We have several training rooms here."); @@ -112,10 +112,10 @@ function legionState2 { next; mesn; mesc l("%s gives you a piece of paper, which you put on a different pocket."); - mesq lg("Go to the ship, show the captain this letter if asked. After reaching, look for Captain Hal. He'll give you further instructions."); + mesq l("Go to the ship, show the captain this letter if asked. After reaching, look for Captain Hal. He'll give you further instructions."); next; mesn; - mesq lg("Make me proud, girl.", "Make me proud, boy."); + mesq l("Make me proud!"); setq Artis_Legion_Progress, 7; } else { mesn; diff --git a/npc/001-2-41/edouard.txt b/npc/001-2-41/edouard.txt index e176593f..275896e3 100644 --- a/npc/001-2-41/edouard.txt +++ b/npc/001-2-41/edouard.txt @@ -115,7 +115,7 @@ OnNotSit: OnChair: speech S_LAST_NEXT, - lg("Hello, young lady.", "Hello, young man."); + l("Welcome to Edouard's Barber Shop."); if (Edouard_StoryTold == 0) { diff --git a/npc/001-2-9/janus.txt b/npc/001-2-9/janus.txt index 0e02f1b8..200dbd6c 100644 --- a/npc/001-2-9/janus.txt +++ b/npc/001-2-9/janus.txt @@ -20,7 +20,7 @@ l("Creating a party has some advantages, it's a pretty good choice!"), l("I remember when I created my first party, we were amazed to share some experience with a small group of adventurer..."), l("Oh! And our party chat was really entertaining, I do highly recommend you to share this fun as well."), - lg("The cost to create a party is @@ E, are you interested?", + l("The cost to create a party is @@ E, are you interested?", "The cost to create a party is @@ E, are you interested?", .@party_price); if (askyesno() == 1) @@ -49,7 +49,7 @@ l("Anyway, the guild creation is perfect for both!"), l("You can keep your current party as it is, while leading or being part of a guild in order to talk and share different items with all of its members!"), l("The @@ is a one time item, you can use it as many times as you want, but you can only have one!", getitemlink(GuildCertification)), - lg("The cost to create a guild is @@ E, are you interested?", + l("The cost to create a guild is @@ E, are you interested?", "The cost to create a guild is @@ E, are you interested?", .@guild_price); if (askyesno() == 1) @@ -126,7 +126,7 @@ } speech S_LAST_NEXT, - lg("Welcome miss.", "Good day sir."); + l("Welcome!"); do { diff --git a/npc/008-1-1/cutscene.txt b/npc/008-1-1/cutscene.txt index 4d50ea1b..a9d39a6c 100644 --- a/npc/008-1-1/cutscene.txt +++ b/npc/008-1-1/cutscene.txt @@ -98,11 +98,11 @@ OnBegin: .@tm$=instance_npcname("Thamas"); npctalk l("Welcome to my humble abode."), .@mc$; sleep2(500); - npctalk lg("Who is that fellow?"), .@tm$; + npctalk l("Who is that fellow?"), .@tm$; sleep2(2500); npctalk l("Thamas, this is a stowaway who reached here from Artis."), .@mc$; sleep2(2500); - npctalk lg("Yes, I remember her.", "Yes, I remember him."), .@tm$; + npctalk l("Yes, I remember."), .@tm$; sleep2(3000); npctalk l("Anyway, I assume you're trying to get into Hurnscald?"), .@mc$; sleep2(2100); diff --git a/npc/008-1/auldsbel.txt b/npc/008-1/auldsbel.txt index e801e146..316bf604 100644 --- a/npc/008-1/auldsbel.txt +++ b/npc/008-1/auldsbel.txt @@ -43,7 +43,7 @@ } } else { mesn; - mesq lg("If you come back later, I may teach you something. But psst, practising magic is quite dangerous these days."); + mesq l("If you come back later, I may teach you something. But psst, practising magic is quite dangerous these days."); } close; diff --git a/npc/008-1/banu.txt b/npc/008-1/banu.txt index 13c037ac..05209a2c 100644 --- a/npc/008-1/banu.txt +++ b/npc/008-1/banu.txt @@ -10,7 +10,7 @@ l("Hello."), l("You don't have a scythe, by chance? I am too old to mew this field all alone."), l("I asked Hinnak, but he wants at least a beer in exchange for his scythe."), - lg("But I hate alcohol, so thats not an option for me."); + l("But I hate alcohol, so thats not an option for me."); close; diff --git a/npc/008-1/rossy.txt b/npc/008-1/rossy.txt index d496de0a..f0acfa67 100644 --- a/npc/008-1/rossy.txt +++ b/npc/008-1/rossy.txt @@ -127,7 +127,7 @@ function rossyFirstmet { mes ""; if (@menu == 2) { mesn; - mesq lg("Then why bother? Weird person..."); + mesq l("Then why bother? Weird person..."); return; } setq HurnscaldQuests_Rossy, 2; diff --git a/npc/008-1/snarfles.txt b/npc/008-1/snarfles.txt index 53dd817a..d4de8ed0 100644 --- a/npc/008-1/snarfles.txt +++ b/npc/008-1/snarfles.txt @@ -10,7 +10,7 @@ speech l("My Mouboos, my beloved Mouboos!"), l("Oh, hi, isn't it cool to live among all those Mouboos? I don't understand how some people can eat Mouboo steak."), - lg("Murderers!"); + l("Murderers!"); if (getq(General_SmearedHands) <= 3 && getq2(General_SmearedHands) != 2) foodQuest(); close; diff --git a/npc/008-1/voltain.txt b/npc/008-1/voltain.txt index 46cb60a8..ce41f10b 100644 --- a/npc/008-1/voltain.txt +++ b/npc/008-1/voltain.txt @@ -8,7 +8,7 @@ 008-1,182,155,0 script Voltain NPC_DARK_DRUID,{ speech l("Go away, I have to think about new evil doings."), - lg("GO AWAY, I SAID!"); + l("GO AWAY, I SAID!"); close; diff --git a/npc/008-2-0/celestia.txt b/npc/008-2-0/celestia.txt index b8be3297..81fb372b 100644 --- a/npc/008-2-0/celestia.txt +++ b/npc/008-2-0/celestia.txt @@ -8,7 +8,7 @@ 008-2-0,30,23,0 script Celestia NPC_CELESTIA,{ speech l("Hi!"), - lg("You may remember me, I am Celestia."); + l("You may remember me, I am Celestia."); l("Take a cup of tea until something happens here."); close; diff --git a/npc/008-2-1/generalstore.txt b/npc/008-2-1/generalstore.txt index 47346fa7..ffbbb6d1 100644 --- a/npc/008-2-1/generalstore.txt +++ b/npc/008-2-1/generalstore.txt @@ -9,7 +9,7 @@ speech l("Hi!"), l("My name is General Store, they still call me this although I left the army a few years ago."), - lg("I have nothing to sell, come back later."); + l("I have nothing to sell, come back later."); close; diff --git a/npc/008-2-10/airlia.txt b/npc/008-2-10/airlia.txt index 4f3964a6..64f18436 100644 --- a/npc/008-2-10/airlia.txt +++ b/npc/008-2-10/airlia.txt @@ -9,7 +9,7 @@ speech l("Hello."), l("Do you know where the graveyard is?"), - lg("No? Better that way. It's so dangerous there."); + l("No? Better that way. It's so dangerous there."); if (getq(General_Brotherhood) < 2) close; diff --git a/npc/008-2-13/lena.txt b/npc/008-2-13/lena.txt index 0c941417..1de7a98b 100644 --- a/npc/008-2-13/lena.txt +++ b/npc/008-2-13/lena.txt @@ -69,7 +69,7 @@ function lenaTooWeak { speech l("Hey."), l("Did you hear about the Bandit's attacks? They must have a hideout somewhere outside Hurnscald."), - lg("However, you are too weak to help me, so come back later."); + l("However, you are too weak to help me, so come back later."); close; } @@ -117,7 +117,7 @@ function lenaStart { function lenaReturn { mesn; - mesq lg("Adventurer, did you brought me what I asked? I see you have %d/%d %s.","Adventurer, did you brought me what I asked? I see you have %d/%d %s.", countitem(TreasureKey), .numKeys, getitemlink(TreasureKey)); + mesq l("Adventurer, did you brought me what I asked? I see you have %d/%d %s.", countitem(TreasureKey), .numKeys, getitemlink(TreasureKey)); mes ""; select rif(countitem(TreasureKey) >= .numKeys, l("Yes, take it.")), @@ -174,7 +174,7 @@ function lenaQuest { function lenaCoinBag { mesn; - mesq lg("Adventurer, did you brought me what I asked? I see you have %d/%d %s.","Adventurer, did you brought me what I asked? I see you have %d/%d %s.", countitem(CoinBag), .numCoins, getitemlink(CoinBag)); + mesq l("Adventurer, did you brought me what I asked? I see you have %d/%d %s.", countitem(CoinBag), .numCoins, getitemlink(CoinBag)); mes ""; select rif(countitem(CoinBag) >= .numCoins, l("Yes, take it.")), diff --git a/npc/008-2-16/stove.txt b/npc/008-2-16/stove.txt index 85e62a23..d4389f7a 100644 --- a/npc/008-2-16/stove.txt +++ b/npc/008-2-16/stove.txt @@ -18,7 +18,7 @@ // Cooking loop do { - mesc lg("It is time to make some sandwiches myself!"); + mesc l("It is time to make some sandwiches myself!"); mes "##B" + l("Drag and drop the items from your inventory in the frames.") + "##b"; // Crafting skin with 4 columns diff --git a/npc/008-2-16/yannika.txt b/npc/008-2-16/yannika.txt index f9160c4e..05c8a41e 100644 --- a/npc/008-2-16/yannika.txt +++ b/npc/008-2-16/yannika.txt @@ -26,9 +26,9 @@ if (.@q < 3) { speech - lg(l("Hello madam."), l("Hi Sir.")), + l("Hello."), l("Isn't my husband Hinnak so hardworking?"), - lg("Come back later."); + l("Come back later."); close; } @@ -43,7 +43,7 @@ break; default: speech - lg(l("Hello madam."), l("Hi Sir.")), + l("Hello."), l("Thanks for helping my husband Hinnak."), l("He likes to eat sandwiches. A good thing they are so easy to make!"); @@ -72,14 +72,14 @@ function yannika_intro { speech - lg(l("Hello madam."), l("Hi Sir.")), + l("Hello."), l("Thanks for helping my husband Hinnak."), l("Could you please bring me 2 new knives?"), l("Hinnak wasted all my good kitchen knives trying to get rid of his accursed Pinkies."); select l("Yes, sure thing."), - lg("Not my problem."); + l("Not my problem."); if (@menu == 1) { @@ -94,13 +94,13 @@ function yannika_knives { speech - lg(l("Hello madam."), l("Hi Sir.")), + l("Hello."), l("Thanks for helping my husband Hinnak."), l("Did you brought me 2 new knives?"); select rif(countitem(Knife) >= 2, l("Yes, here they are.")), - lg("Not yet, I'll be back."); + l("Not yet, I'll be back."); if (@menu == 1) { @@ -118,7 +118,7 @@ l("Well, of course. First of all, you need a @@. You can have mine, if you want.", getitemlink(RecipeBook)), l("The recipes, of course, you must collect yourself. Even sandwiches are not so simple as to simply put ingredients and hope for the best."), l("Cooking is an art. You need to know how to cook something. You can use my stove to prepare."), - lg("Or, you can just forget all that, and let me prepare sandwiches for you, too! %%H"), // %%H - Smile Emote + l("Or, you can just forget all that, and let me prepare sandwiches for you, too! %%H"), // %%H - Smile Emote l("Oh, but I'll still need the book. Even if all pages are white."); next; } diff --git a/npc/008-2-17/angus.txt b/npc/008-2-17/angus.txt index 03a919c2..b51f1dcd 100644 --- a/npc/008-2-17/angus.txt +++ b/npc/008-2-17/angus.txt @@ -9,7 +9,7 @@ speech l("Hello."), l("Do you need your pickaxe or your shovel fixed? Then I am your man."), - lg("If you want to play with unicorns, you better piss off now."); + l("If you want to play with unicorns, you better piss off now."); close; diff --git a/npc/008-2-17/caul.txt b/npc/008-2-17/caul.txt index 4381c904..00515a89 100644 --- a/npc/008-2-17/caul.txt +++ b/npc/008-2-17/caul.txt @@ -9,7 +9,7 @@ speech l("Hi there."), l("Don't you like the smoke, when there is a nice fire beneath a cauldron?"), - lg("Honestly, sometimes I prefer nice explosions. Better keep back!"); + l("Honestly, sometimes I prefer nice explosions. Better keep back!"); close; diff --git a/npc/008-2-2/melania.txt b/npc/008-2-2/melania.txt index e585033c..e8e7aa86 100644 --- a/npc/008-2-2/melania.txt +++ b/npc/008-2-2/melania.txt @@ -10,7 +10,7 @@ function lodge_check; speech - lg("Hello Sir.","Hello Miss."), + l("Hello."), l("Welcome to the Rusty Pick."), l("One advice: Don't take the things those drinkers say too serious. They are sitting here and drinking all day."), l("How can we serve you today?"); @@ -39,13 +39,13 @@ else if (INN_REGISTER == .inn) { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("You are already registered here."), + l("You are already registered here."), l("Go on the upper level if you want to change your room or to use it."); } else { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("If you are registered somewhere else you will loose that reservation."), + l("If you are registered somewhere else you will loose that reservation."), l("Do you still want to lodge here?"); if (askyesno() == ASK_YES) @@ -94,7 +94,7 @@ PC_IS_DEAD = false; speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - lg("I registered you on a random bed on the upper level."), + l("I registered you on a random bed on the upper level."), l("You can go upstairs and choose a different room if you want."); savepoint "008-2-3", any(49, 53, 57), any(31, 35); } diff --git a/npc/008-2-20/valia.txt b/npc/008-2-20/valia.txt index 6d88d13c..d9545bf5 100644 --- a/npc/008-2-20/valia.txt +++ b/npc/008-2-20/valia.txt @@ -8,7 +8,7 @@ 008-2-20,32,22,0 script Valia NPC_VALIA,{ speech l("Hi!"), - lg("You may remember me, I am Valia."); + l("You may remember me, I am Valia."); l("Better stay away from my basement, you may end up like the poor guy down there."); close; diff --git a/npc/008-2-4/olana.txt b/npc/008-2-4/olana.txt index cbb4f1b5..4c42f599 100644 --- a/npc/008-2-4/olana.txt +++ b/npc/008-2-4/olana.txt @@ -89,7 +89,7 @@ speech l("Did you see my daughters Rossy and Juliet, by chance?"), l("She wasn't at home for two days now. I worry about her!"), - lg("If you see her, please tell her to come home."); + l("If you see her, please tell her to come home."); } close; @@ -170,7 +170,7 @@ function olanaRossyLie { mesq l("I'll now book you a room on the Inn."); select l("Thanks."), - lg("Actually, please don't. I do this out of the goodness of my heart."); + l("Actually, please don't. I do this out of the goodness of my heart."); mes ""; // Do not register the inn if (@menu == 2) { @@ -203,7 +203,7 @@ function olanaDeliverBerries { setq HurnscaldQuests_Rossy, 5; next; mesn; - mesq lg("Could you do me a small favor, though? I know I barely know you, and you must be very busy, but..."); + mesq l("Could you do me a small favor, though? I know I barely know you, and you must be very busy, but..."); next; olanaGetLetter(); return; diff --git a/npc/008-2-6/donald.txt b/npc/008-2-6/donald.txt index 170059f4..5c75896e 100644 --- a/npc/008-2-6/donald.txt +++ b/npc/008-2-6/donald.txt @@ -9,7 +9,7 @@ speech l("Good day."), l("Sorry, we are sold out for today."), - lg("Come back later."); + l("Come back later."); } else { speech diff --git a/npc/008-2-7/wyara.txt b/npc/008-2-7/wyara.txt index ef7e29fb..7bac6efc 100644 --- a/npc/008-2-7/wyara.txt +++ b/npc/008-2-7/wyara.txt @@ -9,7 +9,7 @@ speech l("What? Is there someone?"), l("Please, leave me alone. I have to pixel- erm, brew potions."), - lg("I will sell some when you return a bit later."), + l("I will sell some when you return a bit later."), l("Unless you are interested in a status reset?"); next; select diff --git a/npc/008-3-0/juliet.txt b/npc/008-3-0/juliet.txt index fb66b917..e0d256be 100644 --- a/npc/008-3-0/juliet.txt +++ b/npc/008-3-0/juliet.txt @@ -605,7 +605,7 @@ OnInstanceInit: mesq l("Mommy teached me about precious gemstones. This Golem has quite a few of them."); next; mesn; - mesq lg("Here you go, miss!", "Here you go, mister!"); + mesq l("Here you go!"); getitem .@gems, 1; quest_item(.@rune, 1); quest_xp(.maxLevel, 100000); @@ -632,7 +632,7 @@ OnInstanceInit: mesq l("But it was big and scary! I haven't seen it since I entered this cave, though..."); next; mesn; - mesq lg("It probably went away after seeing your bravure, tee-hee!"); + mesq l("It probably went away after seeing your bravure, tee-hee!"); next; mesn; mesq l("I must go now. I've already spent too much time here already."); diff --git a/npc/008-3-5/bryant.txt b/npc/008-3-5/bryant.txt index ba97251c..4199c484 100644 --- a/npc/008-3-5/bryant.txt +++ b/npc/008-3-5/bryant.txt @@ -14,7 +14,7 @@ if (.@q == 6) bryantBanditLord(); if (.@q >= 7) bryantComplete(); mesn; - mesq lg("Welcome."); + mesq l("Welcome."); next; mesn; mesq l("I'm looking everywhere for the bandit leader. I can't seem to find him. So I stopped here to rest a bit."); diff --git a/npc/008-3-5/nunia.txt b/npc/008-3-5/nunia.txt index 11fdd179..cd12a085 100644 --- a/npc/008-3-5/nunia.txt +++ b/npc/008-3-5/nunia.txt @@ -32,7 +32,7 @@ function nuniaIntruder { speech l("Who dares to enter this cave? Who are you?"), l("At least, you look peaceful."), - lg("Let's do like this: You leave me alone, and I don't mess with you. Deal?"); + l("Let's do like this: You leave me alone, and I don't mess with you. Deal?"); select l("Deal."), l("No deal, I'm going to report you to authorities!"); diff --git a/npc/009-2-3/barbara.txt b/npc/009-2-3/barbara.txt index 49eb2474..b555b472 100644 --- a/npc/009-2-3/barbara.txt +++ b/npc/009-2-3/barbara.txt @@ -7,7 +7,7 @@ 009-2-3,41,30,0 script Barbara Grey NPC_UNDEAD_RECPTION,{ speech - lg("Don't be shy, darling."), + l("Don't be shy, darling."), l("Come on in and have a nice long... long slumber..."); close; diff --git a/npc/012-1/hasan.txt b/npc/012-1/hasan.txt index 4bdda0b2..79cf9023 100644 --- a/npc/012-1/hasan.txt +++ b/npc/012-1/hasan.txt @@ -9,7 +9,7 @@ speech l("Hey. I did nothing, I swear."), l("Crasmande has been this way since I got here."), - lg("Don't you have more important business to attend to, anyway?"); + l("Don't you have more important business to attend to, anyway?"); close; OnInit: diff --git a/npc/012-2-2/sorfina.txt b/npc/012-2-2/sorfina.txt index d47e5b9f..4c8f476e 100644 --- a/npc/012-2-2/sorfina.txt +++ b/npc/012-2-2/sorfina.txt @@ -7,7 +7,7 @@ 012-2-2,26,30,0 script Sorfina NPC_SORFINA,{ speech - lg("Welcome, adventurer."), + l("Welcome, adventurer."), l("I will never know why people barge in others' houses and get away with it."), l("Ah, no, I'm not telling you to go away. Visits are always welcome, it gets lonely over time. But I don't have anything to offer you otherwise."); if (islegacyaccount() && countitem(ClothesPack)) goto L_Legacy; diff --git a/npc/012-2-4/zitoni.txt b/npc/012-2-4/zitoni.txt index 397a9194..1d8ce355 100644 --- a/npc/012-2-4/zitoni.txt +++ b/npc/012-2-4/zitoni.txt @@ -13,8 +13,8 @@ OnTalk: next; menu - lg("I do not like whiners."), -, - lg("What is your problem?"), L_toams; + l("I do not like whiners."), -, + l("What is your problem?"), L_toams; close; @@ -28,8 +28,8 @@ L_toams: next; menu - lg("Ok, I can try."), -, - lg("Ok, but do you have something else?"), L_jez; + l("Ok, I can try."), -, + l("Ok, but do you have something else?"), L_jez; close; @@ -44,8 +44,8 @@ L_jez: next; menu - lg("Ok, I will do that, but now I must leave."), -, - lg("Is that all, or do you have more problems?"), L_wildx; + l("Ok, I will do that, but now I must leave."), -, + l("Is that all, or do you have more problems?"), L_wildx; close; L_wildx: @@ -56,8 +56,8 @@ L_wildx: mesq l("Please, please find WildX. He will explain to me what my role in this world has been."); menu - lg("Ok, but all that will keep me busy for a while. So, goodbye."), -, - lg("You do not have more problems, do you?"), L_mick; + l("Ok, but all that will keep me busy for a while. So, goodbye."), -, + l("You do not have more problems, do you?"), L_mick; close; L_mick: diff --git a/npc/012-3-3/manatree.txt b/npc/012-3-3/manatree.txt index a348811a..7f37ad30 100644 --- a/npc/012-3-3/manatree.txt +++ b/npc/012-3-3/manatree.txt @@ -9,7 +9,7 @@ speech l("Magic is all around."), l("You just must listen to it, and feel it deep inside."), - lg("Now go, search for the unknown."); + l("Now go, search for the unknown."); close; diff --git a/npc/020-1/hocus.txt b/npc/020-1/hocus.txt index 7d71f957..fcfbe73c 100644 --- a/npc/020-1/hocus.txt +++ b/npc/020-1/hocus.txt @@ -59,7 +59,7 @@ close; } mesn; - mesq lg("Child, I do not need your money nor items. I told you I would teach you the recipe. It is free."); + mesq l("Child, I do not need your money nor your items. I told you I would teach you the recipe. It is free."); next; mesn; mesq l("I am already happy enough that you want to improve your own eating habits. You don't need to give me anything."); @@ -90,7 +90,7 @@ function anwarNotMe { mesq l("Hello Mr. Hocus, kind sir Anwar sent me to fetch some fertilizers to save Tulimshar from famine, if you may?"); next; mesn; - mesq lg("Sorry kind lady @@, but no.", "Sorry kind sir @@, but no.", strcharinfo(0)); + mesq l("Sorry kind friend @@, but no.", strcharinfo(0)); next; mesn; mesq l("Or rather, I can't. I would love to help you, just like everybody else, but I don't know how to make fertilizers, only Salad."); diff --git a/npc/020-1/joaquim.txt b/npc/020-1/joaquim.txt index ad462df0..83c90596 100644 --- a/npc/020-1/joaquim.txt +++ b/npc/020-1/joaquim.txt @@ -122,7 +122,7 @@ function joaquimFound { mes ""; mesn; if (@menu == 1) { - mes lg("Thanks! Thanks! Savior! Hurry up!"); + mes l("Thanks! Thanks! Savior! Hurry up!"); setq TonoriQuest_Joaquim, 2; } else if (@menu == 2) { mes l("Uhm, sorry, I don't trust stuff you get at market. You know."); 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, diff --git a/npc/items/shovel.txt b/npc/items/shovel.txt index 27c9352c..b4a5a968 100644 --- a/npc/items/shovel.txt +++ b/npc/items/shovel.txt @@ -72,7 +72,7 @@ if (@ShovelLastUsed + max(4, .@playertick) > .@tick) { narrator S_FIRST_BLANK_LINE, - lg("You are exhausted, you should rest a bit."); + l("You are exhausted, you should rest a bit."); return true; } @ShovelLastUsed = .@tick; diff --git a/npc/test/test1.txt b/npc/test/test1.txt index 3e6adb30..9fefe307 100644 --- a/npc/test/test1.txt +++ b/npc/test/test1.txt @@ -72,11 +72,13 @@ test,10,5,0 script test1 NPC_HAT_BOX,{ assert(l("data @@ @@ @@ data", "this", "is", "test") == "data this is test data", "\"data @@ @@ @@ data\", \"this\", \"is\", \"test\""); next(); + /* mesf("##2Testing old translation system as %s gender...##0", g("female", "male")); if (Sex == 1) assert(lg("test1 @@", "test2 @@", "line") == "test2 line#1", "\"test1 @@\", \"test2 @@\", \"line\""); else if (Sex == 0) assert(lg("test1 @@", "test2 @@", "line") == "test1 line#0", "\"test1 @@\", \"test2 @@\", \"line\""); + */ next(); } @@ -95,6 +97,7 @@ test,10,5,0 script test1 NPC_HAT_BOX,{ assert(l("data %s %s %s data", "this", "is", "test") == "data this is test data", "\"data %s %s %s data\", \"this\", \"is\", \"test\""); next(); + /* mesf("##2Testing new translation system as %s gender...##0", g("female", "male")); if (Sex == 1) { assert(lg("test") == "test#1", "\"test\""); @@ -105,6 +108,7 @@ test,10,5,0 script test1 NPC_HAT_BOX,{ assert(lg("test1", "test2") == "test1#0", "\"test1\", \"test2\""); assert(lg("test1 %s", "test2 %s", "line") == "test1 line#0", "\"test1 %s\", \"test2 %s\", \"line\""); } + */ next(); mes("##2Testing advanced translation...##0"); |