git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6513 54d463be-8e91-2dee-dedb-b68131a5f0ec

6 files changed, 84 insertions, 77 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c751a7ffd..64c719e0d 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.

 

 2006/05/07

+	* Fixed readme/changelog.html [KillerBox]

 	* Removed old logs. [Lupus]

 	TODO: 1. Add produce logging into PICKLOG 2. Replace map names with map index

 2006/05/05

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 863762117..7c38958b3 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -28,6 +28,7 @@ Nexon
 Date		Added

 ======

 05/07

+	* Fixed some grammar errors in Thief Job, Kunai, and others [KillerBox]

 	* Fixed Sea Otter Quest thanks to nolider [Playtester]

 05/06

 	* Fixed the warp in the Turbo Track Room [Playtester]

diff --git a/npc/custom/quests/elvenear.txt b/npc/custom/quests/elvenear.txt
index 475f7c87f..a20dacd82 100644
--- a/npc/custom/quests/elvenear.txt
+++ b/npc/custom/quests/elvenear.txt
@@ -19,7 +19,6 @@ geffen.gat,127,49,5	script	Elven Ears Quest	84,{
 	mes "Ah, the ^61B031Elven Ears ^000000Quest!"; 

 	next; 

 	menu "Requirements",L_Bl, "Make Item",-, "Cancel",L_Cancel; 

-

 	mes "[Elven Ears quest]";

 	mes "Good good, let me just check"; 

 	if(countitem(2213)<1 || countitem(1040)<20 || countitem(919)<20) goto L_NoMake; 

@@ -36,6 +35,7 @@ geffen.gat,127,49,5	script	Elven Ears Quest	84,{
 	close;

 

 L_NoMake:

+	next;

 	mes "[Elven Ears Quest]";

 	mes "You don't have the requirements.";

 	mes "Please come back another time...";

@@ -47,18 +47,18 @@ L_Bl:
 	mes "^362ED620 Elder Pixie Mustaches^000000"; 

 	mes "and ^362ED620 Animal Skin^000000";

 	next;

-

 	menu "Accept",-, "Leave",L_Leave;

-

 	mes "When you are done, bring the items to me.  Ok good luck finding those items.";

 	close;

 

 L_Leave:

+	next;

 	mes "[Elven Ears quest]";

 	mes "Maybe another time?";

 	close;

 

 L_Cancel:

+	next;

 	mes "[Elven Ears quest]";

 	mes "Aw, what a shame";

 	mes "Giving up already?";

diff --git a/npc/jobs/1-1/thief.txt b/npc/jobs/1-1/thief.txt
index 3f34947a1..0d1361927 100644
--- a/npc/jobs/1-1/thief.txt
+++ b/npc/jobs/1-1/thief.txt
@@ -44,8 +44,8 @@ M_Menu:
 

 		M_0:

 		mes "[Thief Guide]";

-		mes "Hmph... you sound a little cocky....  Ya know, being a Thief isn't all it's cracked up to be....";

-		mes "That reminds me.... I must have been at lvl 9 or 10.... it was my first robbery....";

+		mes "Hmph... you sound a little cocky....  Yah know, being a Thief isn't all it's cracked up to be....";

+		mes "That reminds me.... I must have been at lvl 9 or 10 when I did my first robbery....";

 		next;

 		mes "[Thief Guide]";

 		mes "Hahahaha... I can still remember the look on that guy's face...";

@@ -54,7 +54,7 @@ M_Menu:
 		mes "[Thief Guide]";

 		mes "But anyways... I assume you're here to become a thief...";

 		next;

-		menu "-You got it.",sM_0a, "-Nope.  Just wasting your time. ^ ^",sM_0b, "-Why did you steal from that man?",sM_0c;

+		menu "You got it.",sM_0a, "Nope.  Just wasting your time. ^ ^",sM_0b, "Why did you steal from that man?",sM_0c;

 

 		sM_0a:

 			goto L_Test;

@@ -82,50 +82,52 @@ M_Menu:
 

 	L_Test:

 		mes "[Thief Guide]";

-		mes "Ok then.  First, fill out this application form.";

+		mes "Okay then; first, fill out this application form.";

 		next;

-		mes "(you fill out the form and hand it back)";

+		mes "^0000FF(You fill out the form and hand it back)^000000";

 		next;

 		if(JobLevel < 10) goto sL_JobLvl;

 

 		mes "[Thief Guide]";

-		mes "Alrighty ^ff0000"+ strcharinfo(0) + "^000000, if that IS your real name..... looks like you've got quite a 'record' here.";

+		mes "Alrighty ^FF0000"+ strcharinfo(0) + "^000000, if that IS your real name..... looks like you've got quite a 'record' here.";

 		mes "Let's see.... aggravated assualt... felony larson..... hmm....";

 		next;

 		mes "[Thief Guide]";

-		mes "Ah, here we go...... you've got the job and skill requirements to become a Thief.  Now all you gota do is pass the Morroc Thief Test.";

+		mes "Ah, here we go...... you've got the job and skill requirements to become a Thief.  Now all you've got to do is pass the ^FF0000Morroc Thief Test^000000.";

 		next;

 

 		L_Explain:

 		mes "[Thief Guide]";

-		mes "   The test will require you to ^ff0000'sneak'^000000 into ^ff0000'Shibu's Farm'^000000, and ^ff0000'steal'^000000 some ^aaaa00'Mushrooms'^000000.";

-		mes "   There are ^ff00002^000000 kinds of ^aaaa00Mushrooms^000000 on the farm, ^ffbb00Orange Net Mushrooms^000000 and ^ffbb00Orange Gooey Mushrooms^000000.";

+		mes "   The test will require you to ^FF0000'sneak'^000000 into ^FF0000'Shibu's Farm'^000000, and ^FF0000'borrow'^000000 some ^AAAA00'Mushrooms'^000000.";

+		mes "   There are ^ff00002^000000 kinds of ^AAAA00Mushrooms^000000 on the farm, ^FFBB00Orange Net Mushrooms^000000 and ^FFBB00Orange Gooey Mushrooms^000000.";

 		next;

 		mes "[Thief Guide]";

-		mes "'Shibu' just happens to be the worst merchant scammer in Morroc, in case your wondering why he's our target.";

+		mes "'Shibu just happens to be the worst merchant scammer in Morroc, in case you're wondering why he's our target.";

 		next;

 		mes "[Thief Guide]";

-		mes "   Bring the Mushrooms back here and someone will give you a score based on the type, and the amount of mushrooms you get.";

-		mes "   1 Orange Net Mushroom = ^0000ff3 points^000000 while 1 Orange Gooey Mushroom = ^0000ff1 point^000000.  You need 25 points to pass the test.";

+		mes "   Bring the Mushrooms back here and someone will give you a score based on the type and the amount of mushrooms you get.";

+		mes "   1 Orange Net Mushroom = ^0000FF3 points^000000 while 1 Orange Gooey Mushroom = ^0000FF1 point^000000.  You need ^FF000025^000000 points to pass the test.";

 		next;

 		mes "[Thief Guide]";

 		mes "   In order to get into Shibu's Farm you'll need to talk to one of our 'associates'.  You can find him just ouside of this pyramid standing near some columns.";

-		mes "   He goes by the name ^ddcc00'Irrelevant Man'^000000.";

+		mes "   He goes by the name ^DDCC00'Irrelevant Man'^000000.";

 		next;

 		mes "[Thief Guide]";

 		mes "   Here are his exact coordinates just in case you are 'directionaly challenged': '^FF0000141, 125^000000'.";

 		mes  "  Find him and he'll show you a secrect way into the Farm.";

 		next;

 		mes "[Thief Guide]";

-		mes "   This sounds easy but ^009900do you know there are Monsters which keep Mushrooms from the robbery^000000?";				//had to leave the engrish in, it was to good not too.  d^_^b

-		mes "   Please ^0000ffget yourself out of the Fairy Tales^000000 and ^ff0000'Brace up your nerves. That will be the toughest experience to you^000000.";

+		mes "   This sounds easy but ^009900do know, there are Monsters who guard Mushrooms^000000?";

+				// had to leave the engrish in, it was to good not too.  d^_^b

+				// And I took it out.  :D  [KillerBox]

+		mes "   Stop reading Fairy Tales and ^FF0000brace up your nerves; this will be the toughest experience ever^000000.";

 		next;

 		mes "[Thief Guide]";

-		mes "   So, I will give you one tip. ^ff0000Elaborate the Strategy^000000 before you going inside the Farm.";

+		mes "   So, I will give you one tip. ^FF0000Elaborate the Strategy^000000 before you going inside the Farm.";

 		next;

 		mes "[Thief Guide]";

-		mes "   Try to steal the mushrooms as quickly as you can.  You may even have to ^0000ffunequip some weapons or armor^000000.";

-		mes "   You don't want to get killed while doing this... at the very least try to give me the mushrooms first.... then you can go get yourself killed... HA!";

+		mes "   Try to steal the mushrooms as quickly as you can.  You may even have to ^0000FFunequip some weapons or armor to attack faster^000000.";

+		mes "   Try not to get killed while doing this... at the very least try to give me the mushrooms first.... then you can go get yourself killed... HA!";

 		next;

 		mes "[Thief Guide]";

 		mes "   If you don't have any questions... then GET moving!";

@@ -135,7 +137,7 @@ M_Menu:
 

 		sL_JobLvl:

 			mes "[Thief Guide]";

-			mes "Err I can see how ambitious you are......but we can't hand a gun to a baby only for that? Come back when you learn all Basic Skills.";

+			mes "Err... I can see how ambitious you are, but we can't hand a gun to a baby only for that. Come back when you learn all Basic Skills.";

 			close;

 

 	L_Back:

@@ -175,16 +177,19 @@ M_Menu:
 

 	L_1:

 		mes "[Thief Guide]";

-		mes "So how was the Mushroom Farm.  Did ya have much fun?";

+		mes "So how was the Mushroom Farm?  Did yah have much fun?";

 		next;

 		menu "Yeah, kinda Cool.",M_Cool,"It was horrible.",M_Not;

 

 		M_Cool:

 			mes "[Thief Guide]";

-			mes "   Wow! I like you! Fabulous! Everyone before you was `S@#$ Bloody As#$%^&s'.";

+			mes "   Wow! I like you! Fabulous! Everyone before you was #&$@ bloody As#$%^&s#!";

 			next;

 			mes "[Thief Guide]";

-			mes "...... You won't take my place, will you? If you have any ambition like that, I will kick your ^ff0000'ASS OUT OF YOUR BUTT'^000000!";	//this is just too much lol.

+			mes "...... You won't take my place, will you?  If you have any ambition like that, I'll ^ff0000DESTROY YOU^000000!";

+			// mes "...... You won't take my place, will you?  If you have any ambition like that, I will kick your ^ff0000'ASS OUT OF YOUR BUTT'^000000!";

+			// this is just too much lol.

+			// That line before was just too precious to delete.  [KillerBox]

 			emotion e_gasp;

 			next;

 			mes "[Thief Guide]";

@@ -192,7 +197,7 @@ M_Menu:
 			close;

 		M_Not:

 			mes "[Thief Guide]";

-			mes "   I know what ya mean.  I was there before and it was awfull.  All those smelly mushrooms and aggressive monsters.";

+			mes "   I know what yah mean.  I was there before and it was awful:  all those smelly mushrooms and aggressive monsters.";

 			next;

 			mes "[Thief Guide]";

 			mes "   Eeewww! Yuuuckk! Still, in order to pass the test you need to go get some mushrooms.";

@@ -257,9 +262,8 @@ L_4:
 

 	L_High:

 		mes "[Comrade Brad]";

-		mes "Ooooh.  Above 25, kewl.  You passed the Test!";

+		mes "Ooooh.  Above 25, you will make an excellent thief.";

 		next;

-

 	L_Final:

 		mes "[Comrade Brad]";

 		mes "Congratulations ^ff0000"+strcharinfo(0)+"^000000, you passed the official Thief Test!  You can now become a Thief!!";

@@ -282,7 +286,7 @@ L_4:
 		next;

 		mes "[Comrade Brad]";

 		mes "However, If you bring disgrace to our Guild, or ever betray us, we will not hesitate to have you......";

-		mes "how shall I say..... ^ff0000'REMOVED'^000000 from the Thief Guild.";

+		mes "How shall I say, ^ff0000'REMOVED'^000000 from the Thief Guild.";

 		emotion e_gg;

 		next;

 		mes "[Comrade Brad]";

@@ -291,7 +295,7 @@ L_4:
 

 		sL_SkPoint:

 			mes "[Comrade Brad]";

-			mes "But before that happens please use up all of your skill points ok?";

+			mes "But before that happens please use up all of your skill points, okay?";

 			close;

 

 }

@@ -347,7 +351,7 @@ L_Thief:
 	emotion e_no1;

 	next;

 	mes "[Irrelevant Man]";

-	mes "Don't worry about Shibu's Farm.  Let the newbies handle that.  Why don't ya go out and kill some stronger monsters.";

+	mes "Don't worry about Shibu's Farm.  Let the newbies handle that.  Why don't yah go out and kill some stronger monsters?";

 	close;

 

 L_Novice:

@@ -368,7 +372,7 @@ L_2:
 	mes "Lets see here.....(checks his list).... you're ^ff0000"+ strcharinfo(0) +"^000000 right?  Good.";

 	next;

 	mes "[Irrelevant Man]";

-	mes "Ok! I'm gonna show you the way in but keep quite.  I can't guarantee your safety so watch your back.";

+	mes "Okay! I'm gonna show you the way in but keep quite.  I can't guarantee your safety so watch your back.";

 	next;

 

 	L_Warp:

@@ -399,7 +403,7 @@ L_3:
 	emotion e_heh;

 	next;

 	mes "[Irrelevant Man]";

-	mes "Just kidding..... NOT!!.  Anywho I'll let ya back in!";

+	mes "Just kidding..... NOT!!.  Anywho I'll let yah back in!";

 	next;

 	menu "Ready",M_Yes,"Not yet",M_No;

 

@@ -408,7 +412,7 @@ L_3:
 

 	M_No:

 		mes "[Irrelevant Man]";

-		mes "Ok, let me know when you are.";

+		mes "Okay, let me know when you are.";

 		close;

 

 }

diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
index feb7427ff..c114f1e75 100644
--- a/npc/merchants/kunai_maker.txt
+++ b/npc/merchants/kunai_maker.txt
@@ -16,7 +16,7 @@
 //============================================================

 que_ng.gat,72,29,3	script	Kunai Seller	83,{

 mes "[Jin]";

-mes "Hi, I sell elemental enchanted kunais. I'll trade you some elemental stones and one kind of shurikens for a determined elemental Kunai";

+mes "Hi, I sell elemental enchanted kunais. I'll trade you some elemental stones and one kind of shuriken for a determined elemental Kunai";

 next;

 mes "[Jin]";

 mes "What would you like to trade some? It's free";

@@ -48,49 +48,50 @@ L_Bye:
 }

 

 function	script	Kunai_Trade	-1,{

-next;

-mes "[Jin]";

-if (MaxWeight*50/100 < Weight) {

-	if (MaxWeight*90/100 < Weight) {

-		mes "Sorry but you have more than 90% weight. Your kunais might drop. I can't give you anything.";

-		return;

+	next;

+	mes "[Jin]";

+	if (MaxWeight*50/100 < Weight) {

+		if (MaxWeight*90/100 < Weight) {

+			mes "Sorry but you have more than 90% weight. Your kunais might drop. I can't give you anything.";

+			return;

+		}

+		mes "You have 50% or more weight, do you still want to continue?";

+		menu "Yes",-,"No, thanks",L_Return;

 	}

-	mes "You have 50% or more weight, do you still want to continue?";

-	menu "Yes",-,"No, thanks",L_Return;

-}

 

-mes "Would you like to trade my 10 "+getitemname(getarg(4))+" for yours "+getarg(1)+" "+getitemname(getarg(0))+" and "+getarg(3)+" "+getitemname(getarg(2))+" ?";

-switch(select("Yes:I'll think about it")) {

-	case 1:

-		next; 

-		mes "[Jin]";

-		if (countitem(getarg(0)) < getarg(1) || countitem(getarg(2)) < getarg(3)) {

-			mes "Sorry but you're missing one of the required items. Please get them";

-			close;

-		} else

-		mes "How many do you want to trade? I can only trade you 500 units at once, and remember 1 unit = 10 kunais of your wish";

-		input @trade;

-		next;

-		mes "[Jin]";

-		if (@trade > 500) {

-			mes "Sorry, but I told you I could only trade you 500 units at once. Try again";

-			close;

-		} else if (@trade == 0) {

-			mes "Sorry, but 1 unit is the minimun I can trade. Try again please.";

-			close;

-		} else if ((countitem(getarg(0)) < @trade*getarg(1)) || (countitem(getarg(2)) < @trade*getarg(3))) {

- 			mes "Sorry, but you don't have enough items to trade "+@trade+" unit(s). Get more please";

-			close;

-		} else

-		mes "Here you go, enjoy them";

-		delitem getarg(0),getarg(1)*@trade;

-		delitem getarg(2),getarg(3)*@trade;

-		getitem getarg(4),10*@trade;

-		next;

-		return;

-	case 2:

-		return;

-	}

+	mes "Would you like to trade my 10 "+getitemname(getarg(4))+" for your "+getarg(1)+" "+getitemname(getarg(0))+" and "+getarg(3)+" "+getitemname(getarg(2))+" ?";

+	switch(select("Yes:I'll think about it")) {

+		case 1:

+			next; 

+			mes "[Jin]";

+			if (countitem(getarg(0)) < getarg(1) || countitem(getarg(2)) < getarg(3)) {

+				mes "Sorry but you're missing one of the required items. Please get them";

+				close;

+			} else

+			mes "How many do you want to trade? I can only trade you ^FF0000500^000000 units at once.";

+			mes "^00FF001 Unit^000000 ^FF0000=^000000 ^0000FF10 Kunais^000000 of your desire";

+			input @trade;

+			next;

+			mes "[Jin]";

+			if (@trade > 500) {

+				mes "Sorry, but I told you I could only trade you 500 units at once. Try again";

+				close;

+			} else if (@trade < 1) {

+				mes "Sorry, but 1 unit is the minimun I can trade. Try again please.";

+				close;

+			} else if ((countitem(getarg(0)) < @trade*getarg(1)) || (countitem(getarg(2)) < @trade*getarg(3))) {

+ 				mes "Sorry, but you don't have enough items to trade "+@trade+" unit(s). Get more please";

+				close;

+			} else

+			mes "Here you go, enjoy them";

+			delitem getarg(0),getarg(1)*@trade;

+			delitem getarg(2),getarg(3)*@trade;

+			getitem getarg(4),10*@trade;

+			next;

+			return;

+		case 2:

+			return;

+		}

 L_Return:

 	return;

 }

diff --git a/readme/changelog.html b/readme/changelog.html
index b7488f9c9..0969a6a9e 100644
--- a/readme/changelog.html
+++ b/readme/changelog.html
@@ -97,7 +97,7 @@ This is our current changelog. Please note this isn't our <i>complete</i> change
 											<td id="midtext">

 											</td>

 											<td id="righttext" valign="top">

-<iframe src="../Changelog-SVN.txt" name="Changelog" title="eAthena SVN Changelog" marginwidth="10" marginheight="10" frameborder="0" height="500" width="100%"></iframe>

+												<iframe src="../Changelog-Trunk.txt" name="Changelog" title="eAthena SVN Changelog" marginwidth="10" marginheight="10" frameborder="0" height="500" width="100%"></iframe>

 			

 											</td>

 										</tr>