Prechádzať zdrojové kódy

Added latest constants and names

Lemongrass3110 2 rokov pred
rodič
commit
4836d8e77a
5 zmenil súbory, kde vykonal 1069 pridanie a 77 odobranie
  1. 775 1
      db/re/mob_db.yml
  2. 25 2
      src/map/npc.hpp
  3. 1 0
      src/map/script.hpp
  4. 126 0
      src/map/script_constants.hpp
  5. 142 74
      src/map/status.hpp

+ 775 - 1
db/re/mob_db.yml

@@ -88368,6 +88368,86 @@ Body:
     AttackMotion: 864
     DamageMotion: 480
     Ai: 21
+#  - Id: 3529
+#    AegisName: JP_E_MONSTER_1
+#  - Id: 3530
+#    AegisName: JP_E_MONSTER_2
+#  - Id: 3531
+#    AegisName: JP_E_MONSTER_3
+#  - Id: 3532
+#    AegisName: JP_E_MONSTER_4
+#  - Id: 3533
+#    AegisName: JP_E_MONSTER_5
+#  - Id: 3534
+#    AegisName: JP_E_MONSTER_6
+#  - Id: 3535
+#    AegisName: JP_E_MONSTER_7
+#  - Id: 3536
+#    AegisName: JP_E_MONSTER_8
+#  - Id: 3537
+#    AegisName: JP_E_MONSTER_9
+#  - Id: 3538
+#    AegisName: JP_E_MONSTER_10
+#  - Id: 3539
+#    AegisName: JP_E_MONSTER_11
+#  - Id: 3540
+#    AegisName: JP_E_MONSTER_12
+#  - Id: 3541
+#    AegisName: JP_E_MONSTER_13
+#  - Id: 3542
+#    AegisName: JP_E_MONSTER_14
+#  - Id: 3543
+#    AegisName: JP_E_MONSTER_15
+#  - Id: 3544
+#    AegisName: JP_E_MONSTER_16
+#  - Id: 3545
+#    AegisName: JP_E_MONSTER_17
+#  - Id: 3546
+#    AegisName: JP_E_MONSTER_18
+#  - Id: 3547
+#    AegisName: JP_E_MONSTER_19
+#  - Id: 3548
+#    AegisName: JP_E_MONSTER_20
+#  - Id: 3549
+#    AegisName: JP_E_MONSTER_21
+#  - Id: 3550
+#    AegisName: JP_E_MONSTER_22
+#  - Id: 3551
+#    AegisName: JP_E_MONSTER_23
+#  - Id: 3552
+#    AegisName: JP_E_MONSTER_24
+#  - Id: 3553
+#    AegisName: JP_E_MONSTER_25
+#  - Id: 3554
+#    AegisName: JP_E_MONSTER_26
+#  - Id: 3555
+#    AegisName: JP_E_MONSTER_27
+#  - Id: 3556
+#    AegisName: JP_E_MONSTER_28
+#  - Id: 3557
+#    AegisName: JP_E_MONSTER_29
+#  - Id: 3558
+#    AegisName: JP_E_MONSTER_30
+#  - Id: 3559
+#    AegisName: JP_E_MONSTER_31
+#  - Id: 3560
+#    AegisName: JP_E_MONSTER_32
+#  - Id: 3561
+#    AegisName: JP_E_MONSTER_33
+#  - Id: 3562
+#    AegisName: JP_E_MONSTER_34
+#  - Id: 3563
+#    AegisName: JP_E_MONSTER_35
+#  - Id: 3564
+#    AegisName: JP_E_MONSTER_36
+#  - Id: 3565
+#    AegisName: JP_E_MONSTER_37
+#  - Id: 3566
+#    AegisName: JP_E_MONSTER_38
+#  - Id: 3567
+#    AegisName: JP_E_MONSTER_39
+#  - Id: 3568
+#    AegisName: JP_E_MONSTER_40
   - Id: 3569
     AegisName: POPE_MD_H_MERC_NORMAL
     Name: Casual Pope
@@ -92505,7 +92585,7 @@ Body:
 #  - Id: 3825
 #    AegisName: E_SALAMANDER
 #  - Id: 3826
-#    AegisName: EP16_2_SEYREN
+#    AegisName: E16_2_SEYREN
 #  - Id: 3827
 #    AegisName: AB_MOB_001
 #  - Id: 3828
@@ -95916,6 +95996,152 @@ Body:
 #  - Id: 20928
 #    AegisName: CHIMERA_THEONE
 #    DamageTaken: 10
+#  - Id: 20856
+#    AegisName: MD_N_ARENA_1
+#  - Id: 20857
+#    AegisName: MD_N_ARENA_2
+#  - Id: 20858
+#    AegisName: MD_N_ARENA_3_1
+#  - Id: 20859
+#    AegisName: MD_N_ARENA_3_2
+#  - Id: 20860
+#    AegisName: MD_N_ARENA_3_3
+#  - Id: 20861
+#    AegisName: MD_N_ARENA_4
+#  - Id: 20862
+#    AegisName: MD_N_ARENA_5
+#  - Id: 20863
+#    AegisName: MD_N_ARENA_6
+#  - Id: 20864
+#    AegisName: MD_N_ARENA_7
+#  - Id: 20865
+#    AegisName: MD_N_ARENA_8
+#  - Id: 20866
+#    AegisName: MD_N_ARENA_9
+#  - Id: 20867
+#    AegisName: MD_N_ARENA_10
+#  - Id: 20868
+#    AegisName: MD_N_ARENA_11
+#  - Id: 20869
+#    AegisName: MD_N_ARENA_12
+#  - Id: 20870
+#    AegisName: MD_KANABIAN_N
+#  - Id: 20871
+#    AegisName: MD_ALPHONSE_N
+#  - Id: 20872
+#    AegisName: MD_GEFFEN_FENRIR_N
+#  - Id: 20873
+#    AegisName: WAR_NUT
+#  - Id: 20874
+#    AegisName: MOLE_TW
+#  - Id: 20875
+#    AegisName: 4JOB_LETICIA
+#  - Id: 20876
+#    AegisName: 4JOB_ACIDUS
+#  - Id: 20877
+#    AegisName: G_ILL_SROPHO
+#  - Id: 20878
+#    AegisName: G_ILL_OBEAUNE
+#  - Id: 20879
+#    AegisName: G_ILL_DEVIACE
+#  - Id: 20880
+#    AegisName: G_ILL_MARSE
+#  - Id: 20881
+#    AegisName: G_ILL_MERMAN
+#  - Id: 20882
+#    AegisName: G_ILL_SEDORA
+#  - Id: 20883
+#    AegisName: G_ILL_SWORD_FISH
+#  - Id: 20884
+#    AegisName: G_ILL_STROUF
+#  - Id: 20885
+#    AegisName: G_ILL_PHEN
+#  - Id: 20886
+#    AegisName: MD_AIRBOAT_TREE
+#  - Id: 20887
+#    AegisName: MD_AIRBOAT_PORING
+#  - Id: 20888
+#    AegisName: MD_AIRBOAT_WORM
+#  - Id: 20889
+#    AegisName: MD_AIRBOAT_LEECH
+#  - Id: 20890
+#    AegisName: MD_AIRBOAT_MOS
+#  - Id: 20891
+#    AegisName: MD_AIRBOAT_BOSS
+#  - Id: 20892
+#    AegisName: MD_SAKRAY
+#  - Id: 20893
+#    AegisName: MD_TIARA
+#  - Id: 20894
+#    AegisName: MD_UNDEAD_KNIGHT
+#  - Id: 20895
+#    AegisName: MD_UNDEAD_SOLDIER
+#  - Id: 20896
+#    AegisName: MD_UNDEAD_ARCHER
+#  - Id: 20897
+#    AegisName: MD_UNDEAD_WIZARD
+#  - Id: 20898
+#    AegisName: MD_UNDEAD_MAGICIAN
+#  - Id: 20899
+#    AegisName: MD_UNDEAD_NOBLE
+#  - Id: 20900
+#    AegisName: MD_UNDEAD_SERVANT
+#  - Id: 20901
+#    AegisName: DISASTER_OMEN
+#  - Id: 20902
+#    AegisName: DISASTER_WIND
+#  - Id: 20903
+#    AegisName: CONQUER_INCARNATION
+#  - Id: 20904
+#    AegisName: FAMINE_INCARNATION
+#  - Id: 20905
+#    AegisName: APPETITE_INCARNATION
+#  - Id: 20906
+#    AegisName: DISASTER_SYMBOL
+#  - Id: 20907
+#    AegisName: DEVIL_EYE
+#  - Id: 20908
+#    AegisName: WAR_INCARNATION
+#  - Id: 20909
+#    AegisName: DEATH_INCARNATION
+#  - Id: 20910
+#    AegisName: CARNIVOROUS
+#  - Id: 20911
+#    AegisName: SINS_JUSTICE
+#  - Id: 20912
+#    AegisName: SINS_BRAVE
+#  - Id: 20913
+#    AegisName: SINS_MODERATION
+#  - Id: 20914
+#    AegisName: SINS_WISDOM
+#  - Id: 20915
+#    AegisName: G_SINS_JUSTICE
+#  - Id: 20916
+#    AegisName: G_SINS_BRAVE
+#  - Id: 20917
+#    AegisName: G_SINS_MODERATION
+#  - Id: 20918
+#    AegisName: G_SINS_WISDOM
+#  - Id: 20919
+#    AegisName: CARAT_TWEVENT
+#  - Id: 20920
+#    AegisName: CHIMERA_LAVA
+#  - Id: 20921
+#    AegisName: CHIMERA_FULGOR
+#  - Id: 20922
+#    AegisName: CHIMERA_NAPEO
+#  - Id: 20923
+#    AegisName: CHIMERA_GALENSIS
+#  - Id: 20924
+#    AegisName: CHIMERA_AMITERA
+#  - Id: 20925
+#    AegisName: CHIMERA_LITUS
+#  - Id: 20926
+#    AegisName: CHIMERA_FILLIA
+#  - Id: 20927
+#    AegisName: CHIMERA_VANILAQUS
+#  - Id: 20928
+#    AegisName: CHIMERA_THEONE
   - Id: 20929
     AegisName: GIANT_CAPUT
     Name: Giant Caput
@@ -97820,6 +98046,14 @@ Body:
 #    AegisName: SEASON_MOB_105
 #  - Id: 21508
 #    AegisName: SEASON_MOB_106
+#  - Id: 21509
+#    AegisName: SEASON_MOB_107
+#  - Id: 21510
+#    AegisName: SEASON_MOB_108
+#  - Id: 21511
+#    AegisName: SEASON_MOB_109
+#  - Id: 21512
+#    AegisName: SEASON_MOB_110
 #  - Id: 21513
 #    AegisName: EP19_NPC_IWIN
 #  - Id: 21514
@@ -97956,6 +98190,12 @@ Body:
 #    AegisName: ECO_LORD_OF_DEATH
 #  - Id: 21580
 #    AegisName: G_BIJOU
+#  - Id: 21581
+#    AegisName: BD_DUMMY_TW
+#  - Id: 21582
+#    AegisName: BD_KUJAKA_TW
+#  - Id: 21583
+#    AegisName: BD_KUJAKA_REWARD_TW
 #  - Id: 21587
 #    AegisName: NPC_EDDGA
 #  - Id: 21588
@@ -97986,6 +98226,430 @@ Body:
 #    AegisName: EP19_RE_RGAN_E
 #  - Id: 21601
 #    AegisName: EP19_ET_RGAN_D
+#  - Id: 21602
+#    AegisName: C5_KASA_VEINS
+#  - Id: 21603
+#    AegisName: C4_GHOUL_VEINS
+#  - Id: 21604
+#    AegisName: BYORGUE_VEINS
+#  - Id: 21605
+#    AegisName: BOW_GUARDIAN_VEINS
+#  - Id: 21606
+#    AegisName: C5_SALAMANDER_VEINS
+#  - Id: 21607
+#    AegisName: DROSERA_VEINS
+#  - Id: 21608
+#    AegisName: IMP_VEINS
+#  - Id: 21609
+#    AegisName: KASA_VEINS
+#  - Id: 21610
+#    AegisName: MAGMARING_VEINS
+#  - Id: 21611
+#    AegisName: MUSCIPULAR_VEINS
+#  - Id: 21612
+#    AegisName: SALAMANDER_VEINS
+#  - Id: 21613
+#    AegisName: SWORD_GUARDIAN_VEINS
+#  - Id: 21614
+#    AegisName: KNOCKER_VEINS
+#  - Id: 21615
+#    AegisName: C3_KNOCKER_VEINS
+#  - Id: 21616
+#    AegisName: VR_BOOK_FAIRY
+#  - Id: 21617
+#    AegisName: VR_UNKOWN_MAN
+#  - Id: 21618
+#    AegisName: VR_LADY
+#  - Id: 21619
+#    AegisName: VR_KNIGHT_SILVER
+#  - Id: 21620
+#    AegisName: VR_ELYUMINA
+#  - Id: 21621
+#    AegisName: VR_MD_HHA_RKNT
+#  - Id: 21622
+#    AegisName: VR_MD_HHA_RYGD
+#  - Id: 21623
+#    AegisName: VR_MD_HHA_ACBS
+#  - Id: 21624
+#    AegisName: VR_MD_HHA_RNGR
+#  - Id: 21625
+#    AegisName: VR_MD_HHA_GX
+#  - Id: 21626
+#    AegisName: VR_MD_HHA_SC
+#  - Id: 21627
+#    AegisName: VR_MD_HHA_WR
+#  - Id: 21628
+#    AegisName: VR_MD_LEVI
+#  - Id: 21629
+#    AegisName: VR_MD_LEVI_2
+#  - Id: 21630
+#    AegisName: WILD_ROSE3
+#  - Id: 21631
+#    AegisName: BLUEMOON_LOLI_RURI2
+#  - Id: 21632
+#    AegisName: FARMILIAR2
+#  - Id: 21633
+#    AegisName: VR_AGNES
+#  - Id: 21634
+#    AegisName: 20TH_GATE_GREEN
+#  - Id: 21635
+#    AegisName: 20TH_GATE_PURPLE
+#  - Id: 21636
+#    AegisName: 20TH_GATE_RED
+#  - Id: 21637
+#    AegisName: 20TH_CRYSTAL_S
+#  - Id: 21638
+#    AegisName: 20TH_CRYSTAL_M
+#  - Id: 21639
+#    AegisName: 20TH_CRYSTAL_L
+#  - Id: 21640
+#    AegisName: SEASON_MOB_111
+#  - Id: 21641
+#    AegisName: SEASON_MOB_112
+#  - Id: 21642
+#    AegisName: SEASON_MOB_113
+#  - Id: 21643
+#    AegisName: SEASON_MOB_114
+#  - Id: 21644
+#    AegisName: SEASON_MOB_115
+#  - Id: 21645
+#    AegisName: SEASON_MOB_116
+#  - Id: 21646
+#    AegisName: SEASON_MOB_117
+#  - Id: 21647
+#    AegisName: SEASON_MOB_118
+#  - Id: 21648
+#    AegisName: SEASON_MOB_119
+#  - Id: 21649
+#    AegisName: SEASON_MOB_120
+#  - Id: 21650
+#    AegisName: CWHITEKNIGHT
+#  - Id: 21651
+#    AegisName: KNIGHT_OF_ABYSS2
+#  - Id: 21652
+#    AegisName: GH_WHITEKNIGHT
+#  - Id: 21653
+#    AegisName: EDDGA3
+#  - Id: 21779
+#    AegisName: SEASON_MOB_121
+#  - Id: 21780
+#    AegisName: SEASON_MOB_122
+#  - Id: 21781
+#    AegisName: SEASON_MOB_123
+#  - Id: 21782
+#    AegisName: SEASON_MOB_124
+#  - Id: 21783
+#    AegisName: SEASON_MOB_125
+#  - Id: 21784
+#    AegisName: SEASON_MOB_126
+#  - Id: 21785
+#    AegisName: SEASON_MOB_127
+#  - Id: 21786
+#    AegisName: SEASON_MOB_128
+#  - Id: 21787
+#    AegisName: SEASON_MOB_129
+#  - Id: 21788
+#    AegisName: SEASON_MOB_130
+#  - Id: 21789
+#    AegisName: SEASON_MOB_131
+#  - Id: 21790
+#    AegisName: SEASON_MOB_132
+#  - Id: 21791
+#    AegisName: SEASON_MOB_133
+#  - Id: 21792
+#    AegisName: SEASON_MOB_134
+#  - Id: 21793
+#    AegisName: SEASON_MOB_135
+#  - Id: 21794
+#    AegisName: SEASON_MOB_136
+#  - Id: 21795
+#    AegisName: SEASON_MOB_137
+#  - Id: 21796
+#    AegisName: SEASON_MOB_138
+#  - Id: 21797
+#    AegisName: SEASON_MOB_139
+#  - Id: 21798
+#    AegisName: SEASON_MOB_140
+#  - Id: 21799
+#    AegisName: SEASON_MOB_141
+#  - Id: 21800
+#    AegisName: SEASON_MOB_142
+#  - Id: 21801
+#    AegisName: SEASON_MOB_143
+#  - Id: 21802
+#    AegisName: SEASON_MOB_144
+#  - Id: 21803
+#    AegisName: SEASON_MOB_145
+#  - Id: 21804
+#    AegisName: SEASON_MOB_146
+#  - Id: 21805
+#    AegisName: SEASON_MOB_147
+#  - Id: 21806
+#    AegisName: SEASON_MOB_148
+#  - Id: 21807
+#    AegisName: SEASON_MOB_149
+#  - Id: 21808
+#    AegisName: SEASON_MOB_150
+#  - Id: 21809
+#    AegisName: 20TH_GATE_GREEN_M
+#  - Id: 21810
+#    AegisName: 20TH_GATE_GREEN_S
+#  - Id: 21811
+#    AegisName: 20TH_GATE_PURPLE_M
+#  - Id: 21812
+#    AegisName: 20TH_GATE_PURPLE_S
+#  - Id: 21813
+#    AegisName: 20TH_GATE_RED_M
+#  - Id: 21814
+#    AegisName: 20TH_GATE_RED_S
+#  - Id: 21815
+#    AegisName: VH_BONE_DETALE
+#  - Id: 21816
+#    AegisName: VH_INGRID
+#  - Id: 21817
+#    AegisName: VH_GRAN_PAPILIA
+#  - Id: 21818
+#    AegisName: VH_PITAYA_BOSS
+#  - Id: 21819
+#    AegisName: VH_SILVA_PAPILIA
+#  - Id: 21820
+#    AegisName: VH_SWEETY
+#  - Id: 21821
+#    AegisName: VH_AMDARAIS
+#  - Id: 21822
+#    AegisName: VH_HEMEL
+#  - Id: 21823
+#    AegisName: VH_ABYSMAL_WITCH
+#  - Id: 21824
+#    AegisName: VH_DEATH_WITCH
+#  - Id: 21825
+#    AegisName: VH_R001_BESTIA
+#  - Id: 21826
+#    AegisName: VH_SAKRAY
+#  - Id: 21827
+#    AegisName: VH_TIARA
+#  - Id: 21828
+#    AegisName: VH_AIRBOAT_BOSS
+#  - Id: 21829
+#    AegisName: VH_BETELGEUSE
+#  - Id: 21830
+#    AegisName: VH_BURNING_FANG
+#  - Id: 21831
+#    AegisName: VH_FREYJA
+#  - Id: 21832
+#    AegisName: VH_SCHULANG
+#  - Id: 21833
+#    AegisName: VH_LIMACINA_BOSS
+#  - Id: 21834
+#    AegisName: VH_JUNCEA
+#  - Id: 21835
+#    AegisName: VH_RKNT
+#  - Id: 21836
+#    AegisName: VH_RYGD
+#  - Id: 21837
+#    AegisName: VH_ACBS
+#  - Id: 21838
+#    AegisName: VH_RNGR
+#  - Id: 21839
+#    AegisName: VH_GX
+#  - Id: 21840
+#    AegisName: VH_SC
+#  - Id: 21841
+#    AegisName: VH_WR
+#  - Id: 21842
+#    AegisName: E_PORING_20
+#  - Id: 21843
+#    AegisName: SEASON_MOB_151
+#  - Id: 21844
+#    AegisName: SEASON_MOB_152
+#  - Id: 21845
+#    AegisName: SEASON_MOB_153
+#  - Id: 21846
+#    AegisName: SEASON_MOB_154
+#  - Id: 21847
+#    AegisName: SEASON_MOB_155
+#  - Id: 21848
+#    AegisName: SEASON_MOB_156
+#  - Id: 21849
+#    AegisName: SEASON_MOB_157
+#  - Id: 21850
+#    AegisName: SEASON_MOB_158
+#  - Id: 21853
+#    AegisName: EP19_MD_BOX1
+#  - Id: 21854
+#    AegisName: EP19_MD_BOX2
+#  - Id: 21855
+#    AegisName: HEROS_DRAGON_1
+#  - Id: 21856
+#    AegisName: HEROS_DRAGON_2
+#  - Id: 21857
+#    AegisName: HEROS_DRAGON_3
+#  - Id: 21858
+#    AegisName: HEROS_DRAGON_4
+#  - Id: 21859
+#    AegisName: G_MASTERING
+#  - Id: 21860
+#    AegisName: G_CRAB
+#  - Id: 21861
+#    AegisName: G_SHELLFISH
+#  - Id: 21862
+#    AegisName: VR_MD_SWORDMAN
+#  - Id: 21863
+#    AegisName: VR_MARLBRON
+#  - Id: 21864
+#    AegisName: E_HILLSRION
+#  - Id: 21865
+#    AegisName: E_BABY_LEOPARD
+#  - Id: 21866
+#    AegisName: HEROS_IN_ORB_1
+#  - Id: 21867
+#    AegisName: HEROS_IN_ORB_2
+#  - Id: 21868
+#    AegisName: HEROS_IN_ORB_3
+#  - Id: 21869
+#    AegisName: HEROS_IN_ORB_4
+#  - Id: 21870
+#    AegisName: VR_MD_DEVIL
+#  - Id: 21887
+#    AegisName: HEROS_OUT_ORB
+#  - Id: 21888
+#    AegisName: G_DEVILING
+#  - Id: 21889
+#    AegisName: HEROS_WOLF
+#  - Id: 21890
+#    AegisName: HEROS_GINSENG
+#  - Id: 21891
+#    AegisName: HEROS_CANNON_R
+#  - Id: 21892
+#    AegisName: HEROS_CANNON_Y
+#  - Id: 21893
+#    AegisName: HEROS_CANNON_G
+#  - Id: 21894
+#    AegisName: HEROS_CANNON_B
+#  - Id: 21895
+#    AegisName: HEROS_R_PLANT
+#  - Id: 21896
+#    AegisName: HEROS_Y_PLANT
+#  - Id: 21897
+#    AegisName: HEROS_B_PLANT
+#  - Id: 21898
+#    AegisName: HEROS_W_PLANT
+#  - Id: 21899
+#    AegisName: HEROS_R_FERUS
+#  - Id: 21900
+#    AegisName: HEROS_G_FERUS
+#  - Id: 21901
+#    AegisName: HEROS_P_FERUS
+#  - Id: 21902
+#    AegisName: HEROS_WATCHER
+#  - Id: 21903
+#    AegisName: HEROS_KEEPER
+#  - Id: 21904
+#    AegisName: HEROS_F_PEGASUS
+#  - Id: 21905
+#    AegisName: G_HEROS_R_FERUS
+#  - Id: 21906
+#    AegisName: G_HEROS_G_FERUS
+#  - Id: 21907
+#    AegisName: G_HEROS_P_FERUS
+#  - Id: 21908
+#    AegisName: VR_WILD_ROSE
+#  - Id: 21909
+#    AegisName: E_SOHEE
+#  - Id: 21910
+#    AegisName: VR_MD_LZ
+#  - Id: 21911
+#    AegisName: 2210_EV_SPIDING
+#  - Id: 21912
+#    AegisName: MD_SEWER_THIEF_BUG
+#  - Id: 21913
+#    AegisName: MD_SEWER_CHONCHON
+#  - Id: 21914
+#    AegisName: MD_SEWER_AMBERNITE
+#  - Id: 21915
+#    AegisName: MD_SEWER_BEETLE
+#  - Id: 21916
+#    AegisName: MD_SEWER_ARCLOUSE
+#  - Id: 21917
+#    AegisName: MD_SEWER_ARGIOPE
+#  - Id: 21918
+#    AegisName: MD_SEWER_CAVE_FLOWER
+#  - Id: 21919
+#    AegisName: LARVA_VIOLET
+#  - Id: 21920
+#    AegisName: ECO_RUDO
+#  - Id: 21921
+#    AegisName: ECO_ARCHANGELING
+#  - Id: 21922
+#    AegisName: ECO_FAKE_ANGEL
+#  - Id: 21923
+#    AegisName: ECO_PLASMA_P
+#  - Id: 21924
+#    AegisName: ECO_SOLACE
+#  - Id: 21925
+#    AegisName: ECO_ANOPHELES
+#  - Id: 21926
+#    AegisName: ECO_GRYPHON
+#  - Id: 21927
+#    AegisName: ECO_RANDGRIS
+#  - Id: 21928
+#    AegisName: ECO_COMODO
+#  - Id: 21929
+#    AegisName: ECO_POISON_TOAD
+#  - Id: 21930
+#    AegisName: ECO_SIDE_WINDER
+#  - Id: 21931
+#    AegisName: ECO_CRAMP
+#  - Id: 21932
+#    AegisName: ECO_KUKRE
+#  - Id: 21933
+#    AegisName: ECO_NEPENTHES
+#  - Id: 21934
+#    AegisName: ECO_ANGRA_MANTIS
+#  - Id: 21935
+#    AegisName: ECO_VENOM_KIMERA
+#  - Id: 21936
+#    AegisName: ECO_NIGHTMARE
+#  - Id: 21937
+#    AegisName: ECO_WHISPER
+#  - Id: 21938
+#    AegisName: ECO_MARIONETTE
+#  - Id: 21939
+#    AegisName: ECO_NOXIOUS
+#  - Id: 21940
+#    AegisName: ECO_THE_PAPER
+#  - Id: 21941
+#    AegisName: ECO_GAJOMART
+#  - Id: 21942
+#    AegisName: ECO_ODIUM
+#  - Id: 21943
+#    AegisName: ECO_GLOOMUNDERNIGHT
+#  - Id: 21946
+#    AegisName: BURNING_KNIGHT
+#  - Id: 21947
+#    AegisName: DEDSERA
+#  - Id: 21948
+#    AegisName: HARDROCK_TITAN
+#  - Id: 21949
+#    AegisName: DEADWEEN
+#  - Id: 21950
+#    AegisName: GAIA_POL
+#  - Id: 21951
+#    AegisName: PUNCH_BUG
+#  - Id: 21952
+#    AegisName: AFERDE
+#  - Id: 21953
+#    AegisName: DISPOL
+#  - Id: 21954
+#    AegisName: TIMBERS
+#  - Id: 21955
+#    AegisName: RENIRE
+#  - Id: 21956
+#    AegisName: G_BURNING_KNIGHT
+#  - Id: 21957
+#    AegisName: G_TIMBERS
+#  - Id: 21964
+#    AegisName: 2301_EV_RICE_FLOUR
 #  - Id: 22328
 #    AegisName: DESERT_WOLF_RAC
 #  - Id: 22329
@@ -98036,6 +98700,116 @@ Body:
 #    AegisName: MQ_KIND_OF_BEETLE3
 #  - Id: 22352
 #    AegisName: MQ_KIND_OF_BEETLE4
+#  - Id: 23000
+#    AegisName: DARK_ILLUSION2
+#  - Id: 23001
+#    AegisName: MD_RIGEL
+#  - Id: 23002
+#    AegisName: 20TH_EVENT_HEMEL
+#  - Id: 23003
+#    AegisName: 20TH_EVENT_LOLI_RURI
+#  - Id: 23004
+#    AegisName: 20TH_EVENT_GIBBET
+#  - Id: 23005
+#    AegisName: 20TH_EVENT_HYLOZOIST
+#  - Id: 23006
+#    AegisName: 20TH_EVENT_MURDERER
+#  - Id: 23007
+#    AegisName: 20TH_EVENT_CORPS
+#  - Id: 23008
+#    AegisName: 20TH_EVENT_CO_CMDER
+#  - Id: 23009
+#    AegisName: PITAYA_R_PET
+#  - Id: 25019
+#    AegisName: MQ_M_MOCLORD
+#  - Id: 25020
+#    AegisName: MQ_M_ZAVIER
+#  - Id: 25021
+#    AegisName: MQ_EREMES
+#  - Id: 25022
+#    AegisName: MQ_HARWORD
+#  - Id: 25023
+#    AegisName: MQ_KATRINN
+#  - Id: 25024
+#    AegisName: MQ_MAGALETA
+#  - Id: 25025
+#    AegisName: MQ_M_TRISTAN
+#  - Id: 25026
+#    AegisName: MQ_BREEZE
+#  - Id: 25027
+#    AegisName: MQ_C4_BREEZE
+#  - Id: 25028
+#    AegisName: MQ_C3_BREEZE
+#  - Id: 25029
+#    AegisName: MQ_SKOGUL
+#  - Id: 25030
+#    AegisName: MQ_C2_SKOGUL
+#  - Id: 25031
+#    AegisName: MQ_FRUS
+#  - Id: 25032
+#    AegisName: MQ_SKEGGIOLD_
+#  - Id: 25033
+#    AegisName: MQ_SKEGGIOLD
+#  - Id: 25034
+#    AegisName: MQ_G_RANDGRIS
+#  - Id: 25035
+#    AegisName: MQ_RANDGRIS
+#  - Id: 25036
+#    AegisName: MQ_SHECIL
+#  - Id: 25037
+#    AegisName: MQ_VALKYRIE
+#  - Id: 25038
+#    AegisName: 06_EVENT_THIEF_FAIRY
+#  - Id: 25039
+#    AegisName: MD_MOROCC
+#  - Id: 25047
+#    AegisName: ICE_TITAN_FV
+#  - Id: 25049
+#    AegisName: SNOWIER_FV
+#  - Id: 25050
+#    AegisName: ICEICLE_FV
+#  - Id: 25051
+#    AegisName: GAZETI_FV
+#  - Id: 25052
+#    AegisName: HAPPY_GIVER_FV
+#  - Id: 25053
+#    AegisName: PRAY_GIVER_FV
+#  - Id: 25054
+#    AegisName: BOOK_OF_DEATH_FV
+#  - Id: 25055
+#    AegisName: SMILE_GIVER_FV
+#  - Id: 25056
+#    AegisName: EMPATHIZER_FV
+#  - Id: 25057
+#    AegisName: THA_RESENT_FV
+#  - Id: 25058
+#    AegisName: THA_ANGER_FV
+#  - Id: 25059
+#    AegisName: THA_HORROR_FV
+#  - Id: 25060
+#    AegisName: VOID_MIMIC_FV
+#  - Id: 25072
+#    AegisName: HOLY_FRUS_FV
+#  - Id: 25073
+#    AegisName: HOLY_SKOGUL_FV
+#  - Id: 25074
+#    AegisName: ANGELGOLT_FV
+#  - Id: 25075
+#    AegisName: ANGELGOLT2_FV
+#  - Id: 25076
+#    AegisName: INGRID_FV
+#  - Id: 25077
+#    AegisName: REGINLEIF_FV
+#  - Id: 25078
+#    AegisName: G_RANDGRIS_FV
+#  - Id: 27000
+#    AegisName: E_EDDGA_TW
+#  - Id: 29500
+#    AegisName: DROSERA_VEINS0
+#  - Id: 29501
+#    AegisName: G_ZOMBIE_SLAUGHTER
+#  - Id: 29502
+#    AegisName: KAHO_VEINS
 #  - Id: 31999
 #    AegisName: HUNTING_GID_DEFAULT
 #  - Id: 32000

+ 25 - 2
src/map/npc.hpp

@@ -1427,12 +1427,35 @@ enum e_job_types
 	JT_4_RAGFES_16,
 	JT_4_RAGFES_16_M,
 	JT_4_EXJOB_NINJA2,
-
-	JT_ROZ_MQ_LUCIAN = 10510,
+	JT_4_VR_BOOK_FAIRY,
+	JT_ROZ_MQ_LUCIAN,
 	JT_ROZ_MQ_BRITIA,
 	JT_ROZ_MQ_ASSASIN01,
 	JT_STRANGE_B_SMITH1,
 	JT_STRONGER_B_SMTIH,
+	JT_4_VR_BOOK_RED,
+	JT_4_VR_BOOK_BLUE,
+	JT_4_VR_BOOK_YELLOW,
+	JT_4_VR_BOOK_GREEN,
+	JT_4_VR_BOOK_WHITE,
+	JT_4_VR_YGNIZEM,
+
+	JT_4_JP_19TH = 10524,
+	JT_4_KING_PORING,
+	JT_4_VR_SWORDMAN_DEAD,
+	JT_GATE_SKYBLUE,
+	JT_4_CS_RIGEL,
+	JT_4_M_NILLEM,
+	JT_4_LARVA_RED,
+	JT_4_LARVA_YELLOW,
+	JT_4_LARVA_BLACK,
+	JT_4_LARVA_VIOLET,
+	JT_4_HERO_SAUSAGE,
+	JT_4_PRINCESS_SAUSAGE,
+
+	JT_ROZ_MQ_XAVIER = 13000,
+	JT_ROZ_MQ_MOCLORD,
+	JT_ROZ_MQ_SKULD,
 
 	JT_NEW_NPC_3RD_END = 19999,
 	NPC_RANGE3_END, // Official: JT_NEW_NPC_3RD_END=19999

+ 1 - 0
src/map/script.hpp

@@ -2069,6 +2069,7 @@ enum e_hat_effects : int16{
 	HAT_EF_C_MELODY_WING,
 	HAT_EF_C_SPOT_LIGHT,
 	HAT_EF_C_ASTRA_BLESSING,
+	HAT_EF_EFST_C_20TH_ANNIVERSARY_HAT,
 	HAT_EF_MAX
 };
 

+ 126 - 0
src/map/script_constants.hpp

@@ -3572,6 +3572,7 @@
 	export_constant(EFST_DRESS_UP);
 	export_constant(EFST_MAPLE_FALLS);
 	export_constant(EFST_ALL_NIFLHEIM_RECALL);
+	export_constant(EFST_MARKING_USE_CHANGEMONSTER);
 	export_constant(EFST_MTF_MARIONETTE);
 	export_constant(EFST_MTF_LUDE);
 	export_constant(EFST_MTF_CRUISER);
@@ -3582,6 +3583,8 @@
 	export_constant(EFST_LIMIT_POWER_BOOSTER);
 	export_constant(EFST_GIFT_OF_SNOW);
 	export_constant(EFST_NPC_HALLUCINATIONWALK);
+	export_constant(EFST_NPC_HALLUCINATIONWALK_POSTDELAY);
+	export_constant(EFST_NPC_XXXWALK);
 	export_constant(EFST_TIME_ACCESSORY);
 	export_constant(EFST_EP16_DEF);
 	export_constant(EFST_NORMAL_ATKED_SP);
@@ -3644,6 +3647,7 @@
 	export_constant(EFST_HELM_ASIR);
 	export_constant(EFST_HELM_URJ);
 	export_constant(EFST_SUHIDE);
+	export_constant(EFST_REUSE_LIMIT_MG);
 	export_constant(EFST_DORAM_BUF_01);
 	export_constant(EFST_DORAM_BUF_02);
 	export_constant(EFST_SPRITEMABLE);
@@ -3655,10 +3659,21 @@
 	export_constant(EFST_ALL_GLASTHEIM_RECALL);
 	export_constant(EFST_REUSE_LIMIT_PEPO_MD);
 	export_constant(EFST_ALL_THANATOS_RECALL);
+	export_constant(EFST_KAFRA_STORE);
+	export_constant(EFST_REUSE_ABBYS);
 	export_constant(EFST_MAGICSTONE_OF_GRACE_SET);
+	export_constant(EFST_PRIVATE_AIRPLANE);
 	export_constant(EFST_HISS);
+	export_constant(EFST_HISS_AVOID);
 	export_constant(EFST_NYANGGRASS);
 	export_constant(EFST_CHATTERING);
+	export_constant(EFST_CHATTERING_OPT_ATK_MATK);
+	export_constant(EFST_CHATTERING_OPT_HASTE);
+	export_constant(EFST_SPIRITOFLAND_STEMSPEAR);
+	export_constant(EFST_SPIRITOFLAND_ROOTTWIST);
+	export_constant(EFST_SPIRITOFLAND_POWDERING);
+	export_constant(EFST_SPIRITOFLAND_METEOR);
+	export_constant(EFST_SPIRITOFLAND_NYANGGRASS);
 	export_constant(EFST_GROOMING);
 	export_constant(EFST_PROTECTIONOFSHRIMP);
 	export_constant(EFST_EP16_2_BUFF_SS);
@@ -3666,6 +3681,8 @@
 	export_constant(EFST_EP16_2_BUFF_AC);
 	export_constant(EFST_GS_MAGICAL_BULLET);
 	export_constant(EFST_FALLEN_ANGEL);
+	export_constant(EFST_REUSE_LIMIT_MOVEPOINT);
+	export_constant(EFST_MACRO_DETECTOR_ANSWER_WAITING);
 	export_constant(EFST_BLAZE_BEAD);
 	export_constant(EFST_FROZEN_BEAD);
 	export_constant(EFST_BREEZE_BEAD);
@@ -3674,19 +3691,32 @@
 	export_constant(EFST_AID_PERIOD_PLUSEXP_2ND);
 	export_constant(EFST_AID_PERIOD_PLUSJOBEXP_2ND);
 	export_constant(EFST_PRONTERA_JP);
+	export_constant(EFST_ASSISTANT_VENDING);
 	export_constant(EFST_GLOOM_CARD);
 	export_constant(EFST_PHARAOH_CARD);
 	export_constant(EFST_KIEL_CARD);
+	export_constant(EFST_ASSISTANT_BUYING);
 	export_constant(EFST_CHEERUP);
 	export_constant(EFST_GET_CNT_UNREAD_RODEX_CHARDB);
 	export_constant(EFST_GET_CNT_UNREAD_RODEX_GLOBALDB);
 	export_constant(EFST_S_MANAPOTION);
 	export_constant(EFST_M_DEFSCROLL);
+	export_constant(EFST_OPEN_REFINING_UI);
+	export_constant(EFST_ALL_LIGHTHALZEN_RECALL);
+	export_constant(EFST_SWAP_EQUIPITEM);
 	export_constant(EFST_AS_RAGGED_GOLEM_CARD);
 	export_constant(EFST_LHZ_DUN_N1);
 	export_constant(EFST_LHZ_DUN_N2);
 	export_constant(EFST_LHZ_DUN_N3);
 	export_constant(EFST_LHZ_DUN_N4);
+	export_constant(EFST_TAEKWON_MISSION);
+	export_constant(EFST_SUN_PLACE);
+	export_constant(EFST_MOON_PLACE);
+	export_constant(EFST_STAR_PLACE);
+	export_constant(EFST_SUN_MONSTER);
+	export_constant(EFST_MOON_MONSTER);
+	export_constant(EFST_STAR_MONSTER);
+	export_constant(EFST_AL_WARP_ADDSLOT);
 	export_constant(EFST_ALL_STAT_DOWN);
 	export_constant(EFST_GRADUAL_GRAVITY);
 	export_constant(EFST_DAMAGE_HEAL);
@@ -3725,6 +3755,8 @@
 	export_constant(EFST_FALLINGSTAR);
 	export_constant(EFST_NOVAEXPLOSING);
 	export_constant(EFST_GRAVITYCONTROL);
+	export_constant(XXX_EFST_WORLDSTORE_ACTIVE);
+	export_constant(EFST_WORLDSTORE_ITEMMOVEINFO_SENDCOMPLETE);
 	export_constant(EFST_SOULCOLLECT);
 	export_constant(EFST_SOULREAPER);
 	export_constant(EFST_SOULUNITY);
@@ -3753,6 +3785,7 @@
 	export_constant(EFST_REUSE_LIMIT_TBG);
 	export_constant(EFST_REUSE_LIMIT_TBM);
 	export_constant(EFST_YGGDRASIL_BLESS);
+	export_constant(EFST_USE_SKILL_SP_SWHOO);
 	export_constant(EFST_HUNTING_EVENT);
 	export_constant(EFST_PERIOD_RECEIVEITEM_2ND);
 	export_constant(EFST_PERIOD_PLUSEXP_2ND);
@@ -3760,9 +3793,23 @@
 	export_constant(EFST_TW_NEWYEAR_EVENT);
 	export_constant(EFST_ENSEMBLEFATIGUE);
 	export_constant(EFST_ADAPTATION);
+	export_constant(EFST_DANCINGLESSON);
+	export_constant(EFST_MUSICALLESSON);
+	export_constant(EFST_REUSE_LIMIT_RC);
+	export_constant(EFST_DANCINGLESSON_EQUIPPED);
+	export_constant(EFST_MUSICALLESSON_EQUIPPED);
 	export_constant(EFST_ANCILLA);
+	export_constant(EFST_REUSE_LIMIT_POTION_A);
+	export_constant(EFST_REUSE_LIMIT_POTION_B);
+	export_constant(EFST_REUSE_LIMIT_POTION_C);
+	export_constant(EFST_REUSE_LIMIT_POTION_D);
+	export_constant(EFST_REUSE_LIMIT_POTION_E);
+	export_constant(EFST_REUSE_LIMIT_POTION_F);
+	export_constant(EFST_BRAVESET);
+	export_constant(EFST_MACEMASTERY_EQUIPPED);
 	export_constant(EFST_FESTIVE_ENERGY);
 	export_constant(EFST_TEST_KR01);
+	export_constant(EFST_STARFISH_JP);
 	export_constant(EFST_WEAPONBLOCK_ON);
 	export_constant(EFST_CRI_DAMAGE);
 	export_constant(EFST_DEF_POWER);
@@ -3770,12 +3817,17 @@
 	export_constant(EFST_BOW_ATK_POWER);
 	export_constant(EFST_RED_ORG_POTION);
 	export_constant(EFST_CAST_TIME);
+	export_constant(EFST_BLADESTOPREADY);
+	export_constant(EFST_TELEPORT_BR);
+	export_constant(EFST_SA_WEAPON_PROPERTY);
 	export_constant(EFST_LEAPIMPAIRED);
+	export_constant(EFST_SENDING_ITEMLIST);
 	export_constant(EFST_EXCLUSIVE_RECEIVEITEM);
 	export_constant(EFST_EXCLUSIVE_PLUSEXP);
 	export_constant(EFST_ASSUMPTIO_BUFF);
 	export_constant(EFST_BASILICA_BUFF);
 	export_constant(EFST_OVERLAPEXPUP2);
+	export_constant(EFST_STOPMOVE_IMMEDIATELY);
 	export_constant(EFST_SOULCURSE);
 	export_constant(EFST_SOUND_OF_DESTRUCTION);
 	export_constant(EFST_DF_MANAPLUS);
@@ -3785,17 +3837,26 @@
 	export_constant(EFST_NV_TRANSCENDENCE);
 	export_constant(EFST_SWEETSFAIR_ATK);
 	export_constant(EFST_SWEETSFAIR_MATK);
+	export_constant(EFST_REUSE_SKILL);
 	export_constant(EFST_FLOWER_LEAF2);
 	export_constant(EFST_FLOWER_LEAF3);
 	export_constant(EFST_FLOWER_LEAF4);
+	export_constant(EFST_CHARM_BOOST);
+	export_constant(EFST_EARTHSHAKER);
+	export_constant(EFST_PERIOD_USE_WORLDMAP);
 	export_constant(EFST_MISTY_FROST);
 	export_constant(EFST_MAGIC_POISON);
 	export_constant(EFST_KAUTE);
+	export_constant(EFST_REUSE_JPNONLY_LIMIT_I);
+	export_constant(EFST_REUSE_JPNONLY_LIMIT_J);
+	export_constant(EFST_REUSE_JPNONLY_LIMIT_K);
 	export_constant(EFST_JPNONLY_TACTICS);
+	export_constant(EFST_PRISON);
 	export_constant(EFST_MADOGEAR);
 	export_constant(EFST_DEADLY_DEFEASANCE);
 	export_constant(EFST_CLIMAX_DES_HU);
 	export_constant(EFST_CLIMAX);
+	export_constant(EFST_FEINTBOMB);
 	export_constant(EFST_LUXANIMA);
 	export_constant(EFST_BATH_FOAM_A);
 	export_constant(EFST_BATH_FOAM_B);
@@ -3810,6 +3871,7 @@
 	export_constant(EFST_HELLS_PLANT_ARMOR);
 	export_constant(EFST_RELIEVE_DAMAGE);
 	export_constant(EFST_LOCKON_LASER);
+	export_constant(EFST_GRADE_ENCHANT_UI_OPEN);
 	export_constant(EFST_REF_T_POTION);
 	export_constant(EFST_ADD_ATK_DAMAGE);
 	export_constant(EFST_ADD_MATK_DAMAGE);
@@ -3820,7 +3882,9 @@
 	export_constant(EFST_DRAGONIC_AURA);
 	export_constant(EFST_BIG_SCAR);
 	export_constant(EFST_VIGOR);
+	export_constant(EFST_WILL_OF_FAITH);
 	export_constant(EFST_PRESSURE);
+	export_constant(EFST_SA_DRAGONOLOGY);
 	export_constant(EFST_CLIMAX_EARTH);
 	export_constant(EFST_CLIMAX_BLOOM);
 	export_constant(EFST_CLIMAX_CRYIMP);
@@ -3828,6 +3892,7 @@
 	export_constant(EFST_MD_MA_POTION);
 	export_constant(EFST_MD_TA_POTION);
 	export_constant(EFST_MD_RA_POTION);
+	export_constant(EFST_REUSE_MEGAPHONE);
 	export_constant(EFST_HOLY_OIL);
 	export_constant(EFST_CRYSTAL_IMPACT);
 	export_constant(EFST_SHADOW_EXCEED);
@@ -3862,6 +3927,8 @@
 	export_constant(EFST_ULTIMATE_S);
 	export_constant(EFST_SPEAR_SCAR);
 	export_constant(EFST_SHIELD_POWER);
+	export_constant(EFST_FIDUS_ANIMUS);
+	export_constant(EFST_MACE_BOOK_M);
 	export_constant(EFST_SHADOW_WEAPON);
 	export_constant(EFST_RELIGIO);
 	export_constant(EFST_BENEDICTUM);
@@ -3882,12 +3949,14 @@
 	export_constant(EFST_ABYSS_DAGGER);
 	export_constant(EFST_ABYSSFORCEWEAPON);
 	export_constant(EFST_ABYSS_SLAYER);
+	export_constant(EFST_TWOHANDDEF);
 	export_constant(EFST_PROTECTSHADOWEQUIP);
 	export_constant(EFST_RESEARCHREPORT);
 	export_constant(EFST_BO_HELL_DUSTY);
 	export_constant(EFST_WINDSIGN);
 	export_constant(EFST_CRESCIVEBOLT);
 	export_constant(EFST_CALAMITYGALE);
+	export_constant(EFST_CRESCIVEBOLT3);
 	export_constant(EFST_STAGE_MANNER);
 	export_constant(EFST_RETROSPECTION);
 	export_constant(EFST_MYSTIC_SYMPHONY);
@@ -3899,6 +3968,7 @@
 	export_constant(EFST_JAWAII_SERENADE);
 	export_constant(EFST_PRON_MARCH);
 	export_constant(EFST_ROSEBLOSSOM);
+	export_constant(EFST_BO_BIONIC_PHARMACY_OPERATOR);
 	export_constant(EFST_ACIDIFIED_ZONE_WATER);
 	export_constant(EFST_ACIDIFIED_ZONE_GROUND);
 	export_constant(EFST_ACIDIFIED_ZONE_WIND);
@@ -3935,6 +4005,7 @@
 	export_constant(EFST_ABR_MOTHER_NET);
 	export_constant(EFST_ABR_INFINITY);
 	export_constant(EFST_ELEMENTAL_VEIL);
+	export_constant(EFST_RENOVATIO_EXT);
 	export_constant(EFST_HOMUN_TIME);
 	export_constant(EFST_POWER_ACCELERATION);
 	export_constant(EFST_MAX_HP_SP_AVOID);
@@ -3943,9 +4014,13 @@
 	export_constant(EFST_AID_PERIOD_MAX_HP_SP_AVOID);
 	export_constant(EFST_AID_PERIOD_ADD_ALL_STATE);
 	export_constant(EFST_POISON_MIST);
+	export_constant(EFST_HACKANDSLASHER);
+	export_constant(EFST_GET_CNT_UNREAD_RETURN_RODEX_CHARDB);
 	export_constant(EFST_STONE_WALL);
+	export_constant(EFST_REUSE_LIMIT_I);
 	export_constant(EFST_OVERBRANDREADY);
 	export_constant(EFST_SHIELDSPELL);
+	export_constant(EFST_AUTOSHADOWSPELL_CHECK2);
 	export_constant(EFST_CLOUD_POISON);
 	export_constant(EFST_SPORE_EXPLOSION_DEBUFF);
 	export_constant(EFST_DEFSCROLL);
@@ -4024,6 +4099,34 @@
 	export_constant(EFST_RUSH_QUAKE2);
 	export_constant(EFST_SBUNSHIN);
 	export_constant(EFST_MTP_W_POTION_100);
+	export_constant(EFST_CHANGE_SIZE);
+	export_constant(EFST_CHANGE_SIZE_MONSTER);
+	export_constant(EFST_SHOW_EFFECT1);
+	export_constant(EFST_SHOW_EFFECT2);
+	export_constant(EFST_SHOW_EFFECT3);
+	export_constant(EFST_VR_SPEED);
+	export_constant(EFST_VR_ASPD);
+	export_constant(EFST_VR_MHP);
+	export_constant(EFST_VR_MSP);
+	export_constant(EFST_VR_HIT);
+	export_constant(EFST_VR_DEF);
+	export_constant(EFST_VR_MDEF);
+	export_constant(EFST_VR_BOOK001);
+	export_constant(EFST_VR_BOOK002);
+	export_constant(EFST_VR_BOOK003);
+	export_constant(EFST_VR_BOOK004);
+	export_constant(EFST_REUSE_LIMIT_VR_BOOK);
+	export_constant(EFST_VR_BOOK005);
+	export_constant(EFST_VR_BOOK006);
+	export_constant(EFST_VR_BOOK007);
+	export_constant(EFST_VR_BOOK008);
+	export_constant(EFST_VR_BOOK009);
+	export_constant(EFST_ALL_T_STAT);
+	export_constant(EFST_P_ATK_PLUS);
+	export_constant(EFST_S_MATK_PLUS);
+	export_constant(EFST_C_RATE_PLUS);
+	export_constant(EFST_RESIST_PLUS);
+	export_constant(EFST_PVP_DUN_BUFF);
 /// @APIHOOK_END
 /// Do not modify code above this, since it will be automatically generated by the API again
 	export_constant(EFST_MAX);
@@ -7896,11 +7999,33 @@
 	export_constant_npc(JT_4_RAGFES_16);
 	export_constant_npc(JT_4_RAGFES_16_M);
 	export_constant_npc(JT_4_EXJOB_NINJA2);
+	export_constant_npc(JT_4_VR_BOOK_FAIRY);
 	export_constant_npc(JT_ROZ_MQ_LUCIAN);
 	export_constant_npc(JT_ROZ_MQ_BRITIA);
 	export_constant_npc(JT_ROZ_MQ_ASSASIN01);
 	export_constant_npc(JT_STRANGE_B_SMITH1);
 	export_constant_npc(JT_STRONGER_B_SMTIH);
+	export_constant_npc(JT_4_VR_BOOK_RED);
+	export_constant_npc(JT_4_VR_BOOK_BLUE);
+	export_constant_npc(JT_4_VR_BOOK_YELLOW);
+	export_constant_npc(JT_4_VR_BOOK_GREEN);
+	export_constant_npc(JT_4_VR_BOOK_WHITE);
+	export_constant_npc(JT_4_VR_YGNIZEM);
+	export_constant_npc(JT_4_JP_19TH);
+	export_constant_npc(JT_4_KING_PORING);
+	export_constant_npc(JT_4_VR_SWORDMAN_DEAD);
+	export_constant_npc(JT_GATE_SKYBLUE);
+	export_constant_npc(JT_4_CS_RIGEL);
+	export_constant_npc(JT_4_M_NILLEM);
+	export_constant_npc(JT_4_LARVA_RED);
+	export_constant_npc(JT_4_LARVA_YELLOW);
+	export_constant_npc(JT_4_LARVA_BLACK);
+	export_constant_npc(JT_4_LARVA_VIOLET);
+	export_constant_npc(JT_4_HERO_SAUSAGE);
+	export_constant_npc(JT_4_PRINCESS_SAUSAGE);
+	export_constant_npc(JT_ROZ_MQ_XAVIER);
+	export_constant_npc(JT_ROZ_MQ_MOCLORD);
+	export_constant_npc(JT_ROZ_MQ_SKULD);
 	export_constant_npc(JT_NEW_NPC_3RD_END);
 	#undef export_constant_npc
 
@@ -9202,6 +9327,7 @@
 	export_constant(HAT_EF_C_MELODY_WING);
 	export_constant(HAT_EF_C_SPOT_LIGHT);
 	export_constant(HAT_EF_C_ASTRA_BLESSING);
+	export_constant(HAT_EF_EFST_C_20TH_ANNIVERSARY_HAT);
 
 	/* pet catch */
 	export_constant(PET_CATCH_UNIVERSAL);

+ 142 - 74
src/map/status.hpp

@@ -2119,8 +2119,8 @@ enum efst_type : short{
 	EFST_DRESS_UP,
 	EFST_MAPLE_FALLS,
 	EFST_ALL_NIFLHEIM_RECALL,
-
-	EFST_MTF_MARIONETTE = 860,
+	EFST_MARKING_USE_CHANGEMONSTER,
+	EFST_MTF_MARIONETTE,
 	EFST_MTF_LUDE,
 	EFST_MTF_CRUISER,
 	EFST_MERMAID_LONGING,
@@ -2130,8 +2130,9 @@ enum efst_type : short{
 	EFST_LIMIT_POWER_BOOSTER,
 	EFST_GIFT_OF_SNOW,
 	EFST_NPC_HALLUCINATIONWALK,
-
-	EFST_TIME_ACCESSORY = 872,
+	EFST_NPC_HALLUCINATIONWALK_POSTDELAY,
+	EFST_NPC_XXXWALK,
+	EFST_TIME_ACCESSORY,
 	EFST_EP16_DEF,
 	EFST_NORMAL_ATKED_SP,
 	EFST_BODYSTATE_STONECURSE,
@@ -2193,8 +2194,8 @@ enum efst_type : short{
 	EFST_HELM_ASIR,
 	EFST_HELM_URJ,
 	EFST_SUHIDE,
-
-	EFST_DORAM_BUF_01 = 935,
+	EFST_REUSE_LIMIT_MG,
+	EFST_DORAM_BUF_01,
 	EFST_DORAM_BUF_02,
 	EFST_SPRITEMABLE,
 	EFST_AID_PERIOD_RECEIVEITEM,
@@ -2205,15 +2206,22 @@ enum efst_type : short{
 	EFST_ALL_GLASTHEIM_RECALL,
 	EFST_REUSE_LIMIT_PEPO_MD,
 	EFST_ALL_THANATOS_RECALL,
-
-	EFST_MAGICSTONE_OF_GRACE_SET = 948,
-
-	EFST_HISS = 950,
-
-	EFST_NYANGGRASS = 952,
+	EFST_KAFRA_STORE,
+	EFST_REUSE_ABBYS,
+	EFST_MAGICSTONE_OF_GRACE_SET,
+	EFST_PRIVATE_AIRPLANE,
+	EFST_HISS,
+	EFST_HISS_AVOID,
+	EFST_NYANGGRASS,
 	EFST_CHATTERING,
-
-	EFST_GROOMING = 961,
+	EFST_CHATTERING_OPT_ATK_MATK,
+	EFST_CHATTERING_OPT_HASTE,
+	EFST_SPIRITOFLAND_STEMSPEAR,
+	EFST_SPIRITOFLAND_ROOTTWIST,
+	EFST_SPIRITOFLAND_POWDERING,
+	EFST_SPIRITOFLAND_METEOR,
+	EFST_SPIRITOFLAND_NYANGGRASS,
+	EFST_GROOMING,
 	EFST_PROTECTIONOFSHRIMP,
 	EFST_EP16_2_BUFF_SS,
 	EFST_EP16_2_BUFF_SC,
@@ -2221,8 +2229,9 @@ enum efst_type : short{
 	EFST_GS_MAGICAL_BULLET,
 
 	EFST_FALLEN_ANGEL = 976,
-
-	EFST_BLAZE_BEAD = 979,
+	EFST_REUSE_LIMIT_MOVEPOINT,
+	EFST_MACRO_DETECTOR_ANSWER_WAITING,
+	EFST_BLAZE_BEAD,
 	EFST_FROZEN_BEAD,
 	EFST_BREEZE_BEAD,
 	EFST_SOULATTACK,
@@ -2230,24 +2239,33 @@ enum efst_type : short{
 	EFST_AID_PERIOD_PLUSEXP_2ND,
 	EFST_AID_PERIOD_PLUSJOBEXP_2ND,
 	EFST_PRONTERA_JP,
-
-	EFST_GLOOM_CARD = 988,
+	EFST_ASSISTANT_VENDING,
+	EFST_GLOOM_CARD,
 	EFST_PHARAOH_CARD,
 	EFST_KIEL_CARD,
-
-	EFST_CHEERUP = 992,
+	EFST_ASSISTANT_BUYING,
+	EFST_CHEERUP,
 	EFST_GET_CNT_UNREAD_RODEX_CHARDB,
 	EFST_GET_CNT_UNREAD_RODEX_GLOBALDB,
 	EFST_S_MANAPOTION,
 	EFST_M_DEFSCROLL,
-
-	EFST_AS_RAGGED_GOLEM_CARD = 1000,
+	EFST_OPEN_REFINING_UI,
+	EFST_ALL_LIGHTHALZEN_RECALL,
+	EFST_SWAP_EQUIPITEM,
+	EFST_AS_RAGGED_GOLEM_CARD,
 	EFST_LHZ_DUN_N1,
 	EFST_LHZ_DUN_N2,
 	EFST_LHZ_DUN_N3,
 	EFST_LHZ_DUN_N4,
-
-	EFST_ALL_STAT_DOWN = 1013,
+	EFST_TAEKWON_MISSION,
+	EFST_SUN_PLACE,
+	EFST_MOON_PLACE,
+	EFST_STAR_PLACE,
+	EFST_SUN_MONSTER,
+	EFST_MOON_MONSTER,
+	EFST_STAR_MONSTER,
+	EFST_AL_WARP_ADDSLOT,
+	EFST_ALL_STAT_DOWN,
 	EFST_GRADUAL_GRAVITY,
 	EFST_DAMAGE_HEAL,
 	EFST_IMMUNE_PROPERTY_NOTHING,
@@ -2285,8 +2303,9 @@ enum efst_type : short{
 	EFST_FALLINGSTAR,
 	EFST_NOVAEXPLOSING,
 	EFST_GRAVITYCONTROL,
-
-	EFST_SOULCOLLECT = 1053,
+	XXX_EFST_WORLDSTORE_ACTIVE,
+	EFST_WORLDSTORE_ITEMMOVEINFO_SENDCOMPLETE,
+	EFST_SOULCOLLECT,
 	EFST_SOULREAPER,
 	EFST_SOULUNITY,
 	EFST_SOULSHADOW,
@@ -2315,37 +2334,50 @@ enum efst_type : short{
 	EFST_REUSE_LIMIT_TBG,
 	EFST_REUSE_LIMIT_TBM,
 	EFST_YGGDRASIL_BLESS,
-
-	EFST_HUNTING_EVENT = 1083,
+	EFST_USE_SKILL_SP_SWHOO,
+	EFST_HUNTING_EVENT,
 	EFST_PERIOD_RECEIVEITEM_2ND,
 	EFST_PERIOD_PLUSEXP_2ND,
 	EFST_EXPDROPUP,
 	EFST_TW_NEWYEAR_EVENT,
 	EFST_ENSEMBLEFATIGUE,
 	EFST_ADAPTATION,
-
-	EFST_ANCILLA = 1095,
-
-	EFST_FESTIVE_ENERGY = 1104,
+	EFST_DANCINGLESSON,
+	EFST_MUSICALLESSON,
+	EFST_REUSE_LIMIT_RC,
+	EFST_DANCINGLESSON_EQUIPPED,
+	EFST_MUSICALLESSON_EQUIPPED,
+	EFST_ANCILLA,
+	EFST_REUSE_LIMIT_POTION_A,
+	EFST_REUSE_LIMIT_POTION_B,
+	EFST_REUSE_LIMIT_POTION_C,
+	EFST_REUSE_LIMIT_POTION_D,
+	EFST_REUSE_LIMIT_POTION_E,
+	EFST_REUSE_LIMIT_POTION_F,
+	EFST_BRAVESET,
+	EFST_MACEMASTERY_EQUIPPED,
+	EFST_FESTIVE_ENERGY,
 	EFST_TEST_KR01,
-
-	EFST_WEAPONBLOCK_ON = 1107,
+	EFST_STARFISH_JP,
+	EFST_WEAPONBLOCK_ON,
 	EFST_CRI_DAMAGE,
 	EFST_DEF_POWER,
 	EFST_DEF_IGNORE,
 	EFST_BOW_ATK_POWER,
 	EFST_RED_ORG_POTION,
 	EFST_CAST_TIME,
-
-	EFST_LEAPIMPAIRED = 1117,
-
-	EFST_EXCLUSIVE_RECEIVEITEM = 1119,
+	EFST_BLADESTOPREADY,
+	EFST_TELEPORT_BR,
+	EFST_SA_WEAPON_PROPERTY,
+	EFST_LEAPIMPAIRED,
+	EFST_SENDING_ITEMLIST,
+	EFST_EXCLUSIVE_RECEIVEITEM,
 	EFST_EXCLUSIVE_PLUSEXP,
 	EFST_ASSUMPTIO_BUFF,
 	EFST_BASILICA_BUFF,
 	EFST_OVERLAPEXPUP2,
-
-	EFST_SOULCURSE = 1125,
+	EFST_STOPMOVE_IMMEDIATELY,
+	EFST_SOULCURSE,
 	EFST_SOUND_OF_DESTRUCTION,
 	EFST_DF_MANAPLUS,
 	EFST_DF_FULLSWINGK,
@@ -2354,23 +2386,27 @@ enum efst_type : short{
 	EFST_NV_TRANSCENDENCE,
 	EFST_SWEETSFAIR_ATK,
 	EFST_SWEETSFAIR_MATK,
-
-	EFST_FLOWER_LEAF2 = 1135,
+	EFST_REUSE_SKILL,
+	EFST_FLOWER_LEAF2,
 	EFST_FLOWER_LEAF3,
 	EFST_FLOWER_LEAF4,
-
-	EFST_MISTY_FROST = 1141,
+	EFST_CHARM_BOOST,
+	EFST_EARTHSHAKER,
+	EFST_PERIOD_USE_WORLDMAP,
+	EFST_MISTY_FROST,
 	EFST_MAGIC_POISON,
 	EFST_KAUTE,
-
-	EFST_JPNONLY_TACTICS = 1147,
-
-	EFST_MADOGEAR = 1149,
+	EFST_REUSE_JPNONLY_LIMIT_I,
+	EFST_REUSE_JPNONLY_LIMIT_J,
+	EFST_REUSE_JPNONLY_LIMIT_K,
+	EFST_JPNONLY_TACTICS,
+	EFST_PRISON,
+	EFST_MADOGEAR,
 	EFST_DEADLY_DEFEASANCE,
 	EFST_CLIMAX_DES_HU,
 	EFST_CLIMAX,
-
-	EFST_LUXANIMA = 1154,
+	EFST_FEINTBOMB,
+	EFST_LUXANIMA,
 	EFST_BATH_FOAM_A,
 	EFST_BATH_FOAM_B,
 	EFST_BATH_FOAM_C,
@@ -2384,8 +2420,8 @@ enum efst_type : short{
 	EFST_HELLS_PLANT_ARMOR,
 	EFST_RELIEVE_DAMAGE,
 	EFST_LOCKON_LASER,
-
-	EFST_REF_T_POTION = 1169,
+	EFST_GRADE_ENCHANT_UI_OPEN,
+	EFST_REF_T_POTION,
 	EFST_ADD_ATK_DAMAGE,
 	EFST_ADD_MATK_DAMAGE,
 	EFST_SERVANTWEAPON,
@@ -2395,18 +2431,18 @@ enum efst_type : short{
 	EFST_DRAGONIC_AURA,
 	EFST_BIG_SCAR,
 	EFST_VIGOR,
-
-	EFST_PRESSURE = 1180,
-
-	EFST_CLIMAX_EARTH = 1182,
+	EFST_WILL_OF_FAITH,
+	EFST_PRESSURE,
+	EFST_SA_DRAGONOLOGY,
+	EFST_CLIMAX_EARTH,
 	EFST_CLIMAX_BLOOM,
 	EFST_CLIMAX_CRYIMP,
 	EFST_MD_ME_POTION,
 	EFST_MD_MA_POTION,
 	EFST_MD_TA_POTION,
 	EFST_MD_RA_POTION,
-
-	EFST_HOLY_OIL = 1190,
+	EFST_REUSE_MEGAPHONE,
+	EFST_HOLY_OIL,
 	EFST_CRYSTAL_IMPACT,
 	EFST_SHADOW_EXCEED,
 	EFST_DANCING_KNIFE,
@@ -2440,8 +2476,9 @@ enum efst_type : short{
 	EFST_ULTIMATE_S,
 	EFST_SPEAR_SCAR,
 	EFST_SHIELD_POWER,
-
-	EFST_SHADOW_WEAPON = 1226,
+	EFST_FIDUS_ANIMUS,
+	EFST_MACE_BOOK_M,
+	EFST_SHADOW_WEAPON,
 	EFST_RELIGIO,
 	EFST_BENEDICTUM,
 	EFST_MVPCARD_KIEL,
@@ -2461,15 +2498,15 @@ enum efst_type : short{
 	EFST_ABYSS_DAGGER,
 	EFST_ABYSSFORCEWEAPON,
 	EFST_ABYSS_SLAYER,
-
-	EFST_PROTECTSHADOWEQUIP = 1247,
+	EFST_TWOHANDDEF,
+	EFST_PROTECTSHADOWEQUIP,
 	EFST_RESEARCHREPORT,
 	EFST_BO_HELL_DUSTY,
 	EFST_WINDSIGN,
 	EFST_CRESCIVEBOLT,
 	EFST_CALAMITYGALE,
-
-	EFST_STAGE_MANNER = 1254,
+	EFST_CRESCIVEBOLT3,
+	EFST_STAGE_MANNER,
 	EFST_RETROSPECTION,
 	EFST_MYSTIC_SYMPHONY,
 	EFST_KVASIR_SONATA,
@@ -2480,8 +2517,8 @@ enum efst_type : short{
 	EFST_JAWAII_SERENADE,
 	EFST_PRON_MARCH,
 	EFST_ROSEBLOSSOM,
-
-	EFST_ACIDIFIED_ZONE_WATER = 1266,
+	EFST_BO_BIONIC_PHARMACY_OPERATOR,
+	EFST_ACIDIFIED_ZONE_WATER,
 	EFST_ACIDIFIED_ZONE_GROUND,
 	EFST_ACIDIFIED_ZONE_WIND,
 	EFST_ACIDIFIED_ZONE_FIRE,
@@ -2517,8 +2554,8 @@ enum efst_type : short{
 	EFST_ABR_MOTHER_NET,
 	EFST_ABR_INFINITY,
 	EFST_ELEMENTAL_VEIL,
-
-	EFST_HOMUN_TIME = 1303,
+	EFST_RENOVATIO_EXT,
+	EFST_HOMUN_TIME,
 	EFST_POWER_ACCELERATION,
 	EFST_MAX_HP_SP_AVOID,
 	EFST_ADD_ALL_STATE,
@@ -2526,13 +2563,14 @@ enum efst_type : short{
 	EFST_AID_PERIOD_MAX_HP_SP_AVOID,
 	EFST_AID_PERIOD_ADD_ALL_STATE,
 	EFST_POISON_MIST,
-
-	EFST_STONE_WALL = 1313,
-
-	EFST_OVERBRANDREADY = 1315,
+	EFST_HACKANDSLASHER,
+	EFST_GET_CNT_UNREAD_RETURN_RODEX_CHARDB,
+	EFST_STONE_WALL,
+	EFST_REUSE_LIMIT_I,
+	EFST_OVERBRANDREADY,
 	EFST_SHIELDSPELL,
-
-	EFST_CLOUD_POISON = 1318,
+	EFST_AUTOSHADOWSPELL_CHECK2,
+	EFST_CLOUD_POISON,
 	EFST_SPORE_EXPLOSION_DEBUFF,
 
 	EFST_DEFSCROLL = 1321,
@@ -2617,6 +2655,36 @@ enum efst_type : short{
 	EFST_SBUNSHIN = 1415,
 
 	EFST_MTP_W_POTION_100 = 1418,
+
+	EFST_CHANGE_SIZE = 1420,
+	EFST_CHANGE_SIZE_MONSTER,
+	EFST_SHOW_EFFECT1,
+	EFST_SHOW_EFFECT2,
+	EFST_SHOW_EFFECT3,
+	EFST_VR_SPEED,
+	EFST_VR_ASPD,
+	EFST_VR_MHP,
+	EFST_VR_MSP,
+	EFST_VR_HIT,
+	EFST_VR_DEF,
+	EFST_VR_MDEF,
+	EFST_VR_BOOK001,
+	EFST_VR_BOOK002,
+	EFST_VR_BOOK003,
+	EFST_VR_BOOK004,
+	EFST_REUSE_LIMIT_VR_BOOK,
+
+	EFST_VR_BOOK005 = 1439,
+	EFST_VR_BOOK006,
+	EFST_VR_BOOK007,
+	EFST_VR_BOOK008,
+	EFST_VR_BOOK009,
+	EFST_ALL_T_STAT,
+	EFST_P_ATK_PLUS,
+	EFST_S_MATK_PLUS,
+	EFST_C_RATE_PLUS,
+	EFST_RESIST_PLUS,
+	EFST_PVP_DUN_BUFF,
 /// @APIHOOK_END
 /// Do not modify code above this, since it will be automatically generated by the API again
 	EFST_MAX,