Browse Source

Added latest constants and names (#6407)

Lemongrass3110 3 years ago
parent
commit
46827c1d63
4 changed files with 335 additions and 4 deletions
  1. 130 0
      db/re/mob_db.yml
  2. 50 2
      src/map/npc.hpp
  3. 100 0
      src/map/script_constants.hpp
  4. 55 2
      src/map/status.hpp

+ 130 - 0
db/re/mob_db.yml

@@ -90113,6 +90113,28 @@ Body:
 #    AegisName: E_ALICE_TW
 #  - Id: 21438
 #    AegisName: E_FARMILIAR_TW
+#  - Id: 21439
+#    AegisName: MD_OTARGET
+#  - Id: 21440
+#    AegisName: MD_XTARGET
+#  - Id: 21441
+#    AegisName: MD_HLGR_HEARTHUNTER
+#  - Id: 21442
+#    AegisName: MD_HLGR_BELLARE
+#  - Id: 21443
+#    AegisName: MD_HLGR_SANARE
+#  - Id: 21444
+#    AegisName: MD_NINJA_GHOST
+#  - Id: 21445
+#    AegisName: MD_HAPPY_CLOUD
+#  - Id: 21446
+#    AegisName: MD_MR_SEO
+#  - Id: 21447
+#    AegisName: MD_SOL
+#  - Id: 21448
+#    AegisName: MD_HO
+#  - Id: 21449
+#    AegisName: MD_SANGOON
 #  - Id: 21450
 #    AegisName: SEASON_MOB_051
 #  - Id: 21451
@@ -90235,8 +90257,74 @@ Body:
 #    AegisName: MD_COMMON
 #  - Id: 21547
 #    AegisName: M_INCREASE_SOIL
+#  - Id: 21548
+#    AegisName: ECO_CORNUS
+#  - Id: 21549
+#    AegisName: ECO_PINGUICULA
+#  - Id: 21550
+#    AegisName: ECO_HUNTER_FLY
+#  - Id: 21551
+#    AegisName: ECO_ROCKER
+#  - Id: 21552
+#    AegisName: ECO_SAVAGE
+#  - Id: 21553
+#    AegisName: ECO_FLORA
+#  - Id: 21554
+#    AegisName: ECO_HILL_WIND
+#  - Id: 21555
+#    AegisName: ECO_MISTRESS
+#  - Id: 21556
+#    AegisName: ECO_EXPLOSION
+#  - Id: 21557
+#    AegisName: ECO_DELETER
+#  - Id: 21558
+#    AegisName: ECO_JAKK
+#  - Id: 21559
+#    AegisName: ECO_LAVA_GOLEM
+#  - Id: 21560
+#    AegisName: ECO_MAJORUROS
+#  - Id: 21561
+#    AegisName: ECO_HYDRO
+#  - Id: 21562
+#    AegisName: ECO_ACIDUS
+#  - Id: 21563
+#    AegisName: ECO_DETALE
+#  - Id: 21564
+#    AegisName: ECO_ICE_TITAN
+#  - Id: 21565
+#    AegisName: ECO_SIROMA
+#  - Id: 21566
+#    AegisName: ECO_SNOWIER
+#  - Id: 21567
+#    AegisName: ECO_CENTIPEDE
+#  - Id: 21568
+#    AegisName: ECO_AQUA_ELEMENTAL
+#  - Id: 21569
+#    AegisName: ECO_ANGELGOLT
+#  - Id: 21570
+#    AegisName: ECO_RHYNCHO
+#  - Id: 21571
+#    AegisName: ECO_KTULLANUX
+#  - Id: 21572
+#    AegisName: ECO_ANCIENT_MUMMY
+#  - Id: 21573
+#    AegisName: ECO_LUDE
+#  - Id: 21574
+#    AegisName: ECO_RAGGED_ZOMBIE
+#  - Id: 21575
+#    AegisName: ECO_WRAITH
+#  - Id: 21576
+#    AegisName: ECO_FLAME_SKULL
+#  - Id: 21577
+#    AegisName: ECO_BANSHEE
+#  - Id: 21578
+#    AegisName: ECO_KNIGHT_OF_ABYSS
+#  - Id: 21579
+#    AegisName: ECO_LORD_OF_DEATH
 #  - Id: 21580
 #    AegisName: G_BIJOU
+#  - Id: 21587
+#    AegisName: NPC_EDDGA
 #  - Id: 22328
 #    AegisName: DESERT_WOLF_RAC
 #  - Id: 22329
@@ -90245,6 +90333,48 @@ Body:
 #    AegisName: GREMLIN_RAC
 #  - Id: 22331
 #    AegisName: BEHOLDER_RAC
+#  - Id: 22332
+#    AegisName: MQ_KIND_OF_BEETLE
+#  - Id: 22333
+#    AegisName: MQ_FRILLDORA
+#  - Id: 22334
+#    AegisName: MQ_SAND_MAN
+#  - Id: 22335
+#    AegisName: MQ_SAKRAY
+#  - Id: 22336
+#    AegisName: MQ_CRAB
+#  - Id: 22337
+#    AegisName: MQ_SHELLFISH
+#  - Id: 22338
+#    AegisName: MQ_GALAPAGO
+#  - Id: 22339
+#    AegisName: MQ_FUR_SEAL
+#  - Id: 22340
+#    AegisName: MQ_SEE_OTTER
+#  - Id: 22341
+#    AegisName: MQ_PIERE
+#  - Id: 22342
+#    AegisName: MQ_ANDRE
+#  - Id: 22343
+#    AegisName: MQ_DENIRO
+#  - Id: 22344
+#    AegisName: MQ_GOLEM
+#  - Id: 22345
+#    AegisName: MQ_DUSTINESS
+#  - Id: 22346
+#    AegisName: MQ_MANTIS
+#  - Id: 22347
+#    AegisName: MQ_GEOGRAPHER
+#  - Id: 22348
+#    AegisName: MQ_SCORPION_KING
+#  - Id: 22349
+#    AegisName: MQ_KIND_OF_BEETLE1
+#  - Id: 22350
+#    AegisName: MQ_KIND_OF_BEETLE2
+#  - Id: 22351
+#    AegisName: MQ_KIND_OF_BEETLE3
+#  - Id: 22352
+#    AegisName: MQ_KIND_OF_BEETLE4
 #  - Id: 31999
 #    AegisName: HUNTING_GID_DEFAULT
 #  - Id: 32000

+ 50 - 2
src/map/npc.hpp

@@ -1260,8 +1260,16 @@ enum e_job_types
 	JT_4_POINT_YELLOW,
 	JT_4_POINT_BLACK,
 	JT_4_POINT_WHITE,
-
-	JT_1_JOURNEY_STONE_D = 10442,
+	JT_4_EXJOB_GERHOLD,
+	JT_4_EXJOB_NINJA,
+	JT_4_EXJOB_MASTER_J,
+	JT_4_EXJOB_MR_SEO,
+	JT_4_EXJOB_HAPPY_CLOUD,
+	JT_4_EXJOB_STAR,
+	JT_4_EXJOB_CHUL_HO,
+	JT_4_EXJOB_KI_SUL,
+	JT_4_EXJOB_HYUN_ROK,
+	JT_1_JOURNEY_STONE_D,
 	JT_1_JOURNEY_STONE_F,
 	JT_ROZ_MQ_SIGRUN,
 	JT_ROZ_MQ_SIGRUN_S,
@@ -1271,6 +1279,46 @@ enum e_job_types
 	JT_ROZ_MQ_SUPIGEL,
 	JT_ROZ_MQ_DEADSOLDIER,
 
+	JT_1_RAGFES_01 = 10476,
+	JT_1_RAGFES_01_M,
+	JT_4_RAGFES_02,
+	JT_4_RAGFES_02_M,
+	JT_4_RAGFES_03,
+	JT_4_RAGFES_03_M,
+	JT_4_RAGFES_04,
+	JT_4_RAGFES_04_M,
+	JT_4_RAGFES_05,
+	JT_4_RAGFES_05_M,
+	JT_4_RAGFES_06,
+	JT_4_RAGFES_06_M,
+	JT_4_RAGFES_07,
+	JT_4_RAGFES_07_M,
+	JT_4_RAGFES_08,
+	JT_4_RAGFES_08_M,
+	JT_4_RAGFES_09,
+	JT_4_RAGFES_09_M,
+	JT_4_RAGFES_10,
+	JT_4_RAGFES_10_M,
+	JT_4_RAGFES_11,
+	JT_4_RAGFES_11_M,
+	JT_4_RAGFES_12,
+	JT_4_RAGFES_12_M,
+	JT_4_RAGFES_13,
+	JT_4_RAGFES_13_M,
+	JT_4_RAGFES_14,
+	JT_4_RAGFES_14_M,
+	JT_4_RAGFES_15,
+	JT_4_RAGFES_15_M,
+	JT_4_RAGFES_16,
+	JT_4_RAGFES_16_M,
+	JT_4_EXJOB_NINJA2,
+
+	JT_ROZ_MQ_LUCIAN = 10510,
+	JT_ROZ_MQ_BRITIA,
+	JT_ROZ_MQ_ASSASIN01,
+	JT_STRANGE_B_SMITH1,
+	JT_STRONGER_B_SMTIH,
+
 	JT_NEW_NPC_3RD_END = 19999,
 	NPC_RANGE3_END, // Official: JT_NEW_NPC_3RD_END=19999
 

+ 100 - 0
src/map/script_constants.hpp

@@ -3745,6 +3745,58 @@
 	export_constant(EFST_TOXIN_OF_MANDARA);
 	export_constant(EFST_GOLDENE_TONE);
 	export_constant(EFST_TEMPERING);
+	export_constant(EFST_NW_P_F_I);
+	export_constant(EFST_INTENSIVE_AIM);
+	export_constant(EFST_INTENSIVE_AIM_COUNT);
+	export_constant(EFST_GRENADE_FRAGMENT_1);
+	export_constant(EFST_GRENADE_FRAGMENT_2);
+	export_constant(EFST_GRENADE_FRAGMENT_3);
+	export_constant(EFST_GRENADE_FRAGMENT_4);
+	export_constant(EFST_GRENADE_FRAGMENT_5);
+	export_constant(EFST_GRENADE_FRAGMENT_6);
+	export_constant(EFST_AUTO_FIRING_LAUNCHEREFST);
+	export_constant(EFST_HIDDEN_CARD);
+	export_constant(EFST_NW_GRENADE_MASTERY);
+	export_constant(EFST_TALISMAN_OF_PROTECTION);
+	export_constant(EFST_TALISMAN_OF_WARRIOR);
+	export_constant(EFST_TALISMAN_OF_MAGICIAN);
+	export_constant(EFST_TALISMAN_OF_FIVE_ELEMENTS);
+	export_constant(EFST_T_FIRST_GOD);
+	export_constant(EFST_T_SECOND_GOD);
+	export_constant(EFST_T_THIRD_GOD);
+	export_constant(EFST_T_FOURTH_GOD);
+	export_constant(EFST_T_FIVETH_GOD);
+	export_constant(EFST_HEAVEN_AND_EARTH);
+	export_constant(EFST_HOGOGONG);
+	export_constant(EFST_MARINE_FESTIVAL);
+	export_constant(EFST_SANDY_FESTIVAL);
+	export_constant(EFST_KI_SUL_RAMPAGE);
+	export_constant(EFST_COLORS_OF_HYUN_ROK_1);
+	export_constant(EFST_COLORS_OF_HYUN_ROK_2);
+	export_constant(EFST_COLORS_OF_HYUN_ROK_3);
+	export_constant(EFST_COLORS_OF_HYUN_ROK_4);
+	export_constant(EFST_COLORS_OF_HYUN_ROK_5);
+	export_constant(EFST_COLORS_OF_HYUN_ROK_6);
+	export_constant(EFST_COLORS_OF_HYUN_ROK_BUFF);
+	export_constant(EFST_TEMPORARY_COMMUNION);
+	export_constant(EFST_BLESSING_OF_M_CREATURES);
+	export_constant(EFST_BLESSING_OF_M_C_DEBUFF);
+	export_constant(EFST_SHIELDCHAINRUSH);
+	export_constant(EFST_MISTYFROST);
+	export_constant(EFST_GROUNDGRAVITY);
+	export_constant(EFST_BREAKINGLIMIT);
+	export_constant(EFST_RULEBREAK);
+	export_constant(EFST_RISING_SUN);
+	export_constant(EFST_NOON_SUN);
+	export_constant(EFST_SUNSET_SUN);
+	export_constant(EFST_RISING_MOON);
+	export_constant(EFST_MIDNIGHT_MOON);
+	export_constant(EFST_DAWN_MOON);
+	export_constant(EFST_STAR_BURST);
+	export_constant(EFST_SKY_ENCHANT);
+	export_constant(EFST_SHADOW_CLOCK);
+	export_constant(EFST_SHINKIROU_CALL);
+	export_constant(EFST_NIGHTMARE);
 	export_constant(EFST_NOODLE_FES_1);
 	export_constant(EFST_NOODLE_FES_2);
 	export_constant(EFST_NOODLE_FES_3);
@@ -3752,6 +3804,7 @@
 	export_constant(EFST_NOODLE_FES_5);
 	export_constant(EFST_RUSH_QUAKE1);
 	export_constant(EFST_RUSH_QUAKE2);
+	export_constant(EFST_SBUNSHIN);
 /// @APIHOOK_END
 /// Do not modify code above this, since it will be automatically generated by the API again
 	export_constant(EFST_MAX);
@@ -6456,6 +6509,15 @@
 	export_constant_npc(JT_4_POINT_YELLOW);
 	export_constant_npc(JT_4_POINT_BLACK);
 	export_constant_npc(JT_4_POINT_WHITE);
+	export_constant_npc(JT_4_EXJOB_GERHOLD);
+	export_constant_npc(JT_4_EXJOB_NINJA);
+	export_constant_npc(JT_4_EXJOB_MASTER_J);
+	export_constant_npc(JT_4_EXJOB_MR_SEO);
+	export_constant_npc(JT_4_EXJOB_HAPPY_CLOUD);
+	export_constant_npc(JT_4_EXJOB_STAR);
+	export_constant_npc(JT_4_EXJOB_CHUL_HO);
+	export_constant_npc(JT_4_EXJOB_KI_SUL);
+	export_constant_npc(JT_4_EXJOB_HYUN_ROK);
 	export_constant_npc(JT_1_JOURNEY_STONE_D);
 	export_constant_npc(JT_1_JOURNEY_STONE_F);
 	export_constant_npc(JT_ROZ_MQ_SIGRUN);
@@ -6465,6 +6527,44 @@
 	export_constant_npc(JT_ROZ_MQ_SAHARIO);
 	export_constant_npc(JT_ROZ_MQ_SUPIGEL);
 	export_constant_npc(JT_ROZ_MQ_DEADSOLDIER);
+	export_constant_npc(JT_1_RAGFES_01);
+	export_constant_npc(JT_1_RAGFES_01_M);
+	export_constant_npc(JT_4_RAGFES_02);
+	export_constant_npc(JT_4_RAGFES_02_M);
+	export_constant_npc(JT_4_RAGFES_03);
+	export_constant_npc(JT_4_RAGFES_03_M);
+	export_constant_npc(JT_4_RAGFES_04);
+	export_constant_npc(JT_4_RAGFES_04_M);
+	export_constant_npc(JT_4_RAGFES_05);
+	export_constant_npc(JT_4_RAGFES_05_M);
+	export_constant_npc(JT_4_RAGFES_06);
+	export_constant_npc(JT_4_RAGFES_06_M);
+	export_constant_npc(JT_4_RAGFES_07);
+	export_constant_npc(JT_4_RAGFES_07_M);
+	export_constant_npc(JT_4_RAGFES_08);
+	export_constant_npc(JT_4_RAGFES_08_M);
+	export_constant_npc(JT_4_RAGFES_09);
+	export_constant_npc(JT_4_RAGFES_09_M);
+	export_constant_npc(JT_4_RAGFES_10);
+	export_constant_npc(JT_4_RAGFES_10_M);
+	export_constant_npc(JT_4_RAGFES_11);
+	export_constant_npc(JT_4_RAGFES_11_M);
+	export_constant_npc(JT_4_RAGFES_12);
+	export_constant_npc(JT_4_RAGFES_12_M);
+	export_constant_npc(JT_4_RAGFES_13);
+	export_constant_npc(JT_4_RAGFES_13_M);
+	export_constant_npc(JT_4_RAGFES_14);
+	export_constant_npc(JT_4_RAGFES_14_M);
+	export_constant_npc(JT_4_RAGFES_15);
+	export_constant_npc(JT_4_RAGFES_15_M);
+	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_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_NEW_NPC_3RD_END);
 	#undef export_constant_npc
 

+ 55 - 2
src/map/status.hpp

@@ -2322,8 +2322,59 @@ enum efst_types : short{
 	EFST_TOXIN_OF_MANDARA = 1341,
 	EFST_GOLDENE_TONE,
 	EFST_TEMPERING,
-
-	EFST_NOODLE_FES_1 = 1396,
+	EFST_NW_P_F_I,
+	EFST_INTENSIVE_AIM,
+	EFST_INTENSIVE_AIM_COUNT,
+	EFST_GRENADE_FRAGMENT_1,
+	EFST_GRENADE_FRAGMENT_2,
+	EFST_GRENADE_FRAGMENT_3,
+	EFST_GRENADE_FRAGMENT_4,
+	EFST_GRENADE_FRAGMENT_5,
+	EFST_GRENADE_FRAGMENT_6,
+	EFST_AUTO_FIRING_LAUNCHEREFST,
+	EFST_HIDDEN_CARD,
+	EFST_NW_GRENADE_MASTERY,
+	EFST_TALISMAN_OF_PROTECTION,
+	EFST_TALISMAN_OF_WARRIOR,
+	EFST_TALISMAN_OF_MAGICIAN,
+	EFST_TALISMAN_OF_FIVE_ELEMENTS,
+	EFST_T_FIRST_GOD,
+	EFST_T_SECOND_GOD,
+	EFST_T_THIRD_GOD,
+	EFST_T_FOURTH_GOD,
+	EFST_T_FIVETH_GOD,
+	EFST_HEAVEN_AND_EARTH,
+	EFST_HOGOGONG,
+	EFST_MARINE_FESTIVAL,
+	EFST_SANDY_FESTIVAL,
+	EFST_KI_SUL_RAMPAGE,
+	EFST_COLORS_OF_HYUN_ROK_1,
+	EFST_COLORS_OF_HYUN_ROK_2,
+	EFST_COLORS_OF_HYUN_ROK_3,
+	EFST_COLORS_OF_HYUN_ROK_4,
+	EFST_COLORS_OF_HYUN_ROK_5,
+	EFST_COLORS_OF_HYUN_ROK_6,
+	EFST_COLORS_OF_HYUN_ROK_BUFF,
+	EFST_TEMPORARY_COMMUNION,
+	EFST_BLESSING_OF_M_CREATURES,
+	EFST_BLESSING_OF_M_C_DEBUFF,
+	EFST_SHIELDCHAINRUSH,
+	EFST_MISTYFROST,
+	EFST_GROUNDGRAVITY,
+	EFST_BREAKINGLIMIT,
+	EFST_RULEBREAK,
+	EFST_RISING_SUN,
+	EFST_NOON_SUN,
+	EFST_SUNSET_SUN,
+	EFST_RISING_MOON,
+	EFST_MIDNIGHT_MOON,
+	EFST_DAWN_MOON,
+	EFST_STAR_BURST,
+	EFST_SKY_ENCHANT,
+	EFST_SHADOW_CLOCK,
+	EFST_SHINKIROU_CALL,
+	EFST_NIGHTMARE,
+	EFST_NOODLE_FES_1,
 	EFST_NOODLE_FES_2,
 	EFST_NOODLE_FES_3,
 	EFST_NOODLE_FES_4,
@@ -2331,6 +2382,8 @@ enum efst_types : short{
 
 	EFST_RUSH_QUAKE1 = 1402,
 	EFST_RUSH_QUAKE2,
+
+	EFST_SBUNSHIN = 1415,
 /// @APIHOOK_END
 /// Do not modify code above this, since it will be automatically generated by the API again
 	EFST_MAX,