pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-03 17:32:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added 'hit chance' extra attack option can be applied to future special attacks ect.

Browse Source
This commit is contained in:
KayenEQ 2014-10-24 23:36:02 -04:00
parent 4cb6a5635e
commit 5afd6b8628
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zone/attack.cpp
View File

@ -1288,15 +1288,18 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b
mlog(COMBAT__DAMAGE, "Damage calculated to %d (min %d, max %d, str %d, skill %d, DMG %d, lv %d)", mlog(COMBAT__DAMAGE, "Damage calculated to %d (min %d, max %d, str %d, skill %d, DMG %d, lv %d)",
damage, min_hit, max_hit, GetSTR(), GetSkill(skillinuse), weapon_damage, mylevel); damage, min_hit, max_hit, GetSTR(), GetSkill(skillinuse), weapon_damage, mylevel);
int hit_chance_bonus = 0;
if(opts) { if(opts) {
damage *= opts->damage_percent; damage *= opts->damage_percent;
damage += opts->damage_flat; damage += opts->damage_flat;
hate *= opts->hate_percent; hate *= opts->hate_percent;
hate += opts->hate_flat; hate += opts->hate_flat;
hit_chance_bonus += opts->hate_flat;
} }
//check to see if we hit.. //check to see if we hit..
if(!other->CheckHitChance(this, skillinuse, Hand)) { if(!other->CheckHitChance(this, skillinuse, Hand, hit_chance_bonus)) {
mlog(COMBAT__ATTACKS, "Attack missed. Damage set to 0."); mlog(COMBAT__ATTACKS, "Attack missed. Damage set to 0.");
damage = 0; damage = 0;
} else { //we hit, try to avoid it } else { //we hit, try to avoid it
@ -1890,14 +1893,18 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
other->AddToHateList(this, hate); other->AddToHateList(this, hate);
} else { } else {
int hit_chance_bonus = 0;
if(opts) { if(opts) {
damage *= opts->damage_percent; damage *= opts->damage_percent;
damage += opts->damage_flat; damage += opts->damage_flat;
hate *= opts->hate_percent; hate *= opts->hate_percent;
hate += opts->hate_flat; hate += opts->hate_flat;
hit_chance_bonus += opts->hit_chance;
} }
if(!other->CheckHitChance(this, skillinuse, Hand)) { if(!other->CheckHitChance(this, skillinuse, Hand, hit_chance_bonus)) {
damage = 0; //miss damage = 0; //miss
} else { //hit, check for damage avoidance } else { //hit, check for damage avoidance
other->AvoidDamage(this, damage); other->AvoidDamage(this, damage);

3
zone/common.h
View File

@ -563,7 +563,7 @@ struct ExtraAttackOptions {
: damage_percent(1.0f), damage_flat(0), : damage_percent(1.0f), damage_flat(0),
armor_pen_percent(0.0f), armor_pen_flat(0), armor_pen_percent(0.0f), armor_pen_flat(0),
crit_percent(1.0f), crit_flat(0.0f), crit_percent(1.0f), crit_flat(0.0f),
hate_percent(1.0f), hate_flat(0) hate_percent(1.0f), hate_flat(0), hit_chance(0)
{ } { }
float damage_percent; float damage_percent;
@ -574,6 +574,7 @@ struct ExtraAttackOptions {
float crit_flat; float crit_flat;
float hate_percent; float hate_percent;
int hate_flat; int hate_flat;
int hit_chance;
}; };
#endif #endif