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

6
src/map/battle.cpp
View File

@ -2605,7 +2605,7 @@ void battle_consume_ammo(map_session_data*sd, int skill, int lv)
if( skill == NW_MAGAZINE_FOR_ONE && sd->weapontype1 == W_GATLING ){
qty += 4;
}
}
}
if (sd->equip_index[EQI_AMMO] >= 0) //Qty check should have been done in skill_check_condition
@ -3319,7 +3319,7 @@ static bool attack_ignores_def(struct Damage* wd, struct block_list *src, struct
switch( skill_id ){
case RK_WINDCUTTER:
if( sd->status.weapon == W_2HSWORD ){
return true;
return true;
}
break;
case NW_THE_VIGILANTE_AT_NIGHT:
@ -3495,7 +3495,7 @@ int battle_get_weapon_element(struct Damage* wd, struct block_list *src, struct
element = ELE_DARK;
}else if( sc->getSCE( SC_GRENADE_FRAGMENT_6 ) != nullptr ){
element = ELE_HOLY;
}
}
}
break;
}

12
src/map/script_constants.hpp
View File

@ -1934,18 +1934,6 @@
export_constant(SC_T_FIFTH_GOD);
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
export_constant(SC_SHADOW_CLOCK);
export_constant(SC_SHINKIROU_CALL);

10
src/map/skill.cpp
View File

@ -4809,7 +4809,7 @@ static TIMER_FUNC(skill_timerskill){
tmpx = skl->x - area + rnd() % (area * 2 + 1);
tmpy = skl->y - area + rnd() % (area * 2 + 1);
skill_unitsetting(src, skl->skill_id, skl->skill_lv, tmpx, tmpy, skl->flag);
}
}
break;
case NW_MISSION_BOMBARD: {
int area = skill_get_unit_range(skl->skill_id, skl->skill_lv);
@ -4820,7 +4820,7 @@ static TIMER_FUNC(skill_timerskill){
tmpy = skl->y - range + rnd() % (range * 2 + 1);
map_foreachinarea(skill_area_sub, src->m, tmpx - range, tmpy - range, tmpx + range, tmpy + range, BL_CHAR,
src, skl->skill_id, skl->skill_lv, tick, skl->flag | BCT_ENEMY | SD_SPLASH | 1, skill_castend_damage_id);
}
}
break;
}
}
@ -7173,7 +7173,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
// perform skill requirement consumption
if (!(flag&SKILL_NOCONSUME_REQ))
skill_consume_requirement(sd,skill_id,skill_lv,2);
skill_consume_requirement(sd,skill_id,skill_lv,2);
}
return 0;
@ -13099,7 +13099,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
skill_onskillusage(sd, bl, skill_id, tick);
// perform skill requirement consumption
if (!(flag&SKILL_NOCONSUME_REQ))
skill_consume_requirement(sd,skill_id,skill_lv,2);
skill_consume_requirement(sd,skill_id,skill_lv,2);
}
map_freeblock_unlock();
@ -14825,7 +14825,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
skill_onskillusage(sd, NULL, skill_id, tick);
// perform skill requirement consumption
if (!(flag&SKILL_NOCONSUME_REQ))
skill_consume_requirement(sd,skill_id,skill_lv,2);
skill_consume_requirement(sd,skill_id,skill_lv,2);
}
return 0;

1
src/map/status.cpp
View File

@ -14970,7 +14970,6 @@ TIMER_FUNC(status_change_timer){
sc_timer_next(500 + tick);
return 0;
case SC_KI_SUL_RAMPAGE:
if (sce->val4-- > 0) {
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_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
SC_EXTREMITYFIST2, //! NOTE: This SC should be right before SC_MAX, so it doesn't disturb if RENEWAL is disabled
#endif