Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New NPC, Hateffects & Skill Constants (#8656)

Browse Source
This commit is contained in:
AoShinHo 2024-09-18 12:28:21 -03:00 committed by GitHub
parent 7880596b03
commit fa145ac838
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 69 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/map/npc.hpp
View File

@ -1528,6 +1528,11 @@ enum e_job_types
JT_4_EP21_TAN_S,
JT_4_M_VACATION_MARAM = 10595,
JT_4_CLB_SS_FC,
JT_4_CLB_SS_TZ,
JT_4_CLB_SS_AJ,
JT_4_CLB_SS_LK,
JT_4_SMART_ANDRE,
JT_ROZ_MQ_XAVIER = 13000,
JT_ROZ_MQ_MOCLORD,
@ -1547,7 +1552,7 @@ enum e_job_types
#define MAX_NPC_CLASS2_START NPC_RANGE3_START
#define MAX_NPC_CLASS2_END NPC_RANGE3_END
//Checks if a given id is a valid npc id. [Skotlex]
//Checks if a given id is a valid npc id.
//Since new npcs are added all the time, the max valid value is the one before the first mob (Scorpion = 1001)
#define npcdb_checkid(id) ( ( (id) > NPC_RANGE1_START && (id) < NPC_RANGE1_END ) || (id) == JT_HIDDEN_WARP_NPC || ( (id) > NPC_RANGE2_START && (id) < NPC_RANGE2_END ) || (id) == JT_INVISIBLE || ( (id) > NPC_RANGE3_START && (id) < NPC_RANGE3_END ) )

14
src/map/script.hpp
View File

@ -2128,7 +2128,21 @@ enum e_hat_effects : int16{
HAT_EF_C_BABY_GLOOM,
HAT_EF_WINTERNIGHTBELLS,
HAT_EF_NIGHTSKYOFRUTIE,
FOOTPRINT_EF_BASE,
FOOTPRINT_EF_STR_BASE,
FOOTPRINT_EF_PURPLESTAR,
FOOTPRINT_EF_YELLOWSTAR,
FOOTPRINT_EF_REDSTAR,
HAT_EF_RAINBOW_POISON_MASTER,
HAT_EF_C_ANCIENT_RUNE,
HAT_EF_C_DRAGON_GREEN_AURA,
HAT_EF_C_DRAGON_RED_AURA,
HAT_EF_C_DRAGON_YELLOW_AURA,
HAT_EF_INTERDIMENSIONAL_RIFT,
HAT_EF_C_CLB_SS_LL,
HAT_EF_VACATION,
HAT_EF_C_FH_LOSTWING,
FOOTPRINT_EF_DOGFOOT,
HAT_EF_MAX
};

19
src/map/script_constants.hpp
View File

@ -9186,6 +9186,11 @@
export_constant_npc(JT_4_EP21_HOWELL_S);
export_constant_npc(JT_4_EP21_TAN_S);
export_constant_npc(JT_4_M_VACATION_MARAM);
export_constant_npc(JT_4_CLB_SS_FC);
export_constant_npc(JT_4_CLB_SS_TZ);
export_constant_npc(JT_4_CLB_SS_AJ);
export_constant_npc(JT_4_CLB_SS_LK);
export_constant_npc(JT_4_SMART_ANDRE);
export_constant_npc(JT_ROZ_MQ_XAVIER);
export_constant_npc(JT_ROZ_MQ_MOCLORD);
export_constant_npc(JT_ROZ_MQ_SKULD);
@ -10550,7 +10555,21 @@
export_constant(HAT_EF_C_BABY_GLOOM);
export_constant(HAT_EF_WINTERNIGHTBELLS);
export_constant(HAT_EF_NIGHTSKYOFRUTIE);
export_constant(FOOTPRINT_EF_BASE);
export_constant(FOOTPRINT_EF_STR_BASE);
export_constant(FOOTPRINT_EF_PURPLESTAR);
export_constant(FOOTPRINT_EF_YELLOWSTAR);
export_constant(FOOTPRINT_EF_REDSTAR);
export_constant(HAT_EF_RAINBOW_POISON_MASTER);
export_constant(HAT_EF_C_ANCIENT_RUNE);
export_constant(HAT_EF_C_DRAGON_GREEN_AURA);
export_constant(HAT_EF_C_DRAGON_RED_AURA);
export_constant(HAT_EF_C_DRAGON_YELLOW_AURA);
export_constant(HAT_EF_INTERDIMENSIONAL_RIFT);
export_constant(HAT_EF_C_CLB_SS_LL);
export_constant(HAT_EF_VACATION);
export_constant(HAT_EF_C_FH_LOSTWING);
export_constant(FOOTPRINT_EF_DOGFOOT);
/* pet catch */
export_constant(PET_CATCH_UNIVERSAL);

31
src/map/skill.hpp
View File

@ -1500,7 +1500,17 @@ enum e_skill {
NPC_CANE_OF_EVIL_EYE,
NPC_CURSE_OF_RED_CUBE,
NPC_CURSE_OF_BLUE_CUBE,
NPC_KILLING_AURA, // 783
NPC_KILLING_AURA,
ALL_EVENT_20TH_ANNIVERSARY,
NPC_TARGET_MARKER,
NPC_AIMED_SHOWER,
NPC_BLAZING_ERUPTION,
NPC_BLOCK_SEAL,
NPC_BLOCK_EXPLOSION,
NPC_FROST_FIELD,
NPC_LIGHTNING_JUDGEMENT,
NPC_GROGGY_ON,
NPC_RESET_EFST, //793
KN_CHARGEATK = 1001,
CR_SHRINK,
@ -2332,6 +2342,10 @@ enum e_skill {
NW_THE_VIGILANTE_AT_NIGHT_GUN_SHOTGUN,
SS_FUUMAKOUCHIKU_BLASTING,
SS_FOUR_CHARM = 5499,
NW_WILD_SHOT,
NW_MIDNIGHT_FALLEN,
DK_DRAGONIC_BREATH = 6001,
MT_SPARK_BLASTER,
MT_TRIPLE_LASER,
@ -2339,6 +2353,21 @@ enum e_skill {
BO_EXPLOSIVE_POWDER,
BO_MAYHEMIC_THORNS,
IG_RADIANT_SPEAR = 6503,
IG_IMPERIAL_CROSS,
MT_RUSH_STRIKE = 6506,
MT_POWERFUL_SWING,
MT_ENERGY_CANNONADE,
BO_MYSTERY_POWDER,
BO_DUST_EXPLOSION,
SHC_CROSS_SLASH,
ABC_HIT_AND_SLIDING,
ABC_CHASING_BREAK,
ABC_CHASING_SHOT,
TR_RHYTHMICAL_WAVE = 6521,
HLIF_HEAL = 8001,
HLIF_AVOID,
HLIF_BRAIN,