pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 16:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Feature] Add SE_IncreaseArchery and rules to tune archery (#4335)

Browse Source 
* [Feature] Add SE_IncreaseArchery and rules to tune archery

* Adjustments per comments, also added to the tune system.

* Update bonuses.cpp

---------

Co-authored-by: Kinglykrab <kinglykrab@gmail.com>
This commit is contained in:
Fryguy 2024-05-26 08:37:23 -04:00 committed by GitHub
parent 2df5f3f55a
commit 87c207e862
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/ruletypes.h
View File

@ -590,6 +590,8 @@ RULE_BOOL(Combat, BackstabIgnoresElemental, false, "Enable or disable Elemental
RULE_BOOL(Combat, BackstabIgnoresBane, false, "Enable or disable Bane weapon damage affecting backstab damage, false by default.")
RULE_INT(Combat, DoubleBackstabLevelRequirement, 55, "Level requirement to enable double backstab attempts. The default is 55.")
RULE_BOOL(Combat, SummonMeleeRange, true, "Enable or disable summoning of a player when already in melee range of the summoner.")
RULE_REAL(Combat, ArcheryHitPenalty, 0, "Archery has a hit penalty to try to help balance it with the plethora of long term +hit modifiers for it - Default: 0")
RULE_REAL(Combat, ArcheryBaseDamageBonus, 1, "Percentage modifier to base archery Damage 0.5=50% base damage, 1=100%,2=200% - Default: 1")
RULE_BOOL(Combat, WaterMatchRequiredForAutoFireLoS, true, "Enable/Disable the requirement of both the attacker/victim being both in or out of water for AutoFire LoS to pass.")
RULE_INT(Combat, ExtraAllowedKickClassesBitmask, 0, "Bitmask for allowing extra classes beyond Warrior, Ranger, Beastlord, and Berserker to kick, No Extra Classes (0) by default")
RULE_INT(Combat, MaxProcs, 4, "Adjustable maximum number of procs per round, the hard cap is MAX_PROCS (11). Requires mob repop or client zone when changed")

2
common/spdat.h
View File

@ -904,7 +904,7 @@ typedef enum {
#define SE_AlterNPCLevel 107 // implemented - not used on live
#define SE_Familiar 108 // implemented
#define SE_SummonItemIntoBag 109 // implemented - summons stuff into container
//#define SE_IncreaseArchery 110 // not used
#define SE_IncreaseArchery 110 // implemented
#define SE_ResistAll 111 // implemented - Note: Physical Resists are not modified by this effect.
#define SE_CastingLevel 112 // implemented
#define SE_SummonHorse 113 // implemented

8
zone/attack.cpp
View File

@ -232,6 +232,11 @@ int Mob::GetTotalToHit(EQ::skills::SkillType skill, int chance_mod)
aabonuses.HitChanceEffect[skill] +
spellbonuses.HitChanceEffect[skill];
if (skill == EQ::skills::SkillArchery) {
hit_bonus += spellbonuses.increase_archery + aabonuses.increase_archery + itembonuses.increase_archery;
hit_bonus -= hit_bonus * RuleR(Combat, ArcheryHitPenalty);
}
accuracy = (accuracy * (100 + hit_bonus)) / 100;
// TODO: April 2003 added an archery/throwing PVP accuracy penalty while moving, should be in here some where,
@ -6348,6 +6353,9 @@ void Mob::CommonOutgoingHitSuccess(Mob* defender, DamageHitInfo &hit, ExtraAttac
MessageString(Chat::MeleeCrit, BOW_DOUBLE_DAMAGE);
}
}
//Scale Factor for Archery Damage Tuning
hit.damage_done *= RuleR(Combat, ArcheryBaseDamageBonus);
}
int extra_mincap = 0;

12
zone/bonuses.cpp
View File

@ -2235,6 +2235,12 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne
break;
}
case SE_IncreaseArchery:
{
new_bonus->increase_archery += effect_value;
break;
}
case SE_TotalHP:
{
new_bonus->FlatMaxHPChange += effect_value;
@ -4533,6 +4539,12 @@ void Mob::NegateSpellEffectBonuses(uint16 spell_id)
if (negate_itembonus) { itembonuses.inhibitmelee = effect_value; }
break;
case SE_IncreaseArchery:
if (negate_spellbonus) { spellbonuses.increase_archery = effect_value; }
if (negate_aabonus) { aabonuses.increase_archery = effect_value; }
if (negate_itembonus) { itembonuses.increase_archery = effect_value; }
break;
case SE_TotalHP:
if (negate_spellbonus) { spellbonuses.FlatMaxHPChange = effect_value; }
if (negate_aabonus) { aabonuses.FlatMaxHPChange = effect_value; }

1
zone/common.h
View File

@ -336,6 +336,7 @@ struct StatBonuses {
int32 hastetype2;
int32 hastetype3;
int32 inhibitmelee;
int32 increase_archery;
float AggroRange; // when calculate just replace original value with this
float AssistRange;
int32 skillmod[EQ::skills::HIGHEST_SKILL + 1];

1
zone/spell_effects.cpp
View File

@ -3341,6 +3341,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
case SE_SkillProcAttempt:
case SE_SkillProcSuccess:
case SE_SpellResistReduction:
case SE_IncreaseArchery:
case SE_Duration_HP_Pct:
case SE_Duration_Mana_Pct:
case SE_Duration_Endurance_Pct:

5
zone/tune.cpp
View File

@ -1323,6 +1323,11 @@ int64 Mob::TuneGetTotalToHit(EQ::skills::SkillType skill, int chance_mod, int ac
aabonuses.HitChanceEffect[skill] +
spellbonuses.HitChanceEffect[skill];
if (skill == EQ::skills::SkillArchery) {
hit_bonus += spellbonuses.increase_archery + aabonuses.increase_archery + itembonuses.increase_archery;
hit_bonus -= hit_bonus * RuleR(Combat, ArcheryHitPenalty);
}
accuracy = (accuracy * (100 + hit_bonus)) / 100;
return accuracy;
}