pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 23:20:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge fix

Browse Source
This commit is contained in:
KimLS
2017-03-26 17:25:01 -07:00
parent cfdbca6f12 940f3b03e8
commit de777fc90f
324 changed files with 13633 additions and 17652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/special_attacks.cpp
+61 -57
View File
@@ -96,6 +96,8 @@ int Mob::GetBaseSkillDamage(EQEmu::skills::SkillType skill, Mob *target)
}
if (inst)
ac_bonus = inst->GetItemArmorClass(true) / 25.0f;
else
return 0; // return 0 in cases where we don't have an item
if (ac_bonus > skill_bonus)
ac_bonus = skill_bonus;
return static_cast<int>(ac_bonus + skill_bonus);
@@ -144,7 +146,7 @@ void Mob::DoSpecialAttackDamage(Mob *who, EQEmu::skills::SkillType skill, int32
return;
DamageHitInfo my_hit;
my_hit.damage_done = 0;
my_hit.damage_done = 1; // min 1 dmg
my_hit.base_damage = base_damage;
my_hit.min_damage = min_damage;
my_hit.skill = skill;
@@ -849,7 +851,7 @@ void Mob::DoArcheryAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon,
DamageHitInfo my_hit;
my_hit.base_damage = MaxDmg;
my_hit.min_damage = 0;
my_hit.damage_done = 0;
my_hit.damage_done = 1;
my_hit.skill = EQEmu::skills::SkillArchery;
my_hit.offense = offense(my_hit.skill);
@@ -1181,7 +1183,7 @@ void NPC::DoRangedAttackDmg(Mob* other, bool Launch, int16 damage_mod, int16 cha
DamageHitInfo my_hit;
my_hit.base_damage = MaxDmg;
my_hit.min_damage = MinDmg;
my_hit.damage_done = 0;
my_hit.damage_done = 1;
my_hit.skill = skill;
my_hit.offense = offense(my_hit.skill);
@@ -1362,7 +1364,7 @@ void Mob::DoThrowingAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon
DamageHitInfo my_hit;
my_hit.base_damage = WDmg;
my_hit.min_damage = 0;
my_hit.damage_done = 0;
my_hit.damage_done = 1;
my_hit.skill = EQEmu::skills::SkillThrowing;
my_hit.offense = offense(my_hit.skill);
@@ -1868,18 +1870,18 @@ void Client::DoClassAttacks(Mob *ca_target, uint16 skill, bool IsRiposte)
}
}
void Mob::Taunt(NPC* who, bool always_succeed, float chance_bonus, bool FromSpell, int32 bonus_hate) {
void Mob::Taunt(NPC *who, bool always_succeed, int chance_bonus, bool FromSpell, int32 bonus_hate)
{
if (who == nullptr)
return;
if(DivineAura())
if (DivineAura())
return;
if(!FromSpell && !CombatRange(who))
if (!FromSpell && !CombatRange(who))
return;
if(!always_succeed && IsClient())
if (!always_succeed && IsClient())
CastToClient()->CheckIncreaseSkill(EQEmu::skills::SkillTaunt, who, 10);
Mob *hate_top = who->GetHateMost();
@@ -1887,69 +1889,72 @@ void Mob::Taunt(NPC* who, bool always_succeed, float chance_bonus, bool FromSpel
int level_difference = GetLevel() - who->GetLevel();
bool Success = false;
//Support for how taunt worked pre 2000 on LIVE - Can not taunt NPC over your level.
if ((RuleB(Combat,TauntOverLevel) == false) && (level_difference < 0) || who->GetSpecialAbility(IMMUNE_TAUNT)){
Message_StringID(MT_SpellFailure,FAILED_TAUNT);
// Support for how taunt worked pre 2000 on LIVE - Can not taunt NPC over your level.
if ((RuleB(Combat, TauntOverLevel) == false) && (level_difference < 0) ||
who->GetSpecialAbility(IMMUNE_TAUNT)) {
Message_StringID(MT_SpellFailure, FAILED_TAUNT);
return;
}
//All values used based on live parses after taunt was updated in 2006.
if ((hate_top && hate_top->GetHPRatio() >= 20) || hate_top == nullptr) {
// All values used based on live parses after taunt was updated in 2006.
if ((hate_top && hate_top->GetHPRatio() >= 20) || hate_top == nullptr || chance_bonus) {
// SE_Taunt this is flat chance
if (chance_bonus) {
Success = zone->random.Roll(chance_bonus);
} else {
float tauntchance = 50.0f;
int32 newhate = 0;
float tauntchance = 50.0f;
if(always_succeed)
tauntchance = 101.0f;
else {
if (level_difference < 0){
tauntchance += static_cast<float>(level_difference)*3.0f;
if (tauntchance < 20)
tauntchance = 20.0f;
}
if (always_succeed)
tauntchance = 101.0f;
else {
tauntchance += static_cast<float>(level_difference)*5.0f;
if (tauntchance > 65)
tauntchance = 65.0f;
if (level_difference < 0) {
tauntchance += static_cast<float>(level_difference) * 3.0f;
if (tauntchance < 20)
tauntchance = 20.0f;
}
else {
tauntchance += static_cast<float>(level_difference) * 5.0f;
if (tauntchance > 65)
tauntchance = 65.0f;
}
}
// TauntSkillFalloff rate is not based on any real data. Default of 33% gives a reasonable
// result.
if (IsClient() && !always_succeed)
tauntchance -= (RuleR(Combat, TauntSkillFalloff) *
(CastToClient()->MaxSkill(EQEmu::skills::SkillTaunt) -
GetSkill(EQEmu::skills::SkillTaunt)));
if (tauntchance < 1)
tauntchance = 1.0f;
tauntchance /= 100.0f;
Success = tauntchance > zone->random.Real(0, 1);
}
//TauntSkillFalloff rate is not based on any real data. Default of 33% gives a reasonable result.
if (IsClient() && !always_succeed)
tauntchance -= (RuleR(Combat, TauntSkillFalloff) * (CastToClient()->MaxSkill(EQEmu::skills::SkillTaunt) - GetSkill(EQEmu::skills::SkillTaunt)));
//From SE_Taunt (Does a taunt with a chance modifier)
if (chance_bonus)
tauntchance += tauntchance*chance_bonus/100.0f;
if (tauntchance < 1)
tauntchance = 1.0f;
tauntchance /= 100.0f;
if (tauntchance > zone->random.Real(0, 1)) {
if (hate_top && hate_top != this){
newhate = (who->GetNPCHate(hate_top) - who->GetNPCHate(this)) + 1 + bonus_hate;
if (Success) {
if (hate_top && hate_top != this) {
int newhate = (who->GetNPCHate(hate_top) - who->GetNPCHate(this)) + 1 + bonus_hate;
who->CastToNPC()->AddToHateList(this, newhate);
Success = true;
} else {
who->CastToNPC()->AddToHateList(this, 12);
}
else
who->CastToNPC()->AddToHateList(this,12);
if (who->CanTalk())
who->Say_StringID(SUCCESSFUL_TAUNT,GetCleanName());
}
else{
Message_StringID(MT_SpellFailure,FAILED_TAUNT);
who->Say_StringID(SUCCESSFUL_TAUNT, GetCleanName());
} else {
Message_StringID(MT_SpellFailure, FAILED_TAUNT);
}
} else {
Message_StringID(MT_SpellFailure, FAILED_TAUNT);
}
else
Message_StringID(MT_SpellFailure,FAILED_TAUNT);
if (HasSkillProcs())
TrySkillProc(who, EQEmu::skills::SkillTaunt, TauntReuseTime * 1000);
@@ -1957,7 +1962,6 @@ void Mob::Taunt(NPC* who, bool always_succeed, float chance_bonus, bool FromSpel
TrySkillProc(who, EQEmu::skills::SkillTaunt, TauntReuseTime * 1000, true);
}
void Mob::InstillDoubt(Mob *who) {
//make sure we can use this skill
/*int skill = GetSkill(INTIMIDATION);*/ //unused
@@ -2119,7 +2123,7 @@ void Mob::DoMeleeSkillAttackDmg(Mob *other, uint16 weapon_damage, EQEmu::skills:
DamageHitInfo my_hit;
my_hit.base_damage = weapon_damage;
my_hit.min_damage = 0;
my_hit.damage_done = 0;
my_hit.damage_done = 1;
my_hit.skill = skillinuse;
my_hit.offense = offense(my_hit.skill);