- Fixed F_CashSiegeTele typo in item_db.

- Moved VIP_Third_Class function from other/CashShop_Functions into other/re/CashShop_Functions (only used in re folder).
- Fixed a mistake in quests/quests_nameless.txt blame me  36f337ea41a876ef471bfbb78128e35fa0d9aa56
- re/quest/quests_eclage clean-up and bug fix

Signed-off-by: Atemo <capucrath@gmail.com>

db/pre-re/item_db.txt

@@ -6405,7 +6405,7 @@
 14588,Pty_Blessing_Scroll,Party Blessing 10 Scroll,11,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "CASH_BLESSING",10; },{},{}
 14589,Pty_Inc_Agi_Scroll,Party Increase Agi 10 Scroll,11,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "CASH_INCAGI",10; },{},{}
 14590,Pty_Assumptio_Scroll,Party Assumptio 5 Scroll,11,10,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "CASH_ASSUMPTIO",5; },{},{}
-14591,Siege_Teleport_Scroll,WoE Teleport Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashSeigeTele"; },{},{}
+14591,Siege_Teleport_Scroll,WoE Teleport Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "F_CashSiegeTele"; },{},{}
 14592,Job_Manual50,JOB Battle Manual,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_JEXPBOOST,1800000,50; },{},{}
 14593,Magic_Power_Scroll,Mystical Amplification Scroll,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "HW_MAGICPOWER",10; },{},{}
 14594,Quagmire_Scroll,Quagmire Scroll,11,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "WZ_QUAGMIRE",5; },{},{}

db/re/item_db.txt

@@ -6320,7 +6320,7 @@
 12441,F_Bubble_Gum,F Old Bubble Gum,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 12442,F_Kafra_Card,F Kafra Card,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 12443,F_Neuralizer,F Neuralizer,2,2,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12444,F_Dun_Tele_Scroll1,WoE Telport Scroll,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_CashSeigeTele"; },{},{}
+12444,F_Dun_Tele_Scroll1,WoE Telport Scroll,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_CashSiegeTele"; },{},{}
 12445,F_Str_Dish10_,F Str Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 12446,F_Agi_Dish10_,F Agi Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 12447,F_Int_Dish10_,F Int Dish10,2,2,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
@@ -8153,7 +8153,7 @@
 14588,Pty_Blessing_Scroll,Party Blessing 10 Scroll,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "CASH_BLESSING",10; },{},{}
 14589,Pty_Inc_Agi_Scroll,Party Increase Agi 10 Scroll,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "CASH_INCAGI",10; },{},{}
 14590,Pty_Assumptio_Scroll,Party Assumptio 5 Scroll,11,10,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "CASH_ASSUMPTIO",5; },{},{}
-14591,Siege_Teleport_Scroll,WoE Teleport Scroll,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_CashSeigeTele"; },{},{}
+14591,Siege_Teleport_Scroll,WoE Teleport Scroll,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ callfunc "F_CashSiegeTele"; },{},{}
 14592,Job_Manual50,JOB Battle Manual,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ sc_start SC_JEXPBOOST,1800000,50; },{},{}
 14593,Magic_Power_Scroll,Mystical Amplification Scroll,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "HW_MAGICPOWER",10; },{},{}
 14594,Quagmire_Scroll,Quagmire Scroll,11,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ itemskill "WZ_QUAGMIRE",5; },{},{}

npc/instances/NydhoggsNest.txt

@@ -884,7 +884,7 @@ spl_in01,109,60,3	script	Commander Lebiordirr#edq	435,3,3,{
 			mes "His Highness, the World Tree Yggdrasil, said that?";
 			next;
 			mes "[Commander Lebiordirr]";
-			mes "The reason behind all of this... is not because of the Sapha tribe, but because of the sudden leave of the Guardian? And the Guaridan has given up on his identity?";
+			mes "The reason behind all of this... is not because of the Sapha tribe, but because of the sudden leave of the Guardian? And the Guardian has given up on his identity?";
 			next;
 			mes "[Commander Lebiordirr]";
 			mes "This must be reported... reported to the High Priest of Alfheim... Unbelievable.";

npc/other/CashShop_Functions.txt

@@ -27,6 +27,7 @@
 //= 1.7 Added Dungeon Teleport Scroll II maps. [Euphy]
 //= 1.8 Added VIP function. [Euphy]
 //= 1.9 Added checkdragon() in F_CashReset. [Capuche]
+//= 2.0 Moved VIP_Third_Class function into other/re/CashShop_Functions. [Capuche]
 //============================================================ 
 
 // Kafra Card
@@ -303,35 +304,3 @@ function	script	F_Snowball	{
 	}
 	end;
 }
-
-// VIP Functions
-//============================================================ 
-function	script	VIP_Third_Class	{
-	if (!vip_status(1)) {
-		mes "[Voice from nowhere]";
-		mes "Access to Premium content is only available to those who possess a certain amount of Reset Stones.";
-		next;
-		if (countitem(6320) < 1) {
-			mes "[Voice from nowhere]";
-			mes "In order to change to third class, you must bring 1 ^0000CCReset Stone^000000 or have a Premium account.";
-			//mes "Please visit our iShop to purchase the ^0000CCReset Stone^000000.";
-			close;
-		} else {
-			mes "[Voice from nowhere]";
-			mes "Would you like to participate in this quest for 1 ^0000CCReset Stone^000000?";
-			next;
-			switch(select("Yes:No")) {
-			case 1:
-				mes "[Voice from nowhere]";
-				mes "Good luck, adventurer.";
-				delitem 6320,1; //Premium_Reset_Stone
-				break;
-			case 2:
-				mes "[Voice from nowhere]";
-				mes "Very well.";
-				close;
-			}
-		}
-	}
-	return;
-}

npc/other/monster_race.txt

@@ -93,7 +93,7 @@ OnEnable:
 			enablenpc "Tire"+.@c+"#2";
 			enablenpc "Tire"+.@c+"#3";
 			if (.@tired < 30) enablenpc "Tire"+.@c+"#4";
-		} else if (.@line) <= 60 {
+		} else if (.@line <= 60) {
 			.@tired = rand(10,30);
 			for ( .@i = 1; .@i <= 3; .@i++ )
 				enablenpc "Luk"+.@c+"#"+.@i;

npc/quests/quests_nameless.txt

@@ -4058,7 +4058,7 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 		set diamond_edq,6;
 		close;
 	}
-	if (diamond_edq) == 9 {
+	if (diamond_edq == 9) {
 		mes "[Dorian]";
 		mes "Ah, did you bring all";
 		mes "the materials I need to";
@@ -4152,7 +4152,7 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 			close;
 		}
 	}
-	if (diamond_edq) == 10 {
+	if (diamond_edq == 10) {
 		mes "[Dorian]";
 		mes "Did you already forget";
 		mes "my instructions for fixing my";
@@ -4216,7 +4216,7 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 			close;
 		}
 	}
-	if (diamond_edq) == 11 {
+	if (diamond_edq == 11) {
 		mes "[Dorian]";
 		mes "Ah, so you failed to";
 		mes "fix the Mystic Dryer de";
@@ -4227,7 +4227,7 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 		set diamond_edq,10;
 		close;
 	}
-	if (diamond_edq) == 12 {
+	if (diamond_edq == 12) {
 		mes "[Dorian]";
 		mes "Ah, I underestimated you.";
 		mes "You really repaired the";
@@ -4253,7 +4253,7 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 		mes "your kind of help. Farewell~";
 		close;
 	}
-	if (diamond_edq) > 12 {
+	if (diamond_edq > 12) {
 		mes "[Dorian]";
 		mes "Ah, hello! How have";
 		mes "you been? Are you in need";
@@ -4264,7 +4264,7 @@ cmd_fild01,55,160,0	script	Heap of Earth	844,{
 
 //OnTouch2:
 OnTouch:
-	if (diamond_edq) < 9 {
+	if (diamond_edq < 9) {
 		mes "[Dorian]";
 		mes "Wh-what are you doing?";
 		mes "D-don't sully my wonderful";
@@ -4272,7 +4272,7 @@ OnTouch:
 		mes "uncultured hands!";
 		close;
 	}
-	if (diamond_edq) == 9 {
+	if (diamond_edq == 9) {
 		mes "[Dorian]";
 		mes "Can't you see that the";
 		mes "machine won't work without";
@@ -4294,7 +4294,7 @@ OnTouch:
 		mes "goods to Kafra Storage, please.";
 		close;
 	}
-	if (diamond_edq) == 10 {
+	if (diamond_edq == 10) {
 		set .@bolt_rand,rand(2,5);
 		mes "^3355FFThis must be Dorian's";
 		mes "Mystic Dryer de Elegance.";
@@ -8051,7 +8051,7 @@ moc_ruins,90,67,3	script	Suspicious Man#1	4W_M_03,4,4,{
 			callsub S_Quest;
 		else {
 			mes "[Suspicious Man]";
-			if (atoi( strnpcinfo(2) ) == 1) {
+			if (strnpcinfo(2) == "1") {
 				mes "...............................";
 				mes "...............................";
 				mes "............................... ";
@@ -8169,7 +8169,7 @@ moc_ruins,90,67,3	script	Suspicious Man#1	4W_M_03,4,4,{
 		}
 	}
 	else if (zdan_edq < 9) {
-		if (atoi( strnpcinfo(2) ) == 1)
+		if (strnpcinfo(2) == "1")
 			mes "[Suspicious Man]";
 		else
 			mes "[Thug]";
@@ -8194,7 +8194,7 @@ moc_ruins,90,67,3	script	Suspicious Man#1	4W_M_03,4,4,{
 		mes "that sort of deal.";
 	}
 	else {
-		if (atoi( strnpcinfo(2) ) == 1)
+		if (strnpcinfo(2) == "1")
 			mes "[Suspicious Man]";
 		else
 			mes "[Thug]";
@@ -8234,8 +8234,14 @@ S_Quest:
 	mes "Y-you're stronger";
 	mes "than I thought!";
 	mes "Run awaaaaay!";
-	hideoffnpc "Suspicious Man#2";
-	hideonnpc "Suspicious Man#1";
+	if (strnpcinfo(2) == "1") {
+		hideonnpc "Suspicious Man#1";
+		hideoffnpc "Suspicious Man#2";
+	}
+	else {
+		hideonnpc "Suspicious Man#2";
+		hideoffnpc "Suspicious Man#1";
+	}
 	set $@zdan,0;
 	stopnpctimer;
 	next;

npc/re/other/CashShop_Functions.txt

@@ -0,0 +1,41 @@
+//===== rAthena Script =======================================
+//= Cash Shop Functions
+//===== Description: =========================================
+//= Functions related to the VIP system.
+//===== Changelogs: ==========================================
+//= 1.0 Moved VIP_Third_Class function
+//=		from other/CashShop_Functions. [Capuche]
+//============================================================
+
+// VIP Functions
+//============================================================
+function	script	VIP_Third_Class	{
+	if (!vip_status(1)) {
+		mes "[Voice from nowhere]";
+		mes "Access to Premium content is only available to those who possess a certain amount of Reset Stones.";
+		next;
+		if (countitem(6320) < 1) {
+			mes "[Voice from nowhere]";
+			mes "In order to change to third class, you must bring 1 ^0000CCReset Stone^000000 or have a Premium account.";
+			//mes "Please visit our iShop to purchase the ^0000CCReset Stone^000000.";
+			close;
+		} else {
+			mes "[Voice from nowhere]";
+			mes "Would you like to participate in this quest for 1 ^0000CCReset Stone^000000?";
+			next;
+			switch(select("Yes:No")) {
+			case 1:
+				mes "[Voice from nowhere]";
+				mes "Good luck, adventurer.";
+				delitem 6320,1; //Premium_Reset_Stone
+				next;
+				break;
+			case 2:
+				mes "[Voice from nowhere]";
+				mes "Very well.";
+				close;
+			}
+		}
+	}
+	return;
+}

npc/re/scripts_athena.conf

@@ -99,6 +99,7 @@ npc: npc/re/other/pvp.txt
 npc: npc/re/other/resetskill.txt
 npc: npc/re/other/stone_change.txt
 npc: npc/re/other/turbo_track.txt
+npc: npc/re/other/CashShop_Functions.txt
 
 // --------------------------- Quests ---------------------------
 // - Eden Group -------------------------------------------------

sql-files/item_db.sql

@@ -6436,7 +6436,7 @@ REPLACE INTO `item_db` VALUES (14587,'Repair_Scroll_','Equipment Repair Spell Bo
 REPLACE INTO `item_db` VALUES (14588,'Pty_Blessing_Scroll','Party Blessing 10 Scroll',11,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemskill "CASH_BLESSING",10;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (14589,'Pty_Inc_Agi_Scroll','Party Increase Agi 10 Scroll',11,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemskill "CASH_INCAGI",10;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (14590,'Pty_Assumptio_Scroll','Party Assumptio 5 Scroll',11,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemskill "CASH_ASSUMPTIO",5;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (14591,'Siege_Teleport_Scroll','WoE Teleport Scroll',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'callfunc "F_CashSeigeTele";',NULL,NULL);
+REPLACE INTO `item_db` VALUES (14591,'Siege_Teleport_Scroll','WoE Teleport Scroll',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'callfunc "F_CashSiegeTele";',NULL,NULL);
 REPLACE INTO `item_db` VALUES (14592,'Job_Manual50','JOB Battle Manual',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_JEXPBOOST,1800000,50;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (14593,'Magic_Power_Scroll','Mystical Amplification Scroll',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemskill "HW_MAGICPOWER",10;',NULL,NULL);
 REPLACE INTO `item_db` VALUES (14594,'Quagmire_Scroll','Quagmire Scroll',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'itemskill "WZ_QUAGMIRE",5;',NULL,NULL);

sql-files/item_db_re.sql

@@ -6351,7 +6351,7 @@ REPLACE INTO `item_db_re` VALUES (12440,'F_Insurance','F Insurance',2,2,NULL,10,
 REPLACE INTO `item_db_re` VALUES (12441,'F_Bubble_Gum','F Old Bubble Gum',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12442,'F_Kafra_Card','F Kafra Card',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12443,'F_Neuralizer','F Neuralizer',2,2,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12444,'F_Dun_Tele_Scroll1','WoE Telport Scroll',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'callfunc "F_CashSeigeTele";',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12444,'F_Dun_Tele_Scroll1','WoE Telport Scroll',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'callfunc "F_CashSiegeTele";',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12445,'F_Str_Dish10_','F Str Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12446,'F_Agi_Dish10_','F Agi Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12447,'F_Int_Dish10_','F Int Dish10',2,2,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -8184,7 +8184,7 @@ REPLACE INTO `item_db_re` VALUES (14587,'Repair_Scroll_','Equipment Repair Spell
 REPLACE INTO `item_db_re` VALUES (14588,'Pty_Blessing_Scroll','Party Blessing 10 Scroll',11,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemskill "CASH_BLESSING",10;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (14589,'Pty_Inc_Agi_Scroll','Party Increase Agi 10 Scroll',11,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemskill "CASH_INCAGI",10;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (14590,'Pty_Assumptio_Scroll','Party Assumptio 5 Scroll',11,10,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemskill "CASH_ASSUMPTIO",5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (14591,'Siege_Teleport_Scroll','WoE Teleport Scroll',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'callfunc "F_CashSeigeTele";',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (14591,'Siege_Teleport_Scroll','WoE Teleport Scroll',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'callfunc "F_CashSiegeTele";',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (14592,'Job_Manual50','JOB Battle Manual',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'sc_start SC_JEXPBOOST,1800000,50;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (14593,'Magic_Power_Scroll','Mystical Amplification Scroll',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemskill "HW_MAGICPOWER",10;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (14594,'Quagmire_Scroll','Quagmire Scroll',11,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'itemskill "WZ_QUAGMIRE",5;',NULL,NULL);