* Applied BrianL's castle switch fix (bugreport:2969)

* Fixed slotted Memory Book not giving the combo bonus (bugreport:2997)

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

23 files changed, 44 insertions, 141 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index ff96a762e..7c55116e4 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -37,6 +37,8 @@
 	2385 Recuvative_Armor		Should trigger HP/SP return with magical kills as well.
 
 =======================
+2009/04/20
+	* Fixed slotted Memory Book not giving the combo bonus (bugreport:2997) [Playtester]
 2009/04/17
 	* Fixed a few items [Playtester]
 	- Windhawk can be equipped by thief class
diff --git a/db/item_db.txt b/db/item_db.txt
index 1c2aa9049..942e37bb8 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1042,7 +1042,7 @@
 2118,Arm_Guard_,Arm Guard,5,10000,,150,,5,,1,0x02000000,7,2,32,,20,1,,{},{},{}
 2119,Improved_Arm_Guard,Improved Arm Guard,5,40000,,150,,4,,0,0x02000000,7,2,32,,50,1,,{ bonus bMdef,5; },{},{}
 2120,Improved_Arm_Guard_,Improved Arm Guard,5,40000,,150,,4,,1,0x02000000,7,2,32,,50,1,,{ bonus bMdef,5; },{},{}
-2121,Memory_Book_,Memory Book,5,20,,1000,,3,,1,0x00810204,7,2,32,,0,1,0,{ bonus bInt,1; bonus bMdef,2; },{},{}
+2121,Memorize_Book_,Memory Book,5,20,,1000,,3,,1,0x00810204,7,2,32,,0,1,0,{ bonus bInt,1; bonus bMdef,2; if (isequipped(2717) && isequipped(2212)) { bonus bHPrecovRate,15; bonus bSPrecovRate,15; bonus bMatkRate,7; }; },{},{}
 2122,Platinum_Shield,Platinum Shield,5,20,,1200,,5,,0,0xFFFFFFFE,2,2,32,,68,1,1,{ bonus bMdef,5; bonus2 bSubSize,1,15; bonus2 bSubSize,2,15; bonus2 bSubRace,RC_Undead,10; bonus5 bAutoSpellWhenHit,"NPC_MAGICMIRROR",2,150,BF_MAGIC,0; },{},{}
 2123,Orleans_Server,Orleans' Plate,5,20,,1000,,5,,1,0xFFFFFFFE,2,2,32,,55,1,1,{ bonus bMDef,2; bonus bMagicDamageReturn,5; if (isequipped(2701)) bonus bCastrate,-10; },{},{}
 2124,Thorny_Buckler,Thorny Shield,5,20,,1000,,5,,1,0xFFFFFFFE,2,2,32,,55,1,1,{ bonus bMDef,2; if (isequipped(2702)) { bonus bAspdRate,10; bonus bShortWeaponDamageReturn,5; } },{},{}
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 40b8bf4e0..bbce150db 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2009/04/20
+	* Applied BrianL's castle switch fix (bugreport:2969) [Playtester]
 	* Various script updates [Playtester]
 	- Removed the Acorn repeatable quest (got removed on iRO)
 	- Re-enabled Umbala bungee jumping (bugreport:2978)
diff --git a/npc/guild/aldeg_cas01.txt b/npc/guild/aldeg_cas01.txt
index 2e389c749..01f17d148 100644
--- a/npc/guild/aldeg_cas01.txt
+++ b/npc/guild/aldeg_cas01.txt
@@ -124,13 +124,8 @@ aldeg_cas01,123,223,0	script	#switch_A01	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "aldeg_cas01",218,176;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "aldeg_cas01",218,176;
 	end;
 }
 
diff --git a/npc/guild/aldeg_cas02.txt b/npc/guild/aldeg_cas02.txt
index 0fa6e5b56..faeb4e1c7 100644
--- a/npc/guild/aldeg_cas02.txt
+++ b/npc/guild/aldeg_cas02.txt
@@ -123,13 +123,8 @@ aldeg_cas02,139,235,0	script	#switch_A02	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "aldeg_cas02",78,75;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "aldeg_cas02",78,75;
 	end;
 }
 
diff --git a/npc/guild/aldeg_cas03.txt b/npc/guild/aldeg_cas03.txt
index 65b168469..026fe1610 100644
--- a/npc/guild/aldeg_cas03.txt
+++ b/npc/guild/aldeg_cas03.txt
@@ -124,13 +124,8 @@ aldeg_cas03,229,267,0	script	#switch_A03	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "aldeg_cas03",110,119;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "aldeg_cas03",110,119;
 	end;
 }
 
diff --git a/npc/guild/aldeg_cas04.txt b/npc/guild/aldeg_cas04.txt
index cb800228b..bdde8593a 100644
--- a/npc/guild/aldeg_cas04.txt
+++ b/npc/guild/aldeg_cas04.txt
@@ -124,13 +124,8 @@ aldeg_cas04,83,17,0	script	#switch_A04	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "aldeg_cas04",67,117;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "aldeg_cas04",67,117;
 	end;
 }
 
diff --git a/npc/guild/aldeg_cas05.txt b/npc/guild/aldeg_cas05.txt
index 411f0f650..d86a2de40 100644
--- a/npc/guild/aldeg_cas05.txt
+++ b/npc/guild/aldeg_cas05.txt
@@ -123,13 +123,8 @@ aldeg_cas05,64,8,0	script	#switch_A05	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "aldeg_cas05",51,179;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "aldeg_cas05",51,179;
 	end;
 }
 
diff --git a/npc/guild/gefg_cas01.txt b/npc/guild/gefg_cas01.txt
index 80fbbf439..72c339b8b 100644
--- a/npc/guild/gefg_cas01.txt
+++ b/npc/guild/gefg_cas01.txt
@@ -115,13 +115,8 @@ gefg_cas01,152,117,0	script	#switch_G01	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "gefg_cas01",40,49;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "gefg_cas01",40,49;
 	end;
 }
 
diff --git a/npc/guild/gefg_cas02.txt b/npc/guild/gefg_cas02.txt
index 48cac2e0c..4deb9edeb 100644
--- a/npc/guild/gefg_cas02.txt
+++ b/npc/guild/gefg_cas02.txt
@@ -116,13 +116,8 @@ gefg_cas02,145,115,0	script	#switch_G02	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "gefg_cas02",12,67;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "gefg_cas02",12,67;
 	end;
 }
 
diff --git a/npc/guild/gefg_cas03.txt b/npc/guild/gefg_cas03.txt
index b96bf1a18..9fad99607 100644
--- a/npc/guild/gefg_cas03.txt
+++ b/npc/guild/gefg_cas03.txt
@@ -119,13 +119,8 @@ gefg_cas03,275,289,0	script	#switch_G03	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "gefg_cas03",106,24;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "gefg_cas03",106,24;
 	end;
 }
 
diff --git a/npc/guild/gefg_cas04.txt b/npc/guild/gefg_cas04.txt
index 7c4a97493..2688756f6 100644
--- a/npc/guild/gefg_cas04.txt
+++ b/npc/guild/gefg_cas04.txt
@@ -116,13 +116,8 @@ gefg_cas04,117,123,0	script	#switch_G04	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "gefg_cas04",73,47;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "gefg_cas04",73,47;
 	end;
 }
 
diff --git a/npc/guild/gefg_cas05.txt b/npc/guild/gefg_cas05.txt
index 505d07b77..0bde801aea 100644
--- a/npc/guild/gefg_cas05.txt
+++ b/npc/guild/gefg_cas05.txt
@@ -116,13 +116,8 @@ gefg_cas05,149,107,0	script	#switch_G05	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "gefg_cas05",70,53;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "gefg_cas05",70,53;
 	end;
 }
 
diff --git a/npc/guild/payg_cas01.txt b/npc/guild/payg_cas01.txt
index f746551bc..27db2f549 100644
--- a/npc/guild/payg_cas01.txt
+++ b/npc/guild/payg_cas01.txt
@@ -119,13 +119,8 @@ payg_cas01,295,8,0	script	#switch_Py01	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "payg_cas01",120,59;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "payg_cas01",120,59;
 	end;
 }
 
diff --git a/npc/guild/payg_cas02.txt b/npc/guild/payg_cas02.txt
index 8326d1a50..7152379a0 100644
--- a/npc/guild/payg_cas02.txt
+++ b/npc/guild/payg_cas02.txt
@@ -118,13 +118,8 @@ payg_cas02,149,148,0	script	#switch_Py02	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "payg_cas02",22,261;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "payg_cas02",22,261;
 	end;
 }
 
diff --git a/npc/guild/payg_cas03.txt b/npc/guild/payg_cas03.txt
index b9e9839d6..b5a9a4ccc 100644
--- a/npc/guild/payg_cas03.txt
+++ b/npc/guild/payg_cas03.txt
@@ -117,13 +117,8 @@ payg_cas03,163,167,0	script	#switch_Py03	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "payg_cas03",50,261;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "payg_cas03",50,261;
 	end;
 }
 
diff --git a/npc/guild/payg_cas04.txt b/npc/guild/payg_cas04.txt
index 3836ecb6b..5732da557 100644
--- a/npc/guild/payg_cas04.txt
+++ b/npc/guild/payg_cas04.txt
@@ -116,13 +116,8 @@ payg_cas04,151,47,0	script	#switch_Py04	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "payg_cas04",38,285;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "payg_cas04",38,285;
 	end;
 }
 
diff --git a/npc/guild/payg_cas05.txt b/npc/guild/payg_cas05.txt
index b0f48616f..8759998ba 100644
--- a/npc/guild/payg_cas05.txt
+++ b/npc/guild/payg_cas05.txt
@@ -117,13 +117,8 @@ payg_cas05,161,136,0	script	#switch_Py05	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "payg_cas05",277,250;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "payg_cas05",277,250;
 	end;
 }
 
diff --git a/npc/guild/prtg_cas01.txt b/npc/guild/prtg_cas01.txt
index bdb5e5161..a56d83f68 100644
--- a/npc/guild/prtg_cas01.txt
+++ b/npc/guild/prtg_cas01.txt
@@ -120,13 +120,8 @@ prtg_cas01,15,209,0	script	#switch_Pt01	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "prtg_cas01",112,183;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "prtg_cas01",112,183;
 	end;
 }
 
diff --git a/npc/guild/prtg_cas02.txt b/npc/guild/prtg_cas02.txt
index a80a47047..fd58ff74d 100644
--- a/npc/guild/prtg_cas02.txt
+++ b/npc/guild/prtg_cas02.txt
@@ -121,13 +121,8 @@ prtg_cas02,207,228,0	script	#switch_Pt02	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "prtg_cas02",94,62;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "prtg_cas02",94,62;
 	end;
 }
 
diff --git a/npc/guild/prtg_cas03.txt b/npc/guild/prtg_cas03.txt
index 408b03123..255372e47 100644
--- a/npc/guild/prtg_cas03.txt
+++ b/npc/guild/prtg_cas03.txt
@@ -121,13 +121,8 @@ prtg_cas03,193,130,0	script	#switch_Pt03	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "prtg_cas03",51,101;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "prtg_cas03",51,101;
 	end;
 }
 
diff --git a/npc/guild/prtg_cas04.txt b/npc/guild/prtg_cas04.txt
index 46acdec88..9b39423a7 100644
--- a/npc/guild/prtg_cas04.txt
+++ b/npc/guild/prtg_cas04.txt
@@ -119,13 +119,8 @@ prtg_cas04,275,160,0	script	#switch_Pt04	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "prtg_cas04",259,265;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "prtg_cas04",259,265;
 	end;
 }
 
diff --git a/npc/guild/prtg_cas05.txt b/npc/guild/prtg_cas05.txt
index 887d22872..0fd95ab2e 100644
--- a/npc/guild/prtg_cas05.txt
+++ b/npc/guild/prtg_cas05.txt
@@ -118,13 +118,8 @@ prtg_cas05,281,176,0	script	#switch_Pt05	111,{
 	mes " ";
 	mes "There's a small lever. Will you pull it? ";
 	next;
-	switch(select("Pull.:Do not.")) {
-	case 1:
-		warp "prtg_cas05",36,38;
-		break;
-	case 2:
-		break;
-	}
+	if(select("Pull.:Do not.") == 2) close;
+	warp "prtg_cas05",36,38;
 	end;
 }