diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/status.c | 6 | ||||
| -rw-r--r-- | src/map/status.h | 117 |
2 files changed, 118 insertions, 5 deletions
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, }; |