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

Follow up to 9f6f55c.

Browse Source 
* Fixed Dragon Breath skill type checks.
* Adjusted Camouflage to account for ground-based skills.
- Thanks to @reigneil.
This commit is contained in:
aleos89 2015-03-14 12:38:14 -04:00
parent 9d247d88c1
commit 5a9ffc489f
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/map/battle.c
View File

@ -1366,7 +1366,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
* @param flag * @param flag
* @return damage * @return damage
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -1689,7 +1689,7 @@ static int battle_calc_base_weapon_attack(struct block_list *src, struct status_
* &16: Arrow attack but BOW, REVOLVER, RIFLE, SHOTGUN, GATLING or GRENADE type weapon not equipped (i.e. shuriken, kunai and venom knives not affected by DEX) * &16: Arrow attack but BOW, REVOLVER, RIFLE, SHOTGUN, GATLING or GRENADE type weapon not equipped (i.e. shuriken, kunai and venom knives not affected by DEX)
* *
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -1785,7 +1785,7 @@ static int64 battle_calc_base_damage(struct status_data *status, struct weapon_a
* Consumes ammo for the given skill. * Consumes ammo for the given skill.
*------------------------------------------ *------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -2017,7 +2017,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
* Should infinite defense be applied on target? (plant) * Should infinite defense be applied on target? (plant)
*------------------------------------------------------- *-------------------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
* flag - see e_battle_flag * flag - see e_battle_flag
@ -2049,7 +2049,7 @@ bool is_infinite_defense(struct block_list *target, int flag)
* Is attack arrow based? * Is attack arrow based?
*------------------------ *------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -2068,7 +2068,7 @@ static bool is_skill_using_arrow(struct block_list *src, int skill_id)
* Is attack right handed? By default yes. * Is attack right handed? By default yes.
*----------------------------------------- *-----------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -2088,7 +2088,7 @@ static bool is_attack_right_handed(struct block_list *src, int skill_id)
* Is attack left handed? By default no. * Is attack left handed? By default no.
*--------------------------------------- *---------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -2117,7 +2117,7 @@ static bool is_attack_left_handed(struct block_list *src, int skill_id)
* Do we score a critical hit? * Do we score a critical hit?
*----------------------------- *-----------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -2190,7 +2190,7 @@ static bool is_attack_critical(struct Damage wd, struct block_list *src, struct
* Is the attack piercing? (Investigate/Ice Pick in pre-re) * Is the attack piercing? (Investigate/Ice Pick in pre-re)
*---------------------------------------------------------- *----------------------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -2246,7 +2246,7 @@ static bool battle_skill_get_damage_properties(uint16 skill_id, int is_splash)
* Checks if attack is hitting * Checks if attack is hitting
*----------------------------- *-----------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -2402,7 +2402,7 @@ static bool is_attack_hitting(struct Damage wd, struct block_list *src, struct b
* If attack ignores def. * If attack ignores def.
*------------------------------------------ *------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -2451,7 +2451,7 @@ static bool attack_ignores_def(struct Damage wd, struct block_list *src, struct
* Should skill attack consider VVS and masteries? * Should skill attack consider VVS and masteries?
*------------------------------------------------ *------------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -2473,7 +2473,7 @@ static bool battle_skill_stacks_masteries_vvs(uint16 skill_id)
* Calculate equipment ATK for renewal ATK * Calculate equipment ATK for renewal ATK
*---------------------------------------- *----------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -2497,7 +2497,7 @@ static int battle_calc_equip_attack(struct block_list *src, int skill_id)
* Returns the element type of attack * Returns the element type of attack
*---------------------------------------- *----------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -2569,7 +2569,7 @@ static int battle_get_weapon_element(struct Damage wd, struct block_list *src, s
* Do element damage modifier calculation * Do element damage modifier calculation
*---------------------------------------- *----------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -2656,7 +2656,7 @@ static struct Damage battle_calc_element_damage(struct Damage wd, struct block_l
* Calculate weapon mastery damages * Calculate weapon mastery damages
*---------------------------------- *----------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -2749,7 +2749,7 @@ static struct Damage battle_calc_attack_masteries(struct Damage wd, struct block
* Calculate the various Renewal ATK parts * Calculate the various Renewal ATK parts
*----------------------------------------- *-----------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -2800,7 +2800,7 @@ struct Damage battle_calc_damage_parts(struct Damage wd, struct block_list *src,
* Calculate basic ATK that goes into the skill ATK formula * Calculate basic ATK that goes into the skill ATK formula
*---------------------------------------------------------- *----------------------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -3057,7 +3057,7 @@ static struct Damage battle_apply_div_fix(struct Damage d)
* Check for and calculate multi attacks * Check for and calculate multi attacks
*--------------------------------------- *---------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -3123,7 +3123,7 @@ static struct Damage battle_calc_multi_attack(struct Damage wd, struct block_lis
* Calculate skill level ratios for weapon-based skills * Calculate skill level ratios for weapon-based skills
*------------------------------------------------------ *------------------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -4051,7 +4051,7 @@ static int battle_calc_attack_skill_ratio(struct Damage wd, struct block_list *s
* Constant skill damage additions are added before SC modifiers and after skill base ATK calculation * Constant skill damage additions are added before SC modifiers and after skill base ATK calculation
*--------------------------------------------------------------------------------------------------* *--------------------------------------------------------------------------------------------------*
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -4131,7 +4131,7 @@ static int battle_calc_skill_constant_addition(struct Damage wd, struct block_li
* Stackable SC bonuses added on top of calculated skill damage * Stackable SC bonuses added on top of calculated skill damage
*-------------------------------------------------------------- *--------------------------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -4288,7 +4288,7 @@ struct Damage battle_attack_sc_bonus(struct Damage wd, struct block_list *src, s
* Calc defense damage reduction * Calc defense damage reduction
*------------------------------------ *------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -4459,7 +4459,7 @@ struct Damage battle_calc_defense_reduction(struct Damage wd, struct block_list
* Modifiers ignoring DEF * Modifiers ignoring DEF
*------------------------------------ *------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -4519,7 +4519,7 @@ struct Damage battle_calc_attack_post_defense(struct Damage wd, struct block_lis
* "Plant"-type (mobs that only take 1 damage from all sources) damage calculation * "Plant"-type (mobs that only take 1 damage from all sources) damage calculation
*--------------------------------------------------------------------------------- *---------------------------------------------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -4574,7 +4574,7 @@ struct Damage battle_calc_attack_plant(struct Damage wd, struct block_list *src,
* Perform left/right hand weapon damage calculation based on previously calculated damage * Perform left/right hand weapon damage calculation based on previously calculated damage
*---------------------------------------------------------------------------------------- *----------------------------------------------------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -4632,7 +4632,7 @@ struct Damage battle_calc_attack_left_right_hands(struct Damage wd, struct block
* BG/GvG attack modifiers * BG/GvG attack modifiers
*------------------------------------------ *------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -4672,7 +4672,7 @@ struct Damage battle_calc_attack_gvg_bg(struct Damage wd, struct block_list *src
* final ATK modifiers - after BG/GvG calc * final ATK modifiers - after BG/GvG calc
*------------------------------------------ *------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -4771,7 +4771,7 @@ struct Damage battle_calc_weapon_final_atk_modifiers(struct Damage wd, struct bl
* Basic wd init - not influenced by HIT/MISS/DEF/etc. * Basic wd init - not influenced by HIT/MISS/DEF/etc.
*---------------------------------------------------- *----------------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -4940,7 +4940,7 @@ void battle_do_reflect(int attack_type, struct Damage *wd, struct block_list* sr
* Calculate "weapon"-type attacks and skills * Calculate "weapon"-type attacks and skills
*-------------------------------------------- *--------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Initial refactoring by Baalberith * Initial refactoring by Baalberith
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
@ -6022,7 +6022,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
* Calculate "misc"-type attacks and skills * Calculate "misc"-type attacks and skills
*------------------------------------------ *------------------------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Refined and optimized by helvetica * Refined and optimized by helvetica
*/ */
struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv,int mflag) struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *target,uint16 skill_id,uint16 skill_lv,int mflag)
@ -7054,7 +7054,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
* Check for undead status * Check for undead status
*------------------------- *-------------------------
* Credits: * Credits:
* Original coder Skoltex * Original coder Skotlex
* Refactored by Baalberith * Refactored by Baalberith
*/ */
int battle_check_undead(int race,int element) int battle_check_undead(int race,int element)

4
src/map/skill.c
View File

@ -3314,7 +3314,7 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list *
dmg.flag |= BF_WEAPON; dmg.flag |= BF_WEAPON;
if( sd && src != bl && damage > 0 && ( dmg.flag&BF_WEAPON || if( sd && src != bl && damage > 0 && ( dmg.flag&BF_WEAPON ||
(dmg.flag&BF_MISC && (skill_id == RA_CLUSTERBOMB || skill_id == RA_FIRINGTRAP || skill_id == RA_ICEBOUNDTRAP || skill_id == RK_DRAGONBREATH || skill_id == RK_DRAGONBREATH_WATER)) ) ) (dmg.flag&BF_MISC && (skill_id == RA_CLUSTERBOMB || skill_id == RA_FIRINGTRAP || skill_id == RA_ICEBOUNDTRAP)) ) )
{ {
if (battle_config.left_cardfix_to_right) if (battle_config.left_cardfix_to_right)
battle_drain(sd, bl, dmg.damage, dmg.damage, tstatus->race, tstatus->class_); battle_drain(sd, bl, dmg.damage, dmg.damage, tstatus->race, tstatus->class_);
@ -4825,7 +4825,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint
if( (tsc2 = status_get_sc(bl)) && (tsc2->data[SC_HIDING] )) { if( (tsc2 = status_get_sc(bl)) && (tsc2->data[SC_HIDING] )) {
clif_skill_nodamage(src,src,skill_id,skill_lv,1); clif_skill_nodamage(src,src,skill_id,skill_lv,1);
} else } else
skill_attack(BF_MISC,src,src,bl,skill_id,skill_lv,tick,flag); skill_attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag);
} }
break; break;

2
src/map/status.c
View File

@ -1948,7 +1948,7 @@ bool status_check_skilluse(struct block_list *src, struct block_list *target, ui
return false; return false;
if (tsc->data[SC__FEINTBOMB] && (is_boss || is_detect)) if (tsc->data[SC__FEINTBOMB] && (is_boss || is_detect))
return false; return false;
if (tsc->data[SC_CAMOUFLAGE] && !(is_boss || is_detect)) if (tsc->data[SC_CAMOUFLAGE] && !(is_boss || is_detect) && (!skill_id || (!flag && src)))
return false; return false;
if (tsc->data[SC_STEALTHFIELD] && !(is_boss || is_detect)) if (tsc->data[SC_STEALTHFIELD] && !(is_boss || is_detect))
return false; return false;