Merge pull request #208 from Jedzkie/master

Added full support on Moon Star and Super Star items

Thanks to Jedzkie and idathena

5 files changed, 16 insertions, 2 deletions

diff --git a/db/const.txt b/db/const.txt
index 29a6994cb..e5874f52f 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1244,6 +1244,8 @@ SC_MTF_RANGEATK 567
 SC_MTF_MATK 568
 SC_MTF_MLEATKED 569
 SC_MTF_CRIDAMAGE 570
+SC_MOONSTAR	571
+SC_SUPER_STAR	572
 
 e_gasp	0
 e_what	1
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index 870fbfd60..5825034c8 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -8159,9 +8159,9 @@
 18737,Fortier_Mask,Fortier Masque,5,20,,200,,0,,0,0xFFFFFFFF,7,2,512,,10,0,876,{ bonus bUnbreakableHelm,0; },{},{}
 18739,Carnation_Hairband,Carnation Hairband,5,20,,100,,0,,0,0xFFFFFFFF,7,2,256,,0,1,878,{ bonus bLuk,1; },{},{}
 18740,Hair_Of_The_Strong,RMSC2012 Special Costume,5,20,,0,,0,,0,0xFFFFFFFF,7,2,1024,,0,0,879,{},{},{}
-18742,C_MoonStar_Accessory,Moon and Stars,5,20,,0,,0,,0,0xFFFFFFFF,7,2,2048,,0,0,0,{},{},{}
+18742,C_MoonStar_Accessory,Moon and Stars,5,20,,0,,0,,0,0xFFFFFFFF,7,2,2048,,0,0,881,{},{ sc_start SC_MOONSTAR,-1,0; },{ sc_end SC_MOONSTAR; }
 18743,Spirit_Of_Chung_E,Spirit Of Chung E,5,20,,0,,0,,0,0xFFFFFFFF,7,2,1024,,0,0,882,{},{},{}
-18744,C_World_Star,Twilight,5,20,,0,,0,,0,0xFFFFFFFF,7,2,2048,,0,0,0,{},{},{}
+18744,C_World_Star,Twilight,5,20,,0,,0,,0,0xFFFFFFFF,7,2,2048,,0,0,883,{},{ sc_start SC_SUPER_STAR,-1,0; },{ sc_end SC_SUPER_STAR; }
 18745,Choco_Stick_In_Mouth,Choco Stick In Mouth,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,10,0,884,{},{},{}
 18746,Chilly_Breath,Chilly Breath,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,10,0,885,{ bonus bInt,1; },{},{}
 18747,Eyes_Of_Ifrit,Eyes Of Ifrit,5,20,,100,,1,,1,0xFFFFFFFF,7,2,512,,0,0,886,{ bonus bDex,1; },{},{}
diff --git a/db/sc_config.txt b/db/sc_config.txt
index 1adfec6ca..9e0b8b268 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -420,3 +420,5 @@ SC_FORTUNE, 79
 SC_SERVICEFORYOU, 79
 SC_INCHIT, 77
 SC_PUSH_CART, 0x4D
+SC_MOONSTAR, 79
+SC_SUPER_STAR, 79
diff --git a/src/map/status.c b/src/map/status.c
index 70cc3bccf..9e98b2801 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -906,6 +906,8 @@ void initChangeTables(void) {
 	status->IconChangeTable[SC_REBOUND] = SI_REBOUND;
 	status->IconChangeTable[SC_ALL_RIDING] = SI_ALL_RIDING;
 	status->IconChangeTable[SC_MONSTER_TRANSFORM] = SI_MONSTER_TRANSFORM;
+	status->IconChangeTable[SC_MOONSTAR] = SI_MOONSTAR;
+	status->IconChangeTable[SC_SUPER_STAR] = SI_SUPER_STAR;
 
 	//Other SC which are not necessarily associated to skills.
 	status->ChangeFlagTable[SC_ATTHASTE_POTION1] = SCB_ASPD;
@@ -995,6 +997,9 @@ void initChangeTables(void) {
 	status->ChangeFlagTable[SC_MTF_MATK] = SCB_MATK;
 	status->ChangeFlagTable[SC_MTF_MLEATKED] |= SCB_ALL;
 
+	status->ChangeFlagTable[SC_MOONSTAR] |= SCB_NONE;
+	status->ChangeFlagTable[SC_SUPER_STAR] |= SCB_NONE;
+
 	/* status->DisplayType Table [Ind/Hercules] */
 	status->DisplayType[SC_ALL_RIDING]		= true;
 	status->DisplayType[SC_PUSH_CART]			= true;
@@ -1019,6 +1024,8 @@ void initChangeTables(void) {
 	status->DisplayType[SC__SHADOWFORM]		= true;
 	status->DisplayType[SC__MANHOLE]			= true;
 	status->DisplayType[SC_MONSTER_TRANSFORM] = true;
+	status->DisplayType[SC_MOONSTAR]		= true;
+	status->DisplayType[SC_SUPER_STAR]		= true;
 
 #ifdef RENEWAL_EDP
 	// renewal EDP increases your weapon atk
diff --git a/src/map/status.h b/src/map/status.h
index 9edf29d2c..254f3bfab 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -677,6 +677,9 @@ typedef enum sc_type {
 	SC_MTF_MLEATKED,
 	SC_MTF_CRIDAMAGE,
 
+	SC_MOONSTAR,
+	SC_SUPER_STAR,
+
 	SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
 } sc_type;
 // Official status change ids, used to display status icons on the client.