fix merge conflicts with dev

2026-08-15 07:41:21 +02:00 · 2026-08-13 07:39:11 -05:00
parent 6ff7dd0c38 833388c235
commit a722d24759
60 changed files with 1900 additions and 251 deletions
@@ -1119,10 +1119,10 @@ check("seismic toss deals the level",
 do
  check("static damage uses move power",
    Effects.fixedDamage("EFFECT_STATIC_DAMAGE", { level = 10 }, { hp = 50 }, nil,
-      { power = 40 }), 40)
+      40), 40)
  check("sonic boom fixed damage is 20",
    Effects.fixedDamage("EFFECT_STATIC_DAMAGE", { level = 10 }, { hp = 50 }, nil,
-      { power = 20 }), 20)
+      20), 20)

  local boomBattle, _, boomWild = effectBattle({ "SONICBOOM" })
  boomWild.hp = 100