From 2bb879552c0cd1cf4e8838885f72afa5cad8b724 Mon Sep 17 00:00:00 2001 From: samuray22 Date: Sat, 31 May 2008 00:21:08 +0000 Subject: * Corrected some typos errors in Gunslinger Quest. (bugreport:1549) * Corrected some "mes" without the getitemname in Sage Quest. (bugreport:1564) * Deleted Empty Color Tag in Soul Linker Quest. (bugreport:1572) * Changed an incorrect "!=" to "==" in Sage Quest. (bugreport:1572) -And Small Typo Error. * Changed some "close"s to "close2"s on Aldebaran Guides. (bugreport:1597) * Deleted a Unnecessary "end" in Rachel Guide. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12746 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 8 ++++++++ npc/guides/guides_alde.txt | 7 ++++--- npc/guides/guides_rachel.txt | 4 ++-- npc/jobs/1-1e/gunslinger.txt | 6 +++--- npc/jobs/2-2/sage.txt | 17 ++++++++++------- npc/jobs/2-2e/SoulLinker.txt | 7 ++++--- 6 files changed, 31 insertions(+), 18 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 35a01d19a..8db891ffb 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,13 @@ Date Added ====== +2008/05/31 + * Corrected some typos errors in Gunslinger Quest. (bugreport:1549) [Samuray22] + * Corrected some "mes" without the getitemname in Sage Quest. (bugreport:1564) + * Deleted Empty Color Tag in Soul Linker Quest. (bugreport:1572) + * Changed an incorrect "!=" to "==" in Sage Quest. (bugreport:1572) + -And Small Typo Error. + * Changed some "close"s to "close2"s on Aldebaran Guides. (bugreport:1597) + * Deleted a Unnecessary "end" in Rachel Guide. 2008/05/28 * Rev 12740 Added warps points for episode 13.1 maps. [L0ne_W0lf] 2008/05/20 diff --git a/npc/guides/guides_alde.txt b/npc/guides/guides_alde.txt index 8fd200650..d65af4d45 100644 --- a/npc/guides/guides_alde.txt +++ b/npc/guides/guides_alde.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 1.6 +//= 1.6a //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -17,6 +17,7 @@ //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA] //= 1.5 Removed Duplicates [Silent] //= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] +//= 1.6a Changed some "close"s to "close2"s. (bugreport:1597) [Samuray22] //============================================================ aldebaran,139,63,4 script Soldier#alde 105,{ @@ -42,14 +43,14 @@ aldebaran,139,63,4 script Soldier#alde 105,{ mes "^515151+^000000 -> Pub"; mes "^3355FF+^000000 -> Item Shop"; mes "^FF5555+^000000 -> Alchemist Guild"; - close; + close2; cutin "prt_soldier",255; end; } mes "[Al De Baran Guard]"; mes "We are sworn to protect Al De Baran! May the forces of evil always be crushed by the"; mes "righteous fist of good!"; - close; + close2; cutin "prt_soldier",255; end; } diff --git a/npc/guides/guides_rachel.txt b/npc/guides/guides_rachel.txt index 116349689..eecb8eb61 100644 --- a/npc/guides/guides_rachel.txt +++ b/npc/guides/guides_rachel.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2a +//= 1.2b //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -16,6 +16,7 @@ // -Thanks to $ephiroth. //= 1.2a Fixed some errors with the loop[Samuray22] // -Thanks to $ephiroth. +//= 1.2b Deleted a unnecessary "end". [Samuray22] //============================================================ rachel,138,146,5 script Rachel Guide 934,{ @@ -112,5 +113,4 @@ rachel,138,146,5 script Rachel Guide 934,{ } } close; - end; } diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt index 5fc88c33d..79f65b120 100644 --- a/npc/jobs/1-1e/gunslinger.txt +++ b/npc/jobs/1-1e/gunslinger.txt @@ -7,7 +7,7 @@ //= DON'T REMOVE THIS! (by request of him, he provided all //= the info regarding the quests and shops.) //===== Current Version: ===================================== -//= 2.1a +//= 2.1b //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -27,6 +27,7 @@ //= his first try [SinSloth] 1.10b - removed .GATs [Lupus] //= 2.1 Wise Bull Horn now deletes all items. Thanks to yyCC. [L0ne_W0lf] //= 2.1a Corrected a Typo error ";;". [Samuray22] +//= 2.1b Corrected some typos errors. (bugreport:1549) [Samuray22] //============================================================ que_ng,152,167,3 script Master Miller 901,{ @@ -149,7 +150,6 @@ que_ng,152,167,3 script Master Miller 901,{ next; mes "[Master Miller]"; mes "Okay, from now on you'll be a Gunslinger."; - mes "From now on, you are a gunslinger."; mes "After this, for every moment that you live,"; mes "remember can never leave your side"; mes "is your gun. We must remember the gun"; @@ -393,7 +393,7 @@ payon,184,65,3 script The Wise Bull Horn 866,{ set GUNS_Q,5; next; mes "[The Wise Bull Horn]"; - mes "Take this Gift made bye me"; + mes "Take this Gift made by me"; mes "and show it to Dark Fox."; mes "You have my blessings"; mes "to become a Gunslinger."; diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index f702be59c..70e7d23d4 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -5,7 +5,7 @@ //= Unknown Translator (1.0) //= Darkchild (1.2) //===== Current Version: ===================================== -//= 2.5 +//= 2.5a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -20,6 +20,9 @@ //= 2.4 Fixes bug with first room monsters not being reset. [L0ne_W0lf] //= 2.4a Deleted unused variables. [Samuray22] //= 2.5 Updated waiting room. (Removes global var) [L0ne_W0lf] +//= 2.5a Corrected some "mes"s without the getitemname. (bugreport:1564) [Samuray22] +// -Changed an incorrect "!=" to "==". (bugreport:1572) +// -And Small Typo Error //============================================================ yuno_in02,38,61,5 script Dean of the Academy#sa 743,{ @@ -203,7 +206,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{ close; } if (BaseJob != Job_Mage) { - if (BaseJob != Job_Sage) { + if (BaseJob == Job_Sage) { mes "Oh nice to meet you again, long time no see."; mes "So how's it going with the studying?"; next; @@ -554,10 +557,10 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{ next; mes "[Metheus Sylphe]"; mes "Please bring the following items to me."; - mes .@count[0]+" ^3355FF"+.@item[0]+"^000000"; - mes .@count[1]+" ^3355FF"+.@item[1]+"^000000"; - mes .@count[2]+" ^3355FF"+.@item[2]+"^000000"; - if (SAGE_Q == 3) mes .@count[3]+" ^3355FF"+.@item[3]+"^000000"; + mes .@count[0]+" ^3355FF"+getitemname(.@item[0])+"^000000"; + mes .@count[1]+" ^3355FF"+getitemname(.@item[1])+"^000000"; + mes .@count[2]+" ^3355FF"+getitemname(.@item[2])+"^000000"; + if (SAGE_Q == 3) mes .@count[3]+" ^3355FF"+getitemname(.@item[3])+"^000000"; next; mes "[Metheus Sylphe]"; mes "If you bring all of these items, your tuition fee will be reduced from 70,000 zeny to 30,000 zeny."; @@ -649,7 +652,7 @@ yuno_in03,105,177,5 script Written Test Professor#s 754,{ close; } if (SAGE_Q == 0) { - mes "What, do you want to be a sage?"; + mes "What, do you want to be a Sage?"; mes "I can tell by your eyes, hungering for wisdom."; next; mes "[Claytos Verdo]"; diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt index b57179362..3b4fea5e6 100644 --- a/npc/jobs/2-2e/SoulLinker.txt +++ b/npc/jobs/2-2e/SoulLinker.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Celestria & Samuray22 //===== Current Version: ===================================== -//= 1.3 +//= 1.3a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -16,7 +16,8 @@ //= 1.3 Slight updates and fixes to the script. [L0ne_W0lf] //= Removes the use of labels, and corrects other errors. //= Removed the GM-use only NPC from the sec_in map. -//= No longer used a clobal var, uses an NPC var isntead. +//= No longer used a global var, uses an NPC var instead. +//= 1.3a Deleted Empty Color Tag. (bugreport:1572) [Samuray22] //============================================================ morocc_in,174,30,6 script Kid#link1 716,{ @@ -129,7 +130,7 @@ morocc_in,174,30,6 script Kid#link1 716,{ mes "spiritually inclined, these"; mes "spirits are attracted to you."; mes "With enough training, you can"; - mes "temporarily imbue the power^FFFFFF ^000000 of these spirits to your allies."; + mes "temporarily imbue the power of these spirits to your allies."; next; mes "[Kid]"; mes "Now, you can't imbue yourself"; -- cgit v1.2.3-70-g09d2