* Changed An nonexistent variable in Refine NPC. (bugreport:2340)

* Fixed a Exploit in Thief Quest Skill. (bugreport:2332)
* Fixed donpcevent to doevent. (bugreport:2311)

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

4 files changed, 27 insertions, 19 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 9e4883222..6570fd49a 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
 Date		Added
 ======
+2008/10/12
+	* Changed An nonexistent variable in Refine NPC. (bugreport:2340) [Samuray22]
+	* Fixed a Exploit in Thief Quest Skill. (bugreport:2332)
+	* Fixed donpcevent to doevent. (bugreport:2311)
 2008/09/30
 	* Rev. 13250 Added Mercenary System related NPCs. [L0ne_W0lf]
 	* Rev. 13249 Full implementation of all Episode 11.3 Quests. [L0ne_W0lf]
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index bfc38821b..cb37bba64 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -4,7 +4,7 @@
 //= (Aegis) Translated by yoshiki, converted by kobra_k88
 //= Further bugfixed and tested by Lupus
 //===== Current Version: ===================================== 
-//= 2.7
+//= 2.8
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -20,6 +20,7 @@
 //= 2.7 Now uses enable and disable waitingroomevent. [L0ne_W0lf]
 //= 	Other minor fixes to various NPCs.
 //= 2.7a Added end; :D (bugreport:2038) [Yommy]
+//= 2.8 Fixed donpcevent to doevent. (bugreport:2311) [SoulBlaker]
 //============================================================ 
 
 gef_tower,111,37,4	script	Wizard Guildsman	70,{
@@ -1099,7 +1100,7 @@ OnMyMobDead:
 	if (.MyMobs < 1) {
 		set WIZ_Q2,WIZ_Q2+1;
 		mapannounce "job_wiz",strcharinfo(0)+" has succeeded in eliminating the monsters.",bc_map;
-		donpcevent "Room of Water#Door::OnEnable";
+		doevent "Room of Water#Door::OnEnable";
 		stopnpctimer;
 	}
 	end;
@@ -1188,8 +1189,8 @@ OnMyMobDead:
 		mapannounce "job_wiz",strcharinfo(0)+" has succeeded in eliminating the monsters.",bc_map;
 		warp "job_wiz",116,97;
 		percentheal 100,100;
-		donpcevent "Room of Water#Door::OnDisable";
-		donpcevent "Room of Earth::OnEnable";
+		doevent "Room of Water#Door::OnDisable";
+		doevent "Room of Earth::OnEnable";
 		stopnpctimer;
 	}
 	end;
@@ -1269,7 +1270,7 @@ OnMyMobDead:
 	set .MyMobs,.MyMobs-1;
 	if (.MyMobs < 1) {
 		mapannounce "job_wiz",strcharinfo(0) + " has succeeded in eliminating the monsters.",bc_map;
-		donpcevent "Room of Earth#Door::OnEnable";
+		doevent "Room of Earth#Door::OnEnable";
 		stopnpctimer;
 	}
 	end;
@@ -1360,8 +1361,8 @@ OnMyMobDead:
 		mapannounce "job_wiz",strcharinfo(0) + " has succeeded in eliminating the monster.",bc_map;
 		percentheal 100,100;
 		warp "job_wiz",46,99;
-		donpcevent "Room of Earth#Door::OnDisable";
-		donpcevent "Room of Fire::OnEnable";
+		doevent "Room of Earth#Door::OnDisable";
+		doevent "Room of Fire::OnEnable";
 		stopnpctimer;
 	}
 	end;
@@ -1439,7 +1440,7 @@ OnMyMobDead:
 	set .MyMobs,.MyMobs-1;
 	if (.MyMobs < 1) {
 		mapannounce "job_wiz",strcharinfo(0) + " has succeeded in eliminating the monsters.",bc_map;
-		donpcevent "Room of Fire#Door::OnEnable";
+		doevent "Room of Fire#Door::OnEnable";
 		stopnpctimer;
 	}
 	end;
@@ -1525,8 +1526,8 @@ OnMyMobDead:
 	if (.MyMobs < 1) {
 		mapannounce "job_wiz","Congratulations, " + strcharinfo(0) + ". You have passed the job change test.",bc_map;
 		set WIZ_Q,7;
-		donpcevent "Room of Fire#Door::OnDisable";
-		donpcevent "Test Helper#wiz::OnEnable";
+		doevent "Room of Fire#Door::OnDisable";
+		doevent "Test Helper#wiz::OnEnable";
 		stopnpctimer;
 	}
 	end;
@@ -1912,6 +1913,7 @@ gef_tower,107,36,4	script	White Dog#wiz	81,{
 		mes "[Maria]";
 		mes "As I thought, I knew you'd be able to do it, I could smell it in yah! *Woof*";
 		mes "Now I can call you Wizard.";
+
 		next;
 		mes "[Maria]";
 		mes "Congratulations. Always give your best at everything, no matter what.";
@@ -1939,4 +1941,4 @@ gef_tower,107,36,4	script	White Dog#wiz	81,{
 //= 1.8 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
 //= 2.1 Changed numbers to constants. [Vicious]
 //= 2.2 Merged back JFunc [Lupus] 2.2a Removed extra MES, added missing NEXT
-//= 2.3 Bigfoot monster summon corrected [Zairik]
+//= 2.3 Bigfoot monster summon corrected [Zairik]
\ No newline at end of file
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index ec71e423d..a41d26a0b 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Syrus22 (1.1) dafide18 (1.4) Skotlex (1.5)
 //===== Current Version: =====================================
-//= 2.7a
+//= 2.8
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -49,7 +49,8 @@
 //= 2.7 Refiner function accepts additional paramater. [L0ne_W0lf]
 //=     0 = No special features; 1 = new refining features
 //=     Updated Repairmen and function. No longer shows menu.
-//= 2.76a A couple touch-ups to the repairman function. [L0ne_w0lf]
+//= 2.7a A couple touch-ups to the repairman function. [L0ne_w0lf]
+//= 2.8 Changed the nonexistent variable .@matname$ for getitemname(.@material). (bugreport:2340) [Samuray22]
 //============================================================
 
 
@@ -606,7 +607,7 @@ function	script	refinemain	{
 	}
 	set .@fullprice,.@price * .@refinecnt;
 	mes "[" + getarg(0) + "]";
-	mes "That will cost you " + .@refinecnt + " " + .@matname$ + " and " + .@fullprice + " Zeny. Is that ok?";
+	mes "That will cost you " + .@refinecnt + " " + getitemname(.@material) + " and " + .@fullprice + " Zeny. Is that ok?";
 	next;
 	if(select("Yes","No...") == 2){
 		mes "[" + getarg(0) + "]";
diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt
index 9373e3ec5..a38f0020d 100644
--- a/npc/quests/skills/thief_skills.txt
+++ b/npc/quests/skills/thief_skills.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 1.5
+//= 1.6
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= Stone Fling.
 //===== Additional Comments: ================================= 
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
+//= 1.6 Fixed a Exploit for Assassins and Rogues. (bugreport:2332) [Samuray22]
 //============================================================ 
 
 moc_prydb1,154,128,4	script	Alcouskou#qsk_tf	118,{
@@ -28,7 +29,7 @@ moc_prydb1,154,128,4	script	Alcouskou#qsk_tf	118,{
 		case 1:
 			switch(THIEF_SK) {
 			case 0:
-				if (countitem(7041) > 4 && (BaseJob == Job_Thief && JobLevel > 24) || BaseJob == Job_Assassin || BaseJob == Job_Rogue) {
+				if (countitem(7041) > 4 && ((BaseJob == Job_Thief && JobLevel > 24) || BaseJob == Job_Assassin || BaseJob == Job_Rogue)) {
 					mes "[Alcouskou]";
 					mes "Luckily, you have brought some";
 					mes "sand with you. It is very important";
@@ -152,7 +153,7 @@ moc_prydb1,154,128,4	script	Alcouskou#qsk_tf	118,{
 				close;
 			}
 		case 2:
-			if (countitem(940) > 19  && (BaseJob == Job_Thief && JobLevel > 34) || BaseJob == Job_Assassin || BaseJob == Job_Rogue) {
+			if (countitem(940) > 19  && ((BaseJob == Job_Thief && JobLevel > 34) || BaseJob == Job_Assassin || BaseJob == Job_Rogue)) {
 				mes "[Alcouskou]";
 				mes "Okay! Let¡¯s practice!";
 				next;
@@ -231,7 +232,7 @@ moc_prydb1,154,128,4	script	Alcouskou#qsk_tf	118,{
 				close;
 			}
 		case 3:
-			if (countitem(912) > 0 && countitem(948) > 0 && countitem(908) > 4 && (BaseJob == Job_Thief && JobLevel > 19) || BaseJob == Job_Assassin || BaseJob == Job_Rogue) {
+			if (countitem(912) > 0 && countitem(948) > 0 && countitem(908) > 4 && ((BaseJob == Job_Thief && JobLevel > 19) || BaseJob == Job_Assassin || BaseJob == Job_Rogue)) {
 				mes "[Alcouskou]";
 				mes "Wow, you have already prepared?";
 				mes "Great, I see promise in you. -";
@@ -323,7 +324,7 @@ moc_prydb1,154,128,4	script	Alcouskou#qsk_tf	118,{
 				close;
 			}
 		case 4:
-			if (countitem(910) > 1 && countitem(911) > 1 && (BaseJob == Job_Thief && JobLevel > 14) || BaseJob == Job_Assassin || BaseJob == Job_Rogue) {
+			if (countitem(910) > 1 && countitem(911) > 1 && ((BaseJob == Job_Thief && JobLevel > 14) || BaseJob == Job_Assassin || BaseJob == Job_Rogue)) {
 				mes "[Alcouskou]";
 				mes "Wow! Have you already gathered the items!";
 				mes "Very well, do you wish to begin?";