Updated Poring Tower to not refinable. (bugreport: 1050)

Renamed custom Stylist to Stylist#customstylist to avoid conflicts with official one. (bugreport: 1042
Updated Airship Typing Challenge to not fail you when you get both strings correct. (bugreport: 1008)
Fixed Job_Change Function to properly jobchange babies. (bugreport: 943)

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

8 files changed, 18 insertions, 11 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 7a7bf7612..6435943af 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -43,6 +43,8 @@
 	2385 Recuvative_Armor		Should trigger HP/SP return with magical kills as well.
 
 =======================
+2008/03/15
+	* Updated Poring Tower to not refinable. (bugreport: 1050) [Paradox924X]
 2008/03/14
 	* Rev. 12363 Commented out St. Patrick's Day mob_db2 entries. [L0ne_W0lf]
 2008/03/10
diff --git a/db/item_db.txt b/db/item_db.txt
index 20e28e09e..7373f89b9 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -2133,7 +2133,7 @@
 5252,Drooping_Ninetails,Drooping Ninetails,5,,10,300,,1,,0,0xFFFFFFFF,7,2,256,,20,1,296,{ bonus bAgi,1; bonus bDex,1; bonus3 bAutoSpellWhenHit,75,1,30; },{},{}
 5253,Lif_Doll_Hat,Drooping Lif,5,,10,200,,1,,1,0xFFFFFFFF,7,2,256,,20,1,297,{ bonus bInt,1; bonus bMdef,getrefine(); bonus bDef,getrefine()*-1; },{},{}
 5254,Deviling_Hat,Deviling Hat,5,,10,350,,1,,0,0xFFFFFFFF,7,2,256,,20,1,298,{ bonus bStr,1; bonus bCritical,3; bonus2 bSubRace,RC_Angel,-20; if(getrefine()>=6){ bonus bCritical,getrefine()-5; } },{},{}
-5255,Triple_Poring_Hat,Poring Tower,5,,10,600,,3,,0,0xFFFFFFFF,7,2,256,,20,1,299,{ bonus bLuk,3; bonus3 bAutoSpell,1013,1,20; },{},{}
+5255,Triple_Poring_Hat,Poring Tower,5,,10,600,,3,,0,0xFFFFFFFF,7,2,256,,20,0,299,{ bonus bLuk,3; bonus3 bAutoSpell,1013,1,20; },{},{}
 5256,Valkyrie_Feather_Band,Valkyrie Feather Band,5,,10,100,,1,,1,0xFFFFFFFF,7,2,256,,20,1,300,{ bonus bInt,1; bonus3 bAutoSpellWhenHit,28,1,10; },{},{}
 5257,Soulless_Ring,Soul Ring,5,,10,300,,2,,0,0xFFFFFFFE,7,2,256,,20,1,301,{ bonus bMdef,2; bonus3 bAutoSpellWhenHit,361,1,10; },{},{}
 5258,Afro_Wig,Dokebi's Wig,5,,10,100,,0,,0,0xFFFFFFFF,7,2,768,,10,1,302,{ bonus3 bAutoSpellWhenHit,142,1,300; bonus2 bSubEle,Ele_Neutral,1; },{},{}
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index f705a5eec..cdb5b4df9 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
 Date		Added
 ======
+2008/03/15
+	* Fixed Job_Change Function to properly jobchange babies. (bugreport: 943) [Paradox924X]
+	* Updated Airship Typing Challenge to not fail you when you get both strings correct. (bugreport: 1008) [Paradox924X]
+	* Renamed custom Stylist to Stylist#customstylist to avoid conflicts with official one. (bugreport: 1042) [Paradox924X]
 2008/03/14
 	* Fixed a bug allowing Ferlock#Lab to get disabled mid-speech. (bugreport: 1129) [Paradox924X]
 	* Fixed the autotimer on an npc warp in Juperos Quest. [Paradox924X]
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index 7253eca90..02dd7f93f 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.1a
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -29,6 +29,7 @@
 //= 0.9b Fixed a typo and bad variable use in the Typing Challenge [ultramage]
 //= 1.0 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.1 Touch-ups, and changed references of "Yuno" to "Juno",  [L0ne_W0lf]
+//= 1.1a Small fix to comparison check. [Paradox924X]
 //============================================================ 
 
 //============================================================ 
@@ -515,7 +516,7 @@ s_Play:
 	if(@string2c$ != "")mes @string2c$;
 	input @comparisonvar$[2];
 	next;
-	if(@comparisonvar$[1] == @typingstring1$ && @comparisonvar$[2] == @typingstring2$) goto s_Fail;
+	if(@comparisonvar$[1] != @typingstring1$ || @comparisonvar$[2] != @typingstring2$) goto s_Fail;
 	set @time,(gettime(3)*60*60+gettime(2)*60+gettime(1))-@start; //seconds taken
 	set @mypoints,(@typingkeys * 100) / @time;
 	mes "[Nils]";
diff --git a/npc/custom/dye.txt b/npc/custom/dye.txt
index 9b7167ecb..abc1f363e 100644
--- a/npc/custom/dye.txt
+++ b/npc/custom/dye.txt
@@ -4,12 +4,13 @@
 //= eAthena Dev team
 //= Revised by Nekosume [pyRO v3.0] 
 //===== Current Version: ===================================== 
-//= 4.0
+//= 4.2
 //===== Compatible With: ===================================== 
 //= Any eAthena Version 
 //===== Description: ========================================= 
 //= Revised dye NPC
 //===== Additional Comments: =================================
+//= v4.2 - Renamed to avoid conflict [Paradox924X]
 //= v4.1 - New hairstyles added [Mass Zero]
 //= v4.0 - Refined and Combined [Darkchild]
 //= v3.0 - Added the 'Browse' options
@@ -21,7 +22,7 @@
 
 
 //Stylist------------------------------------------------------------------------------------------------------------
-prontera,170,180,1	script	Stylist	122,{
+prontera,170,180,1	script	Stylist#custom_stylist	122,{
 	mes "[^FF8000Stylist^000000]";
 	mes "I'm the greatest stylist in all of Rune-Midgard~~!";
 	mes "I can change your hair style or color!";
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index a9add7eca..d72621074 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Lupus, kobra_k88
 //===== Current Version: ===================================== 
-//= 2.10
+//= 2.11
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -33,6 +33,7 @@
 //= 2.09 Cleared F_ClearGarbage [Lupus]
 //= 2.10 Added F_CheckMaxCount to check count of carrid items. [L0ne_w0lf]
 //= 2.10a Removed fuction F_CheckMaxCount. Not needed. [L0ne_W0lf]
+//= 2.11 Updated function Job_Change to jobchange based on Upper value. [Paradox924X]
 //============================================================ 
 
 
@@ -98,10 +99,7 @@ function	script	F_ClearGarbage	{
 //////////////////////////////////////////////////////////////////////////////////
 
 function	script	Job_Change	{
-	if (Upper<2) 
-		jobchange getarg(0); // Common jobchange
-	else 
-		jobchange getarg(0) + Job_Baby; //Change Job For Baby Class
+	jobchange getarg(0),Upper; //Jobchange based on Upper
 	logmes "CLASS CHANGE: " +strcharinfo(0)+ " become a "+jobname(Class);
 	return;
 }
diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql
index 7791230e8..58b894423 100644
--- a/sql-files/item_db.sql
+++ b/sql-files/item_db.sql
@@ -2151,7 +2151,7 @@ REPLACE INTO `item_db` VALUES (5251,'Blank_Ear','Blank Ear',5,NULL,10,10,NULL,0,
 REPLACE INTO `item_db` VALUES (5252,'Drooping_Ninetails','Drooping Ninetails',5,NULL,10,300,NULL,1,NULL,0,0xFFFFFFFF,7,2,256,NULL,20,1,296,' bonus bAgi,1; bonus bDex,1; bonus3 bAutoSpellWhenHit,75,1,30; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5253,'Lif_Doll_Hat','Drooping Lif',5,NULL,10,200,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,20,1,297,' bonus bInt,1; bonus bMdef,getrefine(); bonus bDef,getrefine()*-1; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5254,'Deviling_Hat','Deviling Hat',5,NULL,10,350,NULL,1,NULL,0,0xFFFFFFFF,7,2,256,NULL,20,1,298,' bonus bStr,1; bonus bCritical,3; bonus2 bSubRace,RC_Angel,-20; if(getrefine()>=6){ bonus bCritical,getrefine()-5; } ',NULL,NULL);
-REPLACE INTO `item_db` VALUES (5255,'Triple_Poring_Hat','Poring Tower',5,NULL,10,600,NULL,3,NULL,0,0xFFFFFFFF,7,2,256,NULL,20,1,299,' bonus bLuk,3; bonus3 bAutoSpell,1013,1,20; ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (5255,'Triple_Poring_Hat','Poring Tower',5,NULL,10,600,NULL,3,NULL,0,0xFFFFFFFF,7,2,256,NULL,20,0,299,' bonus bLuk,3; bonus3 bAutoSpell,1013,1,20; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5256,'Valkyrie_Feather_Band','Valkyrie Feather Band',5,NULL,10,100,NULL,1,NULL,1,0xFFFFFFFF,7,2,256,NULL,20,1,300,' bonus bInt,1; bonus3 bAutoSpellWhenHit,28,1,10; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5257,'Soulless_Ring','Soul Ring',5,NULL,10,300,NULL,2,NULL,0,0xFFFFFFFE,7,2,256,NULL,20,1,301,' bonus bMdef,2; bonus3 bAutoSpellWhenHit,361,1,10; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5258,'Dokebi\'s_Wig','Dokebi\'s Wig',5,NULL,10,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,768,NULL,10,1,302,' bonus3 bAutoSpellWhenHit,142,1,300; bonus2 bSubEle,Ele_Neutral,1; ',NULL,NULL);
diff --git a/sql-files/upgrade_svn12368.sql b/sql-files/upgrade_svn12368.sql
new file mode 100644
index 000000000..62429a19b
--- /dev/null
+++ b/sql-files/upgrade_svn12368.sql
@@ -0,0 +1 @@
+UPDATE `item_db` SET `refineable` = '0' WHERE `item_db`.`id` = '5255';
\ No newline at end of file