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.

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

Implementing the bear sim #1185

Open
wants to merge 62 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
05d97a4
feral tank set bonus
emsimpson92 Nov 25, 2024
8794b8c
Revert "pk swap should default to false"
emsimpson92 Nov 25, 2024
af9bb85
Revert "PK swap implemented"
emsimpson92 Nov 25, 2024
1cb7958
Enable Feral Tank Druid in ui.
SebPrevas Nov 25, 2024
f7e14af
Merge branch 'master' into FeralTankSetBonus
emsimpson92 Nov 26, 2024
d11bfc7
Merge branch 'FeralTankSetBonus' of https://github.com/emsimpson92/so…
emsimpson92 Nov 27, 2024
e6714b7
Update sim/druid/item_sets_pve.go
emsimpson92 Nov 27, 2024
98d423a
Merge branch 'FeralTankSetBonus' of https://github.com/emsimpson92/so…
emsimpson92 Nov 27, 2024
8a9c3f1
rework
emsimpson92 Nov 27, 2024
90d46a4
Merge branch 'master' of https://github.com/ironclad88/wowsims-sod in…
emsimpson92 Nov 27, 2024
0a6489d
wip
emsimpson92 Nov 28, 2024
dd39589
Merge branch 'wowsims:master' into bearstuff
emsimpson92 Nov 28, 2024
3bdd050
bear stuff
emsimpson92 Nov 28, 2024
af30c00
Merge branch 'bearstuff' of https://github.com/emsimpson92/sod into b…
emsimpson92 Nov 28, 2024
0d6ff4a
updated bear threat mods and added threat multipliers for dots
emsimpson92 Nov 28, 2024
9c3a232
dot threat multipliers fixed
emsimpson92 Nov 28, 2024
a6db207
bear form changes
emsimpson92 Nov 28, 2024
9ddff36
Revert "updated bear threat mods and added threat multipliers for dots"
emsimpson92 Nov 29, 2024
9aeab69
Revert "dot threat multipliers fixed"
emsimpson92 Nov 29, 2024
3eb5170
threat mods
emsimpson92 Nov 29, 2024
ac36e87
missed one
emsimpson92 Nov 29, 2024
7179cb4
fixed tests
emsimpson92 Nov 29, 2024
74ba45c
fixes for maul and lacerate
emsimpson92 Nov 29, 2024
29022fa
Merge branch 'master' of https://github.com/wowsims/sod into bearstuff
emsimpson92 Nov 29, 2024
30c2a2e
bugfixes
emsimpson92 Nov 30, 2024
a1e7ccf
item sets, enrage and gore
emsimpson92 Nov 30, 2024
357e4c9
Merge branch 'BearStuffPhaseOne' of https://github.com/emsimpson92/so…
emsimpson92 Nov 30, 2024
3859cff
more goodies
emsimpson92 Nov 30, 2024
aca45b2
Merge branch 'wowsims:master' into BearStuffPhaseOne
emsimpson92 Nov 30, 2024
024c871
commented out survival instincts
emsimpson92 Nov 30, 2024
446b2ec
Merge branch 'BearStuffPhaseOne' of https://github.com/emsimpson92/so…
emsimpson92 Nov 30, 2024
070660e
fixes
emsimpson92 Nov 30, 2024
af9ff9a
Add feral combat skill to bear.
ironclad88 Dec 1, 2024
615f362
Merge branch 'BearStuffPhaseOne' of https://github.com/emsimpson92/so…
ironclad88 Dec 1, 2024
7d01959
Add Razorbramble and Lodestone thorns effect.
ironclad88 Dec 1, 2024
a05feb5
Merge pull request #1 from ironclad88/BearStuffStoic
emsimpson92 Dec 1, 2024
46aec5d
oh god now I have to do tests
emsimpson92 Dec 1, 2024
4f0803d
misc fixes
emsimpson92 Dec 1, 2024
8d4a546
stage 1: denial
emsimpson92 Dec 1, 2024
a4cf794
removed spells that are registered more than once
emsimpson92 Dec 2, 2024
388b1ae
stage 2: anger
emsimpson92 Dec 2, 2024
39a924a
adding in front of target flag
emsimpson92 Dec 2, 2024
88edb09
update 2pc bonus
emsimpson92 Dec 2, 2024
8f67566
Merge branch 'master' of https://github.com/wowsims/sod into BearStuf…
emsimpson92 Dec 3, 2024
802de41
fixed defender's resolve
emsimpson92 Dec 3, 2024
dd1b444
Fix Maul hitting twice per cast, and sorting its threat mod.
ironclad88 Dec 3, 2024
3a21130
Merge branch 'BearStuffPhaseOne' of https://github.com/emsimpson92/so…
ironclad88 Dec 3, 2024
51b8004
Fix Bear T2 4pc bonus overwriting crit chance bonus.
ironclad88 Dec 3, 2024
e5955fe
stage 3: bargaining
emsimpson92 Dec 3, 2024
1bfdf86
maul threat mod
emsimpson92 Dec 3, 2024
94acdb0
Fix review comments.
SebPrevas Dec 3, 2024
f887e8b
Bug fixes for last commit.
SebPrevas Dec 3, 2024
b473ee8
reverted lacerate
emsimpson92 Dec 4, 2024
9dcba87
damage formula updated
emsimpson92 Dec 5, 2024
13631d1
Merge branch 'BearStuffPhaseOne' of https://github.com/ironclad88/wow…
emsimpson92 Dec 5, 2024
f34ba32
Merge branch 'BearStuffPhaseOne' of https://github.com/emsimpson92/so…
emsimpson92 Dec 5, 2024
7f28950
Merge branch 'master' of https://github.com/wowsims/sod into BearStuf…
emsimpson92 Dec 5, 2024
7809b0b
resovled master
emsimpson92 Jan 5, 2025
ba6007b
more later
emsimpson92 Jan 5, 2025
d8e8bfc
rework
emsimpson92 Jan 5, 2025
79b6ee0
build errors
emsimpson92 Jan 5, 2025
aaffeb8
Merge branch 'master' into BearStuffPhaseOne
kayla-glick Jan 14, 2025
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
Empty file modified assets/favicon_io/android-chrome-192x192.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/favicon_io/android-chrome-512x512.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/favicon_io/apple-touch-icon.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/favicon_io/favicon-16x16.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/favicon_io/favicon-32x32.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/favicon_io/favicon.ico
100755 → 100644
Empty file.
Empty file modified assets/favicon_io/site.webmanifest
100755 → 100644
Empty file.
Empty file modified pre-commit
100755 → 100644
Empty file.
49 changes: 48 additions & 1 deletion sim/common/vanilla/item_effects.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ const (
KalimdorsRevenge = 233621
JomGabbar = 233627 // 23570
NeretzekBloodDrinker = 233647
RazorbrambleShoulderpads = 233804
RazorbrambleCowl = 233808
RazorbrambleLeathers = 233813
Speedstone = 233990
LodestoneofRetaliation = 233992
ManslayerOfTheQiraji = 234067
EyeOfMoam = 234080 // 21473
DarkmoonCardHeroism = 234176 // 19287
Expand Down Expand Up @@ -2371,13 +2375,28 @@ func init() {
Name: "Fiery Aura Proc",
Callback: core.CallbackOnSpellHitTaken,
Outcome: core.OutcomeLanded,
ProcMask: core.ProcMaskMelee, // TODO: Unsure if this means melee attacks or all attacks
ProcMask: core.ProcMaskMelee,
Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
procSpell.Cast(sim, spell.Unit)
},
})
})

// https://www.wowhead.com/classic/item=228293/essence-of-the-pure-flame
// Equip: When struck in combat inflicts 100 Nature damage to the attacker. Causes twice as much threat as damage dealt.
core.NewItemEffect(RazorbrambleLeathers, func(agent core.Agent) {
DamageShieldWithThreatMod(agent.GetCharacter(), 1213813, 100, 2, "Damage Shield Razorbramble Leathers")
})
core.NewItemEffect(RazorbrambleShoulderpads, func(agent core.Agent) {
DamageShieldWithThreatMod(agent.GetCharacter(), 1213816, 80, 2, "Damage Shield Razorbramble Shoulderpads")
})
core.NewItemEffect(RazorbrambleCowl, func(agent core.Agent) {
DamageShieldWithThreatMod(agent.GetCharacter(), 1213813, 100, 2, "Damage Shield Razorbramble Cowl")
})
core.NewItemEffect(LodestoneofRetaliation, func(agent core.Agent) {
DamageShieldWithThreatMod(agent.GetCharacter(), 1213816, 80, 2, "Damage Shield Lodestone of Retaliation")
})
Comment on lines +2385 to +2398
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't realize these were included here but I already implemented these in https://github.com/wowsims/sod/blob/master/sim/common/sod/item_effects/phase_6.go the other day while adding in all of the missing Thorns effects


// https://www.wowhead.com/classic/item=234080/eye-of-moam
// Use: Increases damage done by magical spells and effects by up to 150, and decreases the magical resistances of your spell targets by 100 for 30 sec. (3 Min Cooldown)
core.NewSimpleStatOffensiveTrinketEffect(EyeOfMoam, stats.Stats{stats.SpellDamage: 150, stats.SpellPenetration: 100}, time.Second*30, time.Minute*3)
Expand Down Expand Up @@ -3356,6 +3375,34 @@ func manslayerOfTheQirajiAura(character *core.Character) *core.Aura {
})
}

func DamageShieldWithThreatMod(character *core.Character, spellID int32, damage float64, threatMod float64, procName string) {

procSpell := character.GetOrRegisterSpell(core.SpellConfig{
ActionID: core.ActionID{SpellID: spellID},
SpellSchool: core.SpellSchoolNature,
DefenseType: core.DefenseTypeMagic,
ProcMask: core.ProcMaskEmpty,
Flags: core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell,

DamageMultiplier: 1,
ThreatMultiplier: threatMod,

ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
spell.CalcAndDealDamage(sim, target, damage, spell.OutcomeAlwaysHit)
},
})

core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
Name: procName,
Callback: core.CallbackOnSpellHitTaken,
Outcome: core.OutcomeLanded,
ProcMask: core.ProcMaskMelee,
Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
procSpell.Cast(sim, spell.Unit)
},
})
}

func neretzekBloodDrinkerEffect(character *core.Character) *core.Spell { // PPM based on old ppm from Armamaments discord
actionID := core.ActionID{SpellID: 1214208}
healthMetrics := character.NewHealthMetrics(actionID)
Expand Down
66 changes: 0 additions & 66 deletions sim/druid/_frenzied_regeneration.go

This file was deleted.

106 changes: 0 additions & 106 deletions sim/druid/_lacerate.go

This file was deleted.

103 changes: 0 additions & 103 deletions sim/druid/_maul.go

This file was deleted.

Loading
Loading