From 1dc20fef3e06bbd9c260a6240e960e97b6db39da Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Sun, 6 Apr 2025 23:12:02 +0200 Subject: [PATCH 01/20] Update launched_sims.ts --- ui/core/launched_sims.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/core/launched_sims.ts b/ui/core/launched_sims.ts index 0f84f4b4c..456534227 100644 --- a/ui/core/launched_sims.ts +++ b/ui/core/launched_sims.ts @@ -86,7 +86,7 @@ export const simLaunchStatuses: Record = { }, [Spec.SpecShadowPriest]: { phase: Phase.Phase1, - status: LaunchStatus.Unlaunched, + status: LaunchStatus.Alpha, }, [Spec.SpecWarlock]: { phase: Phase.Phase1, From be060c751cc4365d9842fda71673e5d3d9fd4853 Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Sun, 6 Apr 2025 23:14:26 +0200 Subject: [PATCH 02/20] Update index.html --- ui/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/index.html b/ui/index.html index 19b231b49..8e8ff7bd7 100644 --- a/ui/index.html +++ b/ui/index.html @@ -88,12 +88,12 @@

Classic

-->
- +
Priest - Phase 1 - Unreleased + Phase 1 - Alpha
From a48a6697c20a0e053601e0db488b3879778e468c Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Sun, 6 Apr 2025 23:37:28 +0200 Subject: [PATCH 03/20] Update priest.go Starshards entries for each tick --- sim/priest/priest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/priest/priest.go b/sim/priest/priest.go index 1777b1e93..b41dbe9ed 100644 --- a/sim/priest/priest.go +++ b/sim/priest/priest.go @@ -51,7 +51,7 @@ type Priest struct { ShadowWeavingProc *core.Spell ShadowWordPain []*core.Spell Smite []*core.Spell - Starshards []*core.Spell + Starshards [][]*core.Spell VampiricEmbrace *core.Spell InnerFocusAura *core.Aura From e6d83e4c90e0cb558eb1ca7bc18836600d085cb5 Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Sun, 6 Apr 2025 23:52:17 +0200 Subject: [PATCH 04/20] Update item_sets_pve.go --- sim/priest/item_sets_pve.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/sim/priest/item_sets_pve.go b/sim/priest/item_sets_pve.go index adaa3ff6c..2dd494ba8 100644 --- a/sim/priest/item_sets_pve.go +++ b/sim/priest/item_sets_pve.go @@ -1,11 +1,9 @@ package priest import ( - "slices" "time" "github.com/wowsims/classic/sim/core" - "github.com/wowsims/classic/sim/core/proto" "github.com/wowsims/classic/sim/core/stats" ) From 3872b441caf592171e0da347f0a5f01f060b9a15 Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Sun, 6 Apr 2025 23:56:38 +0200 Subject: [PATCH 05/20] Update item_sets_pve.go syntax --- sim/paladin/item_sets_pve.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/paladin/item_sets_pve.go b/sim/paladin/item_sets_pve.go index 5874a2787..54361fa47 100644 --- a/sim/paladin/item_sets_pve.go +++ b/sim/paladin/item_sets_pve.go @@ -61,7 +61,7 @@ var ItemSetSoulforgeArmor = core.NewItemSet(core.ItemSet{ spell.CalcAndDealDamage(sim, target, sim.Roll(60, 66), spell.OutcomeMagicCrit) } }, - }) + ) }, }, }) From 263915b9e448d32854239a0b35080f2c7c89e98c Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Mon, 7 Apr 2025 00:01:29 +0200 Subject: [PATCH 06/20] Update item_sets_pve.go syntax again --- sim/paladin/item_sets_pve.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sim/paladin/item_sets_pve.go b/sim/paladin/item_sets_pve.go index 54361fa47..e6d48a994 100644 --- a/sim/paladin/item_sets_pve.go +++ b/sim/paladin/item_sets_pve.go @@ -61,7 +61,8 @@ var ItemSetSoulforgeArmor = core.NewItemSet(core.ItemSet{ spell.CalcAndDealDamage(sim, target, sim.Roll(60, 66), spell.OutcomeMagicCrit) } }, - ) + }, + }), }, }, }) From 59ec4110a0a46658cad81b084727a6c4358ef16f Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Mon, 7 Apr 2025 00:12:19 +0200 Subject: [PATCH 07/20] Update starshards.go --- sim/priest/starshards.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sim/priest/starshards.go b/sim/priest/starshards.go index 553052b43..7d4e799f8 100644 --- a/sim/priest/starshards.go +++ b/sim/priest/starshards.go @@ -17,10 +17,7 @@ var StarshardsManaCost = [StarshardsRanks + 1]float64{0, 50, 85, 140, 190, 245, var StarshardsLevel = [StarshardsRanks + 1]int{0, 10, 18, 26, 34, 42, 50, 58} func (priest *Priest) registerStarshards() { - if !priest.Race.NightElf { //not sure, if this works.. can anyone confirm? xD - return - } - + priest.Starshards = make([][]*core.Spell, StarshardsRanks+1) for rank := 1; rank <= StarshardsRanks; rank++ { From a05aaac0f65aab1b9ffd92f6a54c37c04b56903d Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Mon, 7 Apr 2025 00:17:20 +0200 Subject: [PATCH 08/20] Update smite.go upper case lower case error --- sim/priest/smite.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/priest/smite.go b/sim/priest/smite.go index 1598bae65..30ff8a736 100644 --- a/sim/priest/smite.go +++ b/sim/priest/smite.go @@ -15,7 +15,7 @@ var SmiteCastTime = [SmiteRanks + 1]int{0, 1500, 2000, 2500, 2500, 2500, 2500, 2 var SmiteManaCost = [SmiteRanks + 1]float64{0, 20, 30, 60, 95, 140, 185, 230, 280} var SmiteLevel = [SmiteRanks + 1]int{0, 1, 6, 14, 22, 30, 38, 46, 54} -func (priest *Priest) RegisterSmiteSpell() { +func (priest *Priest) registerSmiteSpell() { priest.Smite = make([]*core.Spell, SmiteRanks+1) for rank := 1; rank <= SmiteRanks; rank++ { From 13fde1049cccbe98a6bbd8fb9d32e4d6a907815c Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Mon, 7 Apr 2025 00:52:30 +0200 Subject: [PATCH 09/20] Update priest.go --- sim/priest/priest.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sim/priest/priest.go b/sim/priest/priest.go index b41dbe9ed..dec8cf6ac 100644 --- a/sim/priest/priest.go +++ b/sim/priest/priest.go @@ -15,7 +15,6 @@ const ( const ( SpellCode_PriestNone int32 = iota - SpellCode_PriestStarshards SpellCode_PriestDevouringPlague SpellCode_PriestFlashHeal SpellCode_PriestGreaterHeal @@ -25,6 +24,7 @@ const ( SpellCode_PriestMindFlay SpellCode_PriestShadowWordPain SpellCode_PriestSmite + SpellCode_PriestStarshards SpellCode_PriestVampiricTouch ) @@ -88,9 +88,7 @@ func (priest *Priest) Initialize() { if priest.GetCharacter().Race == proto.Race_RaceUndead { priest.registerDevouringPlagueSpell() } - if priest.GetCharacter().Race == proto.Race_RaceNightElf { - priest.registerStarshardsSpell() - } + priest.registerStarshardsSpell() priest.registerSmiteSpell() priest.registerHolyFire() From 6e158a10008e18de148db75efb58ba29885ffb91 Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Mon, 7 Apr 2025 00:57:16 +0200 Subject: [PATCH 10/20] Update priest.go --- sim/priest/priest.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sim/priest/priest.go b/sim/priest/priest.go index dec8cf6ac..9cd358108 100644 --- a/sim/priest/priest.go +++ b/sim/priest/priest.go @@ -88,7 +88,9 @@ func (priest *Priest) Initialize() { if priest.GetCharacter().Race == proto.Race_RaceUndead { priest.registerDevouringPlagueSpell() } - priest.registerStarshardsSpell() + if priest.GetCharacter().Race == proto.Race_NightElf { + priest.registerStarshardsSpell() + } priest.registerSmiteSpell() priest.registerHolyFire() From e9da4354f2457fb30cbc18f657913bfb3b2d35b9 Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Mon, 7 Apr 2025 00:59:15 +0200 Subject: [PATCH 11/20] Update priest.go --- sim/priest/priest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/priest/priest.go b/sim/priest/priest.go index 9cd358108..a4d6474b1 100644 --- a/sim/priest/priest.go +++ b/sim/priest/priest.go @@ -88,7 +88,7 @@ func (priest *Priest) Initialize() { if priest.GetCharacter().Race == proto.Race_RaceUndead { priest.registerDevouringPlagueSpell() } - if priest.GetCharacter().Race == proto.Race_NightElf { + if priest.GetCharacter().Race == proto.Race_RaceNightElf { priest.registerStarshardsSpell() } priest.registerSmiteSpell() From 164a2819d53c191b9e9b158d26a88de9972940d1 Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Mon, 7 Apr 2025 01:03:51 +0200 Subject: [PATCH 12/20] Update item_sets_pve.go --- sim/paladin/item_sets_pve.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/paladin/item_sets_pve.go b/sim/paladin/item_sets_pve.go index e6d48a994..8a881d380 100644 --- a/sim/paladin/item_sets_pve.go +++ b/sim/paladin/item_sets_pve.go @@ -62,7 +62,7 @@ var ItemSetSoulforgeArmor = core.NewItemSet(core.ItemSet{ } }, }, - }), + }) }, }, }) From 4136d64e9d99141fc23652171c60b9b7bf18b79b Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Mon, 7 Apr 2025 01:06:34 +0200 Subject: [PATCH 13/20] Update item_sets_pve.go --- sim/paladin/item_sets_pve.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sim/paladin/item_sets_pve.go b/sim/paladin/item_sets_pve.go index 8a881d380..115607232 100644 --- a/sim/paladin/item_sets_pve.go +++ b/sim/paladin/item_sets_pve.go @@ -60,8 +60,7 @@ var ItemSetSoulforgeArmor = core.NewItemSet(core.ItemSet{ if spell.SpellCode == SpellCode_PaladinJudgement && result.Landed() { spell.CalcAndDealDamage(sim, target, sim.Roll(60, 66), spell.OutcomeMagicCrit) } - }, - }, + }}, }) }, }, From a626ff4504f6c7d51f8a7d4352f42f4e587d474f Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Mon, 7 Apr 2025 01:09:59 +0200 Subject: [PATCH 14/20] Update item_sets_pve.go --- sim/paladin/item_sets_pve.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sim/paladin/item_sets_pve.go b/sim/paladin/item_sets_pve.go index 115607232..98081844d 100644 --- a/sim/paladin/item_sets_pve.go +++ b/sim/paladin/item_sets_pve.go @@ -1,10 +1,8 @@ package paladin import ( - "time" "github.com/wowsims/classic/sim/core" - "github.com/wowsims/classic/sim/core/proto" "github.com/wowsims/classic/sim/core/stats" ) @@ -60,7 +58,8 @@ var ItemSetSoulforgeArmor = core.NewItemSet(core.ItemSet{ if spell.SpellCode == SpellCode_PaladinJudgement && result.Landed() { spell.CalcAndDealDamage(sim, target, sim.Roll(60, 66), spell.OutcomeMagicCrit) } - }}, + }, + }, }) }, }, From 3904584f17305fa3ed7603a9471f42355776159f Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Mon, 7 Apr 2025 01:35:13 +0200 Subject: [PATCH 15/20] Update item_sets_pve.go --- sim/paladin/item_sets_pve.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sim/paladin/item_sets_pve.go b/sim/paladin/item_sets_pve.go index 98081844d..0308fd326 100644 --- a/sim/paladin/item_sets_pve.go +++ b/sim/paladin/item_sets_pve.go @@ -58,8 +58,7 @@ var ItemSetSoulforgeArmor = core.NewItemSet(core.ItemSet{ if spell.SpellCode == SpellCode_PaladinJudgement && result.Landed() { spell.CalcAndDealDamage(sim, target, sim.Roll(60, 66), spell.OutcomeMagicCrit) } - }, - }, + }} }) }, }, From d06bf39590bae1ea076393ad52aec195cac138c5 Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Mon, 7 Apr 2025 01:37:29 +0200 Subject: [PATCH 16/20] Update item_sets_pve.go --- sim/paladin/item_sets_pve.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/paladin/item_sets_pve.go b/sim/paladin/item_sets_pve.go index 0308fd326..0e6d0b74d 100644 --- a/sim/paladin/item_sets_pve.go +++ b/sim/paladin/item_sets_pve.go @@ -58,7 +58,7 @@ var ItemSetSoulforgeArmor = core.NewItemSet(core.ItemSet{ if spell.SpellCode == SpellCode_PaladinJudgement && result.Landed() { spell.CalcAndDealDamage(sim, target, sim.Roll(60, 66), spell.OutcomeMagicCrit) } - }} + }}, }) }, }, From acfc67a19d96b696d134a1bbea47a023834ff391 Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Mon, 7 Apr 2025 01:42:54 +0200 Subject: [PATCH 17/20] Update item_sets_pve.go --- sim/paladin/item_sets_pve.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sim/paladin/item_sets_pve.go b/sim/paladin/item_sets_pve.go index 0e6d0b74d..98081844d 100644 --- a/sim/paladin/item_sets_pve.go +++ b/sim/paladin/item_sets_pve.go @@ -58,7 +58,8 @@ var ItemSetSoulforgeArmor = core.NewItemSet(core.ItemSet{ if spell.SpellCode == SpellCode_PaladinJudgement && result.Landed() { spell.CalcAndDealDamage(sim, target, sim.Roll(60, 66), spell.OutcomeMagicCrit) } - }}, + }, + }, }) }, }, From 47c08d919a48713f429cba6c3cbc670799a7a803 Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Wed, 9 Apr 2025 01:07:26 +0200 Subject: [PATCH 18/20] Update starshards.go omg.. took me too long to find the error >.< --- sim/priest/starshards.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/priest/starshards.go b/sim/priest/starshards.go index 7d4e799f8..5b89c8a49 100644 --- a/sim/priest/starshards.go +++ b/sim/priest/starshards.go @@ -16,7 +16,7 @@ var StarshardsBaseDamage = [StarshardsRanks + 1]float64{0, 84, 162, 288, 414, 57 var StarshardsManaCost = [StarshardsRanks + 1]float64{0, 50, 85, 140, 190, 245, 300, 350} var StarshardsLevel = [StarshardsRanks + 1]int{0, 10, 18, 26, 34, 42, 50, 58} -func (priest *Priest) registerStarshards() { +func (priest *Priest) registerStarshardsSpell() { priest.Starshards = make([][]*core.Spell, StarshardsRanks+1) From c97cfb5d3e587881fa54b3686856eac7709d7479 Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Wed, 9 Apr 2025 01:13:38 +0200 Subject: [PATCH 19/20] Update item_sets_pve.go ? --- sim/paladin/item_sets_pve.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sim/paladin/item_sets_pve.go b/sim/paladin/item_sets_pve.go index 98081844d..fee12d182 100644 --- a/sim/paladin/item_sets_pve.go +++ b/sim/paladin/item_sets_pve.go @@ -58,8 +58,8 @@ var ItemSetSoulforgeArmor = core.NewItemSet(core.ItemSet{ if spell.SpellCode == SpellCode_PaladinJudgement && result.Landed() { spell.CalcAndDealDamage(sim, target, sim.Roll(60, 66), spell.OutcomeMagicCrit) } - }, - }, + } + } }) }, }, From dd8e7f82aa2a738d105a855aa296091eacbe7c12 Mon Sep 17 00:00:00 2001 From: Zephryl87 <46359763+Zephryl87@users.noreply.github.com> Date: Wed, 9 Apr 2025 01:16:58 +0200 Subject: [PATCH 20/20] Update item_sets_pve.go --- sim/paladin/item_sets_pve.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sim/paladin/item_sets_pve.go b/sim/paladin/item_sets_pve.go index fee12d182..936da959d 100644 --- a/sim/paladin/item_sets_pve.go +++ b/sim/paladin/item_sets_pve.go @@ -58,7 +58,7 @@ var ItemSetSoulforgeArmor = core.NewItemSet(core.ItemSet{ if spell.SpellCode == SpellCode_PaladinJudgement && result.Landed() { spell.CalcAndDealDamage(sim, target, sim.Roll(60, 66), spell.OutcomeMagicCrit) } - } + }, } }) },