amatsu field hydra id fix

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

3 files changed, 31 insertions, 33 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index beaf5cc33..e5b707d8d 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -34,6 +34,7 @@ KarLaeda
 Date		Added

 ======

 11/02

+	* Amatsu Field: Fixed Hydra -> G_Hydra (to fix drops exploit) [Lupus]

 	* Fixed typos and item names in DTS warper, 2006 Headgear Quest [Lupus]

 11/01

 	* Added entrance to Kiel Dungeon F2 [Playtester]

diff --git a/npc/mobs/fields/amatsu.txt b/npc/mobs/fields/amatsu.txt
index e33217f86..10371be47 100644
--- a/npc/mobs/fields/amatsu.txt
+++ b/npc/mobs/fields/amatsu.txt
@@ -3,12 +3,13 @@
 //===== By: ==================================================

 //= Athena (1.0)

 //===== Current Version: =====================================

-//= 1.2

+//= 1.3

 //===== Compatible With: =====================================

 //= Any Athena Version

 //===== Additional Comments: =================================

 //= 1.1 replaced Hydra -> G_Hydra (to fix drops exploit) [Lupus]

 //= 1.2 Official kRO 10.1 spawns [Playtester]

+//= 1.3 Again fixed Hydra -> G_Hydra (to fix drops exploit) [Lupus]

 //============================================================

 

 //==================================================

@@ -19,25 +20,25 @@ ama_fild01.gat,174,207,20,20	monster	Kapha	1406,5,1200000,600000,0
 ama_fild01.gat,241,310,10,10	monster	Kapha	1406,5,600000,300000,0

 ama_fild01.gat,114,230,10,10	monster	Kapha	1406,5,600000,300000,0

 ama_fild01.gat,174,253,10,10	monster	Kapha	1406,5,600000,300000,0

-ama_fild01.gat,177,315,0,0	monster	Hydra	1068,1,60000,30000,0

-ama_fild01.gat,175,315,0,0	monster	Hydra	1068,1,63000,31500,0

-ama_fild01.gat,173,315,0,0	monster	Hydra	1068,1,66000,33000,0

-ama_fild01.gat,171,315,0,0	monster	Hydra	1068,1,69000,34500,0

-ama_fild01.gat,169,315,0,0	monster	Hydra	1068,1,72000,39000,0

-ama_fild01.gat,177,314,0,0	monster	Hydra	1068,1,66000,33000,0

-ama_fild01.gat,175,314,0,0	monster	Hydra	1068,1,72000,39000,0

-ama_fild01.gat,173,314,0,0	monster	Hydra	1068,1,60000,30000,0

-ama_fild01.gat,171,314,0,0	monster	Hydra	1068,1,69000,34500,0

-ama_fild01.gat,169,314,0,0	monster	Hydra	1068,1,63000,31500,0

-ama_fild01.gat,171,313,0,0	monster	Hydra	1068,1,66000,33000,0

-ama_fild01.gat,173,313,0,0	monster	Hydra	1068,1,60000,30000,0

-ama_fild01.gat,175,313,0,0	monster	Hydra	1068,1,66000,33000,0

-ama_fild01.gat,175,312,0,0	monster	Hydra	1068,1,63000,31500,0

-ama_fild01.gat,173,312,0,0	monster	Hydra	1068,1,60000,30000,0

-ama_fild01.gat,171,312,0,0	monster	Hydra	1068,1,63000,31500,0

-ama_fild01.gat,174,311,0,0	monster	Hydra	1068,1,63000,31500,0

-ama_fild01.gat,172,311,0,0	monster	Hydra	1068,1,69000,36000,0

-ama_fild01.gat,173,310,0,0	monster	Hydra	1068,1,60000,30000,0

+ama_fild01.gat,177,315,0,0	monster	Hydra	1579,1,60000,30000,0

+ama_fild01.gat,175,315,0,0	monster	Hydra	1579,1,63000,31500,0

+ama_fild01.gat,173,315,0,0	monster	Hydra	1579,1,66000,33000,0

+ama_fild01.gat,171,315,0,0	monster	Hydra	1579,1,69000,34500,0

+ama_fild01.gat,169,315,0,0	monster	Hydra	1579,1,72000,39000,0

+ama_fild01.gat,177,314,0,0	monster	Hydra	1579,1,66000,33000,0

+ama_fild01.gat,175,314,0,0	monster	Hydra	1579,1,72000,39000,0

+ama_fild01.gat,173,314,0,0	monster	Hydra	1579,1,60000,30000,0

+ama_fild01.gat,171,314,0,0	monster	Hydra	1579,1,69000,34500,0

+ama_fild01.gat,169,314,0,0	monster	Hydra	1579,1,63000,31500,0

+ama_fild01.gat,171,313,0,0	monster	Hydra	1579,1,66000,33000,0

+ama_fild01.gat,173,313,0,0	monster	Hydra	1579,1,60000,30000,0

+ama_fild01.gat,175,313,0,0	monster	Hydra	1579,1,66000,33000,0

+ama_fild01.gat,175,312,0,0	monster	Hydra	1579,1,63000,31500,0

+ama_fild01.gat,173,312,0,0	monster	Hydra	1579,1,60000,30000,0

+ama_fild01.gat,171,312,0,0	monster	Hydra	1579,1,63000,31500,0

+ama_fild01.gat,174,311,0,0	monster	Hydra	1579,1,63000,31500,0

+ama_fild01.gat,172,311,0,0	monster	Hydra	1579,1,69000,36000,0

+ama_fild01.gat,173,310,0,0	monster	Hydra	1579,1,60000,30000,0

 ama_fild01.gat,0,0,0,0	monster	Kapha	1406,20,60000,30000,0

 ama_fild01.gat,174,306,20,20	monster	Kapha	1406,10,300000,150000,0

 ama_fild01.gat,0,0,0,0	monster	Miyabi Doll	1404,2,180000,90000,0

diff --git a/npc/quests/newgears/2006_headgear.txt b/npc/quests/newgears/2006_headgear.txt
index 650d05407..c59e383e6 100644
--- a/npc/quests/newgears/2006_headgear.txt
+++ b/npc/quests/newgears/2006_headgear.txt
@@ -8,7 +8,7 @@
 //= SVN eA

 //===== Description: =========================================

 //= Anonymous Mask, Feather Beret, Valk. Helm, Smiling Mask,

-//= Lion Masquerade, Bride Mask, Judge Hat and A-yam Hat

+//= Lion Masquerade, Bride Mask, Judge Hat and A-Yam Hat

 //===== Additional Comments: =================================

 //= NPC id's and dialog are custom, please replace

 //= 1.0a fixed typos, added missing names, more cleaned and

@@ -143,7 +143,7 @@ hugel.gat,146,105,4	script	Genirhimin	897,{
 	next;

 	mes @npcname$;

 	mes "The bravest of Warriors were rewarded with";

-	mes "the Heml of the Valkyries";

+	mes "the Valkyrie Helm";

 	mes "But.. those days are long since passed..";

 	mes "I suppose I could make you one, if you can";

 	mes "gather what I need.";

@@ -192,7 +192,7 @@ hugel.gat,146,105,4	script	Genirhimin	897,{
 			next;

 			getitem 5171,1;

 			mes @npcname$;

-			mes "This is a serious honor.. You have proven yourself a brave and honorable Warrior, Wear this with Pride";

+			mes "This is a serious honour... You have proven yourself a brave and honorable Warrior, Wear this with Pride.";

 			close;

 

 		case 2:

@@ -202,7 +202,7 @@ hugel.gat,146,105,4	script	Genirhimin	897,{
 	}

 

 	L_POOR:

-		mes "My time is worth more than the fortunes of Rune-Midgard and Arunafelz combined..";

+		mes "My time is worth more than the fortunes of Rune-Midgard and Arunafelz combined...";

 		close;

 

 }

@@ -333,7 +333,7 @@ payon.gat,135,231,5	script	Chung-Wol-Mang	907,{
 

 

 

-//====================== Judge Hat / A-yam Hat =============================================

+//====================== Judge Hat / A-Yam Hat =============================================

 

 payon.gat,137,123,5	script	Hangaram	740,{

 	set @npcname$,"[Hangaram]";

@@ -352,7 +352,7 @@ payon.gat,137,123,5	script	Hangaram	740,{
 	mes "Which Hat do you want?";

 	next;

 		

-	switch(select("Judge Hat","A-yam Hat","No thanks"))

+	switch(select("Judge Hat","A-Yam Hat","No thanks"))

 	{

 

 		case 1:

@@ -368,12 +368,11 @@ payon.gat,137,123,5	script	Hangaram	740,{
 			mes "5 Cracked Diamond and";

 			mes "1 Slotted Hat.";

 			next;

-

+			mes @npcname$;

 			if( (countitem(7445)<7) || (countitem(7446)<7) || (countitem(7447)<7) || (countitem(7448)<7) || (countitem(954)<300) || (countitem(983)<1) || (countitem(733)<5) || (countitem(2221)<1) ){

 				mes "Please, return when you have everything I need.";

 				close;

 			}

-

 			delitem 7445,7;

 			delitem 7446,7;

 			delitem 7447,7;

@@ -383,7 +382,6 @@ payon.gat,137,123,5	script	Hangaram	740,{
 			delitem 733,5;

 			delitem 2221,1;

 

-			mes @npcname$;

 			mes "Ok you seem to have all the items.";

 			next;

 

@@ -438,12 +436,11 @@ payon.gat,137,123,5	script	Hangaram	740,{
 			mes "5 Cracked Diamonds and";

 			mes "50 Soft Silks.";

 			next;

-

+			mes @npcname$;

 			if( (countitem(7445)<7) || (countitem(7446)<7) || (countitem(7447)<7) || (countitem(7448)<7) || (countitem(954)<300) || (countitem(975)<1) || (countitem(733)<5) || (countitem(7166)<50) ){

-				mes "Please return when you have everything I need";

+				mes "Please return when you have everything I need.";

 				close;

 			}

-			

 			delitem 7445,7;

 			delitem 7446,7;

 			delitem 7447,7;

@@ -453,7 +450,6 @@ payon.gat,137,123,5	script	Hangaram	740,{
 			delitem 733,5;

 			delitem 7166,50;

 

-			mes @npcname$;

 			mes "Well, you have everything.";

 			next;