Skip to content
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

Jump to bottom

feral: misc tweaks #2085

Merged
merged 2 commits into from
Dec 7, 2022
Merged

feral: misc tweaks #2085

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
ac4e738
ui/feral: fix defaults
jarveson Dec 7, 2022
051d1b0
feral: fix faerie fire to do damage in bear
jarveson Dec 7, 2022
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
7 changes: 5 additions & 2 deletions sim/druid/faerie_fire.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,21 @@ func (druid *Druid) registerFaerieFireSpell() {

ThreatMultiplier: 1,
FlatThreatBonus: 66 * 2,
DamageMultiplier: 1,
CritMultiplier: druid.BalanceCritMultiplier(),

ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
baseDamage := 0.0
outcome := spell.OutcomeMagicHit
if druid.InForm(Bear) {
baseDamage = 1 + 0.15*spell.MeleeAttackPower()
outcome = spell.OutcomeMagicHitAndCrit
}

result := spell.CalcDamage(sim, target, baseDamage, spell.OutcomeMagicHit)
result := spell.CalcAndDealDamage(sim, target, baseDamage, outcome)
if result.Landed() {
druid.FaerieFireAura.Activate(sim)
}
spell.DealDamage(sim, result)
},
})
}
Expand Down
2 changes: 1 addition & 1 deletion ui/feral_druid/presets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const DefaultOptions = FeralDruidOptions.create({

export const DefaultConsumes = Consumes.create({
flask: Flask.FlaskOfEndlessRage,
food: Food.FoodFishFeast,
food: Food.FoodDragonfinFilet,
defaultPotion: Potions.PotionOfSpeed,
});

Expand Down
18 changes: 1 addition & 17 deletions ui/feral_druid/sim.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,12 @@ import { RaidBuffs } from '../core/proto/common.js';
import { PartyBuffs } from '../core/proto/common.js';
import { IndividualBuffs } from '../core/proto/common.js';
import { Debuffs } from '../core/proto/common.js';
import { Class } from '../core/proto/common.js';
import { Consumes } from '../core/proto/common.js';
import { Encounter } from '../core/proto/common.js';
import { ItemSlot } from '../core/proto/common.js';
import { MobType } from '../core/proto/common.js';
import { RaidTarget } from '../core/proto/common.js';
import { Spec } from '../core/proto/common.js';
import { NO_TARGET } from '../core/proto_utils/utils.js';
import { Stat } from '../core/proto/common.js';
import { TristateEffect } from '../core/proto/common.js'
import { Stats } from '../core/proto_utils/stats.js';
import { Player } from '../core/player.js';
import { Sim } from '../core/sim.js';
import { IndividualSimUI } from '../core/individual_sim_ui.js';
import { TypedEvent } from '../core/typed_event.js';

import { FeralDruid, FeralDruid_Rotation as FeralDruidRotation, DruidTalents as DruidTalents, FeralDruid_Options as FeralDruidOptions } from '../core/proto/druid.js';

import * as IconInputs from '../core/components/icon_inputs.js';
import * as OtherInputs from '../core/components/other_inputs.js';
Expand Down Expand Up @@ -89,12 +78,7 @@ export class FeralDruidSimUI extends IndividualSimUI<Spec.SpecFeralDruid> {
// Default talents.
talents: Presets.StandardTalents.data,
// Default spec-specific settings.
specOptions: FeralDruidOptions.create({
innervateTarget: RaidTarget.create({
targetIndex: NO_TARGET, // In an individual sim the 0-indexed player is ourself.
}),
latencyMs: 100,
}),
specOptions: Presets.DefaultOptions,
// Default raid/party buffs settings.
raidBuffs: RaidBuffs.create({
arcaneBrilliance: true,
Expand Down