@pkmn/engine 0.1.0-dev.a93847b2 → 0.1.0-dev.ac652f4e

package/src/lib/gen2/data/items.zig

@@ -1,11 +1,9 @@
 //! Code generated by `tools/generate` - manual edits will be overwritten.
 
-const std = @import("std");
-
 const data = @import("../../gen2/data.zig");
+const std = @import("std");
 
 const assert = std.debug.assert;
-
 const Type = data.Type;
 
 /// Representation of a held item in Generation II Pokémon.
@@ -216,14 +214,14 @@ pub const Item = enum(u8) {
     pub const size = 196;
 
     /// Returns a `Type` boosted by this item or `null` if the item is not a type-boosting item.
-    pub inline fn boost(item: Item) ?Type {
+    pub fn boost(item: Item) ?Type {
         assert(item != .None);
         if (item == .PolkadotBow) return .Normal;
         return if (@intFromEnum(item) <= 18) @enumFromInt(@intFromEnum(item) - 1) else null;
     }
 
     /// Whether or not this item is Mail.
-    pub inline fn isMail(item: Item) bool {
+    pub fn isMail(item: Item) bool {
         assert(item != .None);
         return @intFromEnum(item) > 60 and @intFromEnum(item) <= 70;
     }

package/src/lib/gen2/data/moves.zig

@@ -1,12 +1,10 @@
 //! Code generated by `tools/generate` - manual edits will be overwritten.
 
-const std = @import("std");
-
-const rng = @import("../../common/rng.zig");
 const gen2 = @import("../../gen2/data.zig");
+const rng = @import("../../common/rng.zig");
+const std = @import("std");
 
 const assert = std.debug.assert;
-
 const percent = rng.Gen12.percent;
 const Type = gen2.Type;
 
@@ -2562,7 +2560,7 @@ pub const Move = enum(u8) {
         }
 
         /// Whether this effect has a high critical rate.
-        pub inline fn isHighCritical(effect: Effect) bool {
+        pub fn isHighCritical(effect: Effect) bool {
             return effect == .HighCritical or effect == .RazorWind;
         }
     };
@@ -2865,7 +2863,7 @@ pub const Move = enum(u8) {
     };
 
     /// Returns the `Data` corresponding to the move.
-    pub inline fn get(id: Move) Data {
+    pub fn get(id: Move) Data {
         assert(id != .None);
         return DATA[@intFromEnum(id) - 1];
     }

package/src/lib/gen2/data/species.zig

@@ -1,11 +1,9 @@
 //! Code generated by `tools/generate` - manual edits will be overwritten.
 
-const std = @import("std");
-
 const gen2 = @import("../../gen2/data.zig");
+const std = @import("std");
 
 const assert = std.debug.assert;
-
 const Stats = gen2.Stats;
 const Types = gen2.Types;
 

package/src/lib/gen2/data/types.zig

@@ -1,8 +1,7 @@
 //! Code generated by `tools/generate` - manual edits will be overwritten.
 
-const std = @import("std");
-
 const gen1 = @import("../../gen1/data.zig");
+const std = @import("std");
 
 const assert = std.debug.assert;
 const Effectiveness = gen1.Effectiveness;
@@ -164,27 +163,27 @@ pub const Type = enum(u8) {
     pub const size = 18;
 
     /// Whether or not this type is considered to be special as opposed to physical.
-    pub inline fn special(self: Type) bool {
+    pub fn special(self: Type) bool {
         return @intFromEnum(self) >= @intFromEnum(Type.Fire);
     }
 
     /// The `Effectiveness` of type `t2` vs. type `t1`.
-    pub inline fn effectiveness(t1: Type, t2: Type) Effectiveness {
+    pub fn effectiveness(t1: Type, t2: Type) Effectiveness {
         return CHART[@intFromEnum(t1)][@intFromEnum(t2)];
     }
 
     /// The precedence order of Type `type`.
-    pub inline fn precedence(self: Type) u8 {
+    pub fn precedence(self: Type) u8 {
         return PRECEDENCE[@intFromEnum(self)];
     }
 
     /// The internal index of this Type used by Present.
-    pub inline fn present(self: Type) u8 {
+    pub fn present(self: Type) u8 {
         return INDEXES[@intFromEnum(self)];
     }
 
     /// The Type corresponding to a random roll of `num` for Conversion 2.
-    pub inline fn conversion2(num: u8) Type {
+    pub fn conversion2(num: u8) Type {
         assert(num != 6);
         assert(num < 10 or num >= 20);
         assert(num <= 27);
@@ -192,7 +191,7 @@ pub const Type = enum(u8) {
     }
 
     /// The Type corresponding to a Hidden Power `index`.
-    pub inline fn hiddenPower(index: u8) Type {
+    pub fn hiddenPower(index: u8) Type {
         return HIDDEN_POWER[index];
     }
 };
@@ -209,17 +208,17 @@ pub const Types = extern struct {
     }
 
     /// Whether this typing is immune to type `t`.
-    pub inline fn immune(self: Types, t: Type) bool {
+    pub fn immune(self: Types, t: Type) bool {
         return t.effectiveness(self.type1) == I or t.effectiveness(self.type2) == I;
     }
 
     /// Whether this typing includes type `t`.
-    pub inline fn includes(self: Types, t: Type) bool {
+    pub fn includes(self: Types, t: Type) bool {
         return self.type1 == t or self.type2 == t;
     }
 
     /// Whether this typing is immune to damage from Sandstorm.
-    pub inline fn sandstormImmune(self: Types) bool {
+    pub fn sandstormImmune(self: Types) bool {
         return @intFromEnum(self.type1) <= @intFromEnum(Type.Steel) or
             @intFromEnum(self.type2) <= @intFromEnum(Type.Steel);
     }

package/src/lib/gen2/data.zig

@@ -1,24 +1,20 @@
-const std = @import("std");
-const builtin = @import("builtin");
-
-const pkmn = @import("../pkmn.zig");
-
-const data = @import("../common/data.zig");
 const DEBUG = @import("../common/debug.zig").print;
-const protocol = @import("../common/protocol.zig");
-const rng = @import("../common/rng.zig");
-const util = @import("../common/util.zig");
 
+const builtin = @import("builtin");
+const calc = @import("calc.zig");
+const chance = @import("chance.zig");
+const data = @import("../common/data.zig");
+const gen1 = @import("../gen1/data.zig");
 const items = @import("data/items.zig");
+const mechanics = @import("mechanics.zig");
 const moves = @import("data/moves.zig");
+const pkmn = @import("../pkmn.zig");
+const protocol = @import("../common/protocol.zig");
+const rng = @import("../common/rng.zig");
 const species = @import("data/species.zig");
+const std = @import("std");
 const types = @import("data/types.zig");
-
-const gen1 = @import("../gen1/data.zig");
-
-const calc = @import("calc.zig");
-const chance = @import("chance.zig");
-const mechanics = @import("mechanics.zig");
+const util = @import("../common/util.zig");
 
 const assert = std.debug.assert;
 const expectEqual = std.testing.expectEqual;
@@ -45,6 +41,7 @@ const Player = data.Player;
 const Result = data.Result;
 
 const PointerType = util.PointerType;
+const isPointerTo = util.isPointerTo;
 
 const showdown = pkmn.options.showdown;
 
@@ -62,17 +59,17 @@ pub fn Battle(comptime RNG: anytype) type {
 
         _: [padding]u8 = .{0} ** padding,
 
-        pub inline fn side(self: anytype, player: Player) PointerType(@TypeOf(self), Side) {
-            assert(@typeInfo(@TypeOf(self)).Pointer.child == Self);
+        pub fn side(self: anytype, player: Player) PointerType(@TypeOf(self), Side) {
+            assert(isPointerTo(self, Self));
             return &self.sides[@intFromEnum(player)];
         }
 
-        pub inline fn foe(self: anytype, player: Player) PointerType(@TypeOf(self), Side) {
-            assert(@typeInfo(@TypeOf(self)).Pointer.child == Self);
+        pub fn foe(self: anytype, player: Player) PointerType(@TypeOf(self), Side) {
+            assert(isPointerTo(self, Self));
             return &self.sides[@intFromEnum(player.foe())];
         }
 
-        pub inline fn active(self: *const Self, player: Player) ID {
+        pub fn active(self: *const Self, player: Player) ID {
             return player.ident(@intCast(self.side(player).pokemon[0].position));
         }
 
@@ -133,27 +130,27 @@ pub const Side = extern struct {
         assert(@sizeOf(Side) == 248);
     }
 
-    pub inline fn get(self: anytype, slot: u8) PointerType(@TypeOf(self), Pokemon) {
-        assert(@typeInfo(@TypeOf(self)).Pointer.child == Side);
+    pub fn get(self: anytype, slot: u8) PointerType(@TypeOf(self), Pokemon) {
+        assert(isPointerTo(self, Side));
         assert(slot > 0 and slot <= 6);
         const id = self.pokemon[slot - 1].position;
         assert(id > 0 and id <= 6);
         return &self.pokemon[id - 1];
     }
 
-    pub inline fn stored(self: anytype) PointerType(@TypeOf(self), Pokemon) {
-        assert(@typeInfo(@TypeOf(self)).Pointer.child == Side);
+    pub fn stored(self: anytype) PointerType(@TypeOf(self), Pokemon) {
+        assert(isPointerTo(self, Side));
         return self.get(1);
     }
 
-    pub inline fn lastMove(self: anytype, encore: bool) Move {
+    pub fn lastMove(self: anytype, encore: bool) Move {
         assert(self.last_used_move != .None or !self.active.volatiles.dirty);
         if (encore) return self.last_used_move;
         return if (self.active.volatiles.dirty) .None else self.last_used_move;
     }
 
     // TODO
-    // pub inline fn useMove(self: anytype) void {
+    // pub fn useMove(self: anytype) void {
     //     assert(side.last_selected_move != .None);
     //     self.last_used_move = side.last_selected_move;
     //     self.active.volatiles.dirty = false;
@@ -175,8 +172,8 @@ pub const ActivePokemon = extern struct {
         assert(@sizeOf(ActivePokemon) == 44);
     }
 
-    pub inline fn move(self: anytype, mslot: u8) PointerType(@TypeOf(self), MoveSlot) {
-        assert(@typeInfo(@TypeOf(self)).Pointer.child == Pokemon);
+    pub fn move(self: anytype, mslot: u8) PointerType(@TypeOf(self), MoveSlot) {
+        assert(isPointerTo(self, Pokemon));
         assert(mslot > 0 and mslot <= 4);
         assert(self.moves[mslot - 1].id != .None);
         return &self.moves[mslot - 1];
@@ -200,8 +197,8 @@ pub const Pokemon = extern struct {
         assert(@sizeOf(Pokemon) == 32);
     }
 
-    pub inline fn move(self: anytype, mslot: u8) PointerType(@TypeOf(self), MoveSlot) {
-        assert(@typeInfo(@TypeOf(self)).Pointer.child == Pokemon);
+    pub fn move(self: anytype, mslot: u8) PointerType(@TypeOf(self), MoveSlot) {
+        assert(isPointerTo(self, Pokemon));
         assert(mslot > 0 and mslot <= 4);
         assert(self.moves[mslot - 1].id != .None);
         return &self.moves[mslot - 1];
@@ -225,7 +222,7 @@ pub const DVs = packed struct(u16) {
         return .{ .gender = g, .pow = p, .type = t };
     }
 
-    pub inline fn power(dvs: DVs) u8 {
+    pub fn power(dvs: DVs) u8 {
         return @as(u8, dvs.pow) + 30;
     }
 
@@ -239,7 +236,7 @@ pub const DVs = packed struct(u16) {
         };
         const p: u6 = @intCast(1 + ((5 * @as(u8, (dvs.atk & 0b1000) | ((dvs.def & 0b1000)) >> 1 |
             ((dvs.spe & 0b1000)) >> 2 | ((dvs.spc & 0b1000)) >> 3) + (dvs.spc & 0b0011)) >> 1));
-        var t = @as(u8, dvs.def & 0b0011) + (@as(u8, dvs.atk & 0b0011) << 2);
+        const t = @as(u8, dvs.def & 0b0011) + (@as(u8, dvs.atk & 0b0011) << 2);
         return .{ .gender = g, .pow = p, .type = Type.hiddenPower(t) };
     }
 };
@@ -314,16 +311,18 @@ pub const Volatiles = packed struct(u128) {
     Encore: bool = false,
     LockOn: bool = false,
     DestinyBond: bool = false,
+    Trapped: bool = false,
 
-    trapped: bool = false,
     switched: bool = false,
+    // TODO: replace with simply looking at Choice on Battle
     switching: bool = false,
+    // TODO: simply store both last moves on side
     dirty: bool = false,
 
     frozen: bool = false,
     minimized: bool = false,
     _: u10 = 0,
-    // TODO?
+    // TODO: is this needed for unmodified stats?
     transform: u4 = 0,
 
     bide: u16 = 0,

package/src/lib/gen2/generated.zig

@@ -1,39 +1,32 @@
 //! Code generated by `tools/generate` - manual edits will be overwritten.
 
-const std = @import("std");
-
 const common = @import("../common/data.zig");
-
 const data = @import("data.zig");
 const mechanics = @import("mechanics.zig");
+const std = @import("std");
 
-const assert = std.debug.assert;
-
-const Player = common.Player;
-const Result = common.Result;
-
-const Effectiveness = data.Effectiveness;
-const Move = data.Move;
-
-const Effects = mechanics.Effects;
-const State = mechanics.State;
-
-const canMove = mechanics.canMove;
+const adjustDamage = mechanics.adjustDamage;
+const afterMove = mechanics.afterMove;
+const applyDamage = mechanics.applyDamage;
+const buildRage = mechanics.buildRage;
+const calcDamage = mechanics.calcDamage;
 const canCharge = mechanics.canCharge;
+const canMove = mechanics.canMove;
+const checkCriticalHit = mechanics.checkCriticalHit;
+const checkHit = mechanics.checkHit;
 const decrementPP = mechanics.decrementPP;
+const destinyBond = mechanics.destinyBond;
 const doMove = mechanics.doMove;
-const checkHit = mechanics.checkHit;
-const checkCriticalHit = mechanics.checkCriticalHit;
-const calcDamage = mechanics.calcDamage;
-const adjustDamage = mechanics.adjustDamage;
-const randomizeDamage = mechanics.randomizeDamage;
-const applyDamage = mechanics.applyDamage;
-const reportOutcome = mechanics.reportOutcome;
 const effectChance = mechanics.effectChance;
-const afterMove = mechanics.afterMove;
-const buildRage = mechanics.buildRage;
+const Effectiveness = data.Effectiveness;
+const Effects = mechanics.Effects;
 const kingsRock = mechanics.kingsRock;
-const destinyBond = mechanics.destinyBond;
+const Move = data.Move;
+const Player = common.Player;
+const randomizeDamage = mechanics.randomizeDamage;
+const reportOutcome = mechanics.reportOutcome;
+const Result = common.Result;
+const State = mechanics.State;
 
 const SECONDARY = true;
 const KINGS = true;
@@ -42,7 +35,7 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
     var log = options.log;
 
     var side = battle.side(player);
-    var volatiles = &side.active.volatiles;
+    const volatiles = &side.active.volatiles;
 
     const ident = battle.active(player);
     const foe_ident = battle.active(player.foe());
@@ -97,17 +90,8 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
         },
         .OHKO => {
             if (!try canMove(battle, player, state, options)) return;
-
-            // OHKO calls adjustDamage but only actually cares about immunity
-            assert(move.type == .Normal or move.type == .Ground);
-            const foe = battle.foe(player);
-            const immune = if (move.type == .Normal)
-                foe.active.types.includes(.Ghost) and !foe.active.volatiles.Foresight
-            else
-                foe.active.types.includes(.Ghost);
-            state.effectiveness = if (immune) 0 else Effectiveness.neutral;
-
-            try Effects.ohko(battle, player, state, options);
+            try Effects.ohko.immune(battle, player, state, options);
+            try Effects.ohko.damage(battle, player, state, options);
             try applyDamage(battle, player, state, options);
             try reportOutcome(battle, player, state, options);
             _ = try afterMove(!KINGS, battle, player, state, options);
@@ -118,9 +102,7 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
             try calcDamage(battle, player, state, options);
             try adjustDamage(battle, player, state, options);
             try randomizeDamage(battle, player, state, options);
-
-            if (battle.foe(player).active.volatiles.Flying) state.damage *|= 2;
-
+            try Effects.double.flying(battle, player, state, options);
             try checkHit(battle, player, state, options);
             try applyDamage(battle, player, state, options);
             try reportOutcome(battle, player, state, options);
@@ -157,9 +139,7 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
             try calcDamage(battle, player, state, options);
             try adjustDamage(battle, player, state, options);
             try randomizeDamage(battle, player, state, options);
-
-            if (battle.foe(player).active.volatiles.minimized) state.damage *|= 2;
-
+            try Effects.double.minimize(battle, player, state, options);
             try checkHit(battle, player, state, options);
             try effectChance(battle, player, state, options);
             try applyDamage(battle, player, state, options);
@@ -188,7 +168,7 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
             if (!skip_pp) _ = decrementPP(side, state.move, state.mslot); // TODO if no pp return
             // TODO rampage
             // usedmovetext
-            try log.move(ident, state.move, foe_ident); // FIXME self? from?
+            try log.move(.{ ident, state.move, foe_ident }); // FIXME self? from?
             try checkHit(battle, player, state, options);
             try checkCriticalHit(battle, player, state, options);
             try calcDamage(battle, player, state, options);
@@ -273,7 +253,7 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
             try Effects.hyperBeam(battle, player, state, options);
             _ = try afterMove(!KINGS, battle, player, state, options);
         },
-        .Counter => {
+        .MirrorCoat, .Counter => {
             if (!try canMove(battle, player, state, options)) return;
             try Effects.counter(battle, player, state, options);
             try applyDamage(battle, player, state, options);
@@ -308,7 +288,6 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
             if (!try canMove(battle, player, state, options)) return;
             try checkCriticalHit(battle, player, state, options);
             try calcDamage(battle, player, state, options);
-            // TODO thunderaccuracy
             try checkHit(battle, player, state, options);
             try effectChance(battle, player, state, options);
             try adjustDamage(battle, player, state, options);
@@ -324,9 +303,7 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
             try calcDamage(battle, player, state, options);
             try adjustDamage(battle, player, state, options);
             try randomizeDamage(battle, player, state, options);
-
-            if (battle.foe(player).active.volatiles.Underground) state.damage *|= 2;
-
+            try Effects.double.underground(battle, player, state, options);
             try checkHit(battle, player, state, options);
             try effectChance(battle, player, state, options);
             try applyDamage(battle, player, state, options);
@@ -339,13 +316,10 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
             try calcDamage(battle, player, state, options);
             try adjustDamage(battle, player, state, options);
             try checkHit(battle, player, state, options);
-
-            assert(volatiles.Rage);
-            state.damage *|= (volatiles.rage +| 1);
-
+            try Effects.rage.damage(battle, player, state, options);
             try randomizeDamage(battle, player, state, options);
             // TODO failuretext
-            try Effects.rage(battle, player, state, options);
+            try Effects.rage.start(battle, player, state, options);
             try applyDamage(battle, player, state, options);
             try reportOutcome(battle, player, state, options);
             _ = try afterMove(KINGS, battle, player, state, options);
@@ -363,47 +337,32 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
             if (!try canMove(battle, player, state, options)) return;
             try Effects.heal(battle, player, state, options);
         },
+        .LightScreen => {
+            if (!try canMove(battle, player, state, options)) return;
+            try Effects.lightScreen(battle, player, state, options);
+        },
         .Haze => {
             if (!try canMove(battle, player, state, options)) return;
             try Effects.haze(battle, player, state, options);
         },
-        .LightScreen, .Reflect => {
+        .Reflect => {
             if (!try canMove(battle, player, state, options)) return;
-            try Effects.screens(battle, player, state, options);
+            try Effects.reflect(battle, player, state, options);
         },
         .FocusEnergy => {
             if (!try canMove(battle, player, state, options)) return;
             try Effects.focusEnergy(battle, player, state, options);
         },
         .Bide => {
-            if (!volatiles.Bide) return;
-
-            assert(volatiles.attacks > 0);
-            // if (options.calc.modify(player, .attacking)) |extend| {
-            //     if (!extend) volatiles.attacks = 0;
-            // } else {
-            volatiles.attacks -= 1;
-            // }
-            try options.chance.attacking(player, volatiles.attacks);
-
-            if (volatiles.attacks != 0) return try options.log.activate(ident, .Bide);
-
-            volatiles.Bide = false;
-            try options.log.end(ident, .Bide);
-
-            state.damage = volatiles.bide *% 2;
-            volatiles.bide = 0;
-
-            if (state.damage == 0) state.miss = true;
-
+            try Effects.bide.store(battle, player, state, options);
             // doturn
             const charging = false; // TODO
             const skip_pp = charging or state.move == .Struggle or
                 (volatiles.BeatUp or volatiles.Thrashing or volatiles.Bide);
             if (!skip_pp) _ = decrementPP(side, state.move, state.mslot); // TODO if no pp return
             // usedmovetext
-            try log.move(ident, state.move, foe_ident); // FIXME self? from?
-            // TODO unleashenergy
+            try log.move(.{ ident, state.move, foe_ident }); // FIXME self? from?
+            try Effects.bide.unleash(battle, player, state, options);
 
             if (state.immune()) {
                 state.damage = 0;
@@ -522,7 +481,7 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
             try randomizeDamage(battle, player, state, options);
             try checkHit(battle, player, state, options);
             try effectChance(battle, player, state, options);
-            try Effects.snore(battle, player, state, options);
+            if (!try Effects.snore(battle, player, state, options)) return;
             try applyDamage(battle, player, state, options);
             try reportOutcome(battle, player, state, options);
             if (!try afterMove(!KINGS, battle, player, state, options)) return;
@@ -582,19 +541,19 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
             try Effects.sandstorm(battle, player, state, options);
         },
         .Rollout => {
-            // TODO checkcurl
+            try Effects.rollout.check(battle, player, state, options);
             // doturn
             const charging = false; // TODO
             const skip_pp = charging or state.move == .Struggle or
                 (volatiles.BeatUp or volatiles.Thrashing or volatiles.Bide);
             if (!skip_pp) _ = decrementPP(side, state.move, state.mslot); // TODO if no pp return
             // usedmovetext
-            try log.move(ident, state.move, foe_ident); // FIXME self? from?
+            try log.move(.{ ident, state.move, foe_ident }); // FIXME self? from?
             try checkCriticalHit(battle, player, state, options);
             try calcDamage(battle, player, state, options);
             try adjustDamage(battle, player, state, options);
             try checkHit(battle, player, state, options);
-            // TODO rolloutpower
+            try Effects.rollout.power(battle, player, state, options);
             try randomizeDamage(battle, player, state, options);
             try applyDamage(battle, player, state, options);
             try reportOutcome(battle, player, state, options);
@@ -615,12 +574,7 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
         .Swagger => {
             if (!try canMove(battle, player, state, options)) return;
             try checkHit(battle, player, state, options);
-            // TODO switchturn
-            // TODO attackup2
-            // TODO switchturn
-            // TODO failuretext
-            // TODO switchturn
-            // TODO switchturn
+            try Effects.boost(battle, player.foe(), state, options);
             try Effects.confusionChance(battle, player, state, options);
         },
         .FuryCutter => {
@@ -694,14 +648,12 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
         .Magnitude => {
             if (!try canMove(battle, player, state, options)) return;
             try checkCriticalHit(battle, player, state, options);
-            // TODO getmagnitude
+            try Effects.magnitude(battle, player, state, options);
             try calcDamage(battle, player, state, options);
             try adjustDamage(battle, player, state, options);
             try randomizeDamage(battle, player, state, options);
             try checkHit(battle, player, state, options);
-
-            if (battle.foe(player).active.volatiles.Underground) state.damage *|= 2;
-
+            try Effects.double.underground(battle, player, state, options);
             try applyDamage(battle, player, state, options);
             try reportOutcome(battle, player, state, options);
             _ = try afterMove(KINGS, battle, player, state, options);
@@ -755,9 +707,7 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
             try calcDamage(battle, player, state, options);
             try adjustDamage(battle, player, state, options);
             try randomizeDamage(battle, player, state, options);
-
-            if (battle.foe(player).active.volatiles.Flying) state.damage *|= 2;
-
+            try Effects.double.flying(battle, player, state, options);
             try checkHit(battle, player, state, options);
             try effectChance(battle, player, state, options);
             try applyDamage(battle, player, state, options);
@@ -773,12 +723,6 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
             if (!try canMove(battle, player, state, options)) return;
             try Effects.sunnyDay(battle, player, state, options);
         },
-        .MirrorCoat => {
-            if (!try canMove(battle, player, state, options)) return;
-            try Effects.mirrorCoat(battle, player, state, options);
-            try applyDamage(battle, player, state, options);
-            _ = try afterMove(KINGS, battle, player, state, options);
-        },
         .PsychUp => {
             if (!try canMove(battle, player, state, options)) return;
             try Effects.psychUp(battle, player, state, options);