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

8 files changed, 64 insertions, 23 deletions

diff --git a/db/const.txt b/db/const.txt
index ab14afca2..9a590ac50 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1258,6 +1258,8 @@ SC_MTF_CRIDAMAGE 570
 SC_MOONSTAR	571
 SC_SUPER_STAR	572
 SC_OKTOBERFEST	573
+SC_STRANGELIGHTS	574
+SC_DECORATION_OF_MUSIC	575
 
 e_gasp	0
 e_what	1
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 6c6e429b4..229deb776 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -96593,6 +96593,18 @@ item_db: (
 	View: 879
 },
 {
+	Id: 18741
+	AegisName: "C_WillOWisp_Accessory"
+	Name: "Will O Wisp"
+	Type: 5
+	Buy: 20
+	Loc: 1024
+	Refine: false
+	View: 880
+	OnEquipScript: <" sc_start SC_STRANGELIGHTS,-1,0; ">
+	OnUnequipScript: <" sc_end SC_STRANGELIGHTS; ">
+},
+{
 	Id: 18742
 	AegisName: "C_MoonStar_Accessory"
 	Name: "Moon and Stars"
@@ -98285,4 +98297,16 @@ item_db: (
 	Upper: 63
 	Script: <" itemskill RK_LUXANIMA,1; ">
 },
+{
+	Id: 19871
+	AegisName: "C_DecorationOfMusic_Accessory"
+	Name: "Decoration of Music"
+	Type: 5
+	Buy: 20
+	Loc: 2048
+	Refine: false
+	View: 1074
+	OnEquipScript: <" sc_start SC_DECORATION_OF_MUSIC,-1,0; ">
+	OnUnequipScript: <" sc_end SC_DECORATION_OF_MUSIC; ">
+},
 )
diff --git a/db/sc_config.txt b/db/sc_config.txt
index 682fd060c..5d276f036 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -423,6 +423,8 @@ SC_INCHIT, 77
 SC_PUSH_CART, 205
 SC_MOONSTAR, 207
 SC_SUPER_STAR, 207
+SC_STRANGELIGHTS, 207
+SC_DECORATION_OF_MUSIC, 207
 
 //Cant Clear
 SC_ALL_RIDING, 128
\ No newline at end of file
diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index 82ea04c67..58362472a 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -8019,6 +8019,7 @@ REPLACE INTO `item_db_re` VALUES ('18730','Cryptura_Academy_Hat','Criatura Hat',
 REPLACE INTO `item_db_re` VALUES ('18737','Fortier_Mask','Fortier Masque','5','20','10','200','0','0','0','0','0','4294967295','63','2','512','0','10',NULL,'0','876','0','bonus bUnbreakableHelm,0;','','');
 REPLACE INTO `item_db_re` VALUES ('18739','Carnation_Hairband','Carnation Hairband','5','20','10','100','0','0','0','0','0','4294967295','63','2','256','0','0',NULL,'1','878','0','bonus bLuk,1;','','');
 REPLACE INTO `item_db_re` VALUES ('18740','Hair_Of_The_Strong','RMSC2012 Special Costume','5','20','10','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'0','879','0','','','');
+REPLACE INTO `item_db_re` VALUES ('18741','C_WillOWisp_Accessory','Will O Wisp','5','20','10','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'0','880','0','','sc_start SC_STRANGELIGHTS,-1,0;','sc_end SC_STRANGELIGHTS;');
 REPLACE INTO `item_db_re` VALUES ('18742','C_MoonStar_Accessory','Moon and Stars','5','20','10','0','0','0','0','0','0','4294967295','63','2','2048','0','0',NULL,'0','881','0','','sc_start SC_MOONSTAR,-1,0;','sc_end SC_MOONSTAR;');
 REPLACE INTO `item_db_re` VALUES ('18743','Spirit_Of_Chung_E','Spirit Of Chung E','5','20','10','0','0','0','0','0','0','4294967295','63','2','1024','0','0',NULL,'0','882','0','','','');
 REPLACE INTO `item_db_re` VALUES ('18744','C_World_Star','Twilight','5','20','10','0','0','0','0','0','0','4294967295','63','2','2048','0','0',NULL,'0','883','0','','sc_start SC_SUPER_STAR,-1,0;','sc_end SC_SUPER_STAR;');
@@ -8142,3 +8143,4 @@ REPLACE INTO `item_db_re` VALUES ('21004','Alca_Bringer_','Alca Bringer','4','20
 REPLACE INTO `item_db_re` VALUES ('21005','Metal_Two_Hand_Sword','Metal Two-Handed Sword','4','20','10','0','95','0','0','1','1','16514','63','2','34','3','0',NULL,'1','3','0','','','');
 REPLACE INTO `item_db_re` VALUES ('22514','Candy_Holder','Candy Holder','11','20','10','10','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','','','');
 REPLACE INTO `item_db_re` VALUES ('22540','Runstone_Luxanima','Lux Anima Rune','11','2','1','100','0','0','0','0','0','4294967295','63','2','0','0','0',NULL,'0','0','0','itemskill RK_LUXANIMA,1;','','');
+REPLACE INTO `item_db_re` VALUES ('19871','C_DecorationOfMusic_Accessory','Decoration of Music','5','20','10','0','0','0','0','0','0','4294967295','63','2','2048','0','0',NULL,'0','1074','0','','sc_start SC_DECORATION_OF_MUSIC,-1,0;','sc_end SC_DECORATION_OF_MUSIC;');
diff --git a/sql-files/main.sql b/sql-files/main.sql
index 398bdcfe4..4a91aeef8 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -639,26 +639,28 @@ CREATE TABLE IF NOT EXISTS `sql_updates` (
 ) ENGINE=MyISAM;
 
 -- Existent updates to enter
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1360858500);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1360951560);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1362445531);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1362528000);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1362794218);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1364409316);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1366075474);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1366078541);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1381354728);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1381423003);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1382892428);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1383162785);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1383167577);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1383205740);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1383955424);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1384545461);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1384588175);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1387844126);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1388854043);
-INSERT INTO `sql_updates` (`timestamp`) VALUES (1389028967);
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1360858500); -- 2013-02-14--16-15.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1360951560); -- 2013-02-15--18-06.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1362445531); -- 2013-03-05--01-05.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1362528000); -- 2013-03-06--00-00.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1362794218); -- 2013-03-09--01-56.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1364409316); -- 2013-03-27--18-35.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1366075474); -- 2013-04-16--01-24.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1366078541); -- 2013-04-16--02-15.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1381354728); -- 2013-10-09--21-38.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1381423003); -- 2013-10-10--16-36.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1382892428); -- 2013-10-27--16-47.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1383162785); -- 2013-10-30--19-53.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1383167577); -- 2013-10-30--21-12.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1383205740); -- 2013-10-31--07-49.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1383955424); -- 2013-11-09--00-03.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1384473995); -- 2013-11-15--00-06.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1384545461); -- 2013-11-15--19-57.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1384588175); -- 2013-11-16--07-49.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1384763034); -- 2013-11-18--08-23.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1387844126); -- 2013-12-24--00-15.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1388854043); -- 2014-01-04--16-47.sql
+INSERT INTO `sql_updates` (`timestamp`) VALUES (1389028967); -- 2014-01-06--17-22.sql
 
 --
 -- Table structure for table `sstatus`
diff --git a/src/map/clif.c b/src/map/clif.c
index b51651b90..d13cea145 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5492,10 +5492,10 @@ void clif_status_change_notick(struct block_list *bl,int type,int flag,int tick,
 	
 	nullpo_retv(bl);
 	
-	if (!(status->type2relevant_bl_types(type)&bl->type)) // only send status changes that actually matter to the client
+	if (type == SI_BLANK)  //It shows nothing on the client...
 		return;
 	
-	if (type == SI_BLANK)  //It shows nothing on the client...
+	if (!(status->type2relevant_bl_types(type)&bl->type)) // only send status changes that actually matter to the client
 		return;
 	
 	sd = BL_CAST(BL_PC, bl);
diff --git a/src/map/status.c b/src/map/status.c
index 1f7d81ccf..e89f8d331 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -96,7 +96,7 @@ int status_type2relevant_bl_types(int type)
 {
 	if( type < 0 || type >= SI_MAX ) {
 		ShowError("status_type2relevant_bl_types: Unsupported type %d\n", type);
-		return SI_BLANK;
+		return BL_NUL;
 	}
 
 	return status->RelevantBLTypes[type];
@@ -908,6 +908,8 @@ void initChangeTables(void) {
 	status->IconChangeTable[SC_MONSTER_TRANSFORM] = SI_MONSTER_TRANSFORM;
 	status->IconChangeTable[SC_MOONSTAR] = SI_MOONSTAR;
 	status->IconChangeTable[SC_SUPER_STAR] = SI_SUPER_STAR;
+	status->IconChangeTable[SC_STRANGELIGHTS] = SI_STRANGELIGHTS;
+	status->IconChangeTable[SC_DECORATION_OF_MUSIC] = SI_DECORATION_OF_MUSIC;
 
 	//Other SC which are not necessarily associated to skills.
 	status->ChangeFlagTable[SC_ATTHASTE_POTION1] = SCB_ASPD;
@@ -999,6 +1001,8 @@ void initChangeTables(void) {
 
 	status->ChangeFlagTable[SC_MOONSTAR] |= SCB_NONE;
 	status->ChangeFlagTable[SC_SUPER_STAR] |= SCB_NONE;
+	status->ChangeFlagTable[SC_STRANGELIGHTS] |= SCB_NONE;
+	status->ChangeFlagTable[SC_DECORATION_OF_MUSIC] |= SCB_NONE;
 
 	/* status->DisplayType Table [Ind/Hercules] */
 	status->DisplayType[SC_ALL_RIDING]		= true;
@@ -1026,6 +1030,8 @@ void initChangeTables(void) {
 	status->DisplayType[SC_MONSTER_TRANSFORM] = true;
 	status->DisplayType[SC_MOONSTAR]		= true;
 	status->DisplayType[SC_SUPER_STAR]		= true;
+	status->DisplayType[SC_STRANGELIGHTS]		= true;
+	status->DisplayType[SC_DECORATION_OF_MUSIC]		= true;
 
 #ifdef RENEWAL_EDP
 	// renewal EDP increases your weapon atk
diff --git a/src/map/status.h b/src/map/status.h
index 44cc3b0a1..f319b1506 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -697,6 +697,8 @@ typedef enum sc_type {
 	SC_SUPER_STAR,
 
 	SC_OKTOBERFEST,
+	SC_STRANGELIGHTS,
+	SC_DECORATION_OF_MUSIC,
 	
 	SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
 } sc_type;
@@ -1458,6 +1460,7 @@ enum si_type {
 	SI_PACKING_ENVELOPE10 = 775,
 	SI_GLASTHEIM_TRANS = 776,
 	SI_HEAT_BARREL_AFTER = 778,
+	SI_DECORATION_OF_MUSIC = 779,
 	SI_MAX,
 };
 // JOINTBEAT stackable ailments