瀏覽代碼

- Added documentation for 'setiteminfo', follow up to r9938. (bugreport:3360)
- Added @reloadmobdb to the custom Floating Rates script.
- Added a missing check in THQS. (bugreport:4107)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14264 54d463be-8e91-2dee-dedb-b68131a5f0ec

brianluau 15 年之前
父節點
當前提交
2b305d5a62

+ 23 - 1
doc/script_commands.txt

@@ -2593,7 +2593,7 @@ Valid types are:
 		if = 0, then monsters don't drop it at all (rare or a quest item)
 		if = 0, then monsters don't drop it at all (rare or a quest item)
 		if = 10000, then this item is sold in NPC shops only
 		if = 10000, then this item is sold in NPC shops only
 	4 - sex; 5 - equip; 6 - weight; 7 - atk; 8 - def; 9 - range;
 	4 - sex; 5 - equip; 6 - weight; 7 - atk; 8 - def; 9 - range;
-	10 - slot; 11 - look; 12 - elv; 13 - wlv;
+	10 - slot; 11 - look; 12 - elv; 13 - wlv; 14 - view id
 
 
 Check sample in nps\sample\getiteminfo.txt
 Check sample in nps\sample\getiteminfo.txt
 
 
@@ -2993,6 +2993,7 @@ currently has active. Valid types are:
  3 - Pet friendly level (intimacy score). 1000 is full loyalty.
  3 - Pet friendly level (intimacy score). 1000 is full loyalty.
  4 - Pet hungry level. 100 is completely full.
  4 - Pet hungry level. 100 is completely full.
  5 - Pet rename flag. 0 means this pet has not been named yet.
  5 - Pet rename flag. 0 means this pet has not been named yet.
+
 ---------------------------------------
 ---------------------------------------
 
 
 *gethominfo(<type>)
 *gethominfo(<type>)
@@ -3005,6 +3006,7 @@ This function works as a direct counterpart of 'getpetinfo':
  4 - Hungry level. 100 is completely full.
  4 - Hungry level. 100 is completely full.
  5 - Rename flag. 0 means this homunculus has not been named yet.
  5 - Rename flag. 0 means this homunculus has not been named yet.
  6 - Homunculus level
  6 - Homunculus level
+
 ---------------------------------------
 ---------------------------------------
 
 
 
 
@@ -6239,10 +6241,30 @@ Example 1:
 
 
 ---------------------------------------
 ---------------------------------------
 
 
+*setiteminfo(<item id>,<type>,<value>)
+
+This function will set some value of an item.
+Returns the new value on success, or -1 on fail (item_id not found or invalid type).
+
+Valid types are:
+	0 - Buy Price; 1 - Sell Price; 2 - Item Type;
+	3 - maxchance (Max drop chance of this item e.g. 1 = 0.01% , etc..
+		if = 0, then monsters don't drop it at all (rare or a quest item)
+		if = 10000, then this item is sold in NPC shops only
+	4 - sex; 5 - equip; 6 - weight; 7 - atk; 8 - def; 9 - range;
+	10 - slot; 11 - look; 12 - elv; 13 - wlv; 14 - view id
+
+Example:
+
+setiteminfo 7049,6,999; // Stone now weighs 999
+
+---------------------------------------
+
 *setitemscript(<item id>,<"{ new item script }">{,<type>});
 *setitemscript(<item id>,<"{ new item script }">{,<type>});
 
 
 Set a new script bonus to the Item. Very useful for game events.
 Set a new script bonus to the Item. Very useful for game events.
 You can remove an item's itemscript by leaving the itemscript argument empty.
 You can remove an item's itemscript by leaving the itemscript argument empty.
+Returns 1 on success, or 0 on fail (item_id not found or new item script is invalid).
 Type can optionally be used indicates which script to set (default is 0):
 Type can optionally be used indicates which script to set (default is 0):
  0 - Script
  0 - Script
  1 - OnEquip_Script
  1 - OnEquip_Script

+ 2 - 1
npc/custom/floating_rates.txt

@@ -39,7 +39,8 @@ OnHour18:
 	setbattleflag("item_rate_use",$@drate);
 	setbattleflag("item_rate_use",$@drate);
 	setbattleflag("item_rate_equip",$@drate);
 	setbattleflag("item_rate_equip",$@drate);
 	//we don't change card drops rate, because these values won't change them anyway
 	//we don't change card drops rate, because these values won't change them anyway
+	atcommand "@reloadmobdb";
 
 
 	announce "Current Rune-Midgard rates are: 1."+($@brate-100)+"x 1."+($@jrate-100)+"x 1."+($@drate-100)+"x",bc_all,0xFF6060;
 	announce "Current Rune-Midgard rates are: 1."+($@brate-100)+"x 1."+($@jrate-100)+"x 1."+($@drate-100)+"x",bc_all,0xFF6060;
 	end;
 	end;
-}
+}

+ 4 - 4
npc/custom/quests/thq/THQS_QuestNPC.txt

@@ -183,8 +183,8 @@ N_JobList2:
 	mes " ";
 	mes " ";
 	mes "A strange man came in here yesterday and asked me to deliver this ^FF0000Strange Letter^000000 to some woman in Morroc. Knowing us we do not ask questions so you must take care of this delivery.";
 	mes "A strange man came in here yesterday and asked me to deliver this ^FF0000Strange Letter^000000 to some woman in Morroc. Knowing us we do not ask questions so you must take care of this delivery.";
 	mes "The Woman is in located in Morroc and her name is Erika.";
 	mes "The Woman is in located in Morroc and her name is Erika.";
-	set two_qset, 1;
 	getitem 1072,1; //Delivery_Message
 	getitem 1072,1; //Delivery_Message
+	set two_qset, 1;
 	goto L_QuestGiven;
 	goto L_QuestGiven;
 
 
 N_JurJeramiah:
 N_JurJeramiah:
@@ -356,8 +356,8 @@ N_JobList6:
 	mes "How ironic.";
 	mes "How ironic.";
 	mes " ";
 	mes " ";
 	mes "Deliver this Box to the Thiefs guild.";
 	mes "Deliver this Box to the Thiefs guild.";
-	set six_qset,1;
 	getitem 1083,1; //Delivery_Box__
 	getitem 1083,1; //Delivery_Box__
+	set six_qset,1;
 	goto L_QuestGiven;
 	goto L_QuestGiven;
 
 
 N_PyrPRT2:
 N_PyrPRT2:
@@ -375,8 +375,8 @@ N_Delivery2:
 	mes "Well most of what we do is run packages, this is no different from other's.";
 	mes "Well most of what we do is run packages, this is no different from other's.";
 	mes " ";
 	mes " ";
 	mes "Take this box, DO NOT OPEN IT! To a little girl in Lutie named Chirach she should be around santa.";
 	mes "Take this box, DO NOT OPEN IT! To a little girl in Lutie named Chirach she should be around santa.";
-	set six_qset,3;
 	getitem 1083,1; //Delivery_Box__
 	getitem 1083,1; //Delivery_Box__
+	set six_qset,3;
 	goto L_QuestGiven;
 	goto L_QuestGiven;
 
 
 N_Gef:
 N_Gef:
@@ -450,8 +450,8 @@ N_Delivery4:
 	mes "Well yah box delivering is in high demand,lots of lazy people.";
 	mes "Well yah box delivering is in high demand,lots of lazy people.";
 	mes " ";
 	mes " ";
 	mes "Take this package to a man in Morroc named Klye.";
 	mes "Take this package to a man in Morroc named Klye.";
-	set eight_qset,2;
 	getitem 1081,1; //Delivery_Box
 	getitem 1081,1; //Delivery_Box
+	set eight_qset,2;
 	goto L_QuestGiven;
 	goto L_QuestGiven;
 
 
 N_Bapho:
 N_Bapho:

+ 41 - 37
npc/custom/quests/thq/THQS_Quests.txt

@@ -52,12 +52,16 @@ pay_arche,86,129,6	script	Archer	732,{
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
 	mes "[Kieth]";
 	mes "[Kieth]";
+	if (countitem(1072) < 1) {
+		mes "Weren't you supposed to deliver me a box? Where is it?";
+		close;
+	}
 	mes "Ahh, you must be from the Treasure Hunter Agensy. Do you have my bow??";
 	mes "Ahh, you must be from the Treasure Hunter Agensy. Do you have my bow??";
 	mes " ";
 	mes " ";
 	mes "Ahh, good,thank you for your time. Take this Treasure Token.";
 	mes "Ahh, good,thank you for your time. Take this Treasure Token.";
+	delitem 1072,1;
 	set one_qset,0;
 	set one_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 1072,1;
 	set #Treasure_Token,#Treasure_Token+1;
 	set #Treasure_Token,#Treasure_Token+1;
 	close;
 	close;
 }
 }
@@ -74,13 +78,13 @@ N_QuestComp:
 	mes "Well those bugs can bugger off...";
 	mes "Well those bugs can bugger off...";
 	mes " ";
 	mes " ";
 	mes "Well here take these 2 Treasure Tokens.";
 	mes "Well here take these 2 Treasure Tokens.";
-	set one_qset,0;
-	set #Treasure_Token,#Treasure_Token+2;
-	set On_Quest,0;
 	delitem 909,20;
 	delitem 909,20;
 	delitem 955,20;
 	delitem 955,20;
 	delitem 914,20;
 	delitem 914,20;
 	delitem 705,20;
 	delitem 705,20;
+	set one_qset,0;
+	set #Treasure_Token,#Treasure_Token+2;
+	set On_Quest,0;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
 	mes "[Billy-Bob]";
 	mes "[Billy-Bob]";
@@ -101,8 +105,8 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Old Lady]";
 	mes "[Old Lady]";
 	mes "Thank you sooo much here have these 3 Treasure Tokens.";
 	mes "Thank you sooo much here have these 3 Treasure Tokens.";
-	set #Treasure_Token,#Treasure_Token+3;
 	delitem 934,15;
 	delitem 934,15;
+	set #Treasure_Token,#Treasure_Token+3;
 	set one_qset,0;
 	set one_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
 	close;
 	close;
@@ -164,9 +168,9 @@ N_QuestComp:
 	mes "Ahh hello, you must be from the Treasure Hunter Guild.";
 	mes "Ahh hello, you must be from the Treasure Hunter Guild.";
 	mes "Do you have my Jur? Ahh good good. Thank you.";
 	mes "Do you have my Jur? Ahh good good. Thank you.";
 	mes "Here have this Treasure Hunter Token.";
 	mes "Here have this Treasure Hunter Token.";
+	delitem 1998,1;
 	set two_qset,0;
 	set two_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 1998,1;
 	set #Treasure_Token,#Treasure_Token+1;
 	set #Treasure_Token,#Treasure_Token+1;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
@@ -213,10 +217,10 @@ N_QuestComp:
 	mes " ";
 	mes " ";
 	mes "I knew you looked strong, I have no idea how you could have killed that monster though.";
 	mes "I knew you looked strong, I have no idea how you could have killed that monster though.";
 	mes "thank you so much, here have these 3 Guild Tokens as a reward.";
 	mes "thank you so much, here have these 3 Guild Tokens as a reward.";
+	delitem 7005,1;
 	set two_qset,0;
 	set two_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
 	set #Treasure_Token,#Treasure_Token+3;
 	set #Treasure_Token,#Treasure_Token+3;
-	delitem 7005,1;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
 	mes "[Molly]";
 	mes "[Molly]";
@@ -243,8 +247,8 @@ N_QuestComp:
 	mes " ";
 	mes " ";
 	mes "I hope that this hole will go away 1 day, and I might have another quest for you in the future.";
 	mes "I hope that this hole will go away 1 day, and I might have another quest for you in the future.";
 	mes "here take these 2 Treasure Tokens.";
 	mes "here take these 2 Treasure Tokens.";
-	set #Treasure_Token,#Treasure_Token+2;
 	delitem 1040,30;
 	delitem 1040,30;
+	set #Treasure_Token,#Treasure_Token+2;
 	set three_qset,0;
 	set three_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
 	close;
 	close;
@@ -273,8 +277,8 @@ N_QuestComp:
 	mes "[Flank]";
 	mes "[Flank]";
 	mes "Thanks";
 	mes "Thanks";
 	mes "Have this Treasure Token";
 	mes "Have this Treasure Token";
-	set three_qset,0;
 	delitem 1082,1;
 	delitem 1082,1;
+	set three_qset,0;
 	set #Treasure_Token,#Treasure_Token+1;
 	set #Treasure_Token,#Treasure_Token+1;
 	set On_Quest,0;
 	set On_Quest,0;
 	close;
 	close;
@@ -325,9 +329,9 @@ N_QuestComp:
 	mes "I had my doughts but thank you for your help.";
 	mes "I had my doughts but thank you for your help.";
 	mes " ";
 	mes " ";
 	mes "Here have these 4 Treasure Tokens.";
 	mes "Here have these 4 Treasure Tokens.";
+	delitem 1041,50;
 	set three_qset,0;
 	set three_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 1041,50;
 	set #Treasure_Token,#Treasure_Token+4;
 	set #Treasure_Token,#Treasure_Token+4;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
@@ -351,8 +355,8 @@ N_QuestComp:
 	mes "[Flora]";
 	mes "[Flora]";
 	mes "Welcome back, good job you did it. (I wonder if that Flaming Bastard is still alive)";
 	mes "Welcome back, good job you did it. (I wonder if that Flaming Bastard is still alive)";
 	mes "Well I hope that cut down a bit on the monsters and here have these 2 Tokens.";
 	mes "Well I hope that cut down a bit on the monsters and here have these 2 Tokens.";
-	set #Treasure_Token,#Treasure_Token+2;
 	delitem 957,50;
 	delitem 957,50;
+	set #Treasure_Token,#Treasure_Token+2;
 	set four_qset,0;
 	set four_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
 	killmonster "pay_dun00","Flora::OnMobDead";
 	killmonster "pay_dun00","Flora::OnMobDead";
@@ -389,9 +393,9 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Zed]";
 	mes "[Zed]";
 	mes "Well you can take this crapy Treausre Token.";
 	mes "Well you can take this crapy Treausre Token.";
+	delitem 1999,1;
 	set On_Quest,0;
 	set On_Quest,0;
 	set four_qset,0;
 	set four_qset,0;
-	delitem 1999,1;
 	set #Treasure_Token,#Treasure_Token+1;
 	set #Treasure_Token,#Treasure_Token+1;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
@@ -411,9 +415,9 @@ N_QuestComp:
 	mes "Yes! Now my pet will not starve!";
 	mes "Yes! Now my pet will not starve!";
 	mes "Thank you so much!";
 	mes "Thank you so much!";
 	mes "Have this Treasure Token.";
 	mes "Have this Treasure Token.";
+	delitem 711,20;
 	set On_Quest,0;
 	set On_Quest,0;
 	set four_qset,0;
 	set four_qset,0;
-	delitem 711,20;
 	set #Treasure_Token,#Treasure_Token+1;
 	set #Treasure_Token,#Treasure_Token+1;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
@@ -442,10 +446,10 @@ N_QuestComp:
 	mes "[Czhore]";
 	mes "[Czhore]";
 	mes "Here have these 2 Treasure Tokens.";
 	mes "Here have these 2 Treasure Tokens.";
 	mes "And some of my old treasure...";
 	mes "And some of my old treasure...";
+	delitem 714,1;
 	monster "prt_gld",155,99,"Old Man's Treasure",1324,1;
 	monster "prt_gld",155,99,"Old Man's Treasure",1324,1;
 	set four_qset,0;
 	set four_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 714,1;
 	set #Treasure_Token,#Treasure_Token+2;
 	set #Treasure_Token,#Treasure_Token+2;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
@@ -471,10 +475,10 @@ N_QuestComp:
 	mes "Oh thank you so much, but they will be back...";
 	mes "Oh thank you so much, but they will be back...";
 	next;
 	next;
 	mes "Take these 2 Treasure Tokens";
 	mes "Take these 2 Treasure Tokens";
+	delitem 1028,15;
 	set five_qset,0;
 	set five_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
 	set #Treasure_Token,#Treasure_Token+2;
 	set #Treasure_Token,#Treasure_Token+2;
-	delitem 1028,15;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
 	mes "[Lithin]";
 	mes "[Lithin]";
@@ -498,10 +502,10 @@ N_QuestComp:
 	mes "Much thanks I have for you.";
 	mes "Much thanks I have for you.";
 	next;
 	next;
 	mes "Take with you these 2 Treasure Token's.";
 	mes "Take with you these 2 Treasure Token's.";
+	delitem 932,30;
 	set #Treasure_Token,#Treasure_Token+2;
 	set #Treasure_Token,#Treasure_Token+2;
 	set five_qset,0;
 	set five_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 932,30;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
 	mes "[Strange Man]";
 	mes "[Strange Man]";
@@ -550,9 +554,9 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Wizard]";
 	mes "[Wizard]";
 	mes "Here take these 4 Treasure Tokens.";
 	mes "Here take these 4 Treasure Tokens.";
+	delitem 1059,50;
 	set five_qset,0;
 	set five_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 1059,50;
 	set #Treasure_Token,#Treasure_Token+4;
 	set #Treasure_Token,#Treasure_Token+4;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
@@ -578,8 +582,8 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Thief]";
 	mes "[Thief]";
 	mes "Here take this Treasure Token as a reward.";
 	mes "Here take this Treasure Token as a reward.";
-	set six_qset,0;
 	delitem 1083,1;
 	delitem 1083,1;
+	set six_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
 	set #Treasure_Token,#Treasure_Token+1;
 	set #Treasure_Token,#Treasure_Token+1;
 	close;
 	close;
@@ -605,8 +609,8 @@ N_QuestComp2:
 	next;
 	next;
 	mes "[Strange Man]";
 	mes "[Strange Man]";
 	mes "Take with you these 3 tokens.";
 	mes "Take with you these 3 tokens.";
-	set #Treasure_Token,#Treasure_Token+3;
 	delitem 930,30;
 	delitem 930,30;
+	set #Treasure_Token,#Treasure_Token+3;
 	set On_Quest,0;
 	set On_Quest,0;
 	set six_qset,0;
 	set six_qset,0;
 	close;
 	close;
@@ -624,8 +628,8 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Chirach]";
 	mes "[Chirach]";
 	mes "Here take this Treasure Token as a reward.";
 	mes "Here take this Treasure Token as a reward.";
-	set six_qset,0;
 	delitem 1083,1;
 	delitem 1083,1;
+	set six_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
 	set #Treasure_Token,#Treasure_Token+1;
 	set #Treasure_Token,#Treasure_Token+1;
 	close;
 	close;
@@ -646,9 +650,9 @@ N_QuestComp:
 	mes "Thank you for helping me.";
 	mes "Thank you for helping me.";
 	next;
 	next;
 	mes "Here take these 4 Treasure Tokens.";
 	mes "Here take these 4 Treasure Tokens.";
+	delitem 944,20;
 	set six_qset,0;
 	set six_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 944,20;
 	set #Treasure_Token,#Treasure_Token+4;
 	set #Treasure_Token,#Treasure_Token+4;
 	next;
 	next;
 	mes "[Zuuzuu]";
 	mes "[Zuuzuu]";
@@ -680,9 +684,9 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Girl]";
 	mes "[Girl]";
 	mes "Have these 1 Treasure Tokens.";
 	mes "Have these 1 Treasure Tokens.";
+	delitem 531,5;
 	set seven_qset,0;
 	set seven_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 531,5;
 	set #Treasure_Token,#Treasure_Token+1;
 	set #Treasure_Token,#Treasure_Token+1;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
@@ -706,8 +710,8 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Charles]";
 	mes "[Charles]";
 	mes "Here take this Treasure Token as a reward.";
 	mes "Here take this Treasure Token as a reward.";
-	set seven_qset,0;
 	delitem 1082,1;
 	delitem 1082,1;
+	set seven_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
 	set #Treasure_Token,#Treasure_Token+1;
 	set #Treasure_Token,#Treasure_Token+1;
 	close;
 	close;
@@ -730,9 +734,9 @@ N_QuestComp2:
 	next;
 	next;
 	mes "[Sewer Managment]";
 	mes "[Sewer Managment]";
 	mes "Here take these 4 Treasure Tokens.";
 	mes "Here take these 4 Treasure Tokens.";
+	delitem 969,1;
 	set seven_qset,0;
 	set seven_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 969,1;
 	set #Treasure_Token,#Treasure_Token+4;
 	set #Treasure_Token,#Treasure_Token+4;
 	close;
 	close;
 }
 }
@@ -749,9 +753,9 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Scarlet]";
 	mes "[Scarlet]";
 	mes "Here take these 4 Treasure Tokens.";
 	mes "Here take these 4 Treasure Tokens.";
+	delitem 1127,1;
 	set seven_qset,0;
 	set seven_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 1127,1;
 	set #Treasure_Token,#Treasure_Token+4;
 	set #Treasure_Token,#Treasure_Token+4;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
@@ -775,9 +779,9 @@ N_QuestComp2:
 	next;
 	next;
 	mes "[Girl]";
 	mes "[Girl]";
 	mes "Have these 1 Treasure Tokens.";
 	mes "Have these 1 Treasure Tokens.";
+	delitem 532,5;
 	set eight_qset,0;
 	set eight_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 532,5;
 	set #Treasure_Token,#Treasure_Token+1;
 	set #Treasure_Token,#Treasure_Token+1;
 	close;
 	close;
 }
 }
@@ -794,8 +798,8 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Klye]";
 	mes "[Klye]";
 	mes "Here take this Treasure Token as a reward.";
 	mes "Here take this Treasure Token as a reward.";
-	set eight_qset,0;
 	delitem 1081,1;
 	delitem 1081,1;
+	set eight_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
 	set #Treasure_Token,#Treasure_Token+1;
 	set #Treasure_Token,#Treasure_Token+1;
 	close;
 	close;
@@ -818,9 +822,9 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Zack]";
 	mes "[Zack]";
 	mes "Here take these 5 Treasure Tokens.";
 	mes "Here take these 5 Treasure Tokens.";
+	delitem 923,1;
 	set eight_qset,0;
 	set eight_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 923,1;
 	set #Treasure_Token,#Treasure_Token+5;
 	set #Treasure_Token,#Treasure_Token+5;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
@@ -844,9 +848,9 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Flower]";
 	mes "[Flower]";
 	mes "Here take these 2 Treasure Tokens.";
 	mes "Here take these 2 Treasure Tokens.";
+	delitem 746,10;
 	set eight_qset,0;
 	set eight_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 746,10;
 	set #Treasure_Token,#Treasure_Token+2;
 	set #Treasure_Token,#Treasure_Token+2;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
@@ -870,8 +874,8 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Mage]";
 	mes "[Mage]";
 	mes "Here take this Treasure Token as a reward.";
 	mes "Here take this Treasure Token as a reward.";
-	set nine_qset,0;
 	delitem 1082,1;
 	delitem 1082,1;
+	set nine_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
 	set #Treasure_Token,#Treasure_Token+1;
 	set #Treasure_Token,#Treasure_Token+1;
 	close;
 	close;
@@ -893,9 +897,9 @@ N_QuestComp:
 	next;
 	next;
 	mes "[School Girl]";
 	mes "[School Girl]";
 	mes "Here take these 4 Treasure Tokens.";
 	mes "Here take these 4 Treasure Tokens.";
+	delitem 1020,20;
 	set nine_qset,0;
 	set nine_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 1020,20;
 	set #Treasure_Token,#Treasure_Token+4;
 	set #Treasure_Token,#Treasure_Token+4;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
@@ -922,9 +926,9 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Jack]";
 	mes "[Jack]";
 	mes "Here take these 4 Treasure Tokens.";
 	mes "Here take these 4 Treasure Tokens.";
+	delitem 1022,1;
 	set nine_qset,0;
 	set nine_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 1022,1;
 	set #Treasure_Token,#Treasure_Token+4;
 	set #Treasure_Token,#Treasure_Token+4;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
@@ -947,9 +951,9 @@ N_QuestComp2:
 	next;
 	next;
 	mes "[Jack]";
 	mes "[Jack]";
 	mes "Here take these 3 Treasure Tokens.";
 	mes "Here take these 3 Treasure Tokens.";
+	delitem 901,40;
 	set nine_qset,0;
 	set nine_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 901,40;
 	set #Treasure_Token,#Treasure_Token+3;
 	set #Treasure_Token,#Treasure_Token+3;
 	close;
 	close;
 }
 }
@@ -967,8 +971,8 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Kreg]";
 	mes "[Kreg]";
 	mes "Here take this Treasure Token as a reward.";
 	mes "Here take this Treasure Token as a reward.";
-	set ten_qset,0;
 	delitem 1082,1;
 	delitem 1082,1;
+	set ten_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
 	set #Treasure_Token,#Treasure_Token+1;
 	set #Treasure_Token,#Treasure_Token+1;
 	close;
 	close;
@@ -990,9 +994,9 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Man]";
 	mes "[Man]";
 	mes "Here take these 4 Treasure Tokens.";
 	mes "Here take these 4 Treasure Tokens.";
+	delitem 1029,1;
 	set ten_qset,0;
 	set ten_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 1029,1;
 	set #Treasure_Token,#Treasure_Token+4;
 	set #Treasure_Token,#Treasure_Token+4;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
@@ -1015,9 +1019,9 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Caral]";
 	mes "[Caral]";
 	mes "Here take these 4 Treasure Tokens.";
 	mes "Here take these 4 Treasure Tokens.";
+	delitem 1015,1;
 	set ten_qset,0;
 	set ten_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 1015,1;
 	set #Treasure_Token,#Treasure_Token+4;
 	set #Treasure_Token,#Treasure_Token+4;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart:
@@ -1040,9 +1044,9 @@ N_QuestComp:
 	next;
 	next;
 	mes "[Jeni]";
 	mes "[Jeni]";
 	mes "Here take these 3 Treasure Tokens.";
 	mes "Here take these 3 Treasure Tokens.";
+	delitem 1096,1;
 	set ten_qset,0;
 	set ten_qset,0;
 	set On_Quest,0;
 	set On_Quest,0;
-	delitem 1096,1;
 	set #Treasure_Token,#Treasure_Token+3;
 	set #Treasure_Token,#Treasure_Token+3;
 	close;
 	close;
 N_QuestStart:
 N_QuestStart: