-
Notifications
You must be signed in to change notification settings - Fork 26
Priest Atiesh stats added #119
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
Closed
Closed
Changes from 44 commits
Commits
Show all changes
47 commits
Select commit
Hold shift + click to select a range
c9b739b
Atiesh stats added
Zephryl87 7aa7bdc
Update and rename _items.go to items.go
Zephryl87 62bae42
Update buffs.go
Zephryl87 25a811f
Update items.go
Zephryl87 c0b3e12
Update and rename items.go to _items.go
Zephryl87 229bbd1
Update and rename p1.bis.gear.json to p1.shadow.json
Zephryl87 49dd6d5
Update p1.shadow.json
Zephryl87 e5482de
Create p2.shadow.json
Zephryl87 17e6232
Create p3.shadow.json
Zephryl87 6077c89
Create p4.shadow.json
Zephryl87 9237607
Create p5.shadow.json
Zephryl87 3d3103c
Create p6.shadow.json
Zephryl87 a52629a
Update presets.ts
Zephryl87 275793f
Update and rename p1.apl.json to shadow_ud.apl.json
Zephryl87 d8d0ca9
Create shadow.apl.json
Zephryl87 3b96a9e
Update shadow.apl.json
Zephryl87 b93d417
Create disc.apl.json
Zephryl87 d15a97b
Update presets.ts
Zephryl87 0b33b38
Create p1.disc.json
Zephryl87 b212124
Create disc.p2.json
Zephryl87 9015f44
Rename p1.disc.json to disc.p1.json
Zephryl87 dcb5ccd
Create disc.p4.json
Zephryl87 41e6dd7
Create disc.p3.json
Zephryl87 dde23c0
Create disc.p5.json
Zephryl87 a6a8fb2
Create disc.p6.json
Zephryl87 f2dd3ae
Rename p1.shadow.json to shadow.p1.json
Zephryl87 39e5123
Rename p2.shadow.json to shadow.p2.json
Zephryl87 9c38ac2
Rename p3.shadow.json to shadow.p3.json
Zephryl87 e33058c
Rename p4.shadow.json to shadow.p4.json
Zephryl87 67feda2
Rename p5.shadow.json to shadow.p5.json
Zephryl87 d2ccf2c
Rename p6.shadow.json to shadow.p6.json
Zephryl87 8cae17e
Update presets.ts
Zephryl87 8dff9f2
Update shadow.apl.json
Zephryl87 deed98c
Update disc.apl.json
Zephryl87 fc3f485
Update shadow_priest_test.go
Zephryl87 99ad185
Update shadow_priest_test.go
Zephryl87 079aaf6
Update shadow_priest_test.go
Zephryl87 80cfcfa
Rename shadow_ud.apl.json to p1.apl.json
Zephryl87 551c663
Update presets.ts
Zephryl87 1c7d745
Update presets.ts
Zephryl87 f635ebe
Update inputs.ts
Zephryl87 ed37e00
Update presets.ts
Zephryl87 3888ea4
Update sim.ts
Zephryl87 4baaeb3
Update presets.ts
Zephryl87 2d9dcca
Rename _items.go to items.go
Zephryl87 1c476c5
Rename items.go to _items.go
Zephryl87 5b93181
Update index.html
Zephryl87 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,26 @@ | ||
| package priest | ||
|
|
||
| import ( | ||
| "slices" | ||
| "time" | ||
|
|
||
| "github.com/wowsims/classic/sim/core" | ||
| ) | ||
|
|
||
| const ( | ||
| // Keep these ordered by ID | ||
| CassandrasTome = 231509 | ||
| AtieshPriest = 22631 | ||
| ) | ||
|
|
||
| func init() { | ||
| core.AddEffectsToTest = false | ||
|
|
||
| // Keep these ordered by name | ||
|
|
||
| // https://www.wowhead.com/classic/item=231509/cassandras-tome | ||
| core.NewItemEffect(CassandrasTome, func(agent core.Agent) { | ||
| priest := agent.(PriestAgent).GetPriest() | ||
|
|
||
| actionID := core.ActionID{ItemID: CassandrasTome} | ||
| duration := time.Second * 15 | ||
| affectedSpells := []*core.Spell{} | ||
|
|
||
| buffAura := priest.RegisterAura(core.Aura{ | ||
| ActionID: actionID, | ||
| Label: "Cassandra's Tome", | ||
| Duration: duration, | ||
| OnInit: func(aura *core.Aura, sim *core.Simulation) { | ||
| affectedSpells = core.FilterSlice(priest.Spellbook, func(spell *core.Spell) bool { | ||
| return spell.Flags.Matches(SpellFlagPriest) && !spell.Flags.Matches(core.SpellFlagPureDot|core.SpellFlagChanneled) | ||
| }) | ||
| }, | ||
| OnGain: func(aura *core.Aura, sim *core.Simulation) { | ||
| for _, spell := range affectedSpells { | ||
| spell.BonusCritRating += 100 * core.SpellCritRatingPerCritChance | ||
| } | ||
| }, | ||
| OnExpire: func(aura *core.Aura, sim *core.Simulation) { | ||
| for _, spell := range affectedSpells { | ||
| spell.BonusCritRating -= 100 * core.SpellCritRatingPerCritChance | ||
| } | ||
| }, | ||
| OnCastComplete: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) { | ||
| if slices.Contains(affectedSpells, spell) { | ||
| aura.Deactivate(sim) | ||
| } | ||
| }, | ||
| }) | ||
|
|
||
| spell := priest.RegisterSpell(core.SpellConfig{ | ||
| ActionID: actionID, | ||
| Flags: core.SpellFlagNoOnCastComplete | core.SpellFlagOffensiveEquipment, | ||
| Cast: core.CastConfig{ | ||
| CD: core.Cooldown{ | ||
| Timer: priest.NewTimer(), | ||
| Duration: time.Minute * 2, | ||
| }, | ||
| // Does not seem to share the offensive trinket timer | ||
| }, | ||
| ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { | ||
| buffAura.Activate(sim) | ||
| }, | ||
| }) | ||
|
|
||
| priest.AddMajorCooldown(core.MajorCooldown{ | ||
| Spell: spell, | ||
| Type: core.CooldownTypeDPS, | ||
| }) | ||
| // https://www.wowhead.com/classic/item=22631/atiesh-greatstaff-of-the-guardian | ||
| core.NewItemEffect(AtieshPriest, func(agent core.Agent) { | ||
| character := agent.GetCharacter() | ||
| aura := core.AtieshHealingEffect(&character.Unit) | ||
| character.ItemSwap.RegisterProc(AtieshPriest, aura) | ||
| }) | ||
|
|
||
| core.AddEffectsToTest = true | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "type": "TypeAPL", | ||
| "prepullActions": [ | ||
| {"action":{"castSpell":{"spellId":{"spellId":15261,"rank":8}}},"doAtValue":{"const":{"val":"-3s"}}} | ||
| ], | ||
| "priorityList": [ | ||
| {"action":{"autocastOtherCooldowns":{}}}, | ||
| {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":10894,"rank":8}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}}]}},"castSpell":{"spellId":{"spellId":10894,"rank":8}}}}, | ||
| {"action":{"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14751}}},{"castSpell":{"spellId":{"spellId":10934,"rank":8}}}]}}}, | ||
| {"action":{"castSpell":{"spellId":{"spellId":10934,"rank":8}}}} | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| { | ||
| "type": "TypeAPL", | ||
| "prepullActions": [ | ||
| {"action":{"castSpell":{"spellId":{"spellId":15473}}},"doAtValue":{"const":{"val":"-5s"}}}, | ||
| {"action":{"castSpell":{"spellId":{"spellId":10947,"rank":9}}},"doAtValue":{"const":{"val":"-1s"}}} | ||
| ], | ||
| "priorityList": [ | ||
| {"action":{"autocastOtherCooldowns":{}}}, | ||
| {"action":{"condition":{"and":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":10894,"rank":8}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10"}}}}]}},"castSpell":{"spellId":{"spellId":10894,"rank":8}}}}, | ||
| {"action":{"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":14751}}},{"castSpell":{"spellId":{"spellId":10947,"rank":9}}}]}}}, | ||
| {"action":{"castSpell":{"spellId":{"spellId":10947,"rank":9}}}}, | ||
| {"action":{"castSpell":{"spellId":{"spellId":18807,"rank":6}}}} | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| {"items": [ | ||
| {"id":18727,"enchant":1509}, | ||
| {"id":18814}, | ||
| {"id":18681}, | ||
| {"id":17078}, | ||
| {"id":19145,"enchant":1891}, | ||
| {"id":18709,"enchant":1883}, | ||
| {"id":13253}, | ||
| {"id":19136}, | ||
| {"id":13170,"enchant":1509}, | ||
| {"id":11822,"enchant":911}, | ||
| {"id":19147}, | ||
| {"id":19147}, | ||
| {"id":18820}, | ||
| {"id":12930}, | ||
| {"id":18842,"enchant":2504}, | ||
| {}, | ||
| {"id":13938} | ||
| ]} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| {"items": [ | ||
| {"id":18727,"enchant":2544}, | ||
| {"id":18814}, | ||
| {"id":18681}, | ||
| {"id":18350}, | ||
| {"id":19145,"enchant":1891}, | ||
| {"id":18497,"enchant":1883}, | ||
| {"id":13253}, | ||
| {"id":19136}, | ||
| {"id":13170,"enchant":2544}, | ||
| {"id":19131,"enchant":911}, | ||
| {"id":19147}, | ||
| {"id":19147}, | ||
| {"id":18820}, | ||
| {"id":12930}, | ||
| {"id":17070,"enchant":2504}, | ||
| {"id":11904}, | ||
| {"id":13938} | ||
| ]} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| {"items": [ | ||
| {"id":19375,"enchant":2544}, | ||
| {"id":18814}, | ||
| {"id":19370}, | ||
| {"id":19378}, | ||
| {"id":19145,"enchant":1891}, | ||
| {"id":19374,"enchant":1883}, | ||
| {"id":13253}, | ||
| {"id":19400}, | ||
| {"id":19165,"enchant":2544}, | ||
| {"id":19131,"enchant":911}, | ||
| {"id":19147}, | ||
| {"id":19403}, | ||
| {"id":18820}, | ||
| {"id":19379}, | ||
| {"id":19360,"enchant":2504}, | ||
| {"id":19366}, | ||
| {"id":13938} | ||
| ]} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| {"items": [ | ||
| {"id":19375,"enchant":2544}, | ||
| {"id":18814}, | ||
| {"id":19370,"enchant":2605}, | ||
| {"id":19857}, | ||
| {"id":19682,"enchant":1891}, | ||
| {"id":19374,"enchant":1883}, | ||
| {"id":19929}, | ||
| {"id":19400}, | ||
| {"id":19683,"enchant":2544}, | ||
| {"id":19684,"enchant":911}, | ||
| {"id":19147}, | ||
| {"id":19403}, | ||
| {"id":19950}, | ||
| {"id":19379}, | ||
| {"id":19360,"enchant":2504}, | ||
| {"id":19366}, | ||
| {"id":19861} | ||
| ]} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| {"items": [ | ||
| {"id":22267,"enchant":2544}, | ||
| {"id":18814}, | ||
| {"id":19370,"enchant":2605}, | ||
| {"id":22731}, | ||
| {"id":19682,"enchant":1891}, | ||
| {"id":21186,"enchant":1883}, | ||
| {"id":21585,"enchant":2614}, | ||
| {"id":22730}, | ||
| {"id":19683,"enchant":2544}, | ||
| {"id":19684,"enchant":911}, | ||
| {"id":21709}, | ||
| {"id":19403}, | ||
| {"id":19950}, | ||
| {"id":19379}, | ||
| {"id":19360,"enchant":2504}, | ||
| {"id":21597}, | ||
| {"id":21603} | ||
| ]} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| {"items": [ | ||
| {"id":23035,"enchant":2544}, | ||
| {"id":18814}, | ||
| {"id":22983,"enchant":2721}, | ||
| {"id":23050}, | ||
| {"id":19682,"enchant":1891}, | ||
| {"id":21186,"enchant":1883}, | ||
| {"id":21585,"enchant":2614}, | ||
| {"id":22730}, | ||
| {"id":19683,"enchant":2544}, | ||
| {"id":19684,"enchant":911}, | ||
| {"id":21709}, | ||
| {"id":23031}, | ||
| {"id":23046}, | ||
| {"id":19379}, | ||
| {"id":22800,"enchant":2504}, | ||
| {}, | ||
| {"id":22820} | ||
| ]} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @Zephryl87 you need to remove the underscore from the file name in order to have it loaded. In Go, files starting with
_are not loadedThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know.. I was getting errors, so I put the underscore in again.. xD
I'll see, what the issue was.. I actually forgot about it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh, yea.. the itemswap thingy.. not sure how to solve this.. >.<
I think I'll need help with this one.. ^^"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This isn't needed for the stats anyway, no? I'll just add back in the underscore, since the aura ist just affecting healing and we don't have healing sims right now.