Merge branch 'master' of https://github.com/HerculesWS/Hercules

6 files changed, 129 insertions, 9 deletions

diff --git a/db/const.txt b/db/const.txt
index 78d64345e..8ee4fd84b 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1283,6 +1283,9 @@ SC_MTF_MSP	585
 SC_MTF_PUMPKIN	586
 SC_MTF_HITFLEE	587
 
+SC_LJOSALFAR	588
+SC_MERMAID_LONGING	589
+
 e_gasp	0
 e_what	1
 e_ho	2
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 05edbd275..c6e8c9a08 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -129729,6 +129729,8 @@ item_db: (
 	Type: 5
 	Loc: 1024
 	View: 1239
+	OnEquipScript: <" sc_start SC_LJOSALFAR,-1,0; ">
+	OnUnequipScript: <" sc_end SC_LJOSALFAR; ">
 },
 {
 	Id: 20100
@@ -130694,6 +130696,8 @@ item_db: (
 	Type: 5
 	Loc: 1024
 	View: 1299
+	OnEquipScript: <" sc_start SC_MERMAID_LONGING,-1,0; ">
+	OnUnequipScript: <" sc_end SC_MERMAID_LONGING; ">
 },
 {
 	Id: 20210
diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql
index 74413d762..5a48cd4cb 100644
--- a/sql-files/item_db.sql
+++ b/sql-files/item_db.sql
@@ -1077,7 +1077,7 @@ REPLACE INTO `item_db` VALUES ('2000','Destruction_Rod','Staff of Destruction','
 REPLACE INTO `item_db` VALUES ('2001','Divine_Cross','Divine Cross','4','20','10','1500','120','0','0','1','0','33024','63','2','34','4','70',NULL,'1','23','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Holy; bonus bMatkRate,15; bonus bDex,4; bonus2 bSubRace,RC_Demon,15; bonus2 bSubRace,RC_Undead,15;','','');
 REPLACE INTO `item_db` VALUES ('2002','Krieger_Twohand_Staff1','Glorious Destruction Staff','4','20','10','0','70','0','0','1','0','99092','63','2','34','4','80',NULL,'1','23','0','0','0','0','499',NULL,'0',NULL,'0',NULL,'0','bonus bMatkRate,getrefine(); bonus2 bMagicAddRace,RC_DemiPlayer,15; bonus2 bIgnoreMdefRate,RC_DemiPlayer,25; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bMagicAddRace,RC_DemiPlayer,(getrefine()-5)*2; bonus2 bIgnoreMdefRate,RC_DemiPlayer,5+(getrefine()-5)*2; } if(getrefine()>8) { bonus5 bAutoSpellOnSkill,WZ_STORMGUST,MG_SAFETYWALL,10,200,1; bonus5 bAutoSpellOnSkill,WZ_METEOR,MG_SAFETYWALL,10,200,1; bonus5 bAutoSpellOnSkill,WZ_VERMILION,MG_SAFETYWALL,10,200,1; }','','');
 REPLACE INTO `item_db` VALUES ('2003','Destruction_Rod_M','Staff of Destruction','4','20','10','2500','130','0','0','1','1','512','2','2','34','4','80',NULL,'1','23','0','0','0','0','475',NULL,'0',NULL,'0',NULL,'0','bonus bMatkRate,25+getrefine()/2; bonus bInt,3; bonus bAgi,10; bonus bUseSPrate,(getrefine()*2); bonus3 bAutoSpellWhenHit,WZ_JUPITEL,5,(getrefine()*20); bonus2 bCastrate,HW_MAGICPOWER,-50;','','');
-REPLACE INTO `item_db` VALUES ('2004','Kronos','Kronos','4','20','10','1000','30','0','0','1','0','66052','2','2','34','4','50',NULL,'1','23','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bMatkRate,20; bonus bInt,3+(getrefine()/2); bonus bMaxHP,300+(50*getrefine()/2); autobonus \"{ bonus bMatkRate,12; bonus buseSPRate,20; }\",1,5000,BF_MAGIC,\"{ specialeffect2 EF_ENHANCE; }\";','','');
+REPLACE INTO `item_db` VALUES ('2004','Kronos','Kronos','4','20','10','1000','30','0','0','1','0','66052','2','2','34','4','50',NULL,'1','23','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bMatkRate,20; bonus bInt,3+(getrefine()/2); bonus bMaxHP,300+(50*getrefine()/2); autobonus \"{ bonus bMatkRate,12; bonus bUseSPrate,20; }\",1,5000,BF_MAGIC,\"{ specialeffect2 EF_ENHANCE; }\";','','');
 REPLACE INTO `item_db` VALUES ('2005','Dea_Staff','Dea Staff','4','20','10','1000','30','0','0','1','1','33040','2','2','34','3','50',NULL,'1','23','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Holy; bonus bMatkRate,15+getrefine()/2; bonus bInt,6; bonus bVit,2; autobonus3 \"{ }\",20,1000,AL_HEAL,\"{ specialeffect2 EF_MAGICALATTHIT; heal 0,200; }\";','','');
 REPLACE INTO `item_db` VALUES ('2006','G_Staff_Of_Light','Staff Of Light','4','20','10','1900','80','0','0','1','0','8454660','63','2','34','4','60',NULL,'1','23','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','//bonus bMatk,150; bonus bAtkEle,Ele_Holy; bonus bInt,6;','','');
 REPLACE INTO `item_db` VALUES ('2101','Guard','Guard','5','500','250','300','0','0','3','0','0','4294967295','63','2','32','0','0',NULL,'1','1','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index dd8e4302c..706a229c8 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -1210,7 +1210,7 @@ REPLACE INTO `item_db` VALUES ('2000','Destruction_Rod','Staff of Destruction','
 REPLACE INTO `item_db` VALUES ('2001','Divine_Cross','Divine Cross','4','20','10','1500','120','210','0','1','0','33024','63','2','34','4','70',NULL,'1','23','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Holy; bonus bDex,4; bonus2 bAddRaceTolerance,RC_Demon,15; bonus2 bAddRaceTolerance,RC_Undead,15;','','');
 REPLACE INTO `item_db` VALUES ('2002','Krieger_Twohand_Staff1','Glorious Destruction Staff','4','20','10','0','70','210','0','1','0','8487700','63','2','34','4','80',NULL,'1','23','0','0','0','0','499',NULL,'0',NULL,'0',NULL,'0','bonus bMatkRate,getrefine(); bonus2 bMagicAddRace,RC_DemiPlayer,15; bonus2 bIgnoreMdefRate,RC_DemiPlayer,25; bonus bUnbreakableWeapon,0; if(getrefine()>5) { bonus2 bMagicAddRace,RC_DemiPlayer,(min(getrefine(),14)-5)*2; bonus2 bIgnoreMdefRate,RC_DemiPlayer,5+(min(getrefine(),14)-5)*2; } if(getrefine()>8) { bonus5 bAutoSpellOnSkill,WZ_STORMGUST,MG_SAFETYWALL,10,200,1; bonus5 bAutoSpellOnSkill,WZ_METEOR,MG_SAFETYWALL,10,200,1; bonus5 bAutoSpellOnSkill,WZ_VERMILION,MG_SAFETYWALL,10,200,1; }','','');
 REPLACE INTO `item_db` VALUES ('2003','Destruction_Rod_M','Staff of Destruction','4','20','10','2500','130','280','0','1','1','512','58','2','34','4','80',NULL,'1','23','0','0','0','0','475',NULL,'0',NULL,'0',NULL,'0','bonus bMatkRate,getrefine()/2; bonus bInt,3; bonus bAgi,10; bonus bUseSPrate,(getrefine()*2); bonus3 bAutoSpellWhenHit,WZ_JUPITEL,5,(getrefine()*20); bonus2 bVariableCastrate,HW_MAGICPOWER,-50;','','');
-REPLACE INTO `item_db` VALUES ('2004','Kronos','Kronos','4','20','10','1000','30','240','0','1','0','66052','58','2','34','4','50',NULL,'1','23','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bInt,3+(getrefine()/2); bonus bMaxHP,300+(50*getrefine()/2); autobonus \"{ bonus bMatkRate,12; bonus buseSPRate,20; }\",1,5000,BF_MAGIC,\"{ specialeffect2 EF_ENHANCE; }\";','','');
+REPLACE INTO `item_db` VALUES ('2004','Kronos','Kronos','4','20','10','1000','30','240','0','1','0','66052','58','2','34','4','50',NULL,'1','23','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bInt,3+(getrefine()/2); bonus bMaxHP,300+(50*getrefine()/2); autobonus \"{ bonus bMatkRate,12; bonus bUseSPrate,20; }\",1,5000,BF_MAGIC,\"{ specialeffect2 EF_ENHANCE; }\";','','');
 REPLACE INTO `item_db` VALUES ('2005','Dea_Staff','Dea Staff','4','20','10','1000','30','220','0','1','1','33040','58','2','34','3','50',NULL,'1','23','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Holy; bonus bMatkRate,getrefine()/2; bonus bInt,6; bonus bVit,2; autobonus3 \"{ }\",20,1000,AL_HEAL,\"{ specialeffect2 EF_MAGICALATTHIT; heal 0,200; }\";','','');
 REPLACE INTO `item_db` VALUES ('2006','G_Staff_Of_Light','Guardian Of Light Wand','4','20','10','1900','80','150','0','1','0','8454660','63','2','34','4','60',NULL,'1','23','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Holy; bonus bInt,6;','','');
 REPLACE INTO `item_db` VALUES ('2007','Golden_Rod_Staff','Golden Rod Staff','4','20','10','900','30','230','0','1','2','512','56','2','34','4','100',NULL,'1','23','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','bonus bAtkEle,Ele_Wind; bonus bInt,3; bonus2 bSkillAtk,WZ_JUPITEL,12;','','');
@@ -9111,7 +9111,7 @@ REPLACE INTO `item_db` VALUES ('20095','C_Red_Ribbon','Costume Red Ribbon','5','
 REPLACE INTO `item_db` VALUES ('20096','C_Blue_Ribbonn','Costume Blue Ribbonn','5','0','0','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','441','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('20097','C_White_Ribbon','Costume White Ribbon','5','0','0','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','442','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('20098','C_Vampire_Hairband','Costume Vampire Hairband','5','0','0','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','1238','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
-REPLACE INTO `item_db` VALUES ('20099','C_Ljosalfar','Costume Ljosalfar','5','0','0','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','1239','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
+REPLACE INTO `item_db` VALUES ('20099','C_Ljosalfar','Costume Ljosalfar','5','0','0','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','1239','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','sc_start SC_LJOSALFAR,-1,0;','sc_end SC_LJOSALFAR;');
 REPLACE INTO `item_db` VALUES ('20100','C_Volume_Fhat','Costume Volume Fhat','5','0','0','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','1240','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('20101','C_Bragi_Wing_Ears','Costume Bragi Wing Ears','5','0','0','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','1241','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('20102','C_Horse_King_J','Costume Horse King_J','5','0','0','0','0','0','0','0','0','4294967295','63','2','7168','0','0',NULL,'1','1189','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
@@ -9221,7 +9221,7 @@ REPLACE INTO `item_db` VALUES ('20205','C_Fancy_Flower','Costume Fancy Flower','
 REPLACE INTO `item_db` VALUES ('20206','C_Chicken_Hat1','Costume Chicken Hat1','5','0','0','0','0','0','0','0','0','4294967295','63','2','7168','0','0',NULL,'1','1296','0','0','0','0','467',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('20207','C_Striped_Hairband','Costume Striped Hairband','5','0','0','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','133','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('20208','C_Necktie','Costume Necktie','5','0','0','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','443','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
-REPLACE INTO `item_db` VALUES ('20209','C_Mermaid_Bubbles','Costume Mermaid Bubbles','5','0','0','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','1299','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
+REPLACE INTO `item_db` VALUES ('20209','C_Mermaid_Bubbles','Costume Mermaid Bubbles','5','0','0','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','1299','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','sc_start SC_MERMAID_LONGING,-1,0;','sc_end SC_MERMAID_LONGING;');
 REPLACE INTO `item_db` VALUES ('20210','C_Chicken_Hat2','Costume Chicken Hat2','5','0','0','0','0','0','0','0','0','4294967295','63','2','7168','0','0',NULL,'1','1297','0','0','0','0','467',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('20211','C_Chicken_Hat3','Costume Chicken Hat3','5','0','0','0','0','0','0','0','0','4294967295','63','2','7168','0','0',NULL,'1','1298','0','0','0','0','467',NULL,'0',NULL,'0',NULL,'0','','','');
 REPLACE INTO `item_db` VALUES ('20212','C_Loki_&_Nidhoggur_dolls','Costume Loki & Nidhoggur dolls','5','0','0','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'1','1304','0','0','0','0','0',NULL,'0',NULL,'0',NULL,'0','','','');
diff --git a/src/map/status.c b/src/map/status.c
index 7a7a4f415..1a07f74dc 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -918,6 +918,8 @@ void initChangeTables(void) {
 	status->dbs->IconChangeTable[SC_SUPER_STAR] = SI_SUPER_STAR;
 	status->dbs->IconChangeTable[SC_STRANGELIGHTS] = SI_STRANGELIGHTS;
 	status->dbs->IconChangeTable[SC_DECORATION_OF_MUSIC] = SI_DECORATION_OF_MUSIC;
+	status->dbs->IconChangeTable[SC_LJOSALFAR] = SI_LJOSALFAR;
+	status->dbs->IconChangeTable[SC_MERMAID_LONGING] = SI_MERMAID_LONGING;
 
 	//Other SC which are not necessarily associated to skills.
 	status->dbs->ChangeFlagTable[SC_ATTHASTE_POTION1] = SCB_ASPD;
@@ -1024,6 +1026,8 @@ void initChangeTables(void) {
 	status->dbs->ChangeFlagTable[SC_SUPER_STAR] |= SCB_NONE;
 	status->dbs->ChangeFlagTable[SC_STRANGELIGHTS] |= SCB_NONE;
 	status->dbs->ChangeFlagTable[SC_DECORATION_OF_MUSIC] |= SCB_NONE;
+	status->dbs->ChangeFlagTable[SC_LJOSALFAR] |= SCB_NONE;
+	status->dbs->ChangeFlagTable[SC_MERMAID_LONGING] |= SCB_NONE;
 
 	/* status->dbs->DisplayType Table [Ind/Hercules] */
 	status->dbs->DisplayType[SC_ALL_RIDING]          = true;
@@ -1052,6 +1056,8 @@ void initChangeTables(void) {
 	status->dbs->DisplayType[SC_SUPER_STAR]          = true;
 	status->dbs->DisplayType[SC_STRANGELIGHTS]       = true;
 	status->dbs->DisplayType[SC_DECORATION_OF_MUSIC] = true;
+	status->dbs->DisplayType[SC_LJOSALFAR]           = true;
+	status->dbs->DisplayType[SC_MERMAID_LONGING]     = true;
 
 	if( !battle_config.display_hallucination ) //Disable Hallucination.
 		status->dbs->IconChangeTable[SC_ILLUSION] = SI_BLANK;
diff --git a/src/map/status.h b/src/map/status.h
index d49bca8b4..800e3de9f 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -742,6 +742,9 @@ typedef enum sc_type {
 	SC_MTF_MSP,
 	SC_MTF_PUMPKIN,
 	SC_MTF_HITFLEE,
+	
+	SC_LJOSALFAR,
+	SC_MERMAID_LONGING,
 
 	SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
 } sc_type;
@@ -1490,7 +1493,7 @@ enum si_type {
 	SI_2013_VALENTINE2                       = 732,
 	SI_2013_VALENTINE3                       = 733,
 	SI_ILLUSIONDOPING                        = 734,
-	//SI_                                    = 735,
+	//SI_WIDEWEB                               = 735,
 	SI_CHILL                                 = 736,
 	SI_BURNT                                 = 737,
 	//SI_PCCAFE_PLAY_TIME                      = 738,
@@ -1536,7 +1539,6 @@ enum si_type {
 	//SI_ZONGZI_POUCH_TRANS                    = 777,
 	SI_HEAT_BARREL_AFTER                     = 778,
 	SI_DECORATION_OF_MUSIC                   = 779,
-
 	//SI_OVERSEAEXPUP                          = 780,
 	//SI_CLOWN_N_GYPSY_CARD                    = 781,
 	//SI_OPEN_NPC_MARKET                       = 782,
@@ -1557,14 +1559,119 @@ enum si_type {
 	//SI_MTF_CRIDAMAGE2                        = 797,
 	//SI_MTF_SPDRAIN                           = 798,
 	//SI_ACUO_MINT_GUM                         = 799,
-	// ...
+	
+	//SI_S_HEALPOTION                          = 800,
+	//SI_REUSE_LIMIT_S_HEAL_POTION             = 801,
+	//SI_PLAYTIME_STATISTICS                   = 802,
+	//SI_GN_CHANGEMATERIAL_OPERATOR            = 803,
+	//SI_GN_MIX_COOKING_OPERATOR               = 804,
+	//SI_GN_MAKEBOMB_OPERATOR                  = 805,
+	//SI_GN_S_PHARMACY_OPERATOR                = 806,
+	//SI_SO_EL_ANALYSIS_DISASSEMBLY_OPERATOR   = 807,
+	//SI_SO_EL_ANALYSIS_COMBINATION_OPERATOR   = 808,
+	//SI_NC_MAGICDECOY_OPERATOR                = 809,
 	//SI_GUILD_STORAGE                         = 810,
-	// ...
+	//SI_GC_POISONINGWEAPON_OPERATOR           = 811,
+	//SI_WS_WEAPONREFINE_OPERATOR              = 812,
+	//SI_BS_REPAIRWEAPON_OPERATOR              = 813,
+	//SI_GET_MAILBOX                           = 814,
 	//SI_JUMPINGCLAN                           = 815,
-	// ...
+	//SI_JP_OTP                                = 816,
+	//SI_HANDICAPTOLERANCE_LEVELGAP            = 817,
 	//SI_MTF_RANGEATK2                         = 818,
 	//SI_MTF_ASPD2                             = 819,
 	//SI_MTF_MATK2                             = 820,
+	//SI_QSCARABA                              = 825,
+	SI_LJOSALFAR                             = 826,
+	//SI_PAD_READER_KNIGHT                     = 827,
+	//SI_PAD_READER_CRUSADER                   = 828,
+	//SI_PAD_READER_BLACKSMITH                 = 829,
+	//SI_PAD_READER_ALCHEMIST                  = 830,
+	//SI_PAD_READER_ASSASSIN                   = 831,
+	//SI_PAD_READER_ROGUE                      = 832,
+	//SI_PAD_READER_WIZARD                     = 833,
+	//SI_PAD_READER_SAGE                       = 834,
+	//SI_PAD_READER_PRIEST                     = 835,
+	//SI_PAD_READER_MONK                       = 836,
+	//SI_PAD_READER_HUNTER                     = 837,
+	//SI_PAD_READER_BARD                       = 838,
+	//SI_PAD_READER_DANCER                     = 839,
+	//SI_PAD_READER_TAEKWON                    = 840,
+	//SI_PAD_READER_NINJA                      = 841,
+	//SI_PAD_READER_GUNSLINGER                 = 842,
+	//SI_PAD_READER_SUPERNOVICE                = 843,
+	//SI_ESSENCE_OF_TIME                       = 844,
+	//SI_MTF_MARIONETTE                        = 860,
+	//SI_MTF_LUDE                              = 861,
+	//SI_MTF_CRUISER                           = 862,
+	SI_MERMAID_LONGING                       = 863,
+	//SI_DRACULA_CARD                          = 865,
+	//SI_LIMIT_POWER_BOOSTER                   = 867,
+	//SI_TIME_ACCESSORY                        = 872,
+	//SI_EP16_DEF                              = 873,
+	//SI_NORMAL_ATKED_SP                       = 874,
+	//SI_BODYSTATE_STONECURSE                  = 875,
+	//SI_BODYSTATE_FREEZING                    = 876,
+	//SI_BODYSTATE_STUN                        = 877,
+	//SI_BODYSTATE_SLEEP                       = 878,
+	//SI_BODYSTATE_UNDEAD                      = 879,
+	//SI_BODYSTATE_STONECURSE_ING              = 880,
+	//SI_BODYSTATE_BURNNING                    = 881,
+	//SI_BODYSTATE_IMPRISON                    = 882,
+	//SI_HEALTHSTATE_POISON                    = 883,
+	//SI_HEALTHSTATE_CURSE                     = 884,
+	//SI_HEALTHSTATE_SILENCE                   = 885,
+	//SI_HEALTHSTATE_CONFUSION                 = 886,
+	//SI_HEALTHSTATE_BLIND                     = 887,
+	//SI_HEALTHSTATE_ANGELUS                   = 888,
+	//SI_HEALTHSTATE_BLOODING                  = 889,
+	//SI_HEALTHSTATE_HEAVYPOISON               = 890,
+	//SI_HEALTHSTATE_FEAR                      = 891,
+	//SI_CHERRY_BLOSSOM_CAKE                   = 892,
+	//SI_SU_STOOP                              = 893,
+	//SI_CATNIPPOWDER                          = 894,
+	//SI_ATTACK_PROPERTY_NOTHING               = 897,
+	//SI_ATTACK_PROPERTY_WATER                 = 898,
+	//SI_ATTACK_PROPERTY_GROUND                = 899,
+	
+	//SI_ATTACK_PROPERTY_FIRE                  = 900,
+	//SI_ATTACK_PROPERTY_WIND                  = 901,
+	//SI_ATTACK_PROPERTY_POISON                = 902,
+	//SI_ATTACK_PROPERTY_SAINT                 = 903,
+	//SI_ATTACK_PROPERTY_DARKNESS              = 904,
+	//SI_ATTACK_PROPERTY_TELEKINESIS           = 905,
+	//SI_ATTACK_PROPERTY_UNDEAD                = 906,
+	//SI_RESIST_PROPERTY_NOTHING               = 907,
+	//SI_RESIST_PROPERTY_WATER                 = 908,
+	//SI_RESIST_PROPERTY_GROUND                = 909,
+	//SI_RESIST_PROPERTY_FIRE                  = 910,
+	//SI_RESIST_PROPERTY_WIND                  = 911,
+	//SI_RESIST_PROPERTY_POISON                = 912,
+	//SI_RESIST_PROPERTY_SAINT                 = 913,
+	//SI_RESIST_PROPERTY_DARKNESS              = 914,
+	//SI_RESIST_PROPERTY_TELEKINESIS           = 915,
+	//SI_RESIST_PROPERTY_UNDEAD                = 916,
+	//SI_PERIOD_RECEIVEITEM                    = 922,
+	//SI_PERIOD_PLUSEXP                        = 923,
+	//SI_PERIOD_PLUSJOBEXP                     = 924,
+	//SI_RUNEHELM                              = 925,
+	//SI_HELM_VERKANA                          = 926,
+	//SI_HELM_RHYDO                            = 927,
+	//SI_HELM_TURISUS                          = 928,
+	//SI_HELM_HAGALAS                          = 929,
+	//SI_HELM_ISIA                             = 930,
+	//SI_HELM_ASIR                             = 931,
+	//SI_HELM_URJ                              = 932,
+	//SI_SV_ROOTTWIST                          = 896,
+	//SI_BITESCAR                              = 917,
+	//SI_ARCLOUSEDASH                          = 918,
+	//SI_TUNAPARTY                             = 919,
+	//SI_SHRIMP                                = 920,
+	//SI_FRESHSHRIMP                           = 921,
+	//SI_SUHIDE                                = 933,
+	//SI_SPRITEMABLE                           = 937,
+	//SI_DORAM_BUF_01                          = 935,
+	//SI_DORAM_BUF_02                          = 936,	
 
 	SI_MAX,
 };