Merge pull request #4 from FelixPflaum/remove-sod-items

Remove SoD items
wowsims · Nov 21, 2024 · 3dc3731 · 3dc3731
2 parents 3d057a9 + b629ca8
commit 3dc3731
Show file tree

Hide file tree

Showing 273 changed files with 4,452 additions and 25,798 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/assets/db_inputs/wowhead_rune_tooltips.csv b/assets/db_inputs/wowhead_rune_tooltips.csv
diff --git a/sim/common/sod/item_effects/phase_6.go b/sim/common/sod/item_effects/phase_6.go
@@ -77,7 +77,7 @@ func init() {
 	core.NewItemEffect(ObsidianChampion, func(agent core.Agent) {
 		character := agent.GetCharacter()
 		vanilla.StrengthOfTheChampionAura(character)
-		vanilla.EnrageAura446327(character)
+		//vanilla.EnrageAura446327(character)
 		ObsidianEdgedAura(ObsidianChampion, agent)
 	})
 

diff --git a/sim/common/vanilla/enchant_effects.go b/sim/common/vanilla/enchant_effects.go
@@ -334,38 +334,5 @@ func init() {
 		})
 	})
 
-	core.NewEnchantEffect(7649, func(agent core.Agent) {
-		character := agent.GetCharacter()
-		actionID := core.ActionID{SpellID: 1213833}
-
-		procSpell := character.RegisterSpell(core.SpellConfig{
-			ActionID:    actionID,
-			SpellSchool: core.SpellSchoolNature,
-			ProcMask:    core.ProcMaskEmpty,
-			Flags:       core.SpellFlagBinary | core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell,
-
-			DamageMultiplier: 1,
-			ThreatMultiplier: 1,
-
-			ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-				spell.CalcAndDealDamage(sim, target, 20, spell.OutcomeMagicHit)
-			},
-		})
-
-		character.GetOrRegisterAura(core.Aura{
-			Label:    "Thorns +20",
-			Duration: core.NeverExpires,
-			OnReset: func(aura *core.Aura, sim *core.Simulation) {
-				aura.Activate(sim)
-			},
-			OnSpellHitTaken: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
-				if result.Landed() && spell.ProcMask.Matches(core.ProcMaskMelee) {
-					procSpell.Cast(sim, spell.Unit)
-				}
-			},
-		})
-	})
-
-
 	core.AddEffectsToTest = true
 }