Skip to content

Adjust compulsion buff effect #620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zintixx merged 2 commits into from
Jan 15, 2026
Merged

Adjust compulsion buff effect #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15dcefa
Adjust compulsion buff effect
glinesbdev Jan 15, 2026
2d0bfe9
Apply crit at the right time
glinesbdev Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Maple2.Server.Game/Manager/BuffManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ public float TotalCompulsionRate(BuffCompulsionEventType type, int skillId = 0)
}

return skillId == 0 ? nestedCompulsionDic.Values.Sum(compulsion => compulsion.Rate) :
nestedCompulsionDic.Values.Where(compulsion => compulsion.SkillIds.Contains(skillId)).Sum(compulsion => compulsion.Rate);
nestedCompulsionDic.Values.Where(compulsion => compulsion.SkillIds.Contains(skillId) || compulsion.SkillIds.Length == 0).Sum(compulsion => compulsion.Rate);
}

public float GetResistance(BasicAttribute attribute) {
Expand Down
13 changes: 6 additions & 7 deletions Maple2.Server.Game/Util/DamageCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,13 @@ public static (DamageType, long) CalculateDamage(IActor caster, IActor target, D
damageBonus += -target.Buffs.GetResistance(BasicAttribute.AttackSpeed) * caster.Stats.Values[BasicAttribute.AttackSpeed].Total;

// Check for crit and get crit damage
if (property.CanCrit) {
if (property.CompulsionTypes.Contains(CompulsionType.Critical)) {
damageType = DamageType.Critical;
}
if (property.CanCrit && property.CompulsionTypes.Contains(CompulsionType.Critical)) {
damageType = DamageType.Critical;
}

if (damageType != DamageType.Critical) {
damageType = caster.Stats.GetCriticalRate(target.Stats.Values[BasicAttribute.CriticalEvasion].Total, caster.Buffs.TotalCompulsionRate(BuffCompulsionEventType.CritChanceOverride, property.SkillId));
}
float critChanceOverrideRate = caster.Buffs.TotalCompulsionRate(BuffCompulsionEventType.CritChanceOverride, property.SkillId);
if (damageType != DamageType.Critical && critChanceOverrideRate > 0f) {
damageType = caster.Stats.GetCriticalRate(target.Stats.Values[BasicAttribute.CriticalEvasion].Total, critChanceOverrideRate);
}

damageBonus *= damageType == DamageType.Critical ? caster.Stats.GetCriticalDamage(target.Buffs.GetResistance(BasicAttribute.CriticalDamage)) : 1;
Expand Down
Loading