* Fixed an assortment of typos and bugs care of yyCC.

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

6 files changed, 19 insertions, 13 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 3aa371abc..68b327878 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2007/10/01
+	* Rev. 11342 Fixed an assortment of typos and bugs care of yyCC. [L0ne_W0lf]
 	* Rev. 11342 Small bug fix (== -> !=) thanks to Saithis. [L0ne_W0lf]
 2007/09/27
 	* Optimized/simplified some poorly written code in TSQ [ultramage]
diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index 800b8920d..0facac58d 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -7,7 +7,7 @@
 //= DON'T REMOVE THIS! (by request of him, he provided all
 //= the info regarding the quests and shops.)
 //===== Current Version: ===================================== 
-//= 1.10b
+//= 2.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -23,8 +23,9 @@
 //= 1.7b Parenthesis fixes [KarLaeda]
 //= 1.8 Fixed the reward you can get [Playtester]
 //= 1.9 Removed some 'clever' script constructs [ultramage]
-//= 1.10 Updated to official version - Thanks to Omega for
+//= 2.0 Updated to official version - Thanks to Omega for
 //= his first try [SinSloth] 1.10b - removed .GATs [Lupus]
+//= 2.1 Wise Bull Horn now deletes all items. Thanks to yyCC. [L0ne_W0lf]
 //============================================================ 
 
 que_ng,152,167,3	script	Master Miller	901,{
@@ -318,6 +319,7 @@ payon,184,65,3	script	The Wise Bull Horn	866,{
 			delitem 1019,1;
 			delitem  912,3;
 			delitem  511,3;
+			delitem 1013,3; //Colorful_Shell
 			set GUNS_Q,3;
 			close;
 
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index 48bd861b2..588650ba1 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -4,7 +4,7 @@
 //= Made by: Black Dragon
 //= Converted by: Shin
 //===== Current Version: ===================================== 
-//= 2.8
+//= 2.9
 //===== Compatible With: ===================================== 
 //= eAthena  SVN
 //===== Description: ========================================= 
@@ -26,6 +26,7 @@
 //=	made some NPC more unique names: Monster Summon#cr1 [Lupus]
 //= 2.7 Fixed Some variables like ".@item", and changed to "@item". [Samuray22]
 //= 2.8 Fixed a little minor bug. [Samuray22]
+//= 2.9 Minor fixes, typos, an incorrect answer. Thanks to yyCC. [L0ne_W0lf]
 //============================================================
 
 
@@ -573,7 +574,7 @@ C_Questions:
 			mes "[Gabriel Valentine]";
 			mes "1. Which of the following monsters is a different attribute than the others?";
 			next;
-			if (select("Karat:Wind Ghost:Isis:Wanderer") == 3)
+			if (select("Carat:Wind Ghost:Isis:Wanderer") == 3)
 				set .@cru_t,.@cru_t+10;
 
 			mes "[Gabriel Valentine]";
@@ -585,7 +586,7 @@ C_Questions:
 			mes "[Gabriel Valentine]";
 			mes "3. Which item is NOT dropped by Dokebi?";
 			next;
-			if (select("Rough Elunium:Golden Hamer:Sword Mace:Mighty Staff") == 2)
+			if (select("Rough Elunium:Golden Hammer:Sword Mace:Mighty Staff") == 2)
 				set .@cru_t,.@cru_t+10;
 
 			mes "[Gabriel Valentine]";
@@ -609,7 +610,7 @@ C_Questions:
 			mes "[Gabriel Valentine]";
 			mes "7. Which attribute is the most effective on the Wind Ghost?";
 			next;
-			if (select("Water:Earth:Fire:Wind") == 3)
+			if (select("Water:Earth:Fire:Wind") == 2)
 				set .@cru_t,.@cru_t+10;
 
 			mes "[Gabriel Valentine]";
diff --git a/npc/quests/newgears/2006_headgear.txt b/npc/quests/newgears/2006_headgear.txt
index 82fe9086d..0c366919c 100644
--- a/npc/quests/newgears/2006_headgear.txt
+++ b/npc/quests/newgears/2006_headgear.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= DiviniaRO members, cleaned by reddozen
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= SVN eA
 //===== Description: =========================================
@@ -19,6 +19,7 @@
 //= 1.1 Full update. EuRO (?) dialogs, and positions. [L0ne_W0lf]
 //= 1.2 Fixed bugs in the Hahoe/Lion/Bride Mask NPC. [L0ne_W0lf]
 //=	Fixed some of the names to iRO.
+//= 1.3 Fixed some color code bugs in Ghenirhemin. Thanks to yyCC. [L0ne_W0lf]
 //============================================================
 
 //===================== Censor Bar =====================================================
@@ -336,9 +337,9 @@ hugel,147,130,3	script	Ghenirhemin	897,{
 		mes "^FF00001 Elder Card, 1 Nightmare Terror Card,^000000";
 		next;
 		mes "[Ghenirhemin]";
-		mes "^1,000 Rune of the Darkness,";
-		mes "^1,000 Bloody Rune,";
-		mes "^and the helm price, 10,000,000 zeny^000000.";
+		mes "^FF00001,000 Rune of the Darkness,";
+		mes "^FF00001,000 Bloody Rune,";
+		mes "^FF0000and the helm price, 10,000,000 zeny^000000.";
 		next;
 		mes "[Ghenirhemin]";
 		mes "It surely is a reasonable price considering that ";
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index 7503e1718..c4beb255e 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.9
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -32,6 +32,7 @@
 //= 1.7b Fixed some minor typos. [SinSloth]
 //= 1.7c replaced item "names" with item id. [Lupus]
 //= 1.8 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
+//= 1.9 Fixed "him" -> "her" in Ph.D hat quest. THansk to yyCC. [L0ne_W0lf]
 //============================================================ 
 
 // Prontera Culvert
@@ -156,7 +157,7 @@ prt_in,38,108,3	script	Teacher	53,{
 		mes "[Teacher]";
 		mes "My God! The Flower you are holding...";
 		next;
-		switch( select( "Show him the flowers.","Give him the flowers.","Cancel.")) {
+		switch( select( "Show her the flowers.","Give her the flowers.","Cancel.")) {
 			case 1:
 				mes "[Teacher]";
 				mes "Are those the Flowers I've been looking for...";
diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt
index d249b1397..6838293b2 100644
--- a/npc/quests/quests_yuno.txt
+++ b/npc/quests/quests_yuno.txt
@@ -498,7 +498,7 @@ yuno_in01,103,157,3	script	Bain#juno	98,{
 		next;
 		mes "[Bain]";
 		mes "^FF00001 Mixture^000000, ^FF00005 Mini-Furnace^000000,";
-		mes "^FF00005 Burnt Treee^000000 , ^FF00005 Coal^000000,";
+		mes "^FF00005 Burnt Tree^000000 , ^FF00005 Coal^000000,";
 		mes "^FF00005 Fine Sand^000000, ^FF00003 Rough Elunium^000000,";
 		mes "^FF00003 Rough Oridecon^000000^000000.";
 		next;