Added Renewal quest items to Ayothaya Dungeon Entrance quest.

Reference: rathena/rathena@1d64b8f9e1d95f40778a625c10735a10d9e6f5db (part)

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 53 insertions, 47 deletions

diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index e4fb2fb75..619880819 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -3,7 +3,7 @@
 //===== By ===================================================
 //= Fredzilla, MasterOfMuppets
 //===== Version ==============================================
-//= 2.5
+//= 2.6
 //===== Description ==========================================
 //= [Official Conversion]
 //= Ayothaya Ring Quest
@@ -29,6 +29,7 @@
 //= 2.3 Replaced effect numerics with constants. [Samuray22]
 //= 2.4 Updated RE/Pre-RE EXP. [Euphy]
 //= 2.5 Added questlog support. [Euphy]
+//= 2.6 Added Renewal quest items. [Euphy]
 //============================================================
 
 // Ayothaya Ring Quest :: ayo_ring
@@ -1327,6 +1328,11 @@ ayothaya,83,132,0	script	Dusit#thai	4_M_THAIONGBAK,{
 }
 
 ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
+	if (RENEWAL)
+		setarray .@items, Transparent_Cloth, Fox_Tail;
+	else
+		setarray .@items, Needle_Pouch, Spool;
+
 	if (ayodunquest == 1) {
 		mes "[Boonthom]";
 		mes "You...!";
@@ -1441,8 +1447,8 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 			mes "containing this holy power if you wish. In order to make it, I will need some materials.";
 			next;
 			mes "[Boonthom]";
-			mes "^3366991 Needle Packet^000000,";
-			mes "^3366991 Spool^000000,";
+			mes "^3366991 "+getitemname(.@items[0])+"^000000,";
+			mes "^3366991 "+getitemname(.@items[1])+"^000000,";
 			mes "^3366991 Solid Husk^000000 and";
 			mes "^3366991 Holy Water^000000...";
 			mes "That's all I need.";
@@ -1465,7 +1471,7 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 		mes "............";
 		close;
 	} else if (ayodunquest == 2) {
-		if (countitem(7213) > 0 && countitem(7217) > 0 && countitem(7190) > 0 && countitem(523) > 0) {
+		if (countitem(.@items[0]) > 0 && countitem(.@items[1]) > 0 && countitem(Solid_Peeling) > 0 && countitem(Holy_Water) > 0) {
 			mes "[Boonthom]";
 			mes "Excellent!";
 			mes "Now you have brought";
@@ -1486,13 +1492,13 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 			mes "Here you go.";
 			mes "Please take these holy threads.";
 			mes "With this, you will be able to enter the ruins with less worry.";
-			delitem 7213,1; //Needle_Pouch
-			delitem 7217,1; //Spool
-			delitem 7190,1; //Solid_Peeling
-			delitem 523,1; //Holy_Water
+			delitem .@items[0],1;
+			delitem .@items[1],1;
+			delitem Solid_Peeling,1;
+			delitem Holy_Water,1;
 			ayodunquest = 3;
 			changequest 12036,12037;
-			getitem 7285,1; //Thread_Skein
+			getitem Thread_Skein,1;
 			next;
 			mes "[Boonthom]";
 			mes "Even if you lose this, don't worry. Just bring me the materials, and";
@@ -1508,8 +1514,8 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 		mes "carefully this time.";
 		next;
 		mes "[Boonthom]";
-		mes "^3366991 Needle Packet^000000,";
-		mes "^3366991 Spool^000000,";
+		mes "^3366991 "+getitemname(.@items[0])+"^000000,";
+		mes "^3366991 "+getitemname(.@items[1])+"^000000,";
 		mes "^3366991 Solid Husk^000000 and";
 		mes "^3366991 Holy Water^000000.";
 		next;
@@ -1517,7 +1523,7 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 		mes "See you later.";
 		close;
 	} else if (ayodunquest == 3) {
-		if (countitem(7213) > 0 && countitem(7217) > 0 && countitem(7190) > 0 && countitem(523) > 0) {
+		if (countitem(.@items[0]) > 0 && countitem(.@items[1]) > 0 && countitem(Solid_Peeling) > 0 && countitem(Holy_Water) > 0) {
 			mes "[Boonthom]";
 			mes "Excellent! Now you have brought everything I need, let me make the thing for you as I promised...";
 			next;
@@ -1535,11 +1541,11 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 			mes "Here you go.";
 			mes "Please take these holy threads.";
 			mes "With this, you will be able to enter the ruins with less worry.";
-			delitem 7213,1; //Needle_Pouch
-			delitem 7217,1; //Spool
-			delitem 7190,1; //Solid_Peeling
-			delitem 523,1; //Holy_Water
-			getitem 7285,1; //Thread_Skein
+			delitem .@items[0],1;
+			delitem .@items[1],1;
+			delitem Solid_Peeling,1;
+			delitem Holy_Water,1;
+			getitem Thread_Skein,1;
 			next;
 			mes "[Boonthom]";
 			mes "Even if you lose this, don't worry. Just bring me the materials, I can make you another one.";
@@ -1549,8 +1555,8 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 		mes "If you lose the holy threads, don't worry. I can make some more for you. Just gather the following items.";
 		next;
 		mes "[Boonthom]";
-		mes "^3366991 Needle Packet^000000,";
-		mes "^3366991 Spool^000000,";
+		mes "^3366991 "+getitemname(.@items[0])+"^000000,";
+		mes "^3366991 "+getitemname(.@items[1])+"^000000,";
 		mes "^3366991 Solid Husk^000000 and";
 		mes "^3366991 Holy Water^000000.";
 		next;
@@ -1599,8 +1605,8 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 		mes "[Boonthom]";
 		mes "^3366992 Holy Water^000000,";
 		mes "^3366991 Yggdrasil Leaf^000000,";
-		mes "^3366992 Needle Packet^000000 and";
-		mes "^3366992 Spool^000000.";
+		mes "^3366992 "+getitemname(.@items[0])+"^000000 and";
+		mes "^3366992 "+getitemname(.@items[1])+"^000000.";
 		ayodunquest = 10;
 		changequest 12037,12038;
 		next;
@@ -1610,7 +1616,7 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 		mes "gathered everything.";
 		close;
 	} else if (ayodunquest == 10) {
-		if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1) {
+		if (countitem(Holy_Water) > 1 && countitem(Leaf_Of_Yggdrasil) > 0 && countitem(.@items[0]) > 1 && countitem(.@items[1]) > 1) {
 			mes "[Boonthom]";
 			mes "Hmm~";
 			mes "You've brought";
@@ -1632,12 +1638,12 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 			mes "Here you go.";
 			mes "Please take these holy threads.";
 			mes "With this, you will be able to enter the ruins with less worry.";
-			delitem 7213,2; //Needle_Pouch
-			delitem 7217,2; //Spool
-			delitem 610,1; //Leaf_Of_Yggdrasil
-			delitem 523,2; //Holy_Water
+			delitem .@items[0],2; //Needle_Pouch
+			delitem .@items[1],2; //Spool
+			delitem Leaf_Of_Yggdrasil,1;
+			delitem Holy_Water,2;
 			ayodunquest = 11;
-			getitem 7287,1; //Thread_Skein_
+			getitem Thread_Skein_,1;
 			changequest 12038,12039;
 			next;
 			mes "[Boonthom]";
@@ -1655,8 +1661,8 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 		mes "[Boonthom]";
 		mes "^3366992 Holy Water^000000,";
 		mes "^3366991 Yggdrasil Leaf^000000,";
-		mes "^3366992 Needle Packet^000000 and";
-		mes "^3366992 Spool^000000.";
+		mes "^3366992 "+getitemname(.@items[0])+"^000000 and";
+		mes "^3366992 "+getitemname(.@items[1])+"^000000.";
 		next;
 		mes "[Boonthom]";
 		mes "Return to me";
@@ -1666,7 +1672,7 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 		mes "threads for you.";
 		close;
 	} else if (ayodunquest == 11) {
-		if (countitem(7287) > 0) {
+		if (countitem(Thread_Skein_) > 0) {
 			mes "[Boonthom]";
 			mes "Those threads";
 			mes "will protect you";
@@ -1675,7 +1681,7 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 			mes "to you to defend yourself";
 			mes "from monster attacks, okay?";
 			close;
-		} else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
+		} else if (countitem(Holy_Water) > 1 && countitem(Leaf_Of_Yggdrasil) > 0 && countitem(.@items[0]) > 1 && countitem(.@items[1]) > 1 && countitem(Thread_Skein_) == 0) {
 			mes "[Boonthom]";
 			mes "Ooooohmmmmm...";
 			next;
@@ -1690,11 +1696,11 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 			mes "Here you go.";
 			mes "Please take these holy threads.";
 			mes "With this, you will be able to enter the ruins with less worry.";
-			delitem 7213,2; //Needle_Pouch
-			delitem 7217,2; //Spool
-			delitem 610,1; //Leaf_Of_Yggdrasil
-			delitem 523,2; //Holy_Water
-			getitem 7287,1; //Thread_Skein_
+			delitem .@items[0],2;
+			delitem .@items[1],2;
+			delitem Leaf_Of_Yggdrasil,1;
+			delitem Holy_Water,2;
+			getitem Thread_Skein_,1;
 			close;
 		}
 		mes "[Boonthom]";
@@ -1707,8 +1713,8 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 		mes "[Boonthom]";
 		mes "^3366992 Holy Water^000000,";
 		mes "^3366991 Yggdrasil Leaf^000000,";
-		mes "^3366992 Needle Packet^000000 and";
-		mes "^3366992 Spool^000000.";
+		mes "^3366992 "+getitemname(.@items[0])+"^000000 and";
+		mes "^3366992 "+getitemname(.@items[1])+"^000000.";
 		close;
 	} else if (ayodunquest == 12) {
 		mes "[Boonthom]";
@@ -1740,13 +1746,13 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 		completequest 12039;
 		close;
 	} else if (ayodunquest > 12) {
-		if (countitem(7287) > 0) {
+		if (countitem(Thread_Skein_) > 0) {
 			mes "[Boonthom]";
 			mes "Best of luck on your";
 			mes "expeditions, brave";
 			mes "adventurer~";
 			close;
-		} else if (countitem(523) > 1 && countitem(610) > 0 && countitem(7213) > 1 && countitem(7217) > 1 && countitem(7287) == 0) {
+		} else if (countitem(Holy_Water) > 1 && countitem(Leaf_Of_Yggdrasil) > 0 && countitem(.@items[0]) > 1 && countitem(.@items[1]) > 1 && countitem(Thread_Skein_) == 0) {
 			mes "[Boonthom]";
 			mes "Lost the";
 			mes "holy threads";
@@ -1769,11 +1775,11 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 			mes "Here you go.";
 			mes "Please take these holy threads.";
 			mes "With this, you will be able to enter the ruins with less worry.";
-			delitem 7213,2; //Needle_Pouch
-			delitem 7217,2; //Spool
-			delitem 610,1; //Leaf_Of_Yggdrasil
-			delitem 523,2; //Holy_Water
-			getitem 7287,1; //Thread_Skein_
+			delitem .@items[0],2;
+			delitem .@items[1],2;
+			delitem Leaf_Of_Yggdrasil,1;
+			delitem Holy_Water,2;
+			getitem Thread_Skein_,1;
 			close;
 		}
 		mes "[Boonthom]";
@@ -1786,8 +1792,8 @@ ayo_in01,181,193,4	script	Shaman#thai	4_F_THAISHAMAN,{
 		mes "[Boonthom]";
 		mes "^3366992 Holy Water^000000,";
 		mes "^3366991 Yggdrasil Leaf^000000,";
-		mes "^3366992 Needle Packet^000000 and";
-		mes "^3366992 Spool^000000.";
+		mes "^3366992 "+getitemname(.@items[0])+"^000000 and";
+		mes "^3366992 "+getitemname(.@items[1])+"^000000.";
 		close;
 	}
 	mes "[Boonthom]";