@pkmn/engine 0.1.0-dev.f918c3bd → 0.1.0-dev.fb6653d6

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

@@ -1,25 +1,23 @@
-//! Code generated by `tools/generate` - manual edits will be overwritten
-
-const std = @import("std");
+//! Code generated by `tools/generate` - manual edits will be overwritten.
 
 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.
 pub const Item = enum(u8) {
     None,
+    SoftSand, // Ground
+    HardStone, // Rock
+    MetalCoat, // Steel
     PinkBow, // Normal
     BlackBelt, // Fighting
     SharpBeak, // Flying
     PoisonBarb, // Poison
-    SoftSand, // Ground
-    HardStone, // Rock
     SilverPowder, // Bug
     SpellTag, // Ghost
-    MetalCoat, // Steel
     PolkadotBow, // ??? (Normal)
     Charcoal, // Fire
     MysticWater, // Water
@@ -36,21 +34,21 @@ pub const Item = enum(u8) {
     Stick,
     ThickClub,
     FocusBand, // FocusBand
-    BerryJuice, // Berry
     ScopeLens, // CriticalUp
     Leftovers, // Leftovers
     BerserkGene,
     LightBall,
+    Berry, // Berry
+    BerryJuice, // Berry
+    GoldBerry, // Berry
+    MintBerry, // HealSleep
     PSNCureBerry, // HealPoison
     PRZCureBerry, // HealParalyze
-    BurntBerry, // HealFreeze
     IceBerry, // HealBurn
-    BitterBerry, // HealConfusion
-    MintBerry, // HealSleep
+    BurntBerry, // HealFreeze
     MiracleBerry, // HealStatus
+    BitterBerry, // HealConfusion
     MysteryBerry, // RestorePP
-    Berry, // Berry
-    GoldBerry, // Berry
     MasterBall,
     UltraBall,
     GreatBall,
@@ -216,20 +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 a Berry.
-    pub inline fn berry(item: Item) bool {
-        assert(item != .None);
-        return @intFromEnum(item) > 30 and @intFromEnum(item) <= 40;
-    }
-
     /// Whether or not this item is Mail.
-    pub inline fn mail(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
+//! 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;
 
@@ -281,21 +279,23 @@ pub const Move = enum(u8) {
         chance: u8 = 0,
         /// The priority of the move.
         priority: i8 = 0,
-        /// Miscellaneous flags.
-        flags: Flags = .{},
+        /// Miscellaneous extra data/flags.
+        extra: Extra = .{},
 
-        /// Miscellaneous move related flags.
-        const Flags = packed struct(u8) {
+        /// Miscellaneous extra move related data/flags.
+        const Extra = packed struct(u8) {
             /// Whether this move can be called via Metronome.
             metronome: bool = true,
+            /// Whether this move can be called via Sleep Talk.
+            sleep_talk: bool = true,
             /// Whether this move is considered to be "continuous".
             continuous: bool = false,
             /// Whether this move can hit a flying target.
             flying: bool = false,
             /// Whether this move can hit an underground target.
             underground: bool = false,
-
-            _: u4 = 0,
+            /// Protocol reason offset associated with this move.
+            protocol: u3 = 0,
         };
 
         comptime {
@@ -410,7 +410,7 @@ pub const Move = enum(u8) {
             .type = .Normal,
             .accuracy = percent(75),
             .target = .Foes,
-            .flags = .{ .continuous = true },
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // SwordsDance
         .{
@@ -435,7 +435,7 @@ pub const Move = enum(u8) {
             .type = .Flying,
             .accuracy = percent(100),
             .target = .Any,
-            .flags = .{ .flying = true },
+            .extra = .{ .flying = true },
         },
         // WingAttack
         .{
@@ -453,16 +453,16 @@ pub const Move = enum(u8) {
             .accuracy = percent(100),
             .target = .Other,
             .priority = -1,
-            .flags = .{ .flying = true },
+            .extra = .{ .flying = true },
         },
         // Fly
         .{
-            .effect = .Fly,
+            .effect = .FlyDig,
             .bp = 70,
             .type = .Flying,
             .accuracy = percent(95),
             .target = .Any,
-            .flags = .{ .continuous = true },
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // Bind
         .{
@@ -471,6 +471,7 @@ pub const Move = enum(u8) {
             .type = .Normal,
             .accuracy = percent(75),
             .target = .Other,
+            .extra = .{ .protocol = 1 },
         },
         // Slam
         .{
@@ -595,6 +596,7 @@ pub const Move = enum(u8) {
             .type = .Normal,
             .accuracy = percent(85),
             .target = .Other,
+            .extra = .{ .protocol = 2 },
         },
         // TakeDown
         .{
@@ -611,7 +613,7 @@ pub const Move = enum(u8) {
             .type = .Normal,
             .accuracy = percent(100),
             .target = .RandomFoe,
-            .flags = .{ .continuous = true },
+            .extra = .{ .continuous = true },
         },
         // DoubleEdge
         .{
@@ -874,7 +876,7 @@ pub const Move = enum(u8) {
             .accuracy = percent(100),
             .target = .Depends,
             .priority = -1,
-            .flags = .{ .metronome = false },
+            .extra = .{ .metronome = false },
         },
         // SeismicToss
         .{
@@ -934,12 +936,12 @@ pub const Move = enum(u8) {
         },
         // SolarBeam
         .{
-            .effect = .Solarbeam,
+            .effect = .SolarBeam,
             .bp = 120,
             .type = .Grass,
             .accuracy = percent(100),
             .target = .Other,
-            .flags = .{ .continuous = true },
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // PoisonPowder
         .{
@@ -972,7 +974,7 @@ pub const Move = enum(u8) {
             .type = .Grass,
             .accuracy = percent(100),
             .target = .RandomFoe,
-            .flags = .{ .continuous = true },
+            .extra = .{ .continuous = true },
         },
         // StringShot
         .{
@@ -997,6 +999,7 @@ pub const Move = enum(u8) {
             .type = .Fire,
             .accuracy = percent(70),
             .target = .Other,
+            .extra = .{ .protocol = 3 },
         },
         // ThunderShock
         .{
@@ -1032,7 +1035,7 @@ pub const Move = enum(u8) {
             .accuracy = percent(70),
             .target = .Other,
             .chance = percent(30),
-            .flags = .{ .flying = true },
+            .extra = .{ .flying = true },
         },
         // RockThrow
         .{
@@ -1049,7 +1052,7 @@ pub const Move = enum(u8) {
             .type = .Ground,
             .accuracy = percent(100),
             .target = .AllOthers,
-            .flags = .{ .underground = true },
+            .extra = .{ .underground = true },
         },
         // Fissure
         .{
@@ -1058,15 +1061,16 @@ pub const Move = enum(u8) {
             .type = .Ground,
             .accuracy = percent(30),
             .target = .Other,
-            .flags = .{ .underground = true },
+            .extra = .{ .underground = true },
         },
         // Dig
         .{
-            .effect = .Fly,
+            .effect = .FlyDig,
             .bp = 60,
             .type = .Ground,
             .accuracy = percent(100),
             .target = .Other,
+            .extra = .{ .sleep_talk = false },
         },
         // Toxic
         .{
@@ -1158,7 +1162,7 @@ pub const Move = enum(u8) {
             .type = .Normal,
             .accuracy = percent(100),
             .target = .Other,
-            .flags = .{ .metronome = false },
+            .extra = .{ .metronome = false },
         },
         // Screech
         .{
@@ -1279,7 +1283,7 @@ pub const Move = enum(u8) {
             .type = .Normal,
             .accuracy = percent(100),
             .target = .Self,
-            .flags = .{ .continuous = true },
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // Metronome
         .{
@@ -1288,7 +1292,7 @@ pub const Move = enum(u8) {
             .type = .Normal,
             .accuracy = percent(100),
             .target = .Self,
-            .flags = .{ .metronome = false },
+            .extra = .{ .metronome = false },
         },
         // MirrorMove
         .{
@@ -1374,6 +1378,7 @@ pub const Move = enum(u8) {
             .type = .Water,
             .accuracy = percent(75),
             .target = .Other,
+            .extra = .{ .protocol = 4 },
         },
         // Swift
         .{
@@ -1390,7 +1395,7 @@ pub const Move = enum(u8) {
             .type = .Normal,
             .accuracy = percent(100),
             .target = .Other,
-            .flags = .{ .continuous = true },
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // SpikeCannon
         .{
@@ -1496,7 +1501,7 @@ pub const Move = enum(u8) {
             .type = .Flying,
             .accuracy = percent(90),
             .target = .Any,
-            .flags = .{ .continuous = true },
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // Transform
         .{
@@ -1678,7 +1683,7 @@ pub const Move = enum(u8) {
             .type = .Normal,
             .accuracy = percent(100),
             .target = .RandomFoe,
-            .flags = .{ .metronome = false },
+            .extra = .{ .metronome = false },
         },
         // Sketch
         .{
@@ -1687,7 +1692,7 @@ pub const Move = enum(u8) {
             .type = .Normal,
             .accuracy = percent(100),
             .target = .Other,
-            .flags = .{ .metronome = false },
+            .extra = .{ .metronome = false },
         },
         // TripleKick
         .{
@@ -1705,7 +1710,7 @@ pub const Move = enum(u8) {
             .accuracy = percent(100),
             .target = .Other,
             .chance = percent(100),
-            .flags = .{ .metronome = false },
+            .extra = .{ .metronome = false },
         },
         // SpiderWeb
         .{
@@ -1822,7 +1827,7 @@ pub const Move = enum(u8) {
             .accuracy = percent(100),
             .target = .Self,
             .priority = 2,
-            .flags = .{ .metronome = false },
+            .extra = .{ .metronome = false },
         },
         // MachPunch
         .{
@@ -1924,7 +1929,7 @@ pub const Move = enum(u8) {
             .type = .Ghost,
             .accuracy = percent(100),
             .target = .Self,
-            .flags = .{ .metronome = false },
+            .extra = .{ .metronome = false },
         },
         // PerishSong
         .{
@@ -1951,7 +1956,7 @@ pub const Move = enum(u8) {
             .accuracy = percent(100),
             .target = .Self,
             .priority = 2,
-            .flags = .{ .metronome = false },
+            .extra = .{ .metronome = false },
         },
         // BoneRush
         .{
@@ -1976,7 +1981,7 @@ pub const Move = enum(u8) {
             .type = .Dragon,
             .accuracy = percent(100),
             .target = .RandomFoe,
-            .flags = .{ .continuous = true },
+            .extra = .{ .continuous = true },
         },
         // Sandstorm
         .{
@@ -2002,7 +2007,7 @@ pub const Move = enum(u8) {
             .accuracy = percent(100),
             .target = .Self,
             .priority = 2,
-            .flags = .{ .metronome = false },
+            .extra = .{ .metronome = false },
         },
         // Charm
         .{
@@ -2019,7 +2024,7 @@ pub const Move = enum(u8) {
             .type = .Rock,
             .accuracy = percent(90),
             .target = .Other,
-            .flags = .{ .continuous = true },
+            .extra = .{ .continuous = true },
         },
         // FalseSwipe
         .{
@@ -2094,7 +2099,7 @@ pub const Move = enum(u8) {
             .type = .Normal,
             .accuracy = percent(100),
             .target = .Self,
-            .flags = .{ .metronome = false },
+            .extra = .{ .metronome = false },
         },
         // HealBell
         .{
@@ -2160,7 +2165,7 @@ pub const Move = enum(u8) {
             .type = .Ground,
             .accuracy = percent(100),
             .target = .AllOthers,
-            .flags = .{ .underground = true },
+            .extra = .{ .underground = true },
         },
         // DynamicPunch
         .{
@@ -2303,7 +2308,7 @@ pub const Move = enum(u8) {
             .accuracy = percent(100),
             .target = .Foes,
             .chance = percent(20),
-            .flags = .{ .flying = true },
+            .extra = .{ .flying = true },
         },
         // RainDance
         .{
@@ -2338,7 +2343,7 @@ pub const Move = enum(u8) {
             .accuracy = percent(100),
             .target = .Depends,
             .priority = -1,
-            .flags = .{ .metronome = false },
+            .extra = .{ .metronome = false },
         },
         // PsychUp
         .{
@@ -2399,6 +2404,7 @@ pub const Move = enum(u8) {
             .type = .Water,
             .accuracy = percent(70),
             .target = .Other,
+            .extra = .{ .protocol = 5 },
         },
         // BeatUp
         .{
@@ -2458,7 +2464,7 @@ pub const Move = enum(u8) {
         FixedDamage,
         FlameWheel,
         FlinchChance,
-        Fly,
+        FlyDig,
         FocusEnergy,
         ForceSwitch,
         Foresight,
@@ -2521,7 +2527,7 @@ pub const Move = enum(u8) {
         Sleep,
         SleepTalk,
         Snore,
-        Solarbeam,
+        SolarBeam,
         SpAtkUp1,
         SpDefDownChance,
         SpDefUp2,
@@ -2554,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;
         }
     };
@@ -2842,8 +2848,22 @@ pub const Move = enum(u8) {
     /// The number of Pokémon moves in this generation.
     pub const size = 251;
 
+    /// Pokémon moves that can be called by Metronome in this generation.
+    pub const METRONOME = init: {
+        var num = 0;
+        var moves: [239]Move = undefined;
+        for (1..Move.size + 1) |i| {
+            if (Move.get(@enumFromInt(i)).extra.metronome) {
+                moves[num] = @enumFromInt(i);
+                num += 1;
+            }
+        }
+        assert(num == moves.len);
+        break :init moves;
+    };
+
     /// 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");
+//! Code generated by `tools/generate` - manual edits will be overwritten.
 
 const gen2 = @import("../../gen2/data.zig");
+const std = @import("std");
 
 const assert = std.debug.assert;
-
 const Stats = gen2.Stats;
 const Types = gen2.Types;