Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/wowsims/cata into feature…
Browse files Browse the repository at this point in the history
…/balance-t13
  • Loading branch information
stn-ms committed Jan 8, 2025
2 parents b5fe661 + 60e3ee7 commit 5d6157d
Show file tree
Hide file tree
Showing 427 changed files with 35,100 additions and 25,207 deletions.
Binary file modified assets/database/db.bin
Binary file not shown.
276 changes: 29 additions & 247 deletions assets/database/db.json
4 changes: 4 additions & 0 deletions assets/db_inputs/wowhead_spell_tooltips.csv
13 changes: 12 additions & 1 deletion proto/api.proto
59 changes: 57 additions & 2 deletions proto/apl.proto
21 changes: 20 additions & 1 deletion proto/common.proto
1 change: 1 addition & 0 deletions proto/druid.proto
1 change: 1 addition & 0 deletions proto/paladin.proto
3 changes: 3 additions & 0 deletions proto/shaman.proto
3 changes: 1 addition & 2 deletions proto/ui.proto
12 changes: 8 additions & 4 deletions sim/common/cata/dragonwrath.go
14 changes: 14 additions & 0 deletions sim/common/cata/enchant_effects.go
45 changes: 28 additions & 17 deletions sim/common/cata/gurthalak.go
8 changes: 4 additions & 4 deletions sim/common/cata/metagems.go
21 changes: 15 additions & 6 deletions sim/common/cata/other_effects.go
28 changes: 15 additions & 13 deletions sim/common/cata/stat_bonus_cds.go
216 changes: 191 additions & 25 deletions sim/common/cata/stat_bonus_procs.go
46 changes: 25 additions & 21 deletions sim/common/shared/shared_utils.go
74 changes: 52 additions & 22 deletions sim/core/apl.go
2 changes: 2 additions & 0 deletions sim/core/apl_action.go
16 changes: 8 additions & 8 deletions sim/core/apl_actions_casting.go
40 changes: 37 additions & 3 deletions sim/core/apl_actions_misc.go
4 changes: 2 additions & 2 deletions sim/core/apl_actions_sequences.go
2 changes: 1 addition & 1 deletion sim/core/apl_actions_timing.go
22 changes: 12 additions & 10 deletions sim/core/apl_helpers.go
166 changes: 98 additions & 68 deletions sim/core/apl_value.go
22 changes: 11 additions & 11 deletions sim/core/apl_values_aura.go
87 changes: 74 additions & 13 deletions sim/core/apl_values_aura_sets.go
2 changes: 1 addition & 1 deletion sim/core/apl_values_auto_attacks.go
4 changes: 2 additions & 2 deletions sim/core/apl_values_boss.go
6 changes: 3 additions & 3 deletions sim/core/apl_values_core.go
12 changes: 6 additions & 6 deletions sim/core/apl_values_encounter.go
4 changes: 2 additions & 2 deletions sim/core/apl_values_gcd.go
22 changes: 11 additions & 11 deletions sim/core/apl_values_operators.go
6 changes: 3 additions & 3 deletions sim/core/apl_values_properties.go
228 changes: 210 additions & 18 deletions sim/core/apl_values_resources.go
28 changes: 14 additions & 14 deletions sim/core/apl_values_runes.go
18 changes: 9 additions & 9 deletions sim/core/apl_values_sequences.go
20 changes: 10 additions & 10 deletions sim/core/apl_values_spell.go
8 changes: 4 additions & 4 deletions sim/core/apl_values_test.go
2 changes: 1 addition & 1 deletion sim/core/apl_values_unit.go
3 changes: 3 additions & 0 deletions sim/core/attack.go
14 changes: 14 additions & 0 deletions sim/core/aura_helpers.go
4 changes: 3 additions & 1 deletion sim/core/cast.go
10 changes: 8 additions & 2 deletions sim/core/character.go
32 changes: 24 additions & 8 deletions sim/core/consumes.go
13 changes: 13 additions & 0 deletions sim/core/dot.go
31 changes: 30 additions & 1 deletion sim/core/energy.go
50 changes: 35 additions & 15 deletions sim/core/environment.go
21 changes: 20 additions & 1 deletion sim/core/focus.go
33 changes: 27 additions & 6 deletions sim/core/health.go
40 changes: 34 additions & 6 deletions sim/core/movement.go
22 changes: 19 additions & 3 deletions sim/core/pet.go
4 changes: 4 additions & 0 deletions sim/core/runic_power.go
4 changes: 2 additions & 2 deletions sim/core/spell.go
2 changes: 1 addition & 1 deletion sim/core/spell_result.go
12 changes: 8 additions & 4 deletions sim/core/stats/stats.go
2 changes: 2 additions & 0 deletions sim/core/test_result_compare.go
5 changes: 3 additions & 2 deletions sim/core/unit.go
1,952 changes: 1,032 additions & 920 deletions sim/death_knight/blood/TestBlood.results
92 changes: 92 additions & 0 deletions sim/death_knight/blood_strike.go
1 change: 1 addition & 0 deletions sim/death_knight/dancing_rune_weapon.go
46 changes: 37 additions & 9 deletions sim/death_knight/death_coil.go
3 changes: 3 additions & 0 deletions sim/death_knight/death_knight.go
2,728 changes: 1,132 additions & 1,596 deletions sim/death_knight/frost/TestFrost.results
17 changes: 10 additions & 7 deletions sim/death_knight/frost/frost_test.go
10 changes: 10 additions & 0 deletions sim/death_knight/ghoul_pet.go
2 changes: 1 addition & 1 deletion sim/death_knight/glyphs.go
4 changes: 2 additions & 2 deletions sim/death_knight/items.go
1 change: 1 addition & 0 deletions sim/death_knight/presences.go
2 changes: 1 addition & 1 deletion sim/death_knight/raise_dead.go
11 changes: 6 additions & 5 deletions sim/death_knight/talents_unholy.go
1,856 changes: 984 additions & 872 deletions sim/death_knight/unholy/TestUnholy.results
1 change: 1 addition & 0 deletions sim/death_knight/unholy/unholy_test.go
12 changes: 6 additions & 6 deletions sim/druid/apl_values.go
1,388 changes: 743 additions & 645 deletions sim/druid/balance/TestBalance.results
25 changes: 13 additions & 12 deletions sim/druid/burning_treant.go
2 changes: 2 additions & 0 deletions sim/druid/druid.go
7 changes: 3 additions & 4 deletions sim/druid/eclipse.go
2,236 changes: 1,293 additions & 943 deletions sim/druid/feral/TestFeral.results
12 changes: 12 additions & 0 deletions sim/druid/feral/apl_values.go
12 changes: 9 additions & 3 deletions sim/druid/feral/feral.go
11 changes: 7 additions & 4 deletions sim/druid/feral/feral_test.go
59 changes: 39 additions & 20 deletions sim/druid/feral/rotation.go
2 changes: 1 addition & 1 deletion sim/druid/feral/rotation_aoe.go
6 changes: 4 additions & 2 deletions sim/druid/forms.go
1,713 changes: 1,056 additions & 657 deletions sim/druid/guardian/TestGuardian.results
4 changes: 2 additions & 2 deletions sim/druid/guardian/tank_test.go
10 changes: 8 additions & 2 deletions sim/druid/savage_defense.go
1 change: 1 addition & 0 deletions sim/druid/starsurge.go
2 changes: 1 addition & 1 deletion sim/encounters/_ulduar/hodir_ai.go
532 changes: 532 additions & 0 deletions sim/encounters/firelands/baleroc_ai.go
1 change: 1 addition & 0 deletions sim/encounters/firelands/firelands.go
1 change: 1 addition & 0 deletions sim/hunter/aspects.go
1,460 changes: 779 additions & 681 deletions sim/hunter/beast_mastery/TestBM.results
2 changes: 1 addition & 1 deletion sim/hunter/beast_mastery/beast_mastery.go
10 changes: 6 additions & 4 deletions sim/hunter/bm_talents.go
45 changes: 19 additions & 26 deletions sim/hunter/cata_items.go
5 changes: 3 additions & 2 deletions sim/hunter/kill_command.go
1,492 changes: 753 additions & 739 deletions sim/hunter/marksmanship/TestMM.results
7 changes: 3 additions & 4 deletions sim/hunter/marksmanship/aimed_shot.go
6 changes: 3 additions & 3 deletions sim/hunter/marksmanship/marksmanship_test.go
4 changes: 2 additions & 2 deletions sim/hunter/mm_talents.go
8 changes: 5 additions & 3 deletions sim/hunter/pet.go
29 changes: 28 additions & 1 deletion sim/hunter/pet_abilities.go
6 changes: 6 additions & 0 deletions sim/hunter/pet_talents.go
7 changes: 5 additions & 2 deletions sim/hunter/serpent_sting.go
1,516 changes: 807 additions & 709 deletions sim/hunter/survival/TestSV.results
7 changes: 5 additions & 2 deletions sim/hunter/survival/black_arrow.go
58 changes: 53 additions & 5 deletions sim/hunter/survival/explosive_shot.go
14 changes: 10 additions & 4 deletions sim/hunter/survival_talents.go
4 changes: 2 additions & 2 deletions sim/mage/apl_values.go
1,310 changes: 704 additions & 606 deletions sim/mage/arcane/TestArcane.results
1,338 changes: 718 additions & 620 deletions sim/mage/fire/TestFire.results
11 changes: 3 additions & 8 deletions sim/mage/fire/fire.go
18 changes: 17 additions & 1 deletion sim/mage/flame_orb.go
8 changes: 4 additions & 4 deletions sim/mage/frostfire_bolt.go
22 changes: 13 additions & 9 deletions sim/mage/mirror_image_t12.go
35 changes: 22 additions & 13 deletions sim/mage/talents_fire.go
675 changes: 0 additions & 675 deletions sim/paladin/_talents.go

This file was deleted.

20 changes: 19 additions & 1 deletion sim/paladin/ancient_guardian_pet.go
4 changes: 2 additions & 2 deletions sim/paladin/apl_values.go
2 changes: 1 addition & 1 deletion sim/paladin/avenging_wrath.go
8 changes: 4 additions & 4 deletions sim/paladin/consecration.go
2 changes: 1 addition & 1 deletion sim/paladin/divine_plea.go
2 changes: 1 addition & 1 deletion sim/paladin/divine_protection.go
7 changes: 4 additions & 3 deletions sim/paladin/exorcism.go
29 changes: 13 additions & 16 deletions sim/paladin/glyphs.go
14 changes: 7 additions & 7 deletions sim/paladin/guardian_of_ancient_kings.go
11 changes: 6 additions & 5 deletions sim/paladin/hammer_of_wrath.go
4 changes: 2 additions & 2 deletions sim/paladin/holy_power.go
2 changes: 1 addition & 1 deletion sim/paladin/inquisition.go
46 changes: 33 additions & 13 deletions sim/paladin/items.go
6 changes: 1 addition & 5 deletions sim/paladin/judgement.go
7 changes: 4 additions & 3 deletions sim/paladin/paladin.go
2,141 changes: 2,141 additions & 0 deletions sim/paladin/protection/TestProtection.results
6 changes: 3 additions & 3 deletions sim/paladin/protection/avengers_shield.go
6 changes: 3 additions & 3 deletions sim/paladin/protection/protection.go
197 changes: 94 additions & 103 deletions sim/paladin/protection/protection_test.go
1,640 changes: 953 additions & 687 deletions sim/paladin/retribution/TestRetribution.results
7 changes: 4 additions & 3 deletions sim/paladin/retribution/retribution.go
24 changes: 17 additions & 7 deletions sim/paladin/retribution/retribution_test.go
2 changes: 1 addition & 1 deletion sim/paladin/righteous_fury.go
8 changes: 4 additions & 4 deletions sim/paladin/seal_of_insight.go
8 changes: 4 additions & 4 deletions sim/paladin/seal_of_justice.go
82 changes: 36 additions & 46 deletions sim/paladin/seal_of_righteousness.go
16 changes: 8 additions & 8 deletions sim/paladin/seal_of_truth.go
6 changes: 3 additions & 3 deletions sim/paladin/talents_holy.go
43 changes: 25 additions & 18 deletions sim/paladin/talents_protection.go
23 changes: 17 additions & 6 deletions sim/paladin/talents_retribution.go
1,342 changes: 720 additions & 622 deletions sim/priest/shadow/TestShadow.results
19 changes: 9 additions & 10 deletions sim/priest/shadow/shadow.go
2 changes: 1 addition & 1 deletion sim/rogue/ambush.go
2,029 changes: 1,256 additions & 773 deletions sim/rogue/assassination/TestAssassination.results
9 changes: 1 addition & 8 deletions sim/rogue/assassination/assassination.go
2 changes: 1 addition & 1 deletion sim/rogue/assassination/assassination_test.go
5 changes: 3 additions & 2 deletions sim/rogue/assassination/vendetta.go
2 changes: 1 addition & 1 deletion sim/rogue/backstab.go
2,069 changes: 1,276 additions & 793 deletions sim/rogue/combat/TestCombat.results
3 changes: 2 additions & 1 deletion sim/rogue/combat/adrenaline_rush.go
8 changes: 2 additions & 6 deletions sim/rogue/combat/combat.go
2 changes: 1 addition & 1 deletion sim/rogue/combat/combat_test.go
2 changes: 1 addition & 1 deletion sim/rogue/combat/mastery.go
35 changes: 0 additions & 35 deletions sim/rogue/combat/restless_blades.go

This file was deleted.

4 changes: 3 additions & 1 deletion sim/rogue/eviscerate.go
259 changes: 258 additions & 1 deletion sim/rogue/items.go
2 changes: 1 addition & 1 deletion sim/rogue/recuperate.go
28 changes: 25 additions & 3 deletions sim/rogue/rogue.go
3 changes: 1 addition & 2 deletions sim/rogue/rupture.go
2 changes: 1 addition & 1 deletion sim/rogue/slice_and_dice.go
2,023 changes: 1,253 additions & 770 deletions sim/rogue/subtlety/TestSubtlety.results
2 changes: 1 addition & 1 deletion sim/rogue/subtlety/hemorrhage.go
28 changes: 0 additions & 28 deletions sim/rogue/subtlety/serrated_blades.go

This file was deleted.

7 changes: 3 additions & 4 deletions sim/rogue/subtlety/shadow_dance.go
11 changes: 2 additions & 9 deletions sim/rogue/subtlety/subtlety.go
2 changes: 1 addition & 1 deletion sim/rogue/subtlety/subtlety_test.go
35 changes: 26 additions & 9 deletions sim/rogue/talents.go
54 changes: 0 additions & 54 deletions sim/shaman/_apl_values.go

This file was deleted.

114 changes: 114 additions & 0 deletions sim/shaman/apl_values.go
2 changes: 1 addition & 1 deletion sim/shaman/chain_lightning.go
20 changes: 11 additions & 9 deletions sim/shaman/earth_elemental_pet.go
4 changes: 4 additions & 0 deletions sim/shaman/earth_elemental_totem.go
29 changes: 19 additions & 10 deletions sim/shaman/earthquake.go
1,741 changes: 923 additions & 818 deletions sim/shaman/elemental/TestElemental.results
22 changes: 15 additions & 7 deletions sim/shaman/elemental/dragonwrath.go
3 changes: 2 additions & 1 deletion sim/shaman/elemental/elemental.go
1,429 changes: 767 additions & 662 deletions sim/shaman/enhancement/TestEnhancement.results
2 changes: 1 addition & 1 deletion sim/shaman/enhancement/enhancement.go
2 changes: 1 addition & 1 deletion sim/shaman/enhancement/enhancement_test.go
3 changes: 2 additions & 1 deletion sim/shaman/feral_spirit.go
69 changes: 32 additions & 37 deletions sim/shaman/fire_elemental_pet.go
4 changes: 2 additions & 2 deletions sim/shaman/fire_elemental_spells.go
6 changes: 6 additions & 0 deletions sim/shaman/fire_elemental_totem.go
24 changes: 22 additions & 2 deletions sim/shaman/fire_totems.go
121 changes: 108 additions & 13 deletions sim/shaman/items.go
2 changes: 1 addition & 1 deletion sim/shaman/lavaburst.go
2 changes: 1 addition & 1 deletion sim/shaman/lightning_bolt.go
2 changes: 1 addition & 1 deletion sim/shaman/restoration/restoration.go
9 changes: 7 additions & 2 deletions sim/shaman/shaman.go
5 changes: 1 addition & 4 deletions sim/shaman/talents.go
1,325 changes: 715 additions & 610 deletions sim/warlock/affliction/TestAffliction.results
4 changes: 1 addition & 3 deletions sim/warlock/affliction/affliction.go
4 changes: 3 additions & 1 deletion sim/warlock/affliction/affliction_test.go
11 changes: 3 additions & 8 deletions sim/warlock/demon_soul.go
1,615 changes: 860 additions & 755 deletions sim/warlock/demonology/TestDemonology.results
4 changes: 3 additions & 1 deletion sim/warlock/demonology/demonology_test.go
5 changes: 2 additions & 3 deletions sim/warlock/demonology/metamorphosis.go
1,359 changes: 732 additions & 627 deletions sim/warlock/destruction/TestDestruction.results
2 changes: 1 addition & 1 deletion sim/warlock/doomguard.go
8 changes: 0 additions & 8 deletions sim/warlock/glyphs.go
11 changes: 6 additions & 5 deletions sim/warlock/infernal.go
55 changes: 54 additions & 1 deletion sim/warlock/items.go
6 changes: 6 additions & 0 deletions sim/warlock/soul_fire.go
2 changes: 1 addition & 1 deletion sim/warlock/soul_harvest.go
2 changes: 1 addition & 1 deletion sim/warlock/soulburn.go
2 changes: 1 addition & 1 deletion sim/warlock/talents_affliction.go
4 changes: 2 additions & 2 deletions sim/warlock/talents_demonology.go
2 changes: 1 addition & 1 deletion sim/warlock/talents_destruction.go
9 changes: 9 additions & 0 deletions sim/warlock/warlock.go
1,406 changes: 752 additions & 654 deletions sim/warrior/arms/TestArms.results
1 change: 1 addition & 0 deletions sim/warrior/arms/mortal_strike.go
35 changes: 30 additions & 5 deletions sim/warrior/charge.go
1 change: 1 addition & 0 deletions sim/warrior/colossus_smash.go
1 change: 1 addition & 0 deletions sim/warrior/execute.go
240 changes: 169 additions & 71 deletions sim/warrior/fury/TestFury.results
1 change: 1 addition & 0 deletions sim/warrior/fury/bloodthirst.go
1 change: 1 addition & 0 deletions sim/warrior/fury/raging_blow.go
8 changes: 8 additions & 0 deletions sim/warrior/glyphs.go
2 changes: 2 additions & 0 deletions sim/warrior/heroic_strike_cleave.go
1 change: 1 addition & 0 deletions sim/warrior/heroic_throw.go
29 changes: 14 additions & 15 deletions sim/warrior/items.go
1 change: 1 addition & 0 deletions sim/warrior/overpower.go
1,472 changes: 785 additions & 687 deletions sim/warrior/protection/TestProtectionWarrior.results
1 change: 1 addition & 0 deletions sim/warrior/protection/concussion_blow.go
1 change: 1 addition & 0 deletions sim/warrior/protection/devastate.go
1 change: 1 addition & 0 deletions sim/warrior/protection/shield_slam.go
12 changes: 6 additions & 6 deletions sim/warrior/rend.go
1 change: 1 addition & 0 deletions sim/warrior/revenge.go
1 change: 1 addition & 0 deletions sim/warrior/shattering_throw.go
1 change: 1 addition & 0 deletions sim/warrior/slam.go
1 change: 1 addition & 0 deletions sim/warrior/sunder_armor.go
1 change: 1 addition & 0 deletions sim/warrior/talents.go
1 change: 1 addition & 0 deletions sim/warrior/warrior.go
252 changes: 252 additions & 0 deletions tools/database/overrides.go
33 changes: 33 additions & 0 deletions ui/core/cache_handler.ts
6 changes: 2 additions & 4 deletions ui/core/components/detailed_results.tsx
22 changes: 8 additions & 14 deletions ui/core/components/detailed_results/log_runner.tsx
44 changes: 28 additions & 16 deletions ui/core/components/detailed_results/metrics_table/metrics_table.tsx
2 changes: 1 addition & 1 deletion ui/core/components/detailed_results/player_damage.tsx
33 changes: 21 additions & 12 deletions ui/core/components/detailed_results/result_component.ts
10 changes: 5 additions & 5 deletions ui/core/components/detailed_results/results_filter.ts
168 changes: 113 additions & 55 deletions ui/core/components/detailed_results/timeline.tsx
1 change: 1 addition & 0 deletions ui/core/components/encounter_picker.ts
118 changes: 47 additions & 71 deletions ui/core/components/exporters.tsx
11 changes: 9 additions & 2 deletions ui/core/components/gear_picker/gear_picker.tsx
180 changes: 57 additions & 123 deletions ui/core/components/importers.tsx
29 changes: 26 additions & 3 deletions ui/core/components/individual_sim_ui/apl_actions.ts
55 changes: 39 additions & 16 deletions ui/core/components/individual_sim_ui/apl_helpers.tsx
47 changes: 4 additions & 43 deletions ui/core/components/individual_sim_ui/apl_rotation_picker.ts
282 changes: 233 additions & 49 deletions ui/core/components/individual_sim_ui/apl_values.ts
17 changes: 17 additions & 0 deletions ui/core/components/inputs/other_inputs.ts
26 changes: 20 additions & 6 deletions ui/core/components/item_notice/item_notice.tsx
373 changes: 319 additions & 54 deletions ui/core/components/pickers/list_picker.tsx
76 changes: 61 additions & 15 deletions ui/core/components/raid_sim_action.tsx
3 changes: 1 addition & 2 deletions ui/core/components/results_viewer.tsx
30 changes: 22 additions & 8 deletions ui/core/components/suggest_reforges_action.tsx
394 changes: 394 additions & 0 deletions ui/core/components/wowhead_helper.ts
219 changes: 29 additions & 190 deletions ui/core/constants/item_notices.tsx
4 changes: 2 additions & 2 deletions ui/core/constants/lang.ts
2 changes: 1 addition & 1 deletion ui/core/constants/other.ts
8 changes: 4 additions & 4 deletions ui/core/encounter.ts
16 changes: 9 additions & 7 deletions ui/core/individual_sim_ui.tsx
44 changes: 22 additions & 22 deletions ui/core/launched_sims.ts
7 changes: 5 additions & 2 deletions ui/core/player.ts
4 changes: 2 additions & 2 deletions ui/core/player_classes/druid.ts
71 changes: 56 additions & 15 deletions ui/core/proto_utils/action_id.ts
20 changes: 15 additions & 5 deletions ui/core/proto_utils/logs_parser.tsx
17 changes: 16 additions & 1 deletion ui/core/proto_utils/sim_result.ts
4 changes: 3 additions & 1 deletion ui/core/sim.ts
11 changes: 9 additions & 2 deletions ui/core/sim_concurrent.ts
108 changes: 63 additions & 45 deletions ui/core/talents/glyphs_picker.tsx
32 changes: 32 additions & 0 deletions ui/core/utils.ts
4 changes: 2 additions & 2 deletions ui/core/worker_pool.ts
23 changes: 15 additions & 8 deletions ui/death_knight/blood/sim.ts
384 changes: 358 additions & 26 deletions ui/death_knight/frost/apls/2h.apl.json
577 changes: 547 additions & 30 deletions ui/death_knight/frost/apls/dw.apl.json
890 changes: 846 additions & 44 deletions ui/death_knight/frost/apls/masterfrost.apl.json
40 changes: 21 additions & 19 deletions ui/death_knight/frost/gear_sets/p1.2h.gear.json
40 changes: 21 additions & 19 deletions ui/death_knight/frost/gear_sets/p1.dw.gear.json
40 changes: 21 additions & 19 deletions ui/death_knight/frost/gear_sets/p1.masterfrost.gear.json
21 changes: 21 additions & 0 deletions ui/death_knight/frost/gear_sets/p3.dw.gear.json
40 changes: 21 additions & 19 deletions ui/death_knight/frost/gear_sets/p3.masterfrost.gear.json
21 changes: 21 additions & 0 deletions ui/death_knight/frost/gear_sets/prebis.gear.json
116 changes: 100 additions & 16 deletions ui/death_knight/frost/presets.ts
98 changes: 78 additions & 20 deletions ui/death_knight/frost/sim.ts
1,433 changes: 849 additions & 584 deletions ui/death_knight/unholy/apls/default.apl.json
1,719 changes: 0 additions & 1,719 deletions ui/death_knight/unholy/apls/solace.apl.json

This file was deleted.

30 changes: 15 additions & 15 deletions ui/death_knight/unholy/gear_sets/prebis.gear.json
Loading

0 comments on commit 5d6157d

Please sign in to comment.