Merge remote-tracking branch 'origin/master' into blood-dk

ToxicKevinFerm · Apr 24, 2024 · 5fa4671 · 5fa4671
2 parents c5db23e + d53fd14
commit 5fa4671
Show file tree

Hide file tree

Showing 30 changed files with 5,290 additions and 5,187 deletions.
diff --git a/assets/database/db.bin b/assets/database/db.bin
diff --git a/assets/database/db.json b/assets/database/db.json
diff --git a/assets/database/leftover_db.bin b/assets/database/leftover_db.bin
diff --git a/assets/database/leftover_db.json b/assets/database/leftover_db.json
diff --git a/proto/common.proto b/proto/common.proto
@@ -264,6 +264,7 @@ enum GemColor {
 	GemColorOrange = 6;
 	GemColorPurple = 7;
 	GemColorPrismatic = 8;
+	GemColorCogwheel = 9;
 }
 
 enum SpellSchool {

diff --git a/sim/core/buffs.go b/sim/core/buffs.go
@@ -359,6 +359,7 @@ func DarkIntentAura(unit *Unit, selfBuff bool) *Aura {
 			aura.Unit.MultiplyAttackSpeed(sim, 1/1.03)
 		},
 		OnPeriodicDamageDealt: periodicHandler,
+		BuildPhase:            CharacterBuildPhaseBuffs,
 	})
 }
 

diff --git a/sim/core/database_load.go b/sim/core/database_load.go
@@ -37,6 +37,7 @@ func init() {
 			WeaponDamageMax:  item.WeaponDamageMax,
 			WeaponSpeed:      item.WeaponSpeed,
 			SetName:          item.SetName,
+			RandPropPoints:   item.RandPropPoints,
 		}
 	}
 

diff --git a/sim/core/debuffs.go b/sim/core/debuffs.go
@@ -219,7 +219,7 @@ func CurseOfElementsAura(target *Unit) *Aura {
 func EarthAndMoonAura(target *Unit) *Aura {
 	aura := target.GetOrRegisterAura(Aura{
 		Label:    "Earth And Moon",
-		ActionID: ActionID{SpellID: 48511},
+		ActionID: ActionID{SpellID: 60433},
 		Duration: time.Second * 12,
 	})
 	spellDamageEffect(aura, 1.08)

diff --git a/sim/core/mana.go b/sim/core/mana.go
@@ -48,6 +48,9 @@ func (character *Character) EnableManaBarWithModifier(modifier float64) {
 	// Starting with cataclysm 1 intellect now provides 1 spell power
 	character.AddStatDependency(stats.Intellect, stats.SpellPower, 1.0)
 
+	// first 10 int should not count so remove them
+	character.AddStat(stats.SpellPower, -10)
+
 	if character.Unit.Type == PlayerUnit {
 		// Every caster gains 1% crit per 648.91
 		// Pets have different scaling so let them handle their scaling
-Original file line number
+Diff line change
@@ Expand Up / @@ -359,6 +359,7 @@ func DarkIntentAura(unit *Unit, selfBuff bool) *Aura { @@
     			aura.Unit.MultiplyAttackSpeed(sim, 1/1.03)
     		},
     		OnPeriodicDamageDealt: periodicHandler,
+    		BuildPhase:            CharacterBuildPhaseBuffs,
     	})
     }
@@ Expand Down @@