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

Wind druid #313

Merged
merged 9 commits into from
Jun 23, 2024
Merged

Wind druid #313

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6753f71
Added wind druid build
dmelia Jun 22, 2024
aacd537
Added improvements to wind druid routine
dmelia Jun 22, 2024
76a26dc
Changed buff check interval back to 30s
dmelia Jun 22, 2024
0d802c6
Fixed a bug where druid was attacking it's own creeper
dmelia Jun 22, 2024
98373c6
Added improvements to druid buffing and recasting missing buffs like …
dmelia Jun 23, 2024
75dab0c
Merge branch 'main' into wind_druid
SoundsLegit Jun 23, 2024
daf89f1
Update buff.go
SoundsLegit Jun 23, 2024
395c77f
Update wind_druid.go
SoundsLegit Jun 23, 2024
8e4393b
Update wind_druid.go
SoundsLegit Jun 23, 2024
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
Prev Previous commit
Next Next commit
Fixed a bug where druid was attacking it's own creeper
  • Loading branch information
@dmelia
dmelia committed Jun 22, 2024
commit 0d802c6134f56b63558428d52101788995d1ef4a
81 changes: 29 additions & 52 deletions internal/character/wind_druid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ func (du WindDruid) KillMonsterSequence(
id,
3,
step.Distance(druMinDistance, druMaxDistance),
))

),
)
completedAttackLoops++
previousUnitID = int(id)

Expand All @@ -83,38 +83,19 @@ func (du WindDruid) KillMonsterSequence(
}

func (du WindDruid) RecastBuffs(d game.Data) {
if hkb, hurricaneFound := d.KeyBindings.KeyBindingForSkill(skill.Hurricane); hurricaneFound {
du.logger.Error("Hurricane not found")
if !d.PlayerUnit.States.HasState(state.Hurricane) {
du.container.HID.PressKeyBinding(hkb)
helper.Sleep(100)
du.container.HID.Click(game.RightButton, 640, 340)
helper.Sleep(100)
}
}

if okb, oakFound := d.KeyBindings.KeyBindingForSkill(skill.OakSage); oakFound {
if !d.PlayerUnit.States.HasState(state.Oaksage) {

du.container.HID.PressKeyBinding(okb)
helper.Sleep(100)
du.container.HID.Click(game.RightButton, 640, 340)
helper.Sleep(100)

}
}

if akb, armorFound := d.KeyBindings.KeyBindingForSkill(skill.CycloneArmor); armorFound {
if !d.PlayerUnit.States.HasState(state.Cyclonearmor) {

du.container.HID.PressKeyBinding(akb)
helper.Sleep(100)
du.container.HID.Click(game.RightButton, 640, 340)
helper.Sleep(100)

skills := []skill.ID{skill.Hurricane, skill.OakSage, skill.CycloneArmor}

for _, druSkill := range skills {
if kb, found := d.KeyBindings.KeyBindingForSkill(druSkill); found {
du.logger.Error("Hurricane not found")
if !d.PlayerUnit.States.HasState(state.Hurricane) {
du.container.HID.PressKeyBinding(kb)
helper.Sleep(100)
du.container.HID.Click(game.RightButton, 640, 340)
helper.Sleep(100)
}
}
}

}

func (du WindDruid) BuffSkills(d game.Data) (buffs []skill.ID) {
Expand All @@ -124,16 +105,16 @@ func (du WindDruid) BuffSkills(d game.Data) (buffs []skill.ID) {
if _, ravenFound := d.KeyBindings.KeyBindingForSkill(skill.Raven); ravenFound {
buffs = append(buffs, skill.Raven, skill.Raven, skill.Raven, skill.Raven, skill.Raven)
}
if _, hurricaneFound := d.KeyBindings.KeyBindingForSkill(skill.Hurricane); hurricaneFound {
buffs = append(buffs, skill.Hurricane)
}
return buffs
}

func (du WindDruid) PreCTABuffSkills(d game.Data) (skills []skill.ID) {
//_, foundWolf := d.KeyBindings.KeyBindingForSkill(skill.SummonSpiritWolf)
_, foundDireWolf := d.KeyBindings.KeyBindingForSkill(skill.SummonDireWolf)
_, foundBear := d.KeyBindings.KeyBindingForSkill(skill.SummonGrizzly)
_, foundOak := d.KeyBindings.KeyBindingForSkill(skill.OakSage)
_, foundSolar := d.KeyBindings.KeyBindingForSkill(skill.SolarCreeper)
_, foundCarrion := d.KeyBindings.KeyBindingForSkill(skill.CarrionVine)

if foundDireWolf {
skills = append(skills, skill.SummonDireWolf)
Expand All @@ -146,12 +127,6 @@ func (du WindDruid) PreCTABuffSkills(d game.Data) (skills []skill.ID) {
if foundOak {
skills = append(skills, skill.OakSage)
}
if foundSolar {
skills = append(skills, skill.SolarCreeper)
}
if foundCarrion {
skills = append(skills, skill.CarrionVine)
}

return skills
}
Expand Down Expand Up @@ -264,22 +239,24 @@ func (du WindDruid) KillBaal() action.Action {
return du.killMonster(npc.BaalCrab, data.MonsterTypeNone)
}

func (du WindDruid) killMonster(npc npc.ID, t data.MonsterType) action.Action {
func (du WindDruid) killMonster(npcId npc.ID, t data.MonsterType) action.Action {
return action.NewStepChain(func(d game.Data) (steps []step.Step) {
m, found := d.Monsters.FindOne(npc, t)
m, found := d.Monsters.FindOne(npcId, t)
if !found {
return nil
}

helper.Sleep(100)
du.RecastBuffs(d)

steps = append(steps,
step.PrimaryAttack(
m.UnitID,
3,
step.Distance(druMinDistance, druMaxDistance),
))

return steps
for range druMaxAttacksLoop {
steps = append(steps,
step.PrimaryAttack(
m.UnitID,
3,
step.Distance(druMinDistance, druMaxDistance),
),
)
}
return
}, action.CanBeSkipped())
}