From fa4175c2527a328e7c65bab40d9747caaf792656 Mon Sep 17 00:00:00 2001 From: Jedzkie Date: Wed, 16 Dec 2015 17:42:50 +0800 Subject: Added 8 Official kRO & jRO Costumes supported up to 2015-05-13aRagexe. Change the AegisName of Music Decoration to its official name. Update Status Change ID's. (Thanks to Rytech) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Note: • Some of the costumes items are missing or not implemented on this commit, but this is their official SC's. • SC's that don't have costume items: - SC_FLOWERSMOKE - SC_HAPPINESS_STAR - SC_MAGICAL_FEATHER --- db/const.txt | 9 +++++++++ db/re/item_db.conf | 22 +++++++++++++++++++-- db/sc_config.txt | 10 ++++++++++ src/map/status.c | 32 ++++++++++++++++++++++++++++-- src/map/status.h | 58 ++++++++++++++++++++++++++++++++++++++++++++---------- 5 files changed, 117 insertions(+), 14 deletions(-) diff --git a/db/const.txt b/db/const.txt index 100ee1e7a..a338d300d 100644 --- a/db/const.txt +++ b/db/const.txt @@ -1324,6 +1324,15 @@ SC_MVPCARD_MISTRESS 615 SC_MVPCARD_ORCHERO 616 SC_MVPCARD_ORCLORD 617 +SC_HAT_EFFECT 618 +SC_FLOWERSMOKE 619 +SC_FSTONE 620 +SC_HAPPINESS_STAR 621 +SC_MAPLE_FALLS 622 +SC_TIME_ACCESSORY 623 +SC_MAGICAL_FEATHER 624 +SC_BLOSSOM_FLUTTERING 625 + e_gasp 0 e_what 1 e_ho 2 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index b6eeba2cf..a01a9d3d1 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -125524,6 +125524,16 @@ item_db: ( /* every refine of lance increase the chance of trigger and increase damage of spiral pierce by 5%. */ "> }, +{ + Id: 19022 + AegisName: "C_Floating_Stone_Of_Intelligence" + Name: "Floating Stone Of Intelligence" + Type: 5 + Loc: 2048 + View: 1230 + OnEquipScript: <" sc_start SC_FSTONE, -1, 0; "> + OnUnequipScript: <" sc_end SC_FSTONE; "> +}, { Id: 19023 AegisName: "Queen_Scaraba_Crown" @@ -129157,14 +129167,14 @@ item_db: ( }, { Id: 19871 - AegisName: "C_DecorationOfMusic_Accessory" + AegisName: "C_Music_Decoration" Name: "Decoration of Music" Type: 5 Buy: 20 Loc: 2048 Refine: false View: 1074 - OnEquipScript: <" sc_start SC_DECORATION_OF_MUSIC,-1,0; "> + OnEquipScript: <" sc_start SC_DECORATION_OF_MUSIC, -1, 0; "> OnUnequipScript: <" sc_end SC_DECORATION_OF_MUSIC; "> }, { @@ -130616,6 +130626,8 @@ item_db: ( Name: "Costume Angel Stair" Type: 5 Loc: 1024 + OnEquipScript: <" sc_start SC_HAT_EFFECT, -1, 0; "> + OnUnequipScript: <" sc_end SC_HAT_EFFECT; "> }, { Id: 20063 @@ -131464,6 +131476,8 @@ item_db: ( Type: 5 Loc: 4096 View: 1275 + OnEquipScript: <" sc_start SC_MAPLE_FALLS, -1, 0; "> + OnUnequipScript: <" sc_end SC_MAPLE_FALLS; "> }, { Id: 20155 @@ -132266,6 +132280,8 @@ item_db: ( Type: 5 Loc: 2048 View: 1309 + OnEquipScript: <" sc_start SC_TIME_ACCESSORY, -1, 0; "> + OnUnequipScript: <" sc_end SC_TIME_ACCESSORY; "> }, { Id: 20247 @@ -132554,6 +132570,8 @@ item_db: ( Type: 5 Loc: 4096 View: 1331 + OnEquipScript: <" sc_start SC_BLOSSOM_FLUTTERING, -1, 0; "> + OnUnequipScript: <" sc_end SC_BLOSSOM_FLUTTERING; "> }, { Id: 20286 diff --git a/db/sc_config.txt b/db/sc_config.txt index b37afa877..d8272d39f 100644 --- a/db/sc_config.txt +++ b/db/sc_config.txt @@ -466,12 +466,22 @@ SC_FORTUNE, 79 SC_SERVICEFORYOU, 79 SC_INCHIT, 77 SC_PUSH_CART, 205 + +// Costumes SC_MOONSTAR, 207 SC_SUPER_STAR, 207 SC_STRANGELIGHTS, 207 SC_DECORATION_OF_MUSIC, 207 SC_LJOSALFAR, 207 SC_MERMAID_LONGING, 207 +SC_HAT_EFFECT, 207 +SC_FLOWERSMOKE, 207 +SC_FSTONE, 207 +SC_HAPPINESS_STAR, 207 +SC_MAPLE_FALLS, 207 +SC_TIME_ACCESSORY, 207 +SC_MAGICAL_FEATHER, 207 +SC_BLOSSOM_FLUTTERING, 207 // Cant Clear SC_ALL_RIDING, 141 diff --git a/src/map/status.c b/src/map/status.c index 841f9c855..9f7465da0 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -959,13 +959,23 @@ void initChangeTables(void) { status->dbs->IconChangeTable[SC_REBOUND] = SI_REBOUND; status->dbs->IconChangeTable[SC_ALL_RIDING] = SI_ALL_RIDING; status->dbs->IconChangeTable[SC_MONSTER_TRANSFORM] = SI_MONSTER_TRANSFORM; + + // Costumes status->dbs->IconChangeTable[SC_MOONSTAR] = SI_MOONSTAR; 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; - + status->dbs->IconChangeTable[SC_HAT_EFFECT] = SI_HAT_EFFECT; + status->dbs->IconChangeTable[SC_FLOWERSMOKE] = SI_FLOWERSMOKE; + status->dbs->IconChangeTable[SC_FSTONE] = SI_FSTONE; + status->dbs->IconChangeTable[SC_HAPPINESS_STAR] = SI_HAPPINESS_STAR; + status->dbs->IconChangeTable[SC_MAPLE_FALLS] = SI_MAPLE_FALLS; + status->dbs->IconChangeTable[SC_TIME_ACCESSORY] = SI_TIME_ACCESSORY; + status->dbs->IconChangeTable[SC_MAGICAL_FEATHER] = SI_MAGICAL_FEATHER; + status->dbs->IconChangeTable[SC_BLOSSOM_FLUTTERING] = SI_BLOSSOM_FLUTTERING; + // Other SC which are not necessarily associated to skills. status->dbs->ChangeFlagTable[SC_ATTHASTE_POTION1] = SCB_ASPD; status->dbs->ChangeFlagTable[SC_ATTHASTE_POTION2] = SCB_ASPD; @@ -1107,13 +1117,21 @@ void initChangeTables(void) { status->dbs->ChangeFlagTable[SC_MVPCARD_ORCHERO] |= SCB_ALL; status->dbs->ChangeFlagTable[SC_MVPCARD_ORCLORD] |= SCB_ALL; - // Costume + // Costumes status->dbs->ChangeFlagTable[SC_MOONSTAR] |= SCB_NONE; 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->ChangeFlagTable[SC_HAT_EFFECT] |= SCB_NONE; + status->dbs->ChangeFlagTable[SC_FLOWERSMOKE] |= SCB_NONE; + status->dbs->ChangeFlagTable[SC_FSTONE] |= SCB_NONE; + status->dbs->ChangeFlagTable[SC_HAPPINESS_STAR] |= SCB_NONE; + status->dbs->ChangeFlagTable[SC_MAPLE_FALLS] |= SCB_NONE; + status->dbs->ChangeFlagTable[SC_TIME_ACCESSORY] |= SCB_NONE; + status->dbs->ChangeFlagTable[SC_MAGICAL_FEATHER] |= SCB_NONE; + status->dbs->ChangeFlagTable[SC_BLOSSOM_FLUTTERING] |= SCB_NONE; /* status->dbs->DisplayType Table [Ind/Hercules] */ status->dbs->DisplayType[SC_ALL_RIDING] = true; @@ -1138,12 +1156,22 @@ void initChangeTables(void) { status->dbs->DisplayType[SC_BLOOD_SUCKER] = true; status->dbs->DisplayType[SC__SHADOWFORM] = true; status->dbs->DisplayType[SC_MONSTER_TRANSFORM] = true; + + // Costumes status->dbs->DisplayType[SC_MOONSTAR] = true; 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; + status->dbs->DisplayType[SC_HAT_EFFECT] = true; + status->dbs->DisplayType[SC_FLOWERSMOKE] = true; + status->dbs->DisplayType[SC_FSTONE] = true; + status->dbs->DisplayType[SC_HAPPINESS_STAR] = true; + status->dbs->DisplayType[SC_MAPLE_FALLS] = true; + status->dbs->DisplayType[SC_TIME_ACCESSORY] = true; + status->dbs->DisplayType[SC_MAGICAL_FEATHER] = true; + status->dbs->DisplayType[SC_BLOSSOM_FLUTTERING] = 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 d44cc9bca..2bf3c0a57 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -800,6 +800,15 @@ typedef enum sc_type { SC_MVPCARD_ORCHERO, SC_MVPCARD_ORCLORD, + SC_HAT_EFFECT, + SC_FLOWERSMOKE, + SC_FSTONE, // 620 + SC_HAPPINESS_STAR, + SC_MAPLE_FALLS, + SC_TIME_ACCESSORY, + SC_MAGICAL_FEATHER, + SC_BLOSSOM_FLUTTERING, + SC_MAX, //Automatically updated max, used in for's to check we are within bounds. } sc_type; @@ -1404,7 +1413,16 @@ enum si_type { SI_ODINS_POWER = 583, SI_STYLE_CHANGE = 584, SI_SONIC_CLAW_POSTDELAY = 585, - /* IDs 586 - 595 Currently Unused */ + //SI_ = 586, + //SI_ = 587, + //SI_ = 588, + //SI_ = 589, + //SI_ = 590, + //SI_ = 591, + //SI_ = 592, + //SI_ = 593, + //SI_ = 594, + //SI_ = 595, SI_SILVERVEIN_RUSH_POSTDELAY = 596, SI_MIDNIGHT_FRENZY_POSTDELAY = 597, SI_GOLDENE_FERSE = 598, @@ -1635,7 +1653,10 @@ enum si_type { //SI_MTF_RANGEATK2 = 818, //SI_MTF_ASPD2 = 819, //SI_MTF_MATK2 = 820, - /* IDs 821 - 824 Currently Unused */ + //SI_SHOW_NPCHPBAR = 821, + SI_FLOWERSMOKE = 822, + SI_FSTONE = 823, + //SI_DAILYSENDMAILCNT = 824, //SI_QSCARABA = 825, SI_LJOSALFAR = 826, //SI_PAD_READER_KNIGHT = 827, @@ -1656,18 +1677,35 @@ enum si_type { //SI_PAD_READER_GUNSLINGER = 842, //SI_PAD_READER_SUPERNOVICE = 843, //SI_ESSENCE_OF_TIME = 844, - - /* IDs 845 - 859 Currently Unused */ + //SI_MINIGAME_ROULETTE = 845, + //SI_MINIGAME_GOLD_POINT = 846, + //SI_MINIGAME_SILVER_POINT = 847, + //SI_MINIGAME_BRONZE_POINT = 848, + SI_HAPPINESS_STAR = 849, + + //SI_SUMMEREVENT01 = 850, + //SI_SUMMEREVENT02 = 851, + //SI_SUMMEREVENT03 = 852, + //SI_SUMMEREVENT04 = 853, + //SI_SUMMEREVENT05 = 854, + //SI_MINIGAME_ROULETTE_BONUS_ITEM = 855, + //SI_DRESS_UP = 856, + SI_MAPLE_FALLS = 857, + //SI_ALL_NIFLHEIM_RECALL = 858, + //SI_ = 859, //SI_MTF_MARIONETTE = 860, //SI_MTF_LUDE = 861, //SI_MTF_CRUISER = 862, SI_MERMAID_LONGING = 863, - /* IDs 864 Currently Unused */ + SI_MAGICAL_FEATHER = 864, //SI_DRACULA_CARD = 865, - /* ID 866 Currently Unused */ + //SI_ = 866, //SI_LIMIT_POWER_BOOSTER = 867, - /* IDs 868 - 871 Currently Unused */ - //SI_TIME_ACCESSORY = 872, + //SI_ = 868, + //SI_ = 869, + //SI_ = 870, + //SI_ = 871, + SI_TIME_ACCESSORY = 872, //SI_EP16_DEF = 873, //SI_NORMAL_ATKED_SP = 874, //SI_BODYSTATE_STONECURSE = 875, @@ -1690,7 +1728,7 @@ enum si_type { //SI_CHERRY_BLOSSOM_CAKE = 892, //SI_SU_STOOP = 893, //SI_CATNIPPOWDER = 894, - /* ID 895 Currently Unused */ + SI_BLOSSOM_FLUTTERING = 895, //SI_SV_ROOTTWIST = 896, //SI_ATTACK_PROPERTY_NOTHING = 897, //SI_ATTACK_PROPERTY_WATER = 898, @@ -1730,7 +1768,7 @@ enum si_type { //SI_HELM_ASIR = 931, //SI_HELM_URJ = 932, //SI_SUHIDE = 933, - /* ID 934 Currently Unused */ + //SI_ = 934, //SI_DORAM_BUF_01 = 935, //SI_DORAM_BUF_02 = 936, //SI_SPRITEMABLE = 937, -- cgit v1.2.3-60-g2f50