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

Merge corrections

Browse Source
This commit is contained in:
Atemo 2024-03-25 20:37:34 +01:00
parent fc53e2e6dc
commit 055253a926
5 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/map/script_constants.hpp
View File

@ -1934,18 +1934,6 @@
export_constant(SC_T_FIFTH_GOD); export_constant(SC_T_FIFTH_GOD);
export_constant(SC_HEAVEN_AND_EARTH); export_constant(SC_HEAVEN_AND_EARTH);
// Night Watch
export_constant(SC_INTENSIVE_AIM);
export_constant(SC_INTENSIVE_AIM_COUNT);
export_constant(SC_GRENADE_FRAGMENT_1);
export_constant(SC_GRENADE_FRAGMENT_2);
export_constant(SC_GRENADE_FRAGMENT_3);
export_constant(SC_GRENADE_FRAGMENT_4);
export_constant(SC_GRENADE_FRAGMENT_5);
export_constant(SC_GRENADE_FRAGMENT_6);
export_constant(SC_AUTO_FIRING_LAUNCHER);
export_constant(SC_HIDDEN_CARD);
// Shinkiro/Shiranui // Shinkiro/Shiranui
export_constant(SC_SHADOW_CLOCK); export_constant(SC_SHADOW_CLOCK);
export_constant(SC_SHINKIROU_CALL); export_constant(SC_SHINKIROU_CALL);

1
src/map/status.cpp
View File

@ -14970,7 +14970,6 @@ TIMER_FUNC(status_change_timer){
sc_timer_next(500 + tick); sc_timer_next(500 + tick);
return 0; return 0;
case SC_KI_SUL_RAMPAGE: case SC_KI_SUL_RAMPAGE:
if (sce->val4-- > 0) { if (sce->val4-- > 0) {
int i = skill_get_splash(SH_KI_SUL_RAMPAGE, sce->val1); int i = skill_get_splash(SH_KI_SUL_RAMPAGE, sce->val1);

12
src/map/status.hpp
View File

@ -1350,18 +1350,6 @@ enum sc_type : int16 {
SC_BLESSING_OF_M_CREATURES, SC_BLESSING_OF_M_CREATURES,
SC_BLESSING_OF_M_C_DEBUFF, SC_BLESSING_OF_M_C_DEBUFF,
// Night Watch
SC_INTENSIVE_AIM,
SC_INTENSIVE_AIM_COUNT,
SC_GRENADE_FRAGMENT_1,
SC_GRENADE_FRAGMENT_2,
SC_GRENADE_FRAGMENT_3,
SC_GRENADE_FRAGMENT_4,
SC_GRENADE_FRAGMENT_5,
SC_GRENADE_FRAGMENT_6,
SC_AUTO_FIRING_LAUNCHER,
SC_HIDDEN_CARD,
#ifdef RENEWAL #ifdef RENEWAL
SC_EXTREMITYFIST2, //! NOTE: This SC should be right before SC_MAX, so it doesn't disturb if RENEWAL is disabled SC_EXTREMITYFIST2, //! NOTE: This SC should be right before SC_MAX, so it doesn't disturb if RENEWAL is disabled
#endif #endif