From 79329bf9a843203e5bffba9bad141992d963abb7 Mon Sep 17 00:00:00 2001 From: j-tkay Date: Fri, 7 Sep 2012 05:06:24 +0000 Subject: - Fixed bugreport:6588, grammatical errors here and there. (other/pvp.txt & cities/morocc.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16756 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/cities/morocc.txt | 4 +- npc/other/pvp.txt | 126 ++++++++++++++++++++++++-------------------------- 2 files changed, 62 insertions(+), 68 deletions(-) diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt index 5698016bb..a533b0fd6 100644 --- a/npc/cities/morocc.txt +++ b/npc/cities/morocc.txt @@ -7,7 +7,7 @@ //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Morroc Town NPCs //===== Additional Comments: ================================= //= Fully working @@ -296,7 +296,7 @@ moc_ruins,118,82,1 script Little Boy#moc 706,{ moc_ruins,121,116,4 script Picky Lady#moc 66,{ mes "[Syvia]"; - mes "The fields of Rune-Midgard are infested with wild and dangerous monsters..But, you've got to admit a bunch of them are soooo cute!."; + mes "The fields of Rune-Midgard are infested with wild and dangerous monsters..But, you've got to admit a bunch of them are soooo cute!"; mes "You know, like how Spore sticks out its tongue after you kill it.."; next; mes "[Syvia]"; diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index 04133ed89..3fb2833a9 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf, Elias (og2) //===== Current Version: ===================================== -//= 2.2 +//= 2.3 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -13,43 +13,41 @@ //= 2.0 Narrators/GateKeepers,etc. Translated from the Official 2011 [Elias] //= 2.1 Changed PVP Narrator and GateKeeper to Floating NPC [Elias] //= 2.2 Some cleaning. [Euphy] +//= 2.3 Fixed grammatical errors. [Joseph] //============================================================ - script PVP Narrator::pvpe -1,{ mes "[PVP Narrator]"; mes "Hello and welcome!"; mes "I am in charge of"; - mes "explaining the PVP Mode."; + mes "explaining the PVP Modes."; mes "I am the PVP Narrator!"; next; switch(select("What is PVP?","What are the PVP Modes?","What are the rules for PVP?","Save Position.","End Dialog.")) { case 1: mes "[PVP Narrator]"; - mes "In short form"; - mes "PVP means,"; + mes "In short, PVP means"; mes "' Player VS Player Mode '"; mes "It's a unique place for people"; - mes "To duel with each other."; + mes "to duel with each other."; next; mes "[PVP Narrator]"; mes "Just tell the"; mes "^3355FFGate Keeper^000000"; - mes "That you want to try. He will"; - mes "let you into the PVP square."; + mes "that you want to try. He will"; + mes "let you enter the PVP square."; next; mes "[PVP Narrator]"; - mes "But, You need to be at"; + mes "But, you need to be at"; mes "least level 31. And you"; - mes "must pay the 500 zeny"; - mes "entrance fee in order to"; - mes "To enter a PVP Fight Square."; + mes "must pay 500 zeny entrance fee in order"; + mes "to enter a PVP fight square."; break; case 2: mes "[PVP Narrator]"; - mes "When you are qualified, You"; - mes "can choose one of two Modes."; - mes "Yoyo Mode, Or"; - mes "Nightmare Mode."; + mes "When you are qualified, you"; + mes "can choose one of the two modes."; + mes "Yoyo Mode or Nightmare Mode."; next; mes "[PVP Narrator]"; mes "Yoyo Mode is risk free."; @@ -61,25 +59,25 @@ next; mes "[PVP Narrator]"; mes "Nightmare Mode is very"; - mes "dangerous! Please use caution."; - mes "You will lose some of your real"; + mes "dangerous! Please be cautious,"; + mes "you will lose some of your"; mes "EXP when you are defeated. And"; - mes "There is a small chance that"; + mes "there is a small chance that"; mes "you will drop some equipment."; next; mes "[PVP Narrator]"; mes "However, if you win, the"; mes "rewards can be great!"; - mes "To avoid misunderstanding."; - mes "You should think it over"; - mes "twice before you go there..."; + mes "To avoid misunderstanding,"; + mes "you should think twice"; + mes "before you go there..."; mes "Good Luck!"; break; case 3: mes "[PVP Narrator]"; - mes "Each of the Fight squares"; - mes "have a row of Narrators to"; - mes "choose from based on your"; + mes "Each of the fight squares"; + mes "have a row of Narrators and"; + mes "choose them based on your"; mes "qualifications."; next; mes "[PVP Narrator]"; @@ -93,7 +91,7 @@ mes "the number of people who can"; mes "participate. So you will see"; mes "figures in the corner showing"; - mes "'Attendee/total'."; + mes "'Attendee/Total'."; next; mes "[PVP Narrator]"; mes "Also, there is a hidden EXP"; @@ -105,8 +103,8 @@ mes "[PVP Narrator]"; mes "Every player's EXP at the"; mes "beginning is usually 5 points."; - mes "If you win, you will"; - mes "increse your EXP by 1 point"; + mes "If you win, it will"; + mes "increase by 1 point"; next; mes "[PVP Narrator]"; mes "In the same way, when you"; @@ -119,34 +117,33 @@ mes "And your EXP is equal"; mes "to or less than 0,"; mes "You will be removed from PVP"; - mes "And your duel is finished!"; + mes "and your duel is finished!"; next; mes "[PVP Narrator]"; - mes "However, If your EXP is more"; + mes "However, if your EXP is more"; mes "than 0. You can still get help"; - mes "Through other players healing..."; + mes "through other players healing..."; mes "Do you get it?"; next; mes "[PVP Narrator]"; mes "The fighting commands inside of"; - mes "PVP Are the same as the normal."; + mes "PVP are the same as the normal."; mes "All the basic controls are the"; mes "same."; next; mes "[PVP Narrator]"; mes "However, there is one thing..."; - mes "Within the PVP fight square,"; - mes "And in the PVP fighting zones"; - mes "You cannot save your position."; + mes "Within the PVP fight square"; + mes "and PVP fighting zones,"; + mes "you cannot save your position."; mes "Remember well... These rules"; mes "can help to ensure your victory."; break; case 4: mes "[PVP Narrator]"; - mes "Position saved..."; - mes "Successfully."; - mes "Thank you very much, We"; - mes "will see you again soon."; + mes "Position successfully saved..."; + mes "Thank you very much!"; + mes "We will see you again soon."; if(strnpcinfo(4) == "morocc_in") { savepoint "morocc_in",141,139; } if(strnpcinfo(4) == "alberta_in") { savepoint "alberta_in",22,148; } if(strnpcinfo(4) == "prt_in") { savepoint "prt_in",54,137; } @@ -155,12 +152,12 @@ break; case 5: mes "[PVP Narrator]"; - mes "In this war between Monsters"; - mes "and Humans. This competition"; - mes "between people, The PVP Mode!"; - mes "Encourages us all to become"; - mes "stronger. Come again."; - mes "We welcome your challenge!"; + mes "With war raging between monsters"; + mes "and humans, This competition"; + mes "among people - PVP -"; + mes "encourages us all to get"; + mes "stronger. Come again,"; + mes "we welcome your challenge!"; break; } close; @@ -188,7 +185,7 @@ geffen_in,67,63,4 duplicate(pvpe) PVP Narrator#pe6 84 case 1: mes "[Gate Keeper]"; mes "I am sorry, but currently the Nightmare mode service is not available."; - mes "Please use the Yoyo mode instead. We apologize for the inconvenience."; + mes "Please use the Yoyo Mode instead. We apologize for the inconvenience."; break; case 2: mes "[Gate Keeper]"; @@ -197,8 +194,7 @@ geffen_in,67,63,4 duplicate(pvpe) PVP Narrator#pe6 84 mes "to the Yoyo Mode"; mes "fight square?"; next; - switch(select("Move","Cancel")) { - case 1: + if(select("Move","Cancel")==1) { if ((Zeny > 499) && (BaseLevel > 30)) { set Zeny, Zeny - 500; warp "pvp_y_room",51,23; @@ -211,23 +207,21 @@ geffen_in,67,63,4 duplicate(pvpe) PVP Narrator#pe6 84 mes "500 Zeny entrance fee, and"; mes "that you are at least level 31!"; } - break; - case 2: - mes "[Gate Keeper]"; - mes "In this war between Monsters"; - mes "and Humans. This competition"; - mes "between people, The PVP Mode!"; - mes "Encourages us all to become"; - mes "stronger. Come again."; - mes "We welcome your challenge!"; - break; + close; } - break; + mes "[Gate Keeper]"; + mes "With war raging between monsters"; + mes "and humans, This competition"; + mes "among people - PVP -"; + mes "encourages us all to get"; + mes "stronger. Come again,"; + mes "we welcome your challenge!"; + close; case 3: mes "[Gate Keeper]"; - mes "Welcome"; + mes "Welcome!"; mes "Please double check"; - mes "That you have the admission or viewing ticket!"; + mes "that you have the admission or viewing ticket."; next; if ((countitem(7028) == 0) && (countitem(7029) == 0)) { mes "[Gate Keeper]"; @@ -244,12 +238,12 @@ geffen_in,67,63,4 duplicate(pvpe) PVP Narrator#pe6 84 break; case 4: mes "[Gate Keeper]"; - mes "In this war between Monsters"; - mes "and Humans. This competition"; - mes "between people, The PVP Mode!"; - mes "Encourages us all to become"; - mes "stronger. Come again."; - mes "We welcome your challenge!"; + mes "With war raging between monsters"; + mes "and humans, This competition"; + mes "among people - PVP -"; + mes "encourages us all to get"; + mes "stronger. Come again,"; + mes "we welcome your challenge!"; break; } close; -- cgit v1.2.3-60-g2f50