5 kafra passes, fixed refiner's @fullprice, char_name_option

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

5 files changed, 24 insertions, 21 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 7f3855926..d32fbf3bb 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/03/30

+	* Updated char name option. [Vicious]

 	* Added a missing return that fixes crashes on status_change_timer when

 	  source is not found. [Skotlex]

 	* Added year day return in gettime function. gettime(8) returns 1~366

diff --git a/conf-tmpl/char_athena.conf b/conf-tmpl/char_athena.conf
index 1771ab3b3..e47855752 100644
--- a/conf-tmpl/char_athena.conf
+++ b/conf-tmpl/char_athena.conf
@@ -153,11 +153,11 @@ name_ignoring_case: 0
 // 0: no restriction (default)

 // 1: only letters/symbols in 'char_name_letters' option.

 // 2: Letters/symbols in 'char_name_letters' option are forbidden. All others are possibles.

-char_name_option: 2

+char_name_option: 1

 

 // Set the letters/symbols that you want use with the 'char_name_option' option.

 // Note: Don't add spaces unless you mean to add 'space' to the list.

-char_name_letters: <>+(){}[]/\|,@ #$%^&*`~"':;+¡¢¤¦§¨ª¬-

+char_name_letters: abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890

 

 // Filename of the file which receives the online players list in text

 online_txt_filename: online.txt

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 7ad8c6e49..a9af6ec94 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -26,12 +26,12 @@ Nexon
 == Changelog ==

 

 Date		Added

-

 03/30

+	* Fixed refiner full price display, thanks to S4Sly [Vicious]

+	* Training ground giving 5 kafra storage/teleport pass [Vicious]

 	* Revised all the spawns based on Emperium.org. [Poki#3]

 	- Only omobs got changed. eamobs is like it was.

 	- I unified the formatting used for the map names. Please use that in future field expansions.

-

 03/27

 	* Fixed the infinite warp looping between Lutie and Lutie field 01 [Skotlex]

 03/23

diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt
index 8ab5107c7..e0d710a2a 100644
--- a/npc/jobs/novice/novice.txt
+++ b/npc/jobs/novice/novice.txt
@@ -144,7 +144,7 @@ new_1-1.gat,53,114,4	script	Shion	727,{
 		mes "You can even gain";

 		mes "experience like this!";

 		set NEW_MES_FLAG0,3;

-		set BaseExp,BaseExp+NextBaseExp;

+		set BaseExp,BaseExp+9;

 		next;

 		mes "[Shion]";

 		mes "Everything you'll learn here in the";

@@ -180,7 +180,7 @@ new_1-1.gat,53,114,4	script	Shion	727,{
 		mes "you need to be a little more polite.";

 		mes "This is a gift for you.";

 		set NEW_MES_FLAG0,3;

-		set BaseExp,BaseExp+NextBaseExp;

+		set BaseExp,BaseExp+9;

 		close;

 	case 3:	mes "[Shion]";

 		mes "The Training Grounds";

@@ -359,7 +359,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 			mes "I will increase your EXP.";

 			mes "watch how the EXP will change in the basic Information window.";

 			set NEW_MES_FLAG1,1;

-			set BaseExp,BaseExp+NextBaseExp;

+			set BaseExp,BaseExp+155;

 			next;

 			mes "[Chris]";

 			mes "Did you see it?";

@@ -391,7 +391,7 @@ new_1-2.gat,99,105,4	script	Interfaces Instructor	751,{
 			mes "[Chris]";

 			mes "You might have gotten bored event hough I tried to teach you briefly.";

 			mes "It is Job EXP this time.";

-			set JobExp,JobExp+NextJobExp;

+			set JobExp,JobExp+151;

 			next;

 			mes "[Chris]";

 			mes "Increase Basic Skill with it.";

@@ -554,7 +554,7 @@ new_1-2.gat,83,111,4	script	Skill Instructor	753,{
 			mes "Short key is ^0000FFS when holding down alt^000000.";

 			mes "From now we will say like 'alt+s'.";

 			set NEW_MES_FLAG2,1;

-			set JobExp,JobExp+NextJobExp;

+			set JobExp,JobExp+151;

 			next;

 			mes "[Shecil]";

 			mes "Did you open it?";	

@@ -583,7 +583,7 @@ new_1-2.gat,83,111,4	script	Skill Instructor	753,{
 			mes "Try to double-click to use it!";

 			next;

 			mes "^0000FF-You received some Job Exp.-^000000";

-			set JobExp,JobExp+NextJobExp;

+			set JobExp,JobExp+151;

 			next;

 			mes "[Shecil]";

 			mes "How was it?";	

@@ -596,7 +596,7 @@ new_1-2.gat,83,111,4	script	Skill Instructor	753,{
 			mes "Oh, I am feeling so good.";

 			mes "I will give you a Plus-Exp!";

 			mes "Since I am a cool guy!";

-			set BaseExp,BaseExp+NextBaseExp;

+			set BaseExp,BaseExp+155;

 			next;

 			mes "[Shecil]";

 			mes "My lecture ends here.";	

@@ -760,7 +760,7 @@ disable_items;
 				mes "And here's";

 				mes "a little reward";

 				mes "just for listening.";

-				set BaseExp,BaseExp+NextBaseExp;

+				set BaseExp,BaseExp+155;

 				next;

 			}

 			disable_items;	

@@ -792,7 +792,7 @@ disable_items;
 				mes "Hooray~!";

 				mes "You did it!";

 				mes "You deserve a reward!";

-				set BaseExp,BaseExp+NextBaseExp;

+				set BaseExp,BaseExp+155;

 				next;

 			}

 			disable_items;

@@ -812,7 +812,7 @@ disable_items;
 			mes "Do you understand ?";

 			mes "To use skills, you need some skill point,";

 			mes "and anyway, you cannot put passive skills in the 'Short key window'.";

-			set JobExp,JobExp+NextJobExp;

+			set JobExp,JobExp+151;

 			next;

 			mes "[Alice]";

 			mes "'Alice' simple and good quality lecture ends here.";

@@ -828,7 +828,7 @@ disable_items;
 			mes "And lastly...";

 			mes "I will give";

 			mes "you some Job experience!";

-			set JobExp,JobExp+NextJobExp;

+			set JobExp,JobExp+151;

 			next;

 			menu "What do I have to do?",-,"Then, Practical Course!",L_battle,"Cancel.",L_bye;

 				mes "[Alice]";

@@ -1061,7 +1061,7 @@ L_loop:
 			next;

 			if (!(NEW_LVUP0)) {

 				set NEW_LVUP0,1;

-				set BaseExp,BaseExp+NextBaseExp;

+				set BaseExp,BaseExp+155;

 			}

 			mes "[Kafra Employee]";

 			mes "The save Service";

@@ -1097,7 +1097,7 @@ L_loop:
 			mes "[Kafra Employee]";

 			if (!(NEW_JOBLVUP)) {

 				set NEW_JOBLVUP,1;

-				set JobExp,JobExp+NextJobExp;

+				set JobExp,JobExp+151;

 			}

 			mes "Remember though, that in the case of Equipment, each item takes up one Inventory Slot. The maximum number of items that can be placed in Kafra Storage is 30,000.";

 			break;

@@ -1147,6 +1147,8 @@ L_prewarp:
 		getitem 2112,1;

 		getitem 601,10;

 		getitem 602,2;

+		getitem 7059,5;

+		getitem 7060,5;

 	}

 	set NEW_MES_FLAG0,0;

 	set NEW_MES_FLAG1,0;

@@ -2010,7 +2012,7 @@ new_1-2.gat,38,182,4	script	Helper	92,{
 			mes "Then, I will give you some additional help.";

 			mes "Please be careful.";

 				set NEW_LVUP1,1;

-				set BaseExp,BaseExp+NextBaseExp;

+				set BaseExp,BaseExp+155;

 				getitem 569,50;

 		} else {

 			mes "[Kane]";

@@ -2079,7 +2081,7 @@ new_1-2.gat,17,182,6	script	Helper	84,{
 			mes "[Elmeen]";

 			mes "Haaaaaaa~!";

 			set NEW_MES_FLAG4,1;

-			set BaseExp,BaseExp+NextBaseExp;

+			set BaseExp,BaseExp+155;

 			next;

 			mes "[Elmeen]";

 			mes "Which subject";

@@ -2875,7 +2877,7 @@ L_cancel:
 	switch ( select("Yes.","No") ) {

 	case 1:	set NOV_3_SWORDMAN,NOV_3_SWORDMAN+1;break;

 	case 2:	set NOV_3_THIEF,NOV_3_THIEF+1;

-		set NOV_3_MERCHAN,NOV_3_MERCHAN+1;

+		set NOV_3_MERCHANT,NOV_3_MERCHANT+1;

 	}

 	mes "[Hanson]";

 	mes "You are often upset to see someone";

diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 7b3fa9e6e..218ddfa09 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -471,7 +471,7 @@ Lnosafe:
 	if(@refinecheck > 10) goto Lcancel3;

 	set @fullprice,@price * @refinecnt;

 	mes "[" + @name$ + "]";

-	mes "This will cost you " + @refinecnt + " " + @matname$ + " and " + @price + " Zeny... Is that ok?";

+	mes "This will cost you " + @refinecnt + " " + @matname$ + " and " + @fullprice + " Zeny... Is that ok?";

 	next;

 	menu "Yes...",-,"No...",Lcancel;

 		if(@refinecheck > @safe) goto Lwarn;