Skip to content

Commit 585fa75

Browse files
neteyeskingneteyesking
committed
old stuff
1 parent 4840a24 commit 585fa75

7 files changed

Lines changed: 40 additions & 64 deletions

File tree

‎sim/hunter/hunter.go‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package hunter
22

33
import (
4+
"fmt"
45
"time"
56

67
"github.com/wowsims/mop/sim/core"
@@ -127,37 +128,43 @@ func NewHunter(character *core.Character, options *proto.Player, hunterOptions *
127128
}
128129

129130
hunter.AddStatDependencies()
131+
130132
hunter.Pet = hunter.NewHunterPet()
133+
hunter.StampedePet = make([]*HunterPet, 4)
134+
for index := range 3 {
135+
hunter.StampedePet[index] = hunter.NewStampedePet()
136+
}
137+
138+
hunter.DireBeastPet = hunter.NewDireBeastPet()
131139
return hunter
132140
}
133141

134142
func (hunter *Hunter) Initialize() {
135143
hunter.AutoAttacks.RangedConfig().CritMultiplier = hunter.DefaultCritMultiplier()
136144

137145
hunter.FireTrapTimer = hunter.NewTimer()
146+
// hunter.addBloodthirstyGloves()
147+
// Add Stampede pets
138148

149+
// Add Dire Beast pet
139150
// hunter.ApplyGlyphs()
151+
140152
hunter.RegisterSpells()
141-
hunter.ApplyHotfixes()
142153

143-
// hunter.addBloodthirstyGloves()
144-
// Add Stampede pets
145-
hunter.StampedePet = make([]*HunterPet, 4)
146-
for index := range 3 {
147-
hunter.StampedePet[index] = hunter.NewStampedePet()
148-
}
149-
// Add Dire Beast pet
150-
hunter.DireBeastPet = hunter.NewDireBeastPet()
151154
}
152155

153156
func (hunter *Hunter) GetBaseDamageFromCoeff(coeff float64) float64 {
154157
return coeff * hunter.ClassSpellScaling
155158
}
156159

157160
func (hunter *Hunter) ApplyTalents() {
158-
159161
hunter.applyThrillOfTheHunt()
160162
hunter.applyBlinkStrike()
163+
fmt.Println("Sup2")
164+
hunter.ApplyHotfixes()
165+
166+
hunter.Pet.ApplyTalents()
167+
hunter.Pet.ApplySpecialization()
161168
}
162169

163170
func (hunter *Hunter) RegisterSpells() {
@@ -180,6 +187,7 @@ func (hunter *Hunter) RegisterSpells() {
180187
hunter.registerFervorSpell()
181188
hunter.RegisterDireBeastSpell()
182189
hunter.RegisterStampedeSpell()
190+
hunter.registerPowerShotSpell()
183191
}
184192

185193
func (hunter *Hunter) AddStatDependencies() {

‎sim/hunter/pet.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func (hunter *Hunter) NewStampedePet() *HunterPet {
4545

4646
//hasOwnerCooldown: petConfig.SpecialAbility == FuriousHowl || petConfig.SpecialAbility == SavageRend,
4747
}
48-
48+
hunter.AddPet(stampedePet)
4949
return stampedePet
5050
}
5151
func (hunter *Hunter) NewDireBeastPet() *HunterPet {
@@ -65,6 +65,7 @@ func (hunter *Hunter) NewDireBeastPet() *HunterPet {
6565
//hasOwnerCooldown: petConfig.SpecialAbility == FuriousHowl || petConfig.SpecialAbility == SavageRend,
6666
}
6767

68+
hunter.AddPet(stampedePet)
6869
return stampedePet
6970
}
7071
func (hunter *Hunter) NewHunterPet() *HunterPet {
@@ -108,12 +109,10 @@ func (hunter *Hunter) NewHunterPet() *HunterPet {
108109
hp.AddStatDependency(stats.Strength, stats.RangedAttackPower, 2)
109110
hp.AddStatDependency(stats.Agility, stats.PhysicalCritPercent, 1/324.72)
110111

111-
hp.ApplySpecialization()
112112
hunter.AddPet(hp)
113113
return hp
114114
}
115115
func (hp *HunterPet) ApplySpecialization() {
116-
hp.registerRabidCD()
117116
hp.ApplyCombatExperience() // All pets have this
118117
hp.ApplySpikedCollar()
119118

@@ -140,6 +139,8 @@ func (hp *HunterPet) Initialize() {
140139
hp.exoticAbility = hp.NewPetAbility(cfg.ExoticAbility, false)
141140
}
142141
hp.KillCommand = hp.RegisterKillCommandSpell()
142+
143+
hp.registerRabidCD()
143144
}
144145

145146
func (hp *HunterPet) Reset(_ *core.Simulation) {

‎sim/hunter/pet_abilities.go‎

Lines changed: 7 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,14 @@ func (hp *HunterPet) NewPetAbility(abilityType PetAbilityType, isPrimary bool) *
121121
//return hp.newPetDebuff(PetDebuffSpellConfig{SpellID: 35290, CD: time.Second * 25, School: core.SpellSchoolPhysical, DebuffAura: core.GoreAura})
122122
case Ravage:
123123
//return hp.newPetDebuff(PetDebuffSpellConfig{SpellID: 35290, CD: time.Second * 25, School: core.SpellSchoolPhysical, DebuffAura: core.RavageAura})
124-
case StampedeDebuff:
125-
return hp.newPetDebuff(PetDebuffSpellConfig{SpellID: 35290, CD: time.Second * 10, School: core.SpellSchoolPhysical, DebuffAura: core.StampedeAura})
126-
case AcidSpitDebuff:
127-
return hp.newPetDebuff(PetDebuffSpellConfig{SpellID: 55749, CD: time.Second * 10, School: core.SpellSchoolNature, DebuffAura: core.AcidSpitAura})
124+
// case StampedeDebuff:
125+
// return hp.newPetDebuff(PetDebuffSpellConfig{SpellID: 35290, CD: time.Second * 10, School: core.SpellSchoolPhysical, DebuffAura: core.StampedeAura})
126+
// case AcidSpitDebuff:
127+
// return hp.newPetDebuff(PetDebuffSpellConfig{SpellID: 55749, CD: time.Second * 10, School: core.SpellSchoolNature, DebuffAura: core.AcidSpitAura})
128128
case DemoralizingRoar:
129-
return hp.newDemoralizingRoar()
129+
//return hp.newDemoralizingRoar()
130130
case DemoralizingScreech:
131-
return hp.newDemoralizingScreech()
131+
//return hp.newDemoralizingScreech()
132132
case FireBreathDebuff:
133133
return hp.newPetDebuff(PetDebuffSpellConfig{SpellID: 24844, CD: time.Second * 30, School: core.SpellSchoolFire, DebuffAura: core.FireBreathDebuff})
134134
case LightningBreath:
@@ -467,44 +467,6 @@ func (hp *HunterPet) newFrostStormBreath() *core.Spell {
467467
return hp.frostStormBreath
468468
}
469469

470-
func (hp *HunterPet) newDemoralizingScreech() *core.Spell {
471-
debuffs := hp.NewEnemyAuraArray(core.DemoralizingScreechAura)
472-
473-
return hp.newSpecialAbility(PetSpecialAbilityConfig{
474-
Type: DemoralizingScreech,
475-
476-
GCD: PetGCD,
477-
CD: time.Second * 10,
478-
SpellID: 55487,
479-
School: core.SpellSchoolPhysical,
480-
OnSpellHitDealt: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
481-
if result.Landed() {
482-
for _, aoeTarget := range sim.Encounter.TargetUnits {
483-
debuffs.Get(aoeTarget).Activate(sim)
484-
}
485-
}
486-
},
487-
})
488-
}
489-
func (hp *HunterPet) newDemoralizingRoar() *core.Spell {
490-
debuffs := hp.NewEnemyAuraArray(core.DemoralizingScreechAura)
491-
492-
return hp.newSpecialAbility(PetSpecialAbilityConfig{
493-
Type: DemoralizingScreech,
494-
495-
GCD: PetGCD,
496-
CD: time.Second * 10,
497-
SpellID: 55487,
498-
School: core.SpellSchoolPhysical,
499-
OnSpellHitDealt: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
500-
if result.Landed() {
501-
for _, aoeTarget := range sim.Encounter.TargetUnits {
502-
debuffs.Get(aoeTarget).Activate(sim)
503-
}
504-
}
505-
},
506-
})
507-
}
508470
func (hp *HunterPet) newRoarOfCourage() *core.Spell { panic("newRoarOfCourage not implemented") }
509471
func (hp *HunterPet) newSpiritBeastBlessing() *core.Spell {
510472
panic("newSpiritBeastBlessing not implemented")
@@ -514,7 +476,7 @@ func (hp *HunterPet) newSerpentsSwiftness() *core.Spell {
514476
panic("newSerpentsSwiftness not implemented")
515477
}
516478
func (hp *HunterPet) newBellowingRoar() *core.Spell { panic("newBellowingRoar not implemented") }
517-
func (hp *HunterPet) newFuriousHowl() *core.Spell { panic("newFuriousHowl not implemented") }
479+
func (hp *HunterPet) newFuriousHowl() *core.Spell { return hp.focusDump }
518480
func (hp *HunterPet) newTerrifyingRoar() *core.Spell { panic("newTerrifyingRoar not implemented") }
519481
func (hp *HunterPet) newFearlessRoar() *core.Spell { panic("newFearlessRoar not implemented") }
520482
func (hp *HunterPet) newStillWater() *core.Spell { panic("newStillWater not implemented") }

‎sim/hunter/stampede.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ func (hunter *Hunter) RegisterStampedeSpell() {
2323
},
2424
},
2525
ApplyEffects: func(sim *core.Simulation, _ *core.Unit, _ *core.Spell) {
26-
for _, pet := range hunter.StampedePet {
27-
pet.EnableWithTimeout(sim, pet, time.Second*20)
28-
}
26+
// for _, pet := range hunter.StampedePet {
27+
// pet.EnableWithTimeout(sim, pet, time.Second*20)
28+
// }
2929
},
3030
})
3131

‎sim/hunter/survival/specializations.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
package survival
22

33
import (
4+
"fmt"
45
"time"
56

67
"github.com/wowsims/mop/sim/core"
78
"github.com/wowsims/mop/sim/hunter"
89
)
910

11+
func (survHunter *SurvivalHunter) ApplyTalents() {
12+
survHunter.applyLNL()
13+
survHunter.ApplyMods()
14+
survHunter.Hunter.ApplyTalents()
15+
fmt.Println("Sup")
16+
}
1017
func (survHunter *SurvivalHunter) ApplyMods() {
1118
survHunter.AddStaticMod(core.SpellModConfig{
1219
Kind: core.SpellMod_DamageDone_Pct,

‎sim/hunter/survival/survival.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ func RegisterSurvivalHunter() {
2727
func (hunter *SurvivalHunter) Initialize() {
2828
// Initialize global Hunter spells
2929
hunter.Hunter.Initialize()
30-
hunter.applyLNL()
31-
hunter.ApplyMods()
3230
hunter.registerExplosiveShotSpell()
3331
hunter.registerBlackArrowSpell(hunter.FireTrapTimer)
3432
// Apply SV Hunter mastery

‎ui/core/proto_utils/action_id.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ export class ActionId {
778778
} else if (this.otherId) {
779779
return 'other-' + this.otherId;
780780
} else {
781-
throw new Error('Empty action id!');
781+
return 'unknown';
782782
}
783783
}
784784

0 commit comments

Comments
 (0)