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

Updates for Druid, Warlock, Shaman #859

Merged
merged 1 commit into from
Jul 5, 2024
Merged

Updates for Druid, Warlock, Shaman #859

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
Binary file modified assets/database/db.bin
View file
Open in desktop
Binary file not shown.
19,037 changes: 9,518 additions & 9,519 deletions assets/database/db.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified assets/database/leftover_db.bin
View file
Open in desktop
Binary file not shown.
2,918 changes: 1,459 additions & 1,459 deletions assets/database/leftover_db.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions proto/common.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ enum WeaponType {
WeaponTypeSword = 9;
}

// NextIndex: 16
enum WeaponSkill {
WeaponSkillUnknown = 0;
WeaponSkillAxes = 1;
Expand All @@ -212,6 +213,7 @@ enum WeaponSkill {
WeaponSkillBows = 12;
WeaponSkillCrossbows = 13;
WeaponSkillGuns = 14;
WeaponSkillFeralCombat = 15;
}

enum HandType {
Expand Down
15 changes: 15 additions & 0 deletions sim/common/sod/item_effects/phase_4.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
)

const (
CraftOfTheShadows = 227280
SulfurasHandOfRagnaros = 227683 // 17182
DukesDomain = 227915
AccursedChalice = 228078
Expand Down Expand Up @@ -222,5 +223,19 @@ func init() {
})
})

///////////////////////////////////////////////////////////////////////////
// Other
///////////////////////////////////////////////////////////////////////////

// https://www.wowhead.com/classic/item=227280/craft-of-the-shadows
// Equip: Increases your maximum Energy by 10.
core.NewItemEffect(CraftOfTheShadows, func(agent core.Agent) {
character := agent.GetCharacter()

if character.HasEnergyBar() {
character.EnableEnergyBar(character.MaxEnergy() + 10)
}
})

core.AddEffectsToTest = true
}
1 change: 1 addition & 0 deletions sim/core/character.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ func (character *Character) applyWeaponSkills() {
character.PseudoStats.BowsSkill += item.WeaponSkills[int32(proto.WeaponSkill_WeaponSkillBows)]
character.PseudoStats.CrossbowsSkill += item.WeaponSkills[int32(proto.WeaponSkill_WeaponSkillCrossbows)]
character.PseudoStats.GunsSkill += item.WeaponSkills[int32(proto.WeaponSkill_WeaponSkillGuns)]
character.PseudoStats.FeralCombatSkill += item.WeaponSkills[int32(proto.WeaponSkill_WeaponSkillFeralCombat)]
}
}

Expand Down
4 changes: 4 additions & 0 deletions sim/core/energy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ func (eb *energyBar) CurrentEnergy() float64 {
return eb.currentEnergy
}

func (eb *energyBar) MaxEnergy() float64 {
return eb.maxEnergy
}

func (eb *energyBar) NextEnergyTickAt() time.Duration {
return eb.nextEnergyTick
}
Expand Down
8 changes: 6 additions & 2 deletions sim/core/stats/stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ const (
WeaponSkillBows
WeaponSkillCrossbows
WeaponSkillGuns
WeaponSkillFeralCombat

WeaponSkillLen
)
Expand Down Expand Up @@ -424,14 +425,16 @@ type PseudoStats struct {
TwoHandedAxesSkill float64
PolearmsSkill float64
StavesSkill float64
FeralCombatSkill float64

// Ranged Skills
BowsSkill float64
CrossbowsSkill float64
GunsSkill float64
ThrownSkill float64

// Special Feral Weapon Skill
FeralCombatSkill float64

///////////////////////////////////////////////////
// Effects that apply when this unit is the target.
///////////////////////////////////////////////////
Expand Down Expand Up @@ -509,12 +512,13 @@ func NewPseudoStats() PseudoStats {
TwoHandedAxesSkill: 0,
PolearmsSkill: 0,
StavesSkill: 0,
FeralCombatSkill: 0,

BowsSkill: 0,
GunsSkill: 0,
CrossbowsSkill: 0,
ThrownSkill: 0,

FeralCombatSkill: 0,
}
}

Expand Down
11 changes: 6 additions & 5 deletions sim/druid/_maul.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ import (

func (druid *Druid) registerMaulSpell() {
flatBaseDamage := 578.0
if druid.Ranged().ID == 23198 { // Idol of Brutality
flatBaseDamage += 50
} else if druid.Ranged().ID == 38365 { // Idol of Perspicacious Attacks
flatBaseDamage += 120
rageCost := 15 - float64(druid.Talents.Ferocity)

switch druid.Ranged().ID {
case IdolOfBrutality:
rageCost -= 3
}

druid.Maul = druid.RegisterSpell(Bear, core.SpellConfig{
Expand All @@ -20,7 +21,7 @@ func (druid *Druid) registerMaulSpell() {
Flags: SpellFlagOmen | core.SpellFlagMeleeMetrics | core.SpellFlagIncludeTargetBonusDamage | core.SpellFlagNoOnCastComplete,

RageCost: core.RageCostOptions{
Cost: 15 - float64(druid.Talents.Ferocity),
Cost: rageCost,
Refund: 0.8,
},

Expand Down
2 changes: 1 addition & 1 deletion sim/druid/druid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ type Druid struct {
Sunfire *DruidSpell
SunfireCat *DruidSpell
SurvivalInstincts *DruidSpell
SwipeBear []*DruidSpell
SwipeBear *DruidSpell
SwipeCat *DruidSpell
TigersFury *DruidSpell
Typhoon *DruidSpell
Expand Down
Loading
Loading