*Slew of bugreport fixage. Figured I should do something.

* Fixed copy/paste errors in Aru castles. (bugreport:2012)
* Updated Trans-only warp in thanatos tower. (bugreport:2227)
* Fixed improper variable in airship quest (bugreport:2238)
* Fixed a minor bug in updated repairmain. (bugreport:2245)
* Updated Giant Enyclopedia bonus. (bugreport:2053)
* Removed Snap from nocast_db in WoE SE


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

11 files changed, 36 insertions, 18 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 454556660..4cc12c121 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -40,6 +40,9 @@
 	2385 Recuvative_Armor		Should trigger HP/SP return with magical kills as well.
 
 =======================
+2008/09/10
+	* Rev. 13219 Updated Giant Enyclopedia bonus. (bugreport:2053)
+	* Removed Snap from nocast_db in WoE SE
 2008/09/05
 	* Rev. 13192 Removed job and level restriction on Mercenary ASPD potions. [L0ne_W0lf]
 	* Added Monster Mercenaries using mobs original stats.
diff --git a/db/item_db.txt b/db/item_db.txt
index 1b6fde392..920c5d683 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -795,7 +795,7 @@
 1561,Hardback,Hardcover Book,4,20,,1500,140,,1,1,0x00410100,7,2,2,4,55,1,15,{ bonus bStr,3; bonus bDex,2; },{},{}
 1562,Bible_Of_Battlefield,Battlefield Textbook,4,20,,700,110,,1,1,0x00410100,7,2,2,4,80,0,15,{ bonus bInt,3; bonus3 bAutoSpell,"AL_BLESSING",3+(getskilllv("AL_BLESSING")>3)*(getskilllv("AL_BLESSING")-3),20; },{},{}
 1563,Diary_Of_Great_Sage_C,Refined Sage's Diary,4,1,,0,135,,1,2,0x00410100,7,2,2,3,1,0,15,{ bonus bMatkRate,20; bonus bAspdRate,5; },{},{}
-1564,Encyclopedia,Giant Encyclopedia,4,20,,2000,110,,1,2,0x00410100,7,2,2,3,70,1,15,{ bonus bMatkRate,15; bonus bInt,3; bonus bDex,2; bonus bCritical,20+(bLuk*2); },{},{}
+1564,Encyclopedia,Giant Encyclopedia,4,20,,2000,110,,1,2,0x00410100,7,2,2,3,70,1,15,{ bonus bMatkRate,15; bonus bInt,3; bonus bDex,2; bonus bCritical,20+((readparam(bLuk)*2)/10); },{},{}
 1565,Death_Note,Ledger of Death,4,20,,1000,137,,1,2,0x00410100,7,2,2,4,85,1,15,{ bonus bMatkRate,15; bonus bStr,3; bonus bInt,3; bonus bLuk,-20; bonus2 bWeaponComaRace,RC_DemiHuman,100; bonus bAspdRate,getrefine(); if(BaseJob == Job_Sage) bonus3 bAutoSpell,"NPC_HELLJUDGEMENT",5,20; },{},{}
 1566,Diary_Of_Great_Basil,Diary Of Great Basil,4,20,,0,120,,1,0,0x00410100,7,2,2,1,1,0,15,{ bonus2 bAddRace,RC_Boss,50; bonus2 bAddRace,RC_NonBoss,50; },{},{}
 1567,Hardcover_Book_C,Refined Hardcover Book,4,1,,0,168,,1,1,0x00410100,7,2,2,4,1,0,15,{ bonus bStr,5; bonus bDex,2; bonus bMatkRate,20; },{},{}
diff --git a/db/skill_nocast_db.txt b/db/skill_nocast_db.txt
index a5d1f3a58..051c00ce6 100644
--- a/db/skill_nocast_db.txt
+++ b/db/skill_nocast_db.txt
@@ -62,5 +62,4 @@
 26,128	//Teleport
 
 //Zone 4 - WoE:SE
-264,256 //Snap
 426,256 //High Jump
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 6e42cb978..9f11de0a1 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,11 @@
 Date		Added
 ======
+2008/09/18
+	* Rev. 13219 Slew of bugreport fixage. Figured I should do something. [L0ne_W0lf]
+	* Fixed copy/paste errors in Aru castles. (bugreport:2012)
+	* Updated Trans-only warp in thanatos tower. (bugreport:2227)
+	* Fixed improper variable in airship quest (bugreport:2238)
+	* Fixed a minor bug in updated repairmain. (bugreport:2245)
 2008/09/15
 	* Rev. 13216 Corrected a typo in Sleinpr seal quest. (bugreport:2234) [L0ne_W0lf]
 2008/09/14
diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt
index 4505dc66b..b9ef36da3 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/guild2/arug_cas02.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -20,6 +20,7 @@
 //= 1.5 Fixed error with control devices. [L0ne_W0lf]
 //= 1.6 Two small fixes. (aegis carry-overs) [L0ne_W0lf]
 //= 1.7 Another two fixes [Yommy]
+//= 1.8 Corrected copy/paste error. [L0ne_W0lf]
 //============================================================
 
 arug_cas02,1,1,0	script	Manager#aru02_02	111,{
@@ -1467,7 +1468,7 @@ arug_cas02,143,228,0	script	Control Device01#aru02	111,{
 							donpcevent "#aru02_RL01::OnEnable";
 							disablenpc "Control Device01#aru02";
 							mapannounce "arug_cas02","The 1st Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
-							setarray $agit_ar01[2],0;
+							setarray $agit_ar02[2],0;
 							end;
 						}
 						else {
diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt
index 0578f2aa2..72de5f541 100644
--- a/npc/guild2/arug_cas03.txt
+++ b/npc/guild2/arug_cas03.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -19,6 +19,7 @@
 //=     Treasure will now be killed before spawning.
 //=     Should take care of event-not-found error.
 //= 1.5 Fixed error with control devices. [L0ne_W0lf]
+//= 1.6 Corrected copy/paste error. [L0ne_W0lf]
 //============================================================
 
 arug_cas03,1,1,0	script	Manager#aru03_02	111,{
@@ -1466,7 +1467,7 @@ arug_cas03,136,158,0	script	Control Device01#aru03	111,{
 							donpcevent "#aru03_RL01::OnEnable";
 							disablenpc "Control Device01#aru03";
 							mapannounce "arug_cas03","The 1st Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
-							setarray $agit_ar01[2],0;
+							setarray $agit_ar03[2],0;
 							end;
 						}
 						else {
diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index c863a4aae..c2c45f6a5 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -18,6 +18,7 @@
 //=     Made it so treasure won't spawn if castle is empty.
 //=     Treasure will now be killed before spawning.
 //= 1.5 Fixed error with control devices. [L0ne_W0lf]
+//= 1.6 Corrected copy/paste error. [L0ne_W0lf]
 //============================================================
 
 arug_cas04,1,1,0	script	Manager#aru04_02	111,{
@@ -1465,7 +1466,7 @@ arug_cas04,143,158,0	script	Control Device01#aru04	111,{
 							donpcevent "#aru04_RL01::OnEnable";
 							disablenpc "Control Device01#aru04";
 							mapannounce "arug_cas04","The 1st Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
-							setarray $agit_ar01[2],0;
+							setarray $agit_ar04[2],0;
 							end;
 						}
 						else {
diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt
index ab23d11b0..3f5c767b6 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/guild2/arug_cas05.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -18,6 +18,7 @@
 //=     Made it so treasure won't spawn if castle is empty.
 //=     Treasure will now be killed before spawning.
 //= 1.5 Fixed error with control devices. [L0ne_W0lf]
+//= 1.6 Corrected copy/paste error. [L0ne_W0lf]
 //============================================================
 
 arug_cas05,1,1,0	script	Manager#aru05_02	111,{
@@ -1465,7 +1466,7 @@ arug_cas05,136,158,0	script	Control Device01#aru05	111,{
 							donpcevent "#aru05_RL01::OnEnable";
 							disablenpc "Control Device01#aru05";
 							mapannounce "arug_cas05","The 1st Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
-							setarray $agit_ar01[2],0;
+							setarray $agit_ar05[2],0;
 							end;
 						}
 						else {
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 70fe71181..4b9a34d23 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.5
+//= 2.7a
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -49,6 +49,7 @@
 //= 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]
 //============================================================
 
 
@@ -943,6 +944,7 @@ function	script	repairmain	{
 			}
 			set .@checkitem,.@checkitem+1;
 		}
+		set .@checkitem,.@checkitem-1;
 		if (!.@checkitem) {
 			mes "["+getarg(0)+"]";
 			mes "Oh wow, this is incredible!";
@@ -978,6 +980,7 @@ function	script	repairmain	{
 				}
 				set .@checkitem2,.@checkitem2+1;
 			}
+			set .@checkitem2,.@checkitem2-1;
 			if (.@checkitem == .@checkitem2) {
 				set zeny,zeny-.@totalcost;
 				while (.@checkitem) {
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index 0be42cafa..116e27f49 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 // Samuray22
 //===== Current Version: ===================================== 
-//= 1.3a
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -20,6 +20,7 @@
 //= understand. [SinSloth]
 //= 1.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.3a Corrected a Typo error ";;". [Samuray22]
+//= 1.4 Fixed incorrect variable type used. [L0ne_W0lf]
 //============================================================ 
 
 //=======================================================================================================//
@@ -267,7 +268,7 @@ airplane,47,61,1	script	Crewman	833,{
 				close;
 			}
 		}			
-	} else if(@kain_ticket==3) {
+	} else if(kain_ticket==3) {
 		mes "[Kain Himere]";
 		mes "Oh, how are you?";
 		mes "Right, there's a favor I have to ask of you. Where are you heading?";
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index 75e496b2d..cb9f7fac4 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= [Ishizu-chan]
 //===== Current Version: =====================================
-//= 1.9
+//= 2.0
 //===== Compatible With: =====================================
 //= Any eAthena Version i guess?
 //===== Description: =========================================
@@ -21,6 +21,7 @@
 //= 1.7 Fixed a minor bug with prevented code part from reseting properly. [SinSloth]
 //= 1.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 1.9 Fixed a bug in the last event which allowed an exploit after the first summoning. [SinSloth]
+//= 2.0 Cleaned up the trans-only check, and added expanded classes. [L0ne_W0lf]
 //============================================================
 
 hu_fild01,140,163,5	script	Tower Keeper	852,3,3,{
@@ -2589,10 +2590,11 @@ OnThanaDead:
 }
 
 tha_t06,119,120,0	script	thana6-7	45,1,1,{
-
-	if((Class == Job_Lord_Knight) || (Class == Job_High_Priest) || (Class == Job_High_Wizard) || (Class == Job_Whitesmith) || (Class == Job_Sniper) || (Class == Job_Assassin_Cross) || (Class == Job_High_Wizard) || (Class == Job_Lord_Knight2) || (Class == Job_Paladin) || (Class == Job_Champion) || (Class == Job_Professor) || (Class == Job_Stalker) || (Class == Job_Creator) || (Class == Job_Clown) || (Class == Job_Gypsy) || (Class == Job_Paladin2)) warp "thana_step",69,369;
-	else
-	{
+	if (((Upper == 1) && ((Class > Job_Thief_High) && (Class < Job_Baby))) || (((Class == Job_Gunslinger) || (Class == Job_Ninja) || (BaseClass == Job_Taekwon)) && (BaseLevel >= 95))) {
+		warp "thana_step",69,369;
+		end;
+	}
+	else {
 		mes "^3355FFAn overwhelming force";
 		mes "acts against you, preventing";
 		mes "you from proceeding this way...^000000";