Change the sequence of Status ID's according to its number. Minor clean-up.

1 files changed, 160 insertions, 152 deletions

diff --git a/src/map/status.h b/src/map/status.h
index a9538724d..a7549a5e4 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -953,8 +953,8 @@ enum si_type {
 	//SI_FRIENDUP                            = 163,
 	//SI_SG_WARM                             = 164,
 	SI_SG_SUN_WARM                           = 165,
-	//SI_SG_MOON_WARM                        = 166 | The three show the exact same display: ultra red character (165, 166, 167)
-	//SI_SG_STAR_WARM                        = 167 | Their names would be SI_SG_SUN_WARM, SI_SG_MOON_WARM, SI_SG_STAR_WARM
+	//SI_SG_MOON_WARM                        = 166, // The three show the exact same display: ultra red character (165, 166, 167)
+	//SI_SG_STAR_WARM                        = 167,
 	//SI_EMOTION                             = 168,
 	SI_SUN_COMFORT                           = 169,
 	SI_MOON_COMFORT                          = 170,
@@ -1049,11 +1049,11 @@ enum si_type {
 	//SI_DA_SPACE                            = 257,
 	//SI_DA_TRANSFORM                        = 258,
 	//SI_DA_ITEMREBUILD                      = 259,
-	//SI_DA_ILLUSION                         = 260, //All mobs display as Turtle General
+	//SI_DA_ILLUSION                         = 260, // All mobs display as Turtle General
 	//SI_DA_DARKPOWER                        = 261,
 	//SI_DA_EARPLUG                          = 262,
-	//SI_DA_CONTRACT                         = 263, //Bio Mob effect on you and SI_TRICKDEAD icon
-	//SI_DA_BLACK                            = 264, //For short time blurry screen
+	//SI_DA_CONTRACT                         = 263, // Bio Mob effect on you and SI_TRICKDEAD icon
+	//SI_DA_BLACK                            = 264, // For short time blurry screen
 	//SI_DA_MAGICCART                        = 265,
 	//SI_CRYSTAL                             = 266,
 	//SI_DA_REBUILD                          = 267,
@@ -1381,7 +1381,7 @@ enum si_type {
 	SI_ODINS_POWER                           = 583,
 	SI_STYLE_CHANGE                          = 584,
 	SI_SONIC_CLAW_POSTDELAY                  = 585,
-	// ID's 586 - 595 Currently Unused
+	/* IDs 586 - 595 Currently Unused */
 	SI_SILVERVEIN_RUSH_POSTDELAY             = 596,
 	SI_MIDNIGHT_FRENZY_POSTDELAY             = 597,
 	SI_GOLDENE_FERSE                         = 598,
@@ -1524,23 +1524,23 @@ enum si_type {
 	SI_2013_VALENTINE2                       = 732,
 	SI_2013_VALENTINE3                       = 733,
 	SI_ILLUSIONDOPING                        = 734,
-	//SI_WIDEWEB                               = 735,
+	//SI_WIDEWEB                             = 735,
 	SI_CHILL                                 = 736,
 	SI_BURNT                                 = 737,
-	//SI_PCCAFE_PLAY_TIME                      = 738,
-	//SI_TWISTED_TIME                          = 739,
+	//SI_PCCAFE_PLAY_TIME                    = 738,
+	//SI_TWISTED_TIME                        = 739,
 	SI_FLASHCOMBO                            = 740,
-
-	//SI_JITTER_BUFF1                          = 741,
-	//SI_JITTER_BUFF2                          = 742,
-	//SI_JITTER_BUFF3                          = 743,
-	//SI_JITTER_BUFF4                          = 744,
-	//SI_JITTER_BUFF5                          = 745,
-	//SI_JITTER_BUFF6                          = 746,
-	//SI_JITTER_BUFF7                          = 747,
-	//SI_JITTER_BUFF8                          = 748,
-	//SI_JITTER_BUFF9                          = 749,
-	//SI_JITTER_BUFF10                         = 750,
+	//SI_JITTER_BUFF1                        = 741,
+	//SI_JITTER_BUFF2                        = 742,
+	//SI_JITTER_BUFF3                        = 743,
+	//SI_JITTER_BUFF4                        = 744,
+	//SI_JITTER_BUFF5                        = 745,
+	//SI_JITTER_BUFF6                        = 746,
+	//SI_JITTER_BUFF7                        = 747,
+	//SI_JITTER_BUFF8                        = 748,
+	//SI_JITTER_BUFF9                        = 749,
+
+	//SI_JITTER_BUFF10                       = 750,
 	SI_CUP_OF_BOZA                           = 751,
 	SI_B_TRAP                                = 752,
 	SI_E_CHAIN                               = 753,
@@ -1567,142 +1567,150 @@ enum si_type {
 	SI_PACKING_ENVELOPE9                     = 774,
 	SI_PACKING_ENVELOPE10                    = 775,
 	SI_GLASTHEIM_TRANS                       = 776,
-	//SI_ZONGZI_POUCH_TRANS                    = 777,
+	//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,
-	//SI_BEEF_RIB_STEW                         = 783,
-	//SI_PORK_RIB_STEW                         = 784,
-	//SI_CHUSEOK_MONDAY                        = 785,
-	//SI_CHUSEOK_TUESDAY                       = 786,
-	//SI_CHUSEOK_WEDNESDAY                     = 787,
-	//SI_CHUSEOK_THURSDAY                      = 788,
-	//SI_CHUSEOK_FRIDAY                        = 789,
-	//SI_CHUSEOK_WEEKEND                       = 790,
-	//SI_ALL_LIGHTGUARD                        = 791,
-	//SI_ALL_LIGHTGUARD_COOL_TIME              = 792,
-	//SI_MTF_MHP                               = 793,
-	//SI_MTF_MSP                               = 794,
-	//SI_MTF_PUMPKIN                           = 795,
-	//SI_MTF_HITFLEE                           = 796,
-	//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_OVERSEAEXPUP                        = 780,
+	//SI_CLOWN_N_GYPSY_CARD                  = 781,
+	//SI_OPEN_NPC_MARKET                     = 782,
+	//SI_BEEF_RIB_STEW                       = 783,
+	//SI_PORK_RIB_STEW                       = 784,
+	//SI_CHUSEOK_MONDAY                      = 785,
+	//SI_CHUSEOK_TUESDAY                     = 786,
+	//SI_CHUSEOK_WEDNESDAY                   = 787,
+	//SI_CHUSEOK_THURSDAY                    = 788,
+	//SI_CHUSEOK_FRIDAY                      = 789,
+	//SI_CHUSEOK_WEEKEND                     = 790,
+	//SI_ALL_LIGHTGUARD                      = 791,
+	//SI_ALL_LIGHTGUARD_COOL_TIME            = 792,
+	//SI_MTF_MHP                             = 793,
+	//SI_MTF_MSP                             = 794,
+	//SI_MTF_PUMPKIN                         = 795,
+	//SI_MTF_HITFLEE                         = 796,
+	//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,
+	/* IDs 821 - 824 Currently Unused */
+	//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_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,
+
+	/* IDs 845 - 859 Currently Unused */
+	//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,	
+	/* IDs 864 Currently Unused */
+	//SI_DRACULA_CARD                        = 865,
+	/* ID 866 Currently Unused */
+	//SI_LIMIT_POWER_BOOSTER                 = 867,
+	/* IDs 868 - 871 Currently Unused */
+	//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,
+	/* ID 895 Currently Unused */
+	//SI_SV_ROOTTWIST                        = 896,
+	//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_BITESCAR                            = 917,
+	//SI_ARCLOUSEDASH                        = 918,
+	//SI_TUNAPARTY                           = 919,
+	//SI_SHRIMP                              = 920,
+	//SI_FRESHSHRIMP                         = 921,
+	//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_SUHIDE                              = 933,
+	/* ID 934 Currently Unused */
+	//SI_DORAM_BUF_01                        = 935,
+	//SI_DORAM_BUF_02                        = 936,
+	//SI_SPRITEMABLE                         = 937,
 
 	SI_MAX,
 };