From 27c583d609bd220d3a911e5da170462c442957fa Mon Sep 17 00:00:00 2001
From: Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 24 Apr 2007 12:20:12 +0000
Subject: Fixed rewards of Momotaro event

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10336 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/Changelog.txt            |   1 +
 npc/quests/quests_amatsu.txt | 165 ++++++-------------------------------------
 2 files changed, 24 insertions(+), 142 deletions(-)

(limited to 'npc')

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 0665b43db..9c63932ab 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2007/04/25
+	* Fixed rewards of Momotaro event [Playtester]
 	* Applied L0ne_W0lf's fixes to the Kiel quest [ultramage]
 2007/04/24
 	* Fixed exploitable Valkyrie Randgris respawn time [Playtester]
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index 5b942723d..3c8511741 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -113,216 +113,97 @@ Lget:
 	mes "How was it? Did you enjoy the event?";
 	mes "I hope the arrangements at the event hall allowed you to spend an enjoyable time there.";
 	next;
-	if (event_momo > 1 && event_momo < 4)
+	if (event_momo >= 1 && event_momo < 4)
 	{
-	switch(rand(1,24))
+	switch(rand(1,10))
 		{
-
 	case 1:
-		getitem 627,1; //sweet milk
+		getitem 622,1; //rainbow carrot
 	break;
 
 	case 2:
-		getitem 629,1; //singing flower
+		getitem 627,1; //sweet milk
 	break;
 
 	case 3:
-		getitem 625,1; //rusty iron
+		getitem 629,1; //singing flower
 	break;
 
 	case 4:
-		getitem 619,1; //unripe apple
+		getitem 632,1; //fatty chubby earthworm
 	break;
 
 	case 5:
-		getitem 620,1; //orange juice
+		getitem 623,1; //earthworm the dude
 	break;
 
 	case 6:
-		getitem 621,1; //bitter herb
+		getitem 619,1; //unripe apple
 	break;
 
 	case 7:
-		getitem 622,1; //rainbow carrot
+		getitem 621,1; //bitter herb
 	break;
 
 	case 8:
-		getitem 623,1; //earthworm the dude
+		getitem 620,1; //orange juice
 	break;
 
 	case 9:
-		getitem 624,1; //rotten fish
+		getitem 625,1; //rusty iron
 	break;
 
 	case 10:
-		getitem 626,1; //monster juice
-	break;
-
-	case 11:
-		getitem 628,1; //well-dried bone
-	break;
-
-	case 12:
-		getitem 630,1; //dew laden moss
-	break;
-
-	case 13:
-		getitem 631,1; //deadly noxious herb
-	break;
-
-	case 14:
-		getitem 632,1; //fatty chubby earthworm
-	break;
-
-	case 15:
-		getitem 633,1; //sweet potato
-	break;
-
-	case 16:
-		getitem 634,1; //tropical banana
-	break;
-
-	case 17:
-		getitem 635,1; //orc trophy
-	break;
-
-	case 18:
-		getitem 636,1; //no recipient
-	break;
-
-	case 19:
-		getitem 637,1; //old broom
-	break;
-
-	case 20:
-		getitem 638,1; //silver knife of chastity
-	break;
-
-	case 21:
-		getitem 639,1; //armlet of obedience
-	break;
-
-	case 22:
-		getitem 640,1; //shining stone
-	break;
-
-	case 23:
-		getitem 641,1; //contract in shadow
-	break;
-
-	case 24:
-		getitem 642,1; //book of the devil
+		getitem 624,1; //rotten fish
 	break;
-
 		}
 	}
+
 //Am Mut successful finish unknown
 	if (event_momo == 4)
 	{
-	while(@i != 3)
-	{
-	switch(rand(1,24))
+	switch(rand(1,10))
 		{
-
 	case 1:
-		getitem 627,1; //sweet milk
+		getitem 659,1; //her heart
 	break;
 
 	case 2:
-		getitem 629,1; //singing flower
+		getitem 633,1; //sweet potato
 	break;
 
 	case 3:
-		getitem 625,1; //rusty iron
+		getitem 634,1; //tropical banana
 	break;
 
 	case 4:
-		getitem 619,1; //unripe apple
+		getitem 639,1; //armlet of obedience
 	break;
 
 	case 5:
-		getitem 620,1; //orange juice
+		getitem 636,1; //no recipient
 	break;
 
 	case 6:
-		getitem 621,1; //bitter herb
+		getitem 628,1; //well-dried bone
 	break;
 
 	case 7:
-		getitem 622,1; //rainbow carrot
+		getitem 637,1; //old broom
 	break;
 
 	case 8:
-		getitem 623,1; //earthworm the dude
+		getitem 635,1; //orc trophy
 	break;
 
 	case 9:
-		getitem 624,1; //rotten fish
-	break;
-
-	case 10:
 		getitem 626,1; //monster juice
 	break;
 
-	case 11:
-		getitem 628,1; //well-dried bone
-	break;
-
-	case 12:
-		getitem 630,1; //dew laden moss
-	break;
-
-	case 13:
-		getitem 631,1; //deadly noxious herb
-	break;
-
-	case 14:
-		getitem 632,1; //fatty chubby earthworm
-	break;
-
-	case 15:
-		getitem 633,1; //sweet potato
-	break;
-
-	case 16:
-		getitem 634,1; //tropical banana
-	break;
-
-	case 17:
-		getitem 635,1; //orc trophy
-	break;
-
-	case 18:
-		getitem 636,1; //no recipient
-	break;
-
-	case 19:
-		getitem 637,1; //old broom
-	break;
-
-	case 20:
-		getitem 638,1; //silver knife of chastity
-	break;
-
-	case 21:
-		getitem 639,1; //armlet of obedience
-	break;
-
-	case 22:
-		getitem 640,1; //shining stone
-	break;
-
-	case 23:
+	case 10:
 		getitem 641,1; //contract in shadow
 	break;
-
-	case 24:
-		getitem 642,1; //book of the devil
-	break;
-
 		}
-	set @i,@i+1;
-	}
 	}
 	set event_momo,5;
 	mes "[Publisher]";
-- 
cgit v1.2.3-60-g2f50