Skip to content

Enable PvE(M) Life Bolt Crit #4

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

Open
euphemos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable PvE(M) Life Bolt Crit #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions Source/ACE.Server/Managers/PropertyManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,21 +675,24 @@ public static void LoadDefaultProperties()
("block_vpn_connections", new Property<bool>(false, "enable this to block user sessions from IPs identified as VPN proxies")),
("increase_minimum_encounter_spawn_density", new Property<bool>(false, "enable this to increase the density of random encounters that spawn in low density landblocks")),
("command_who_enabled", new Property<bool>(true, "disable this to prevent players from listing online players in their allegiance")),

("enforce_player_movement", new Property<bool>(false, "enable this to enforce server side verification of player movement")),
("enforce_player_movement_speed", new Property<bool>(false, "enable this to enforce server side verification of player movement speed")),
("enforce_player_movement_kick", new Property<bool>(false, "enable this to kick players that fail movement verification too frenquently")),
("fall_damage_enabled", new Property<bool>(true, "Toggles whether fall damage is enabled")),

("useable_gems", new Property<bool>(true, "Allows loot generated gems to be used to cast their spells")),
("allow_PKs_to_go_NPK", new Property<bool>(true, "Allows PKs to go back to being NPKs by using the appropriate altar")),
("show_discord_chat_ingame", new Property<bool>(false, "Display messages posted to Discord in general chat")),
("allow_multiple_accounts_hc", new Property<bool>(false, "Toggles whether multiple accounts are allowed in Hardcore mode")),

("assess_creature_pve_always_succeed", new Property<bool>(false, "enable this to bypass assess creature PvE skill checks (workaround to fix 5 second delay on vtank looting which occurs due to failed assess)")),
("relive_bonus_applies_to_received_fellow_xp", new Property<bool>(true, "Toggles whether incoming xp received from fellowship members benefits from the relive bonus.")),

("fall_damage_enabled", new Property<bool>(true, "Toggles whether fall damage is enabled")),
("allow_multiple_accounts_hc", new Property<bool>(false, "Toggles whether multiple accounts are allowed in Hardcore mode")),
("relive_bonus_applies_to_received_fellow_xp", new Property<bool>(true, "Toggles whether incoming xp received from fellowship members benefits from the relive bonus.")),
("dekaru_hc_keep_non_equippable_bonded_on_death", new Property<bool>(true, "Toggles whether bonded items are kept on a hardcore death despite being non-equippable")),
("dekaru_dual_wield_speed_mod", new Property<bool>(true, "Toggles whether Dekaru's dual wield speed changes (other than for dagger) are enabled")),
("dekaru_hc_keep_non_equippable_bonded_on_death", new Property<bool>(true, "Toggles whether bonded items are kept on a hardcore death despite being non-equippable"))


("pve_allow_life_projectile_crit", new Property<bool>(true, "Toggles whether life bolts can crit in PvE"))

);

public static readonly ReadOnlyDictionary<string, Property<long>> DefaultLongProperties =
Expand Down
21 changes: 13 additions & 8 deletions Source/ACE.Server/WorldObjects/SpellProjectile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,17 +635,22 @@ public List<Creature> GetNearbyTargets(Creature aroundCreature)
{
lifeMagicDamage = LifeProjectileDamage * Spell.DamageRatio;

if (!isPvP || Common.ConfigManager.Config.Server.WorldRuleset != Common.Ruleset.CustomDM)
if (!isPvP)
{
// could life magic projectiles crit?
// if so, did they use the same 1.5x formula as war magic, instead of 2.0x?
// For lack of other evidence, ACE team (Opti, gmriggs, Scribble, Crimson, fatboi, Immortal Bob)
// concluded on Discord 2018 July 4/5 that all projectile spells could crit in PvE, including Void/Life.
// They found no evidence direct cast (prots, harm, drains, etc.) could crit.
// They went with a default bonus of 50% to correspond to War.
if (criticalHit)
{
// verify: CriticalMultiplier only applied to the additional crit damage,
// whereas CD/CDR applied to the total damage (base damage + additional crit damage)
weaponCritDamageMod = GetWeaponCritDamageMod(weapon, sourceCreature, attackSkill, target, isPvP);

critDamageBonus = lifeMagicDamage * 0.5f * weaponCritDamageMod;
bool lifeCrits = PropertyManager.GetBool("pve_allow_life_projectile_crit", true, true).Item;
if (lifeCrits)
{
// verify: CriticalMultiplier only applied to the additional crit damage,
// whereas CD/CDR applied to the total damage (base damage + additional crit damage)
weaponCritDamageMod = GetWeaponCritDamageMod(weapon, sourceCreature, attackSkill, target, isPvP);
critDamageBonus = lifeMagicDamage * 0.5f * weaponCritDamageMod;
}
}
}

Expand Down