From 31af18dc02fffe17c114fafa25bd5d7970a9b666 Mon Sep 17 00:00:00 2001 From: Alige Date: Sun, 6 Jan 2013 20:10:35 +0400 Subject: Fixed newly added language in julia's script. Major consistency fixes: removing useless whitespaces and returns to next line. --- npc/000-1/astapolos.txt | 7 +++---- npc/000-1/chest.txt | 2 +- npc/000-1/couwan.txt | 5 ++--- npc/000-1/darlin.txt | 6 +++--- npc/000-1/gugli.txt | 4 ++-- npc/000-1/gulukan.txt | 6 +++--- npc/000-1/jalad.txt | 2 +- npc/000-1/lean.txt | 2 +- npc/000-1/muller.txt | 2 +- npc/000-2-0/doors.txt | 2 +- npc/000-2-0/julia.txt | 27 +++++++++++++-------------- npc/000-2-0/note.txt | 2 +- npc/000-2-1/alige.txt | 1 - npc/000-2-1/arpan.txt | 2 +- npc/000-2-1/chest.txt | 2 +- npc/000-2-3/box.txt | 3 +-- npc/000-2-3/nard.txt | 20 ++++++++++---------- 17 files changed, 45 insertions(+), 50 deletions(-) (limited to 'npc') diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt index edf57a1bd..70c9f1612 100644 --- a/npc/000-1/astapolos.txt +++ b/npc/000-1/astapolos.txt @@ -27,7 +27,7 @@ next; mesq l("Do you think this is fair? They sent me down here alone, far away from everyone."); next; - + menu lg("I'm sorry for your situation. They should change with another sailor from times to times."), -, l("Well if you are whining like that all the time, then I think there is a reason behind their choice."), l_Whyning; @@ -47,11 +47,10 @@ next; mesq lg("Oh, but you didn't come here to talk about that, am I right?"); next; - menu lg("No, indeed. 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..."); @@ -65,7 +64,7 @@ setq ShipQuests_Astapolos, 1; getitem "CroconutBox", 1; - + mes ""; mesn; mesq l("Good luck! And don't forget to visit Peter and our little friends when you will be back onboard!"); diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt index b8d85e784..386f53348 100644 --- a/npc/000-1/chest.txt +++ b/npc/000-1/chest.txt @@ -7,7 +7,7 @@ // A treasure chest, with... Treasures inside! // Variable: // x ShipQuests_TreasureChest -// Values: +// Values: // 0 Treasure Chest has not been opened yet. // 1 Treasure Chest has been opened. diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt index a4a0b799e..c074362d1 100644 --- a/npc/000-1/couwan.txt +++ b/npc/000-1/couwan.txt @@ -6,7 +6,7 @@ // Couwan is trying to scam the player. // Variable: // x ShipQuests_Couwan -// Values: +// Values: // 0 Never talked with Couwan. // 1 Spoke, and received the quest scam. // 2 Done quest scam. @@ -17,7 +17,6 @@ if (@q == 1) goto l_QuestGiven; if (@q > 1) goto l_QuestDone; - mesn; mesq l("Hello yeye."); next; @@ -63,7 +62,7 @@ l_Water: mesq l("Yeye's brain is probably still full of sea water if yeye can't see the beauty of this place."); next; mesq l("Stupid yeye..."); - + close; l_Decline: diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt index 1e37e806e..60980ef31 100644 --- a/npc/000-1/darlin.txt +++ b/npc/000-1/darlin.txt @@ -6,7 +6,7 @@ // Darlin talks from the top of the tall mast. // Variable: // x ShipQuests_TreasureChest -// Values: +// Values: // 0 Treasure Chest has not been opened yet. // 1 Treasure Chest has been opened. @@ -17,7 +17,7 @@ mesn; setcamnpc; - mesq l("HEY! HEY YOU!"); + mesq l("HEY! HEY YOU!"); next; mesq l("CAN YOU HEAR ME?!"); next; @@ -135,7 +135,7 @@ l_Bye: l_DangerAround: setcamnpc; mesq l("NOTHING ELSE OTHER THAN SHARKS AND AN ODD LIGHT!"); - + close; l_Quit: diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt index c7a2f505c..654e2747f 100644 --- a/npc/000-1/gugli.txt +++ b/npc/000-1/gugli.txt @@ -9,7 +9,7 @@ // 0 ShipQuests_Couwan // 1 ShipQuests_Nard // 2 ShipQuests_Gugli -// Values: +// Values: // 00 Never talked with Couwan. // 01 Spoke, and received the quest scam. // 02 Done quest scam. @@ -189,7 +189,7 @@ l_TaskDone: if (countitem("CroconutBox") == 1) delitem "CroconutBox", 1; if (countitem("PlushroomBox") == 1) delitem "PlushroomBox", 1; setq ShipQuests_Gugli, 2; - + getexp 50, 0; mesq l("Well done! The ship is now ready to sail again!"); diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt index d94adec08..1ec1c94c6 100644 --- a/npc/000-1/gulukan.txt +++ b/npc/000-1/gulukan.txt @@ -58,7 +58,7 @@ l_Continue2: setq ShipQuests_Gulukan, 1; getitem "CroconutBox", 1; - + mes ""; mesn; mesq lg("Thank you my friend."); @@ -104,7 +104,7 @@ l_RandomB: close; l_RandomC: - mesq l("I think that yeye's soon be done. Yeye'll soon have a full box of @@s!", getitemlink("CrocClaw")); + mesq l("I think that yeye's soon be done. Yeye'll soon have a full box of @@s!", getitemlink("CrocClaw")); next; mesq l("And you? How's it yaying on your side?"); next; @@ -145,7 +145,7 @@ l_Top: l_NoTask: mes ""; mesn; - mesq l("*uff*... And another box of @@s for our starving colleagues is ready.", getitemlink("Croconut")); + mesq l("*Uff*... And another box of @@s for our starving colleagues is ready.", getitemlink("Croconut")); close; diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt index a7dbbd415..b57500f93 100644 --- a/npc/000-1/jalad.txt +++ b/npc/000-1/jalad.txt @@ -30,7 +30,7 @@ next; mesq l("You should go see him. He is one of the most experienced sailors we have."); next; - + menu l("I will surely visit him. Do you need any help with your boxes?"), -; diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt index 47379f450..8844416b0 100644 --- a/npc/000-1/lean.txt +++ b/npc/000-1/lean.txt @@ -9,7 +9,7 @@ set @gugli, getq(ShipQuests_Gugli); mesn; - mesq l("Hi! I can finally see you under the sunlight!"); + mesq l("Hi! I can finally see you under the sunlight!"); next; mesq l("I hope you don't mind that we used your raft to build this ramp."); next; diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt index f9b64a25e..a6da67b46 100644 --- a/npc/000-1/muller.txt +++ b/npc/000-1/muller.txt @@ -25,7 +25,7 @@ mesn; mesq l("Oh I see... Sailors are not able to do their job anymore, is it like that?!"); next; - + menu l("Indeed! Goodbye."), l_Quit, l("Yes, it is true! You are not able at all. Nard has been waiting for the food for too long already. Hurry up, you lazy sailors!"), -; diff --git a/npc/000-2-0/doors.txt b/npc/000-2-0/doors.txt index 6dabbd4e2..abd0bb206 100644 --- a/npc/000-2-0/doors.txt +++ b/npc/000-2-0/doors.txt @@ -7,7 +7,7 @@ // Variable: // 0 ShipQUests_Nard // 1 ShipQuests_Julia -// Values: +// Values: // 00 Introduction of the box and Nard. This is displayed when the player never spoke to Nard or his box. // 01 Nard spoke and gave access to the outdoor of the ship. // 02 Completed the quest. diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt index f262f638f..92f55de34 100644 --- a/npc/000-2-0/julia.txt +++ b/npc/000-2-0/julia.txt @@ -47,7 +47,7 @@ l_Menu: menu - rif(@q3 == 3, l("I have heard rumors about some old hostilities between you and Gado. Are they truthful?")), l_Rumors, + rif(@q3 == 3, l("I heard rumors about some old hostilities between you and Gado. Are they true?")), l_Rumors, rif(@q2 == 2 && countitem("PoisonedDish", 1), l("Well... No wait, I have something for you but you shouldn't eat it... I'm taking it back to the kitchen.")), l_Regret, rif(@q2 == 2 && countitem("PoisonedDish", 1), l("I have brought you a tasty present for your delicate mouth.")), l_PoisonJulia, lg("I made a mistake, I would like to change my language."), l_ChooseLang, @@ -104,7 +104,7 @@ l_First: next; mesq l("I'm sure that you've got some questions for me, feel free to ask them, but firstly I need to tell you the rules of proper social conduct on board."); - + mesq l("Here they are."); next; @@ -229,28 +229,28 @@ l_Regret: setq ShipQuests_ChefGado, 5; close; - + l_Rumors: mes ""; mesn; - mesq l("You shouldn't believe all stories sailors tell when they are drunk."); + mesq l("You shouldn't believe all of the stories drunk sailors tell you."); next; menu - l("Let's say that who told me that was a respectable person and not even drunk."), -; + l("Let's say the person who told me about that is well respected on this ship and never drunk."), -; mes ""; mesn; - mesq l("Ahahah. All sailors here are always drunk, well... Except... What?! Nard told you that?!"); + mesq l("Hahaha! All sailors aboard this ship are always drunk... Well... Except... Wait, what?! Nard told you?!"); next; - mesq l("Doesn't he appreciate how I'm taking care of his ship? Everything is finally clean and tidy with me as the lieutenant of La Johanne."); + mesq l("Doesn't he like the way I'm taking care of his ship? Everything is clean and tidy with me, rightful lieutenant of La Johanne."); next; - mesq l("I give tasks to every sailor all day long to make him happy!"); + mesq l("I give tasks to every single sailor, all day long. That should make him happy!"); next; menu - l("Uhm I don't think it is the best way to rule a ship. See you..."), l_Quit, - l("Actually everything seems in perfect order under your guidance. Nard has done the right choice."), -; + l("Well... I don't think it is the best way to rule a ship. Think about it."), l_Quit, + l("In fact, everything seems to work perfectly under your guidance. Nard has made the right choice."), -; setq ShipQuests_ChefGado, 6; mes ""; @@ -260,10 +260,9 @@ l_Rumors: mesq l("Take this money as a reward for your nice words."); set zeny, zeny + 40; message strcharinfo(0), l("You receive 40 GP!"); - - close; - - + + close; + l_Quit: mes ""; mesn; diff --git a/npc/000-2-0/note.txt b/npc/000-2-0/note.txt index bb388a442..a893c54f9 100644 --- a/npc/000-2-0/note.txt +++ b/npc/000-2-0/note.txt @@ -23,7 +23,7 @@ mesq col(l("6. Follow the social convention listed on the RFC1855 article."), 9); next; mes col(l("Following these lines are some other writings on this paper."), 9); - next; + next; mesq col(l("Do not give the password of your room to anybody! Keep it secret and try not to use the same one in any other room in the future. - Julia"), 9); next; mesq col(l("Does somebody know a good place to hang out in Esperia? - M. Arpan"), 9); diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt index 62ae157b3..59a7c3512 100644 --- a/npc/000-2-1/alige.txt +++ b/npc/000-2-1/alige.txt @@ -101,7 +101,6 @@ l_CanHelp: l("Sure, but what can you give me in exchange?"), l_AboutReward, l("Why don't you come out?"), -; - l_ExplainHiding: setcamnpc; mes ""; diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt index 118f25611..a0cfbb793 100644 --- a/npc/000-2-1/arpan.txt +++ b/npc/000-2-1/arpan.txt @@ -151,7 +151,7 @@ l_Menu: rif(!@equipped, lg("What should I do after taking these clothes?")), l_WhatCloth, rif(!@equipped, l("Thank you, I'll take them and put them on.")), l_Quit, l("Nothing, sorry."), l_Quit; - + close; l_Where: diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt index feb4220f3..e379ee765 100644 --- a/npc/000-2-1/chest.txt +++ b/npc/000-2-1/chest.txt @@ -13,7 +13,7 @@ 000-2-1.gat,51,37,0 script Chest 317;2,{ set @q, getq(ShipQuests_Arpan); - + if (@q == 0) goto l_Talk; if (getnpcdir ("") == 4) goto l_Give; diff --git a/npc/000-2-3/box.txt b/npc/000-2-3/box.txt index cbf9c53c8..0712158f1 100644 --- a/npc/000-2-3/box.txt +++ b/npc/000-2-3/box.txt @@ -9,7 +9,7 @@ // ShipQuests // Variable: // ShipQuests_Nard -// Values: +// Values: // 0 Introduction of the boxes and Nard. This is displayed when the player never spoke to Nard or his box. // 1 Nard spoke and gave access to the outdoor of the ship. // 2 Completed the Gugli quest. @@ -17,7 +17,6 @@ // 4 ChefGado Quest completed and "Introduction" chapter finalized. // 5 Reward taken from the box. - 000-2-3.gat,25,24,0 script Box 102;1,{ set @q, getq(ShipQuests_Nard); diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt index aff2f6e07..adb9426ca 100644 --- a/npc/000-2-3/nard.txt +++ b/npc/000-2-3/nard.txt @@ -11,7 +11,7 @@ // 0 ShipQuests_Nard // 1 ShipQuests_Gugli // 2 ShipQuests_ChefGado -// Values: +// Values: // 00 Introduction of the boxes and Nard. This is displayed when the player never spoke to Nard or his box. // 01 Nard spoke and gave access to the outdoor of the ship. // 02 Completed the Gugli quest. @@ -38,9 +38,9 @@ l_Checker: if (@nard == 1) goto l_NotYet; mesn; - mesq l("Hello."); + mesq l("Hello."); next; - mesq l("Let me introduce myself, I am Nard, captain of this ship."); + mesq l("Let me introduce myself, I am Nard, captain of this ship."); next; mesq lg("It is nice to see that you woke up fine at the same time. Elmo came here to tell me this good news!"); next; @@ -78,7 +78,7 @@ l_MenuQuest: mesq l("Oh! I like that sort of answer!"); next; mesq g(l("We need manpower on the island... Oh forgive me, women are also welcome, of course."), - l("We need manpower on the island.")); + l("We need manpower on the island.")); next; goto l_NeedContent; @@ -88,13 +88,13 @@ l_NeedHead: mesn; l_NeedContent: - mesq l("Sure, there is a reward for your task."); + mesq l("Sure, there is a reward for your task."); next; - mesq l("Our crew is like a family, and if you agree to help us, I would like to invite you to join our family!"); + mesq l("Our crew is like a family, and if you agree to help us, I would like to invite you to join our family!"); next; - mesq l("What? It's not a good reward?"); + mesq l("What? It's not a good reward?"); next; - mesq l("Oh well. I'll also give you one of these hats from the box near you, but only after you complete your task!"); + mesq l("Oh well. I'll also give you one of these hats from the box near you, but only after you complete your task!"); next; mesq l("I give you this key, it opens any doors on this ship."); next; @@ -140,7 +140,7 @@ l_SpecialTask: l_NotYet: mesn; - mesq l("You still haven't completed your tasks."); + mesq l("You still haven't completed your tasks."); close; l_Done: @@ -184,7 +184,7 @@ l_ChefQuestGiven: l_ChefQuestComplete: mesn; - mesq l("Congratulations!"); + mesq l("Congratulations!"); next; mesq l("You are now officially part of my crew! Thanks again for your help."); next; -- cgit v1.2.3-70-g09d2