@pkmn/engine 0.1.0-dev.1220fbc5 → 0.1.0-dev.12e7292c

package/src/lib/gen2/README.md

@@ -49,7 +49,6 @@ The following information is required to simulate a Generation II Pokémon battl
 | `volatiles.bind`               | `PlayerWrapCount`                 | `volatiles.partiallytrapped.duration` |
 | `volatiles.bind_reason`        | `PlayerTrappingMove`              | `volatiles.effectState.sourceEffect`  |
 |                                | `PlayerCharging`                  |                                       |
-| `volatiles.trapped FIXME`      | `FIXME`                           | `pokemon.trapped`                     |
 | `volatiles.switched`           | `TODO`                            | `pokemon.switchFlag`                  |
 | `volatiles.switching`          | `PlayerIsSwitching`               | `pokemon.switchFlag`                  |
 | `volatiles.frozen`             | `PlayerJustGotFrozen`             | `volatiles.frozen`                    |

package/src/lib/gen2/data.zig

@@ -314,8 +314,8 @@ 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,

package/src/lib/gen2/generated.zig

@@ -175,7 +175,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);
@@ -260,7 +260,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);
@@ -344,13 +344,17 @@ 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;
@@ -364,7 +368,7 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
                 (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 Effects.bide.unleash(battle, player, state, options);
 
             if (state.immune()) {
@@ -544,19 +548,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);
@@ -577,12 +581,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 => {
@@ -656,7 +655,7 @@ 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);
@@ -731,12 +730,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);