ソースを参照

* Follow-up to pull request #8 and #10.
* Fixed a missing 'delitem' in Port Malaya quests. (bugreport:8168)
http://rathena.org/board/tracker/issue-8168-secret-in-the-woods-port-malaya-quest/
* Fixed an official quest time message mistake in El Dicastes quests. (bugreport:8167)
http://rathena.org/board/tracker/issue-8167-bouy-from-dicastes/

Signed-off-by: Euphy <euphy.raliel@rathena.org>

Euphy 11 年 前
コミット
cd3cb9fa95

+ 2 - 1
conf/msg_conf/map_msg.conf

@@ -497,7 +497,8 @@
 // Trade Spoof Messages
 507: This player has been banned for %d minute(s).
 508: This player hasn't been banned (Ban option is disabled).
-//509 free
+
+509: Script-bound commands:
 
 // mail system
 //----------------------

+ 14 - 15
db/re/item_db.txt

@@ -4790,12 +4790,12 @@
 7648,Snake_Bookmark,Snake Bookmark,3,20,,10,,,,,,,,,,,,,{},{},{}
 7649,Big_Luk_Bookmark,Big Luk Bookmark,3,20,,10,,,,,,,,,,,,,{},{},{}
 7651,Mystery_Egg,Mystery Egg,3,10,,10,,,,,,,,,,,,,{},{},{}
-7666,TimeTravel_Scroll,TimeTravel Scroll,3,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-7667,Abandoned_Machine,Abandoned_Machine,3,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+7666,TimeTravel_Scroll,Time Travel Scroll,3,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+7667,Abandoned_Machine,Abandoned Machine,3,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 7668,Clean_Bandage,Clean Bandage,3,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 7669,Rubbing_Alchohol,Rubbing Alchohol,3,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 7670,Sour_Grass,Sour Grass,3,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-7671,Firstaid_Kit,Firstaid_Kit,3,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+7671,Firstaid_Kit,First Aid Kit,3,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 7672,Relief_Food,Relief Food,3,20,,0,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 //
 7701,Dragon_Spirit,Soul,3,2,,10,,,,,,,,,,,,,{},{},{}
@@ -6000,7 +6000,7 @@
 12672,Start_New_Box,Start New Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 617,2; getitem 12263,2; getitem 12329,3; getitem 12330,2; },{},{}
 12673,Lucky_Egg_C10,Lucky Egg C10,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 12674,God_Material_Box,God Material Box,2,20,,500,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-12675,Sg_Weapon_Supply_Box,WoE_Weapon_Supply_Box,2,20,,500,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
+12675,Sg_Weapon_Supply_Box,WoE Weapon Supply Box,2,20,,500,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 12676,Sg_Violet_Potion_Box,Siege Violet Potion Box,2,20,,500,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 11547,50; },{},{}
 12677,Siege_Arrow_Quiver_S,Siege Arrow Quiver S,2,2,,100,,,,,0xFFFFFFFF,63,2,,,130,,,{ getitem 1776,200; },{},{}
 12678,Siege_Arrow_Quiver_A,Siege Arrow Quiver A,2,2,,100,,,,,0xFFFFFFFF,63,2,,,95,,,{ getitem 1775,200; },{},{}
@@ -7522,11 +7522,10 @@
 14618,AGI_Biscuit_Stick,Bar of Agility,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 //14626,Indigo_Scroll
 //14643,Violet_Scroll
-//14664,Bi_Hwang_Scroll		
-//14665,Jung_Bi_Scroll		
-//14666,Je_Un_Scroll		
+//14664,Bi_Hwang_Scroll
+//14665,Jung_Bi_Scroll
+//14666,Je_Un_Scroll
 //14667,Yong_Kwang_Scroll
-
 // More Armors
 15000,Bone_Plate,Bone Plate,5,20,,1000,,60,,1,0x000654E2,18,2,16,,85,1,0,{ bonus bStr,1; bonus bMdef,3; bonus2 bIgnoreDefRate,RC_DemiHuman,10; bonus2 bIgnoreDefRate,RC_Brute,10; bonus3 bAutoSpellWhenHit,"NPC_WIDEBLEEDING",1,10; },{},{}
 15001,Odin's_Blessing_I,Odin's Blessing,5,0,,0,,10,,0,0xFFFFFFFE,63,2,16,,0,0,0,{},{},{}
@@ -7769,6 +7768,7 @@
 16466,My_Scroll2,My Scroll2,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 //
 16503,E_Insurance_Package,E Insurance Package,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 12209,10; },{},{}
+//
 16542,Xmas_Bless,Xmas Bless,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 16543,Snowman_Hat_Box,Snowman Hat Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5738,1; },{},{}
 16544,FSnowman_Hat_Box,FSnowman Hat Box,18,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5738,1; },{},{}
@@ -7836,7 +7836,6 @@
 16687,RWC2010_SuitcaseA,RWC2010 SuitcaseA,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 16688,RWC2010_SuitcaseB,RWC2010 SuitcaseB,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
 16691,Scorpius_Scroll,Scorpius Scroll,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{}
-//--Untradable
 16692,Alice_Hat_Box,Alice Hat Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5137,1; },{},{}
 16693,Crescent_Helm_Box,Crescent Helm Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5142,1; },{},{}
 16694,Crescent_Helm_Box,Crescent Helm Box,2,20,,10,,,,,0xFFFFFFFF,63,2,,,,,,{ getitem 5142,1; },{},{}
@@ -8350,15 +8349,15 @@
 18759,Stretched_Nose_M,Wood Goblin's Nose,5,20,,200,,0,,0,0xFFFFFFFF,63,2,512,,50,0,737,{ bonus bUnbreakableHelm,0; },{},{}
 //
 18779,RWC_Champ_Crown_First_Place,RWC Champ Crown First Place,5,20,,500,,12,,,0xFFFFFFFF,63,2,256,,1,,902,{ bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,7; bonus bMdef,5; },{},{}
-18780,RWC_Champ_Crown_First_Place,RWC Champ Crown First Place,5,20,,500,,12,,,0xFFFFFFFF,63,2,256,,1,,903,{ bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,7; bonus bMdef,5; },{},{}
-18781,RWC_Champ_Crown_Third_Place,RWC Champ CrownThird  Place,5,20,,500,,12,,,0xFFFFFFFF,63,2,256,,1,,904,{ bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,3; bonus bMdef,1; },{},{}
+18780,RWC_Champ_Crown_Second_Place,RWC Champ Crown Second Place,5,20,,500,,12,,,0xFFFFFFFF,63,2,256,,1,,903,{ bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,7; bonus bMdef,5; },{},{}
+18781,RWC_Champ_Crown_Third_Place,RWC Champ Crown Third Place,5,20,,500,,12,,,0xFFFFFFFF,63,2,256,,1,,904,{ bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,3; bonus bMdef,1; },{},{}
 18782,Butterfly_Wing_Ear_J,Butterfly Wing Ear,5,20,,100,,0,,0,0xFFFFFFFF,63,2,512,,0,0,695,{ bonus bDex,2; bonus bUnbreakableHelm,0; },{},{}
 18785,King_Poring_Hat,King Poring Hat,5,20,,600,,10,,1,0xFFFFFFFF,63,2,256,,10,1,905,{ bonus bDex,1; bonus bLuk,1; if(getrefine()>=3){ bonus bDex,(getrefine()-4); bonus bLuk,(getrefine()-4); } },{},{}
 18786,Anemos_Mask,Anemos Mask,5,20,,200,,0,,0,0xFFFFFFFF,63,2,512,,10,0,906,{ bonus bUnbreakableHelm,0; },{},{}
 //
 18790,Rainbow_Poring_Hat,Rainbow Poring Hat,5,20,,100,,3,,1,0xFFFFFFFF,63,2,256,,0,1,900,{},{},{}
 18791,Shrine_Maiden_Hat,Shrine Maiden Hat,5,20,,200,,30,,,0xFFFFFFFF,63,2,256,,,,908,{},{},{}
-18796,RWC_Champ_Crown_Fourth_Place,RWC Champ Crown_Fourth  Place,5,20,,500,,12,,,0xFFFFFFFF,63,2,256,,1,,914,{ bonus2 bResEff,Eff_Curse,10000;  bonus bUnbreakableHelm,0; bonus bAllStats,2; },{},{}
+18796,RWC_Champ_Crown_Fourth_Place,RWC Champ Crown Fourth Place,5,20,,500,,12,,,0xFFFFFFFF,63,2,256,,1,,914,{ bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,2; },{},{}
 18805,Eclipse_Hat,Eclipse Hat,5,20,,300,,2,,0,0xFFFFFFFF,63,2,256,,0,1,922,{ bonus bLuk,3; bonus bMdef,5; },{},{}
 18806,Black_Rabbit_Hat,Black Rabbit Hat,5,20,,300,,2,,1,0xFFFFFFFF,63,2,256,,0,1,923,{ bonus bDex,2; bonus bAgi,3; },{},{}
 18807,Yellow_Yuzu_Hat,Yellow Yuzu Hat,5,20,,400,,3,,1,0xFFFFFFFE,63,2,256,,0,1,924,{ bonus bVit,2; bonus bLuk,3; },{},{}
@@ -8380,7 +8379,7 @@
 //
 18839,Poring_Sunglasses,Poring Sunglasses,5,0,,100,,10,,1,0xFFFFFFFF,63,2,512,,1,0,954,{ bonus bDex,1; },{},{}
 18841,Small_Poring_Band,Small Poring Band,5,20,,350,,8,,1,0xFFFFFFFF,63,2,256,,0,1,955,{},{},{}
-18842,Hat_Of_Girl,Hat_Of_Girl,5,20,,350,,8,,1,0xFFFFFFFF,63,2,256,,1,,956,{},{},{}
+18842,Hat_Of_Girl,Hat Of Girl,5,20,,350,,8,,1,0xFFFFFFFF,63,2,256,,0,1,956,{},{},{}
 18843,Small_Deviling_Hat,Small Deviling Hat,5,20,,350,,7,,1,0xFFFFFFFF,63,2,256,,0,1,957,{},{},{}
 18844,Blue_Poring_Bubble,Blue Poring Bubble,5,20,,50,,5,,0,0xFFFFFFFF,63,2,1,,0,0,958,{ bonus bStr,2; bonus bInt,2; bonus bVit,2; bonus bDex,2; bonus bAgi,2; bonus bLuk,2; bonus bUnbreakableHelm,0; },{},{}
 18845,Banshee_Master_Kiss,Banshee Master Kiss,5,20,,200,,5,,0,0xFFFFFFFF,63,2,1,,0,0,959,{ bonus bUnbreakableHelm,0; },{},{}
@@ -8458,9 +8457,9 @@
 19620,C_Dectective_Hat,Costume Detective Hat,5,0,,0,,,,,0xFFFFFFFF,63,2,1024,,,,189,{},{},{}
 19621,C_Evil_Wing_Ears,Costume Evil Wing Ear,5,0,,0,,,,,0xFFFFFFFF,63,2,1024,,,,152,{},{},{}
 19622,C_Crescent_Hairpin,Costume Crescent Hairpin,5,0,,0,,,,,0xFFFFFFFF,63,2,1024,,,,132,{},{},{}
-19623,C_Bijofnil_Wings,Costume Bijofnil_Wings,5,0,,0,,,,,0xFFFFFFFF,63,2,1024,,,,477,{},{},{}
+19623,C_Bijofnil_Wings,Costume Bijofnil Wings,5,0,,0,,,,,0xFFFFFFFF,63,2,1024,,,,477,{},{},{}
 19624,C_Blank_Eyes,Costume Blank Eyes,5,0,,0,,,,,0xFFFFFFFF,63,2,1024,,,,185,{},{},{}
-19625,C_Bunny_Band,Costume Bunny_Band,5,0,,0,,,,,0xFFFFFFFF,63,2,1024,,,,15,{},{},{}
+19625,C_Bunny_Band,Costume Bunny Band,5,0,,0,,,,,0xFFFFFFFF,63,2,1024,,,,15,{},{},{}
 19650,C_Rainbow_Feather_Deco,Costume Rainbow Feather Deco,5,0,,0,,0,,0,0xFFFFFFFF,63,2,1024,,1,1,934,{},{},{}
 19655,C_Tiraya_Bonnet,C Tiraya Bonnet,5,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,398,{},{},{}
 19707,C_Polar_Bear_Cap,Costume Polar Bear Cap,5,20,,0,,0,,0,0xFFFFFFFF,63,2,1024,,0,0,966,{ bonus bUnbreakableHelm,0; },{},{}

+ 1 - 1
npc/custom/etc/penal_servitude.txt

@@ -19,7 +19,7 @@
 sec_pri,36,58,1	script	Chief Warder	105,{ 
 	mes "[Saddeus]";
 	emotion e_what;
-	mes (Sex?"Mr.":"Ms.")+". Prisoner #"+BaseLevel+JobLevel+",";
+	mes (Sex?"Mr.":"Ms.")+" Prisoner #"+BaseLevel+JobLevel+",";
 	mes "what's the noise over there?";
 	next;
 	menu "Let me free, I'll pay!",-, "Let me to work off my freedom!",M_Q1, "Nothing",M_NO_THANKS;

+ 47 - 63
npc/re/cities/dicastes.txt

@@ -14,12 +14,12 @@
 //= 1.1 Standardized. [Euphy]
 //= 1.2 Updated to match the official script. [Joseph]
 //= 1.2a Moved Guide to a separate file. [Euphy]
-//= 1.3 Updated to match official script [SkittleNugget]
+//= 1.3 Updated to match official script. [SkittleNugget]
 //============================================================
 
-dicastes01,194,159,5	script	Excited Galten#a	492,{		
+dicastes01,194,159,5	script	Excited Galten#a	492,{
+	mes "[Excited Galten]";
 	if (isequipped(2782)) {
-		mes "[Excited Galten]";
 		mes "I can't get beautiful";
 		mes "Ahat's image out of my head.";
 		emotion e_lv;
@@ -28,18 +28,17 @@ dicastes01,194,159,5	script	Excited Galten#a	492,{
 		mes "will rule this land.";
 		close; 
 	}
-		mes "[Excited Galten]";
-		mes "▲⒉ⅲ ⌒ ◎○○";
-     		mes "△▲● ↑ ↑";
-		mes "※⒉⒊ ⒉ ";
-      		mes "◇□◆ ⅲ ⌒←↑ ◎ ○■ⅲ";
-      		mes "ⅳ□〓 △ ●";
+	mes "▲⒉ⅲ ⌒ ◎○○";
+	mes "△▲● ↑ ↑";
+	mes "※⒉⒊ ⒉";
+	mes "◇□◆ ⅲ ⌒←↑ ◎ ○■ⅲ";
+	mes "ⅳ□〓 △ ●";
 	close;
 }
 
 dicastes01,202,86,3	script	Sentinel#a	492,{
+	mes "[Sentinel]";
 	if (isequipped(2782)) {
-		mes "[Sentinel]";
 		mes "El Dicastes, the";
 		mes "capital city of Sapha.";
 		mes "The land is pretty";
@@ -52,7 +51,6 @@ dicastes01,202,86,3	script	Sentinel#a	492,{
 		mes "Hey, you are an outsider!";
 		close; 
 	}
-	mes "[Sentinel]";
 	mes "◆⒈⒈ ← ◇⌒● ⅲ ⅳ→";
 	mes "▲◇⒉ ⅳ ";
 	mes "□◇⌒ ⒊ ⌒□ⅲ ← →★";
@@ -66,14 +64,13 @@ dicastes01,202,86,3	script	Sentinel#a	492,{
 }
 
 dicastes01,194,95,5	script	Sentinel#b	450,{
+	mes "[Sentinel]";
 	if (isequipped(2782)) {
-		mes "[Sentinel]";
 		mes "I permit your entry.";
 		mes "But if you dare to cause trouble";
 		mes "you won't know what hit you. Beware!";
 		close; 
 	}
-	mes "[Sentinel]";
 	mes "▲◆↑ ▲ ◇";
 	mes "▲★← ◇ ←ⅳ⒉ △ ⅲ";
 	mes "ⅳ◆▲ ⒊ △←■ □ ▲";
@@ -81,51 +78,50 @@ dicastes01,194,95,5	script	Sentinel#b	450,{
 }
 
 dicastes01,234,158,0	script	Training Galten#a	450,{
+	mes "[Training Galten]";
 	if (isequipped(2782)) {
-		mes "[Training Galten]";	
 		mes "I'll be ready for anything";
 		mes "if I keep up with my training every day.";
 		close;
 	}
-	mes "[Training Galten]";	
-   	mes "◇ⅲ↑ → △←△";
-   	mes "◇←ⅳ ⅲ □→↑ ⌒ ";
+	mes "�簟�  �簟� ▲";
+	mes "� ▲";
 	next;
 	mes "Don't know what it means.";
 	close;
 }
 
 dicastes01,244,166,0	script	Training Galten#b	450,{
+	mes "[Training Galten]";
 	if (isequipped(2782)) {
-		mes "[Training Galten]";
 		mes "I wonder if Ahat knows how";
 		mes "hard I am training.";
 		close; 
 	}
-	mes "[Training Galten]";
-   	mes "→↑⒊ ◎ ⅳ□◇ ※ ";
-    	mes "⒉■◎ ← ○◎↑";
+	mes "▲◆↑ ▲";
+	mes "▲◆↑ ▲ ▲◆↑ ▲ ▲◆↑ ▲";
 	next;
 	mes "Don't know what it means.";
 	close;
 }
 
 dicastes01,272,166,0	script	Training Galten#c	450,{
+	mes "[Training Galten]";
 	if (isequipped(2782)) {
 		mes "[Training Galten]";
 		mes "I am a Sapha warrior.";
 		mes "I am never lazy with my training.";
 		close;
 	}
-	mes "[Training Galten]";
-    	mes "⒉◆← ▲ ◇○●";
-    	mes "▲■⒊ ⒉ ▲■← ⌒ ";
+	mes "▲◆↑ ▲ ▲◆↑ ▲";
+	mes "▲◆↑ ▲";
 	next;
 	mes "Don't know what it means.";
 	close;
 }
 
 dicastes01,248,129,0	script	Training Galten#d	450,{
+	mes "[Training Galten]";
 	if (isequipped(2782)) {
 		mes "[Training Galten]";
 		mes "I heard this isn't training";
@@ -133,27 +129,26 @@ dicastes01,248,129,0	script	Training Galten#d	450,{
 		mes "for trainees like me.";
 		close; 
 	}
-	mes "[Training Galten]";
-    	mes "←←▲ ⒊ ▲⌒⒊ ⒉ ";
-    	mes "〓ⅳ◇ □ ↑〓★";
-    	mes "→◆◇ ⅳ ←●";
+	mes "▲◆↑ ▲ ▲◆↑";
+	mes "▲◆↑ ▲� �簟� ▲";
 	next;
 	mes "Don't know what it means.";
 	close;
 }
 
+/*
 dicastes01,271,152,0	script	Training Galten#e	450,{
-	if (isequipped(2782)){
-		mes "[Training Galten]";
+	mes "[Training Galten]";
+	if (isequipped(2782)) {
 		mes "I will get great results";
 		mes "if I do my best, right?";
-        	close;
+		close;
 	}
-	mes "[Training Galten]";
 	mes "▲⒉← ◆ ⅲ⒊◆";
 	mes "↑◆";
 	close;
 }
+*/
 
 dic_in01,349,282,4	script	Waiting Galten#in_1	492,{
 	if (isequipped(2782)) {
@@ -243,8 +238,8 @@ dic_in01,29,119,4	script	Resting Piom#04	489,{
 }
 
 dic_in01,91,113,5	script	Suspicious Piom#a	489,{
+	mes "[Suspicious Piom]";
 	if (isequipped(2782)) {
-		mes "[Suspicious Piom]";
 		mes "Have you heard of the";
 		mes "rumor about Ahat?";
 		next;
@@ -269,7 +264,6 @@ dic_in01,91,113,5	script	Suspicious Piom#a	489,{
 		mes "I am not going to say anything, either!";
 		close; 
 	}
-	mes "[Suspicious Piom]";
 	mes "◇⒊◇ ◇ ◇〓■";
 	mes "□ ⒊⒉△ ◇◇";
 	next;
@@ -285,15 +279,14 @@ dic_in01,91,113,5	script	Suspicious Piom#a	489,{
 }
 
 dic_in01,168,116,5	script	Tired Piom#c	491,{
+	mes "[Tired Piom]";
 	if (isequipped(2782)) {
-		mes "[Tired Piom]";
 		mes "If you need any";
 		mes "information, you'd have better";
-		mes "luck with the Cat Merchant than wander around here.";
+		mes "luck with the Cat Merchant than wandering around here.";
 		mes "But of course you'll have to pay the price.";
 		close; 
 	}
-	mes "[Tired Piom]";
 	mes "〓□○ ⒊ ⒊〓";
 	mes "〓▲○ ■ ●→○ ◎";
 	mes "★●→ ◆ ■■◎ ← ◇ⅳ▲ ▲ ⒉ ▲";
@@ -302,16 +295,15 @@ dic_in01,168,116,5	script	Tired Piom#c	491,{
 }
 
 dic_in01,149,104,5	script	Tired Piom#b	455,{
+	mes "[Tired Piom]";
 	if (isequipped(2782)) {
-		mes "[Tired Piom]";
-		mes "I feel sof stiff,";
+		mes "I feel so stiff...";
 		mes "I will need another dose of Bradium.";
 		mes "I think the effects are weaker than before,";
 		mes "or is it just me?";
 		emotion e_what;
 		close; 
 	}
-	mes "[Tired Piom]";
 	mes "○⌒→ ▲ ⒉";
 	mes "■□◇ ⅳ ◎◎⒊ ◆ ◆◇●";
 	mes "ⅲ●〓 ↑ ⒉←◇ ◎ ○〓";
@@ -321,6 +313,7 @@ dic_in01,149,104,5	script	Tired Piom#b	455,{
 }
 
 dic_in01,341,113,3	script	Tired Piom#a	491,{
+	mes "[Tired Piom]";
 	if (isequipped(2782)) {
 		mes "[Tired Piom]";
 		mes "I think I look better in";
@@ -336,14 +329,13 @@ dic_in01,341,113,3	script	Tired Piom#a	491,{
 		mes "I'll be rejected again, right?";
 		close; 
 	}
-	mes "[Tired Piom]";
 	mes "△◎← ◇ ◇⌒⒈";
 	mes "◇□※ 〓 ◎⒈● □ ⅲ";
 	mes "↑○ⅳ ※ ◎◆□ ◎ ●";
 	mes "⒊→⒊ ⌒ ●□※ △ △⒈";
 	next;
-	mes"[Tired Piom]";
-	mes"〓";
+	mes "[Tired Piom]";
+	mes "〓";
 	next;
 	emotion e_swt;
 	mes "[Tired Piom]";
@@ -381,8 +373,8 @@ dic_in01,32,54,5	script	Venknick#el_01	449,{
 }
 
 dic_in01,372,116,3	script	Thrilled Piom#a	490,{
+	mes "[Thrilled Piom]";
 	if (isequipped(2782)) {
-		mes "[Thrilled Piom]";
 		mes "Ahat is the one";
 		mes "and only Sapha pride.";
 		mes "We have plenty of Bradium";
@@ -394,9 +386,8 @@ dic_in01,372,116,3	script	Thrilled Piom#a	490,{
 		mes "[Thrilled Piom]";
 		mes "You don't feel his";
 		mes "blessing?";
-		close; 
+		close;
 	}
-	mes "[Thrilled Piom]";
 	mes "◎□⒊ □ ◆";
 	mes "ⅲ◇▲ ⒉ ◆△";
 	mes "◎◆⒊ ※ ⒈◇⒈ □";
@@ -412,14 +403,13 @@ dic_in01,372,116,3	script	Thrilled Piom#a	490,{
 }
 
 dic_in01,360,125,5	script	Serious Venknicka	449,{
+	mes "[Serious Venknick]";
 	if (isequipped(2782)) {
-		mes "[Serious Venknick]";
 		mes "A sudden increase in Bradium production.";
 		mes "Why?";
 		mes "I will have to get more factory lines running.";
 		close; 
 	}
-	mes "[Serious Venknick]";
 	mes "←□● ⒉ ⒉ⅳ⌒ ⒉ ↑●□";
 	mes "〓◇■ ⒉";
 	mes "■△← → △⌒⒊ ⒊";
@@ -474,8 +464,8 @@ dic_in01,42,250,5	script	Guide#diel_1	489,{
 }
 
 dic_in01,335,34,5	script	Talkative Piom#a	490,{
+	mes "[Talkative Piom]";
 	if (isequipped(2782)) {	
-		mes "[Talkative Piom]";
 		mes "At my factory";
 		mes "we not only refine Bradium,";
 		mes "but we also produce various";
@@ -484,7 +474,6 @@ dic_in01,335,34,5	script	Talkative Piom#a	490,{
 		mes "here too.";
 		close; 
 	}
-	mes "[Talkative Piom]";
 	mes "↑※⒈ ⒊";
 	mes "△▲★ 〓 ◇◇";
 	mes "●□◎ ◇ △↑※ ■";
@@ -495,21 +484,20 @@ dic_in01,335,34,5	script	Talkative Piom#a	490,{
 }
 
 dic_in01,387,30,1	script	Manuk Piom#a	454,{
+	mes "[Manuk Piom]";
 	if (isequipped(2782)) {
-		mes "[Manuk Piom]";
-		mes "You, We met in Manuk, didn't we?";
+		mes "You! We met in Manuk, didn't we?";
 		mes "I've come to pick up the weapon I ordered.";
 		close; 
 	}
-	mes "[Manuk Piom]";
 	mes "↑◇〓 ◇ ★○ⅳ ↑ ○⒈";
 	mes "※◆★ → ●※⒊ ◇ ◎■◇ ◆◆";
 	close;
 }
 
 dicastes01,282,210,4	script	Free Knit#a	453,{
+	mes "[Free Knit]";
 	if (isequipped(2782)) {
-		mes "[Free Knit]";
 		mes "As long as we have a steady";
 		mes "supply of Bradium";
 		mes "Saphas can live forever.";
@@ -517,7 +505,6 @@ dicastes01,282,210,4	script	Free Knit#a	453,{
 		mes "which is short.";
 		close; 
 	}
-	mes "[Free Knit]";
 	mes "●〓○ ◇ ↑◎■ △";
 	mes "⒊○★ ⅲ ※◆◎ ◆ ◇〓● ⒉ ●←ⅲ ⒉";
 	mes "◆◇○ 〓 ⅲ○ⅳ □ ←⒊↑";
@@ -527,8 +514,8 @@ dicastes01,282,210,4	script	Free Knit#a	453,{
 }
 
 dicastes01,246,210,3	script	Free Venknick#a	449,{
+	mes "[Free Venknick]";
 	if (isequipped(2782)) {
-		mes "[Free Venknick]";
 		mes "At least we have plenty of Bradium.";
 		mes "Look,";
 		mes "You can see Bradium";
@@ -542,7 +529,6 @@ dicastes01,246,210,3	script	Free Venknick#a	449,{
 		mes "but why are you interested in it?";
 		close; 
 	}
-	mes "[Free Venknick]";
 	mes "◆★ⅲ ⅳ △□⒈ ↑ ●□";
 	mes "↑⒊";
 	mes "■※ⅳ ⒉ ※◇◆";
@@ -573,8 +559,8 @@ dicastes01,235,245,4	script	Excited Piom#a	490,{
 }
 
 dicastes01,284,262,3	script	Favorable Knit#a	453,{
+	mes "[Favorable Knit]";
 	if (isequipped(2782)) {
-		mes "[Favorable Knit]";
 		mes "Unlike the Raphine, we Saphas";
 		mes "are a very close community.";
 		mes "We start by living together in common facilities after we are born.";
@@ -582,7 +568,6 @@ dicastes01,284,262,3	script	Favorable Knit#a	453,{
 		mes "We never have any quarrels between classes.";
 		close; 
 	}
-	mes "[Favorable Knit]";
 	mes "◆⒈◇ □ →△⌒ □";
 	mes "↑★⌒ □ ◆◇↑ ◇ ⒊";
 	mes "●◆↑ 〓 ⅳ●ⅳ ◆ ←★※";
@@ -592,8 +577,8 @@ dicastes01,284,262,3	script	Favorable Knit#a	453,{
 }
 
 dicastes01,164,180,4	script	Limpy Piom#a	489,{
+	mes "[Limpy Piom]";
 	if (isequipped(2782)) {
-		mes "[Limpy Piom]";
 		mes "They say there is a";
 		mes "war going on with the Splendide in Manuk.";
 		mes "I hope everything goes well.";
@@ -602,7 +587,6 @@ dicastes01,164,180,4	script	Limpy Piom#a	489,{
 		emotion e_dots;
 		close; 
 	}
-	mes "[Limpy Piom]";
 	mes "⒉◆〓 ※ □⌒";
 	mes "⒊◆← → ▲";
 	mes "⒊〓ⅳ ◇ □△⌒";
@@ -660,7 +644,7 @@ dicastes01,202,197,4	script	Crazy Venknick#fihsing1	449,{
 		next;
 		if(select("Give 5000 Zeny.:Don't give 5000 Zeny.") == 2) {
 			mes "[Crazy Venknick]";
-			mes "Don't come back with regret.";
+			mes "Don't come back with regrets.";
 			close; 
 		}
 		if (Zeny < 5000) {
@@ -683,7 +667,7 @@ dicastes01,202,197,4	script	Crazy Venknick#fihsing1	449,{
 		mes "["+strcharinfo(0)+"]";
 		mes "I asked what the sad legend is about!";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "[Crazy Venknick]";
 		mes "I don't believe in legends.";
 		next;
 		emotion e_dots,1;

+ 21 - 15
npc/re/quests/eden/eden_iro.txt

@@ -340,7 +340,7 @@ moc_para01,50,39,4	script	Eve Natalia	882,{
 // Bubble Gum & Battle Manual Exchanger
 //============================================================
 moc_para01,48,184,2	script	Gum & Manual Exchanger	562,{
-	if(Weight < MaxWeight / 2) {
+	if (Weight < MaxWeight / 2) {
 		mes "You're carrying too many items right now.";
 		close;	
 	}
@@ -356,12 +356,18 @@ moc_para01,48,184,2	script	Gum & Manual Exchanger	562,{
 	mes "What would you like to exchange for?";
 	next;
 	switch(select("HE Bubble Gum:HE Battle Manual:1 Battle Manual X3:2 Battle Manual X3:1 Costume Corsair:Nothing")) {
-	//CallSub L_Exchange,<Insert Item>,<Amount>,<Return Item>,<Amount>
-	case 1:	callsub L_Exchange,12210,2,12412,1;	
-	case 2:	callsub L_Exchange,12208,2,12411,1;
-	case 3:	callsub L_Exchange,12411,4,14545,1;
-	case 4:	callsub L_Exchange,12312,3,14545,2;
-
+	case 1:
+		callsub L_Exchange,12210,2,12412,1;
+		break;
+	case 2:
+		callsub L_Exchange,12208,2,12411,1;
+		break;
+	case 3:
+		callsub L_Exchange,12411,4,14545,1;
+		break;
+	case 4:
+		callsub L_Exchange,12312,3,14545,2;
+		break;
 	case 5:
 		mes "[Trader Machine]";
 		mes "I can give you 1 Battle Manual X3 for 1 Costume Corsair.";
@@ -374,19 +380,20 @@ moc_para01,48,184,2	script	Gum & Manual Exchanger	562,{
 		next;
 		if(select("Yes, give it to me!:No, wait not yet.") == 2)
 			close;
-		//Dialogue below not official.
+		// Unofficial dialogue.
 		mes "[Trader Machine]";
-		mes "You place the required items into the machine..";
+		mes "You place the required items into the machine...";
 		next;
 		mes "[Trader Machine]";
-		mes "Bump... The Machine has given you an Item in return";
-		delitem 19619,1; //Costume Corsair
-		getitem 14545,1; //Battle Manual X3
+		mes "The Machine has given you an item in return!";
+		delitem 19619,1; //C_Corsair
+		getitem 14545,1; //Battle_Manual_X3
 		close;
-	case 6:	
+	case 6:
 		close;
 	}
 
+//callsub L_Exchange,<Insert Item>,<Amount>,<Return Item>,<Amount>
 L_Exchange:
 	mes "[Trader Machine]";
 	mes "How many "+getitemname(getarg(2))+" do you want?";
@@ -450,8 +457,7 @@ moc_para01,41,169,2	script	Kafra Stacker#eden	749,{
 }
 
 // Code Redeemer
-// Used to purchase Items for In-Game use through other sites officially.
-//========================================================================
+//============================================================
 moc_para01,38,162,2	script	Code the Redeemer#Give1	405,{
 	mes "[Code the Redeemer]";
 	mes "Welcome, "+strcharinfo(0)+"!";

+ 12 - 14
npc/re/quests/quests_dicastes.txt

@@ -6030,7 +6030,7 @@ dic_in01,349,129,5	script	Bouy#13_3	449,{
 				mes "I've been waiting for the Galtens to return because I'm not accustomed to battle since I'm Venknick. Thank you very much.";
 				next;
 				mes "[Bouy]";
-				mes "Handwork is much faster to refine pieces of Bradium instead of using a machine. I will only need an hour to finish.";
+				mes "Handwork is much faster to refine pieces of Bradium instead of using a machine. I will only need two hours to finish."; //Official: "an hour", but gives 2-hour quest.
 				next;
 				mes "[Bouy]";
 				mes "Please go rest while I get to work.";
@@ -7374,26 +7374,24 @@ dic_fild01,259,172,3	duplicate(dic_enc#main)	Mancho#pa0829	495
 dic_in01,353,37,5	duplicate(dic_enc#main)	Kareka#pa0829	454
 
 dic_fild01,228,159,4	script	Jahbong#pa0829	496,{
+	mes "[Jahbong]";
 	if (countitem(6304) < 1) {
-		mes "[Jahbong]";
 		mes "You haven't received a Sapha Certification yet?";
 		next;
 		mes "[Jahbong]";
 		mes "Come back to me once you have one. I'll give you something good in exchange.";
 		close; 
 	}
-	mes "[Jahbong]";
-	switch (rand(1,9)) {	
-		case 1:	mes "Don't touch my back! I might bite you unconsciously.";
-		case 2: mes "Pub owner Shay carried something away to make something strange! Be careful!";
-		case 3: mes "We cats can jump 5 times our size. Isn't it cool? But then, don't ask me to jump from here now.";
-		case 4: mes "I have to be diligent with my grooming to maintain beautiful fur.";
-		case 5: mes "I have to groom myself everyday to maintain shiny fluffy fur. But I don't have very nice fur in the first place. Very sad.";
-		case 6: mes "You should receive a Sapha Certification with both paws as a sign of respect. No cat deserves a certification if they don't!";
-		case 7: mes "I don't really talk that much! Ahat looks like... meow meow meooow... sorry.";
-		case 8: mes "Meow~~~~~~~~~~";
-		case 9:	mes "Yarn is a great way to calm a cat.";
-	}
+	set .@cattalkj,rand(1,9);
+	if (.@cattalkj == 1) mes "Don't touch my back! I might bite you unconsciously.";
+	else if (.@cattalkj == 2) mes "Pub owner Shay carried something away to make something strange! Be careful!";
+	else if (.@cattalkj == 3) mes "We cats can jump 5 times our size. Isn't it cool? But then, don't ask me to jump from here now.";
+	else if (.@cattalkj == 4) mes "I have to be diligent with my grooming to maintain beautiful fur.";
+	else if (.@cattalkj == 5) mes "I have to groom myself everyday to maintain shiny fluffy fur. But I don't have very nice fur in the first place. Very sad.";
+	else if (.@cattalkj == 6) mes "You should receive a Sapha Certification with both paws as a sign of respect. No cat deserves a certification if they don't!";
+	else if (.@cattalkj == 7) mes "I don't really talk that much! Ahat looks like... meow meow meooow... sorry.";
+	else if (.@cattalkj == 8) mes "Meow~~~~~~~~~~";
+	else mes "Yarn is a great way to calm a cat.";
 	next;
 	mes "[Jahbong]";
 	mes "Why are you here?";

+ 1 - 0
npc/re/quests/quests_malaya.txt

@@ -4404,6 +4404,7 @@ malaya,290,152,5	script	Master of Hunting#buwaya	578,{
 		mes "Argh! That's so foul.";
 		mes "You've really brought back the samples.";
 		mes "Ho! Leave it there and come back after washing your hands. Even god won't smile down at you with that stench.";
+		delitem 6519,10; //Collected_Sample
 		set malaya_buwaya,8;
 		erasequest 2274;
 		setquest 2275;

+ 25 - 19
sql-files/item_db_re.sql

@@ -4821,12 +4821,12 @@ REPLACE INTO `item_db_re` VALUES (7647,'Taiwan_Luk_Coin','Taiwan Luk Coin',3,0,N
 REPLACE INTO `item_db_re` VALUES (7648,'Snake_Bookmark','Snake Bookmark',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (7649,'Big_Luk_Bookmark','Big Luk Bookmark',3,20,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (7651,'Mystery_Egg','Mystery Egg',3,10,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (7666,'TimeTravel_Scroll','TimeTravel Scroll',3,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (7667,'Abandoned_Machine','Abandoned_Machine',3,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (7666,'TimeTravel_Scroll','Time Travel Scroll',3,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (7667,'Abandoned_Machine','Abandoned Machine',3,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (7668,'Clean_Bandage','Clean Bandage',3,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (7669,'Rubbing_Alchohol','Rubbing Alchohol',3,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (7670,'Sour_Grass','Sour Grass',3,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (7671,'Firstaid_Kit','Firstaid_Kit',3,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (7671,'Firstaid_Kit','First Aid Kit',3,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (7672,'Relief_Food','Relief Food',3,20,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 #
 REPLACE INTO `item_db_re` VALUES (7701,'Dragon_Spirit','Soul',3,2,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -6031,7 +6031,7 @@ REPLACE INTO `item_db_re` VALUES (12671,'99lv_Battle_Manual','99lv Battle Manual
 REPLACE INTO `item_db_re` VALUES (12672,'Start_New_Box','Start New Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 617,2; getitem 12263,2; getitem 12329,3; getitem 12330,2;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12673,'Lucky_Egg_C10','Lucky Egg C10',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12674,'God_Material_Box','God Material Box',2,20,NULL,500,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (12675,'Sg_Weapon_Supply_Box','WoE_Weapon_Supply_Box',2,20,NULL,500,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (12675,'Sg_Weapon_Supply_Box','WoE Weapon Supply Box',2,20,NULL,500,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12676,'Sg_Violet_Potion_Box','Siege Violet Potion Box',2,20,NULL,500,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 11547,50;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12677,'Siege_Arrow_Quiver_S','Siege Arrow Quiver S',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'130',NULL,NULL,'getitem 1776,200;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (12678,'Siege_Arrow_Quiver_A','Siege Arrow Quiver A',2,2,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,'95',NULL,NULL,'getitem 1775,200;',NULL,NULL);
@@ -7551,6 +7551,12 @@ REPLACE INTO `item_db_re` VALUES (14614,'Ex_Def_Potion','Ex Def Potion',2,0,NULL
 REPLACE INTO `item_db_re` VALUES (14616,'STR_Biscuit_Stick','Bar of Strength',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (14617,'VIT_Biscuit_Stick','Bar of Fitness',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (14618,'AGI_Biscuit_Stick','Bar of Agility',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+#14626,Indigo_Scroll
+#14643,Violet_Scroll
+#14664,Bi_Hwang_Scroll
+#14665,Jung_Bi_Scroll
+#14666,Je_Un_Scroll
+#14667,Yong_Kwang_Scroll
 # More Armors
 REPLACE INTO `item_db_re` VALUES (15000,'Bone_Plate','Bone Plate',5,20,NULL,1000,NULL,60,NULL,1,0x000654E2,18,2,16,NULL,'85',1,0,'bonus bStr,1; bonus bMdef,3; bonus2 bIgnoreDefRate,RC_DemiHuman,10; bonus2 bIgnoreDefRate,RC_Brute,10; bonus3 bAutoSpellWhenHit,"NPC_WIDEBLEEDING",1,10;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (15001,'Odin\'s_Blessing_I','Odin\'s Blessing',5,0,NULL,0,NULL,10,NULL,0,0xFFFFFFFE,63,2,16,NULL,'0',0,0,NULL,NULL,NULL);
@@ -7784,8 +7790,7 @@ REPLACE INTO `item_db_re` VALUES (16446,'Tw_October_Scroll','Tw October Scroll',
 REPLACE INTO `item_db_re` VALUES (16447,'Scorpio_Crown_Box','Scorpio Crown Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5676,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16448,'Scorpio_Diadem_Box','Scorpio Diadem Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5677,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16449,'Scorpio_Crown_Box','Scorpio Crown Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5676,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16550,'Sagittarius_Crown_Box','Sagittarius Crown Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5739,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16551,'Sagittarius_Diadem_Box','Sagittarius Diadem Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5740,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16450,'FScorpio_Diadem_Box','FScorpio Diadem Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5677,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16456,'My_Scroll1','My Scroll1',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16457,'Tw_Nov_Scroll','Tw Nov Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 #
@@ -7800,8 +7805,9 @@ REPLACE INTO `item_db_re` VALUES (16543,'Snowman_Hat_Box','Snowman Hat Box',18,2
 REPLACE INTO `item_db_re` VALUES (16544,'FSnowman_Hat_Box','FSnowman Hat Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5738,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16548,'Sagittarius_Crown_Box','Sagittarius Crown Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5739,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16549,'Sagittarius_Diadem_Box','Sagittarius Diadem Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5740,1;',NULL,NULL);
-#16550,Sagittarius_Crown_Box
-#16551,Sagittarius_Diadem_Box
+REPLACE INTO `item_db_re` VALUES (16550,'Sagittarius_Crown_Box','Sagittarius Crown Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5739,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16551,'Sagittarius_Diadem_Box','Sagittarius Diadem Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5740,1;',NULL,NULL);
+#
 REPLACE INTO `item_db_re` VALUES (16554,'Elven_Sunglasses_Box','Elven Sunglasses Box',2,20,NULL,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5245,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16555,'Pr_Reset_Stone_Box','Pr Reset Stone Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6320,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16556,'FPr_Reset_Stone_Box','Reset Stone Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 6320,1;',NULL,NULL);
@@ -7828,6 +7834,7 @@ REPLACE INTO `item_db_re` VALUES (16588,'Thoughtful_Hat_Box','Thoughtful Hat Box
 REPLACE INTO `item_db_re` VALUES (16589,'Thoughtful_Hat_Box','Thoughtful Hat Box',2,20,10,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem callfunc("F_Rand",5336,5337,5338,5346,5339,5474),1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16590,'Thoughtful_Hat_Box','Thoughtful Hat Box',2,20,10,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem callfunc("F_Rand",5336,5337,5338,5346,5339,5474),1;',NULL,NULL);
 #
+REPLACE INTO `item_db_re` VALUES (16659,'Zodiac_Diadem_Pack','Zodiac Diadem Box',2,20,NULL,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem callfunc("F_Rand",5545,5549,5569,5581,5589,5599,5663,5677,5740,5745,5512,5514),1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16600,'Spring_Flower_Scr_Tw','Spring Flower Scr Tw',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16601,'Blue_Arara_Hat_Box','Blue Arara Hat Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5778,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16602,'F_Blue_Arara_Hat_Box','F Blue Arara Hat Box',18,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5778,1;',NULL,NULL);
@@ -7846,7 +7853,7 @@ REPLACE INTO `item_db_re` VALUES (16665,'Virgo_Scroll','Virgo Scroll',2,20,NULL,
 REPLACE INTO `item_db_re` VALUES (16666,'Magic_Candy_Box10','Magic Candy Box10',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16673,'Libra_Scroll','Libra Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16675,'Splash_Scroll','Splash Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16676,'Zodiac_Crown_Pack','Zodiac Crown Box',2,20,NULL,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem callfunc(\"F_Rand\",5546,5550,5570,5582,5588,5598,5662,5676,5739,5744,5513,5515),1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16676,'Zodiac_Crown_Pack','Zodiac Crown Box',2,20,NULL,1,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem callfunc("F_Rand",5546,5550,5570,5582,5588,5598,5662,5676,5739,5744,5513,5515),1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16677,'Universal_Catalog_Gold_Box10','Universal Catalog Gold 10 Box',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12581,10;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16678,'Universal_Catalog_Gold_Box50','Universal Catalog Gold 50 Box',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12581,50;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16679,'Universal_Catalog_Gold_Box10','Universal Catalog Gold 10 Box',2,0,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 12581,10;',NULL,NULL);
@@ -7908,7 +7915,7 @@ REPLACE INTO `item_db_re` VALUES (16736,'Fantastic_Wig_Box','Fanastic Wigt Box',
 REPLACE INTO `item_db_re` VALUES (16737,'Fantastic_Wig_Box','Fanastic Wigt Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5276,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16738,'Yellow_Mage_Hat_Box','Yellow_Mage_Hat Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5242,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16739,'Yellow_Mage_Hat_Box','Yellow_Mage_Hat Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'getitem 5242,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (16740,'Ptotection_Seagod_Box','The Sea God\'s Call 23 Hour Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 6436,86400;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (16740,'Protection_Seagod_Box','The Sea God\'s Call 23 Hour Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 6436,86400;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16741,'Hairtail_Box1','Cutlass 1 Hour Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 1198,3600;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16742,'Hairtail_Box2','Cutlass 7 Day Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 1198,604800;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (16743,'Spearfish_Box1','Marlin 1 Hour Box',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,NULL,NULL,NULL,NULL,NULL,'rentitem 1489,3600;',NULL,NULL);
@@ -8372,16 +8379,16 @@ REPLACE INTO `item_db_re` VALUES (18756,'Black_Shiba_Inu_Hat','Black Shiba Inu H
 REPLACE INTO `item_db_re` VALUES (18758,'Hat_Of_Scrat','Hat Of Scrat',5,20,NULL,200,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,896,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18759,'Stretched_Nose_M','Wood Goblin\'s Nose',5,20,NULL,200,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'50',0,737,'bonus bUnbreakableHelm,0;',NULL,NULL);
 #
-REPLACE INTO `item_db_re` VALUES (18779,'RWC_Champ_Crown_First_Place','RWC Champ Crown First Place',5,20,NULL,500,NULL,12,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,1,NULL,902,'bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,7; bonus bMdef,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18780,'RWC_Champ_Crown_First_Place','RWC Champ Crown First Place',5,20,NULL,500,NULL,12,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,1,NULL,903,'bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,7; bonus bMdef,5;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18781,'RWC_Champ_Crown_Third_Place','RWC Champ CrownThird  Place',5,20,NULL,500,NULL,12,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,1,NULL,904,'bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,3; bonus bMdef,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18779,'RWC_Champ_Crown_First_Place','RWC Champ Crown First Place',5,20,NULL,500,NULL,12,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,'1',NULL,902,'bonus2 bResEff,Eff_Stun,10000; bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,7; bonus bMdef,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18780,'RWC_Champ_Crown_Second_Place','RWC Champ Crown Second Place',5,20,NULL,500,NULL,12,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,'1',NULL,903,'bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,7; bonus bMdef,5;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18781,'RWC_Champ_Crown_Third_Place','RWC Champ Crown Third Place',5,20,NULL,500,NULL,12,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,'1',NULL,904,'bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,3; bonus bMdef,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18782,'Butterfly_Wing_Ear_J','Butterfly Wing Ear',5,20,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'0',0,695,'bonus bDex,2; bonus bUnbreakableHelm,0;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18785,'King_Poring_Hat','King Poring Hat',5,20,NULL,600,NULL,10,NULL,1,0xFFFFFFFF,63,2,256,NULL,'10',1,905,'bonus bDex,1; bonus bLuk,1; if(getrefine()>=3){ bonus bDex,(getrefine()-4); bonus bLuk,(getrefine()-4); }',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18786,'Anemos_Mask','Anemos Mask',5,20,NULL,200,NULL,0,NULL,0,0xFFFFFFFF,63,2,512,NULL,'10',0,906,'bonus bUnbreakableHelm,0;',NULL,NULL);
 #
 REPLACE INTO `item_db_re` VALUES (18790,'Rainbow_Poring_Hat','Rainbow Poring Hat',5,20,NULL,100,NULL,3,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,900,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18791,'Shrine_Maiden_Hat','Shrine Maiden Hat',5,20,NULL,200,NULL,30,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,NULL,NULL,908,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (18796,'RWC_Champ_Crown_Fourth_Place','RWC Champ Crown_Fourth  Place',5,20,NULL,500,NULL,12,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,1,NULL,914,'bonus2 bResEff,Eff_Curse,10000;  bonus bUnbreakableHelm,0; bonus bAllStats,2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (18796,'RWC_Champ_Crown_Fourth_Place','RWC Champ Crown Fourth Place',5,20,NULL,500,NULL,12,NULL,NULL,0xFFFFFFFF,63,2,256,NULL,'1',NULL,914,'bonus2 bResEff,Eff_Curse,10000; bonus bUnbreakableHelm,0; bonus bAllStats,2;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18805,'Eclipse_Hat','Eclipse Hat',5,20,NULL,300,NULL,2,NULL,0,0xFFFFFFFF,63,2,256,NULL,'0',1,922,'bonus bLuk,3; bonus bMdef,5;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18806,'Black_Rabbit_Hat','Black Rabbit Hat',5,20,NULL,300,NULL,2,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,923,'bonus bDex,2; bonus bAgi,3;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18807,'Yellow_Yuzu_Hat','Yellow Yuzu Hat',5,20,NULL,400,NULL,3,NULL,1,0xFFFFFFFE,63,2,256,NULL,'0',1,924,'bonus bVit,2; bonus bLuk,3;',NULL,NULL);
@@ -8403,13 +8410,13 @@ REPLACE INTO `item_db_re` VALUES (18832,'Rolf_Von_Gigue_666','Rolf Von Gigue 666
 #
 REPLACE INTO `item_db_re` VALUES (18839,'Poring_Sunglasses','Poring Sunglasses',5,0,NULL,100,NULL,10,NULL,1,0xFFFFFFFF,63,2,512,NULL,'1',0,954,'bonus bDex,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18841,'Small_Poring_Band','Small Poring Band',5,20,NULL,350,NULL,8,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,955,NULL,NULL,NULL);
-#
 REPLACE INTO `item_db_re` VALUES (18842,'Hat_Of_Girl','Hat Of Girl',5,20,NULL,350,NULL,8,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,956,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18843,'Small_Deviling_Hat','Small Deviling Hat',5,20,NULL,350,NULL,7,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,957,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18844,'Blue_Poring_Bubble','Blue Poring Bubble',5,20,NULL,50,NULL,5,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,958,'bonus bStr,2; bonus bInt,2; bonus bVit,2; bonus bDex,2; bonus bAgi,2; bonus bLuk,2; bonus bUnbreakableHelm,0;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18845,'Banshee_Master_Kiss','Banshee Master Kiss',5,20,NULL,200,NULL,5,NULL,0,0xFFFFFFFF,63,2,1,NULL,'0',0,959,'bonus bUnbreakableHelm,0;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18850,'Polar_Bear_Cap','Polar Bear Cap',5,20,NULL,300,NULL,7,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',0,966,'bonus bUnbreakableHelm,0; bonus bDex,1; bonus bAgi,1; bonus bMdef,3;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18851,'C_Polar_Bear_Cap','Costume Polar Bear Cap',5,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,966,NULL,NULL,NULL);
+#
 REPLACE INTO `item_db_re` VALUES (18872,'Snake_Hat','Snake Hat',5,20,NULL,100,NULL,5,NULL,1,0xFFFFFFFF,63,2,256,NULL,'0',1,986,'bonus bStr,3; bonus bInt,3; bonus bMdef,5; bonus bUnbreakableHelm,0;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (18873,'Sweet_Valentine_Out','Sweet Valentine Out',5,20,NULL,100,NULL,1,NULL,0,0xFFFFFFFF,63,2,256,NULL,'1',1,965,NULL,NULL,NULL);
 #
@@ -8476,15 +8483,14 @@ REPLACE INTO `item_db_re` VALUES (19574,'C_Lord_of_Death','Costume Lord of Death
 REPLACE INTO `item_db_re` VALUES (19587,'C_King_Poring_Hat','Costume King Poring Hat',5,0,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',0,905,'bonus bUnbreakableHelm,0;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (19589,'C_Fallen_Angel_Lost_J','C Fallen Angel Lost J',5,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,907,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (19617,'C_Puppy_Headband','Costume Puppy Headband',5,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,199,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19619,'C_Corsair','Costume Corsair',5,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,0,0,105,'bonus bVit,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (19618,'C_Kitsune_Mask','Costume Kitsune Mask',5,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,153,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19619,'C_Corsair','Costume Corsair',5,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,0,0,105,'bonus bVit,1;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19619,'C_Corsair','Costume Corsair',5,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,'0',0,105,'bonus bVit,1;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (19620,'C_Dectective_Hat','Costume Detective Hat',5,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,189,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (19621,'C_Evil_Wing_Ears','Costume Evil Wing Ear',5,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,152,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (19622,'C_Crescent_Hairpin','Costume Crescent Hairpin',5,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,132,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19623,'C_Bijofnil_Wings','Costume Bijofnil_Wings',5,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,477,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19623,'C_Bijofnil_Wings','Costume Bijofnil Wings',5,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,477,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (19624,'C_Blank_Eyes','Costume Blank Eyes',5,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,185,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (19625,'C_Bunny_Band','Costume Bunny_Band',5,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,15,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (19625,'C_Bunny_Band','Costume Bunny Band',5,0,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,63,2,1024,NULL,NULL,NULL,15,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (19650,'C_Rainbow_Feather_Deco','Costume Rainbow Feather Deco',5,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'1',1,934,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (19655,'C_Tiraya_Bonnet','C Tiraya Bonnet',5,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,398,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (19707,'C_Polar_Bear_Cap','Costume Polar Bear Cap',5,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,1024,NULL,'0',0,966,'bonus bUnbreakableHelm,0;',NULL,NULL);

+ 1 - 1
src/map/atcommand.c

@@ -8708,7 +8708,7 @@ static void atcommand_commands_sub(struct map_session_data* sd, const int fd, At
 					memset(line_buff,' ',CHATBOX_SIZE);
 					line_buff[CHATBOX_SIZE-1] = 0;
 					clif_displaymessage(fd, "-----------------");
-					clif_displaymessage(fd, "Customs commands :");
+					clif_displaymessage(fd, msg_txt(sd,509)); // Script-bound commands:
 				}
 				if (slen + cur - line_buff >= CHATBOX_SIZE) {
 					clif_displaymessage(fd,line_buff);