Merge pull request #150 from wowsims/sim-status

Update shaman / balance statuses
wowsims · Feb 8, 2024 · 77a5ce5 · 77a5ce5
2 parents b1e38a6 + e680a0d
commit 77a5ce5
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 13 deletions.
diff --git a/sim/druid/balance/balance.go b/sim/druid/balance/balance.go
@@ -38,6 +38,14 @@ func NewBalanceDruid(character *core.Character, options *proto.Player) *BalanceD
 		moonkin.SelfBuffs.InnervateTarget = balanceOptions.Options.InnervateTarget
 	}
 
+	// moonkin.EnableEnergyBar(100.0)
+
+	// Enable Auto Attacks for this spec
+	// moonkin.EnableAutoAttacks(moonkin, core.AutoAttackOptions{
+	// 	MainHand:       moonkin.GetCatWeapon(),
+	// 	AutoSwingMelee: true,
+	// })
+
 	return moonkin
 }
 
@@ -59,4 +67,5 @@ func (moonkin *BalanceDruid) GetDruid() *druid.Druid {
 func (moonkin *BalanceDruid) Initialize() {
 	moonkin.Druid.Initialize()
 	moonkin.RegisterBalanceSpells()
+	// moonkin.RegisterFeralCatSpells()
 }
diff --git a/ui/balance_druid/presets.ts b/ui/balance_druid/presets.ts
@@ -1,4 +1,4 @@
-import { Phase } from '../core/constants/other.js';
+import { CURRENT_PHASE, Phase } from '../core/constants/other.js';
 import {
 	Consumes,
 	Debuffs,
@@ -23,8 +23,6 @@ import * as PresetUtils from '../core/preset_utils.js';
 import BlankGear from './gear_sets/blank.gear.json';
 import Phase1Gear from './gear_sets/phase_1.gear.json';
 
-import Phase1APL from './apls/phase_1.apl.json';
-
 // Preset options for this spec.
 // Eventually we will import these values for the raid sim too, so its good to
 // keep them in a separate file.
@@ -51,20 +49,25 @@ export const DefaultGear = GearPresets[Phase.Phase1][0];
 //                                 APL Presets
 ///////////////////////////////////////////////////////////////////////////
 
+import Phase1APL from './apls/phase_1.apl.json';
+import Phase2APL from './apls/phase_2.apl.json';
+
 export const APLPhase1 = PresetUtils.makePresetAPLRotation('Phase 1', Phase1APL);
+export const APLPhase2 = PresetUtils.makePresetAPLRotation('Phase 2', Phase2APL);
 
 export const APLPresets = {
   [Phase.Phase1]: [
     APLPhase1,
   ],
   [Phase.Phase2]: [
+		APLPhase2,
   ]
 };
 
 // TODO: Add Phase 2 preset and pull from map
 export const DefaultAPLs: Record<number, PresetUtils.PresetRotation> = {
   25: APLPresets[Phase.Phase1][0],
-  40: APLPresets[Phase.Phase1][0],
+  40: APLPresets[Phase.Phase2][0],
 };
 
 ///////////////////////////////////////////////////////////////////////////
@@ -81,16 +84,24 @@ export const TalentsPhase1 = {
 	}),
 };
 
+export const TalentsPhase2 = {
+	name: 'Phase 2',
+	data: SavedTalents.create({
+		talentsString: '5000500302541051',
+	}),
+};
+
 export const TalentPresets = {
   [Phase.Phase1]: [
     TalentsPhase1,
   ],
   [Phase.Phase2]: [
+		TalentsPhase2
   ]
 };
 
 // TODO: Add Phase 2 preset and pull from map
-export const DefaultTalents = TalentPresets[Phase.Phase1][0];
+export const DefaultTalents = TalentPresets[CURRENT_PHASE][0];
 
 ///////////////////////////////////////////////////////////////////////////
 //                                 Options

diff --git a/ui/core/launched_sims.ts b/ui/core/launched_sims.ts
@@ -24,7 +24,7 @@ export const raidSimStatus: SimStatus = {
 // This list controls which links are shown in the top-left dropdown menu.
 export const simLaunchStatuses: Record<Spec, SimStatus> = {
 	[Spec.SpecBalanceDruid]: {
-		phase: Phase.Phase1,
+		phase: Phase.Phase2,
 		status: LaunchStatus.Alpha,
 	},
 	[Spec.SpecFeralDruid]: {
@@ -41,11 +41,11 @@ export const simLaunchStatuses: Record<Spec, SimStatus> = {
 	},
 	[Spec.SpecElementalShaman]: {
 		phase: Phase.Phase2,
-		status: LaunchStatus.Alpha,
+		status: LaunchStatus.Beta,
 	},
 	[Spec.SpecEnhancementShaman]: {
 		phase: Phase.Phase2,
-		status: LaunchStatus.Alpha,
+		status: LaunchStatus.Beta,
 	},
 	[Spec.SpecRestorationShaman]: {
 		phase: Phase.Phase1,

diff --git a/ui/index.html b/ui/index.html
@@ -115,7 +115,7 @@ <h3 class="expansion-title w-100 mb-0">Season of Discovery</h2>
 										</div>
 										<div class="d-flex flex-column">
 											<span class="sim-link-title">Druid</span>
-											<span class="launch-status-label text-brand">Phase 1 - Alpha</span>
+											<span class="launch-status-label text-brand">Partial Phase 2 Support</span>
 										</div>
 									</div>
 								</a>
@@ -127,7 +127,7 @@ <h3 class="expansion-title w-100 mb-0">Season of Discovery</h2>
 												<div class="d-flex flex-column">
 													<span class="sim-link-label">Druid</span>
 													<span class="sim-link-title">Balance</span>
-													<span class="launch-status-label text-brand">Phase 1 - Alpha</span>
+													<span class="launch-status-label text-brand">Phase 2 - Alpha</span>
 												</div>
 											</div>
 										</a>
@@ -187,7 +187,7 @@ <h3 class="expansion-title w-100 mb-0">Season of Discovery</h2>
 										<img src="/sod/assets/img/shaman_icon.png" class="sim-link-icon">
 										<div class="d-flex flex-column">
 											<span class="sim-link-title">Shaman</span>
-											<span class="launch-status-label text-brand">Phase 2 - Alpha</span>
+											<span class="launch-status-label text-brand">Phase 2 - Beta</span>
 										</div>
 									</div>
 								</a>
@@ -199,7 +199,7 @@ <h3 class="expansion-title w-100 mb-0">Season of Discovery</h2>
 												<div class="d-flex flex-column">
 													<span class="sim-link-label">Shaman</span>
 													<span class="sim-link-title">Elemental</span>
-													<span class="launch-status-label text-brand">Phase 2 - Alpha</span>
+													<span class="launch-status-label text-brand">Phase 2 - Beta</span>
 												</div>
 											</div>
 										</a>
@@ -211,7 +211,7 @@ <h3 class="expansion-title w-100 mb-0">Season of Discovery</h2>
 												<div class="d-flex flex-column">
 													<span class="sim-link-label">Shaman</span>
 													<span class="sim-link-title">Enhancement</span>
-													<span class="launch-status-label text-brand">Phase 2 - Alpha</span>
+													<span class="launch-status-label text-brand">Phase 2 - Beta</span>
 												</div>
 											</div>
 										</a>