@pkmn/engine 0.1.0-dev.8b83af6b → 0.1.0-dev.900756a9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (49) hide show
  1. package/README.md +53 -42
  2. package/build/pkg/addon.js +3 -2
  3. package/build/pkg/addon.js.map +1 -1
  4. package/build/pkg/data/ids.json +12 -12
  5. package/build/pkg/data/layout.json +26 -4
  6. package/build/pkg/data/protocol.json +69 -12
  7. package/build/pkg/data.d.ts +2 -2
  8. package/build/pkg/gen1.js +15 -18
  9. package/build/pkg/gen1.js.map +1 -1
  10. package/build/pkg/protocol.js +56 -37
  11. package/build/pkg/protocol.js.map +1 -1
  12. package/build/tools/debug.js +3 -1
  13. package/build/tools/debug.js.map +1 -1
  14. package/build.zig +96 -65
  15. package/package.json +40 -19
  16. package/src/bin/install-pkmn-engine +10 -5
  17. package/src/lib/binding/node.zig +40 -132
  18. package/src/lib/binding/wasm.zig +2 -0
  19. package/src/lib/common/battle.zig +17 -0
  20. package/src/lib/common/data.zig +8 -20
  21. package/src/lib/common/debug.zig +20 -11
  22. package/src/lib/common/js.zig +118 -0
  23. package/src/lib/common/optional.zig +67 -0
  24. package/src/lib/common/options.zig +9 -0
  25. package/src/lib/common/protocol.zig +635 -88
  26. package/src/lib/common/rational.zig +353 -0
  27. package/src/lib/common/rng.zig +19 -10
  28. package/src/lib/common/util.zig +12 -0
  29. package/src/lib/gen1/README.md +284 -204
  30. package/src/lib/gen1/calc.zig +426 -0
  31. package/src/lib/gen1/chance.zig +1060 -0
  32. package/src/lib/gen1/data/moves.zig +192 -180
  33. package/src/lib/gen1/data/species.zig +2 -2
  34. package/src/lib/gen1/data/types.zig +7 -7
  35. package/src/lib/gen1/data.zig +67 -58
  36. package/src/lib/gen1/helpers.zig +566 -10
  37. package/src/lib/gen1/mechanics.zig +800 -563
  38. package/src/lib/gen2/README.md +105 -85
  39. package/src/lib/gen2/calc.zig +143 -0
  40. package/src/lib/gen2/chance.zig +1314 -0
  41. package/src/lib/gen2/data/items.zig +12 -18
  42. package/src/lib/gen2/data/moves.zig +663 -569
  43. package/src/lib/gen2/data/species.zig +1 -1
  44. package/src/lib/gen2/data/types.zig +134 -31
  45. package/src/lib/gen2/data.zig +115 -78
  46. package/src/lib/gen2/generated.zig +808 -0
  47. package/src/lib/gen2/helpers.zig +11 -17
  48. package/src/lib/gen2/mechanics.zig +3492 -12
  49. package/src/lib/pkmn.zig +61 -2
@@ -48,7 +48,7 @@ pub const Battle = struct {
48
48
  comptime rolls: anytype,
49
49
  p1: []const Pokemon,
50
50
  p2: []const Pokemon,
51
- ) data.Battle(rng.FixedRNG(1, rolls.len)) {
51
+ ) data.Battle(rng.FixedRNG(2, rolls.len)) {
52
52
  return .{
53
53
  .rng = .{ .rolls = rolls },
54
54
  .sides = .{ Side.init(p1), Side.init(p2) },
@@ -72,11 +72,9 @@ pub fn prng(rand: *PSRNG) data.PRNG {
72
72
  rand.newSeed()
73
73
  else
74
74
  .{
75
- rand.range(u8, 0, 256), rand.range(u8, 0, 256),
76
- rand.range(u8, 0, 256), rand.range(u8, 0, 256),
77
- rand.range(u8, 0, 256), rand.range(u8, 0, 256),
78
- rand.range(u8, 0, 256), rand.range(u8, 0, 256),
79
- rand.range(u8, 0, 256), rand.range(u8, 0, 256),
75
+ rand.range(u8, 0, 256), rand.range(u8, 0, 256), rand.range(u8, 0, 256),
76
+ rand.range(u8, 0, 256), rand.range(u8, 0, 256), rand.range(u8, 0, 256),
77
+ rand.range(u8, 0, 256), rand.range(u8, 0, 256), rand.range(u8, 0, 256),
80
78
  },
81
79
  },
82
80
  };
@@ -89,7 +87,7 @@ pub const Side = struct {
89
87
 
90
88
  for (0..ps.len) |i| {
91
89
  side.pokemon[i] = Pokemon.init(ps[i]);
92
- // FIXME side.order[i] = i + 1;
90
+ side.pokemon[i].position = @as(u4, @intCast(i)) + 1;
93
91
  }
94
92
  return side;
95
93
  }
@@ -100,7 +98,7 @@ pub const Side = struct {
100
98
 
101
99
  for (0..n) |i| {
102
100
  side.pokemon[i] = Pokemon.random(rand, opt);
103
- side.pokemon[i].position = i + 1;
101
+ side.pokemon[i].position = @as(u4, @intCast(i)) + 1;
104
102
  }
105
103
 
106
104
  return side;
@@ -137,12 +135,9 @@ pub const Pokemon = struct {
137
135
  }
138
136
  assert(p.moves.len > 0 and p.moves.len <= 4);
139
137
  for (p.moves, 0..) |m, j| {
140
- pokemon.moves[j] = .{
141
- .id = m,
142
- .pp_ups = 3,
143
- // NB: PP can be at most 61 legally (though can overflow to 63)
144
- .pp = @intCast(@min(Move.pp(m) / 5 * 8, 61)),
145
- };
138
+ pokemon.moves[j].id = m;
139
+ // NB: PP can be at most 61 legally (though can overflow to 63)
140
+ pokemon.moves[j].pp = @intCast(@min(Move.pp(m) / 5 * 8, 61));
146
141
  }
147
142
  pokemon.item = p.item;
148
143
  if (p.hp) |hp| {
@@ -153,7 +148,7 @@ pub const Pokemon = struct {
153
148
  pokemon.status = p.status;
154
149
  pokemon.types = species.types;
155
150
  pokemon.level = p.level;
156
- pokemon.dvs = DVs.from(p.dvs);
151
+ pokemon.dvs = DVs.from(p.species, p.dvs);
157
152
  return pokemon;
158
153
  }
159
154
 
@@ -194,14 +189,13 @@ pub const Pokemon = struct {
194
189
  const max_pp: u8 = @intCast(Move.pp(m) + pp_ups * @min(Move.pp(m) / 5, 7));
195
190
  ms[i] = .{
196
191
  .id = m,
197
- .pp_ups = pp_ups,
198
192
  .pp = if (opt.cleric) max_pp else rand.range(u8, 0, max_pp + 1),
199
193
  };
200
194
  }
201
195
  return .{
202
196
  .species = s,
203
197
  .types = species.types,
204
- .dvs = DVs.from(dvs),
198
+ .dvs = DVs.from(s, dvs),
205
199
  .level = lvl,
206
200
  .stats = stats,
207
201
  .hp = if (opt.cleric) stats.hp else rand.range(u16, 0, stats.hp + 1),