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

Updated EFST datas (#8553)

Browse Source
This commit is contained in:
Atemo 2024-08-16 15:44:27 +02:00 committed by GitHub
parent 6f44b98fe9
commit 37f402aca7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 104 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/pre-re/status.yml
View File

@ -3967,7 +3967,7 @@ Body:
Unlimitedhummingvoice: true
Sircleofnature: true
- Status: Deepsleep
Icon: EFST_HANDICAPSTATE_DEEP_SLEEP
Icon: EFST_DEEP_SLEEP
DurationLookup: WM_LULLABY_DEEPSLEEP
States:
NoCast: true

4
db/re/status.yml
View File

@ -4130,7 +4130,7 @@ Body:
Unlimitedhummingvoice: true
Sircleofnature: true
- Status: Deepsleep
Icon: EFST_HANDICAPSTATE_DEEP_SLEEP
Icon: EFST_DEEP_SLEEP
DurationLookup: WM_LULLABY_DEEPSLEEP
States:
NoCast: true
@ -7450,7 +7450,7 @@ Body:
NoClearance: true
NoClearbuff: true
- Status: Madogear
Icon: EFST_MADOGEAR
Icon: EFST_MADOGEAR_TYPE
CalcFlags:
Speed: true
Flags:

2
src/map/clif.cpp
View File

@ -6488,7 +6488,7 @@ void clif_status_change(struct block_list *bl, int type, int flag, t_tick tick,
#if !( PACKETVER_MAIN_NUM >= 20191120 || PACKETVER_RE_NUM >= 20191106 )
// Older clients display normal riding icon.
if (type == EFST_MADOGEAR)
if (type == EFST_MADOGEAR_TYPE)
type = EFST_RIDING;
#endif

56
src/map/script_constants.hpp
View File

@ -3203,7 +3203,7 @@
export_constant(EFST_SPELLFIST);
export_constant(EFST_NETHERWORLD);
export_constant(EFST_SIREN);
export_constant(EFST_HANDICAPSTATE_DEEP_SLEEP);
export_constant(EFST_DEEP_SLEEP);
export_constant(EFST_SIRCLEOFNATURE);
export_constant(EFST_COLD);
export_constant(EFST_GLOOMYDAY);
@ -3266,7 +3266,7 @@
export_constant(EFST_DROCERA_HERB_STEAMED);
export_constant(EFST_PUTTI_TAILS_NOODLES);
export_constant(EFST_BANANA_BOMB);
export_constant(XXX_EFST_SM_ELEMENTAL);
export_constant(EFST_SUMMON_AGNI);
export_constant(EFST_SPELLBOOK4);
export_constant(EFST_SPELLBOOK5);
export_constant(EFST_SPELLBOOK6);
@ -3400,8 +3400,8 @@
export_constant(EFST_SET_NUM_MDEF);
export_constant(EFST_SET_PER_DEF);
export_constant(EFST_SET_PER_MDEF);
export_constant(EFST_PARTYBOOKING_SEARCH_DELAY);
export_constant(EFST_PARTYBOOKING_REGISTER_DELAY);
export_constant(EFST_PARTYBOOKING_SEARCH_DEALY);
export_constant(EFST_PARTYBOOKING_REGISTER_DEALY);
export_constant(EFST_PERIOD_TIME_CHECK_DETECT_SKILL);
export_constant(EFST_KO_JYUMONJIKIRI);
export_constant(EFST_MEIKYOUSISUI);
@ -3442,7 +3442,7 @@
export_constant(EFST_GLASTHEIM_STATE);
export_constant(EFST_GLASTHEIM_ITEMDEF);
export_constant(EFST_GLASTHEIM_HPSP);
export_constant(EFST_FOLLOWER_NPC_SKILL_POSTDELAY);
export_constant(EFST_HOMUN_SKILL_POSTDELAY);
export_constant(EFST_ALMIGHTY);
export_constant(EFST_GVG_GIANT);
export_constant(EFST_GVG_GOLEM);
@ -3468,7 +3468,7 @@
export_constant(EFST_QUEST_BUFF3);
export_constant(EFST_REUSE_LIMIT_RECALL);
export_constant(EFST_SAVEPOSITION);
export_constant(EFST_NPC_ICEEXPLO);
export_constant(EFST_HANDICAPSTATE_ICEEXPLO);
export_constant(EFST_FENRIR_CARD);
export_constant(EFST_REUSE_LIMIT_ASPD_POTION);
export_constant(EFST_MAXPAIN);
@ -3572,7 +3572,7 @@
export_constant(EFST_GC_POISONINGWEAPON_OPERATOR);
export_constant(EFST_WS_WEAPONREFINE_OPERATOR);
export_constant(EFST_BS_REPAIRWEAPON_OPERATOR);
export_constant(EFST_UNREADMAIL_CHECK);
export_constant(EFST_GET_MAILBOX);
export_constant(EFST_JUMPINGCLAN);
export_constant(EFST_JP_OTP);
export_constant(EFST_HANDICAPTOLERANCE_LEVELGAP);
@ -3891,13 +3891,13 @@
export_constant(EFST_PERIOD_USE_WORLDMAP);
export_constant(EFST_MISTY_FROST);
export_constant(EFST_MAGIC_POISON);
export_constant(EFST_KAUTE);
export_constant(EFST_MOVE_AGIT);
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_MADOGEAR_TYPE);
export_constant(EFST_DEADLY_DEFEASANCE);
export_constant(EFST_CLIMAX_DES_HU);
export_constant(EFST_CLIMAX);
@ -4172,6 +4172,44 @@
export_constant(EFST_C_RATE_PLUS);
export_constant(EFST_RESIST_PLUS);
export_constant(EFST_PVP_DUN_BUFF);
export_constant(EFST_TARGET_MARKER);
export_constant(EFST_BLOCK_SEAL);
export_constant(EFST_FROST_STORM);
export_constant(EFST_GROGGY);
export_constant(EFST_WARM_SHIELD);
export_constant(EFST_CONTENTS_1);
export_constant(EFST_CONTENTS_2);
export_constant(EFST_CONTENTS_3);
export_constant(EFST_CONTENTS_4);
export_constant(EFST_CONTENTS_5);
export_constant(EFST_CONTENTS_6);
export_constant(EFST_CONTENTS_7);
export_constant(EFST_CONTENTS_8);
export_constant(EFST_CONTENTS_9);
export_constant(EFST_CONTENTS_10);
export_constant(EFST_CONTENTS_11);
export_constant(EFST_CONTENTS_12);
export_constant(EFST_CONTENTS_13);
export_constant(EFST_CONTENTS_14);
export_constant(EFST_CONTENTS_15);
export_constant(EFST_CONTENTS_16);
export_constant(EFST_CONTENTS_17);
export_constant(EFST_CONTENTS_18);
export_constant(EFST_CONTENTS_19);
export_constant(EFST_CONTENTS_20);
export_constant(EFST_CONTENTS_21);
export_constant(EFST_CONTENTS_22);
export_constant(EFST_CONTENTS_23);
export_constant(EFST_CONTENTS_24);
export_constant(EFST_CONTENTS_25);
export_constant(EFST_C_BUFF_1);
export_constant(EFST_C_BUFF_2);
export_constant(EFST_CHASING);
export_constant(EFST_MYSTERY_POWDER);
export_constant(EFST_FIRE_CHARM_POWER);
export_constant(EFST_WATER_CHARM_POWER);
export_constant(EFST_WIND_CHARM_POWER);
export_constant(EFST_GROUND_CHARM_POWER);
/// @APIHOOK_END
/// Do not modify code above this, since it will be automatically generated by the API again
export_constant(EFST_MAX);

62
src/map/status.hpp
View File

@ -1755,7 +1755,7 @@ enum efst_type : short{
EFST_SPELLFIST,
EFST_NETHERWORLD,
EFST_SIREN,
EFST_HANDICAPSTATE_DEEP_SLEEP,
EFST_DEEP_SLEEP,
EFST_SIRCLEOFNATURE,
EFST_COLD,
EFST_GLOOMYDAY,
@ -1818,7 +1818,7 @@ enum efst_type : short{
EFST_DROCERA_HERB_STEAMED,
EFST_PUTTI_TAILS_NOODLES,
EFST_BANANA_BOMB,
XXX_EFST_SM_ELEMENTAL,
EFST_SUMMON_AGNI,
EFST_SPELLBOOK4,
EFST_SPELLBOOK5,
EFST_SPELLBOOK6,
@ -1953,8 +1953,8 @@ enum efst_type : short{
EFST_SET_NUM_MDEF,
EFST_SET_PER_DEF,
EFST_SET_PER_MDEF,
EFST_PARTYBOOKING_SEARCH_DELAY,
EFST_PARTYBOOKING_REGISTER_DELAY,
EFST_PARTYBOOKING_SEARCH_DEALY,
EFST_PARTYBOOKING_REGISTER_DEALY,
EFST_PERIOD_TIME_CHECK_DETECT_SKILL,
EFST_KO_JYUMONJIKIRI,
EFST_MEIKYOUSISUI,
@ -1995,7 +1995,7 @@ enum efst_type : short{
EFST_GLASTHEIM_STATE,
EFST_GLASTHEIM_ITEMDEF,
EFST_GLASTHEIM_HPSP,
EFST_FOLLOWER_NPC_SKILL_POSTDELAY,
EFST_HOMUN_SKILL_POSTDELAY,
EFST_ALMIGHTY,
EFST_GVG_GIANT,
EFST_GVG_GOLEM,
@ -2021,7 +2021,7 @@ enum efst_type : short{
EFST_QUEST_BUFF3,
EFST_REUSE_LIMIT_RECALL,
EFST_SAVEPOSITION,
EFST_NPC_ICEEXPLO,
EFST_HANDICAPSTATE_ICEEXPLO,
EFST_FENRIR_CARD,
EFST_REUSE_LIMIT_ASPD_POTION,
EFST_MAXPAIN,
@ -2125,7 +2125,7 @@ enum efst_type : short{
EFST_GC_POISONINGWEAPON_OPERATOR,
EFST_WS_WEAPONREFINE_OPERATOR,
EFST_BS_REPAIRWEAPON_OPERATOR,
EFST_UNREADMAIL_CHECK,
EFST_GET_MAILBOX,
EFST_JUMPINGCLAN,
EFST_JP_OTP,
EFST_HANDICAPTOLERANCE_LEVELGAP,
@ -2446,13 +2446,13 @@ enum efst_type : short{
EFST_PERIOD_USE_WORLDMAP,
EFST_MISTY_FROST,
EFST_MAGIC_POISON,
EFST_KAUTE,
EFST_MOVE_AGIT,
EFST_REUSE_JPNONLY_LIMIT_I,
EFST_REUSE_JPNONLY_LIMIT_J,
EFST_REUSE_JPNONLY_LIMIT_K,
EFST_JPNONLY_TACTICS,
EFST_PRISON,
EFST_MADOGEAR,
EFST_MADOGEAR_TYPE,
EFST_DEADLY_DEFEASANCE,
EFST_CLIMAX_DES_HU,
EFST_CLIMAX,
@ -2736,6 +2736,50 @@ enum efst_type : short{
EFST_C_RATE_PLUS,
EFST_RESIST_PLUS,
EFST_PVP_DUN_BUFF,
EFST_TARGET_MARKER = 1453,
EFST_BLOCK_SEAL,
EFST_FROST_STORM,
EFST_GROGGY,
EFST_WARM_SHIELD, //1457
EFST_CONTENTS_1 = 1459,
EFST_CONTENTS_2,
EFST_CONTENTS_3,
EFST_CONTENTS_4,
EFST_CONTENTS_5,
EFST_CONTENTS_6,
EFST_CONTENTS_7,
EFST_CONTENTS_8,
EFST_CONTENTS_9,
EFST_CONTENTS_10,
EFST_CONTENTS_11,
EFST_CONTENTS_12,
EFST_CONTENTS_13,
EFST_CONTENTS_14,
EFST_CONTENTS_15,
EFST_CONTENTS_16,
EFST_CONTENTS_17,
EFST_CONTENTS_18,
EFST_CONTENTS_19,
EFST_CONTENTS_20,
EFST_CONTENTS_21,
EFST_CONTENTS_22,
EFST_CONTENTS_23,
EFST_CONTENTS_24,
EFST_CONTENTS_25, //1483
EFST_C_BUFF_1 = 1509,
EFST_C_BUFF_2,
EFST_CHASING = 1560,
EFST_MYSTERY_POWDER = 1665,
EFST_FIRE_CHARM_POWER = 1667,
EFST_WATER_CHARM_POWER,
EFST_WIND_CHARM_POWER,
EFST_GROUND_CHARM_POWER,
/// @APIHOOK_END
/// Do not modify code above this, since it will be automatically generated by the API again
EFST_MAX,