From d4d37e6a8675a805c574b2bfbff46b2114141f47 Mon Sep 17 00:00:00 2001 From: Haru Date: Wed, 15 Jan 2014 04:18:31 +0100 Subject: Fixed mapserver error when display_status_timers is disabled - Fixes message "status_type2relevant_bl_types: Unsupported type -1" displayed when the display_status_timers battle flag is disabled. - Corrects return value for status_type2relevant_bl_types in case of unsupported type. - Special thanks to Ind Signed-off-by: Haru --- src/map/clif.c | 4 ++-- src/map/status.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/map') 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..782f31780 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]; -- cgit v1.2.3-70-g09d2 From 7ed885a1411aec8e368bbf9c59c0715542045bd0 Mon Sep 17 00:00:00 2001 From: ossi0110 Date: Thu, 16 Jan 2014 09:09:45 +0100 Subject: Added 2 Missing Costumes Will O Wisp Decoration of Music --- db/const.txt | 2 ++ db/re/item_db.conf | 24 ++++++++++++++++++++++++ db/sc_config.txt | 2 ++ src/map/status.c | 6 ++++++ src/map/status.h | 3 +++ 5 files changed, 37 insertions(+) (limited to 'src/map') 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 @@ -96592,6 +96592,18 @@ item_db: ( Refine: false 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" @@ -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/src/map/status.c b/src/map/status.c index 782f31780..e89f8d331 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -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 -- cgit v1.2.3-70-g09d2