@pkmn/engine 0.1.0-dev.7679dad9 → 0.1.0-dev.7963b917

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 (39) hide show
  1. package/README.md +43 -40
  2. package/build/pkg/addon.js +3 -2
  3. package/build/pkg/addon.js.map +1 -1
  4. package/build/pkg/data/layout.json +24 -2
  5. package/build/pkg/gen1.js +13 -16
  6. package/build/pkg/gen1.js.map +1 -1
  7. package/build.zig +59 -51
  8. package/package.json +24 -15
  9. package/src/bin/install-pkmn-engine +10 -5
  10. package/src/lib/binding/node.zig +45 -140
  11. package/src/lib/binding/wasm.zig +4 -2
  12. package/src/lib/common/battle.zig +17 -0
  13. package/src/lib/common/data.zig +11 -11
  14. package/src/lib/common/debug.zig +20 -11
  15. package/src/lib/common/js.zig +118 -0
  16. package/src/lib/common/optional.zig +60 -0
  17. package/src/lib/common/options.zig +9 -0
  18. package/src/lib/common/protocol.zig +204 -140
  19. package/src/lib/common/rational.zig +353 -0
  20. package/src/lib/common/rng.zig +10 -10
  21. package/src/lib/common/util.zig +12 -0
  22. package/src/lib/gen1/README.md +173 -173
  23. package/src/lib/gen1/calc.zig +427 -0
  24. package/src/lib/gen1/chance.zig +1044 -0
  25. package/src/lib/gen1/data/moves.zig +10 -10
  26. package/src/lib/gen1/data/species.zig +2 -2
  27. package/src/lib/gen1/data/types.zig +3 -3
  28. package/src/lib/gen1/data.zig +61 -37
  29. package/src/lib/gen1/helpers.zig +435 -17
  30. package/src/lib/gen1/mechanics.zig +754 -481
  31. package/src/lib/gen2/README.md +12 -13
  32. package/src/lib/gen2/data/items.zig +3 -3
  33. package/src/lib/gen2/data/moves.zig +1 -1
  34. package/src/lib/gen2/data/species.zig +1 -1
  35. package/src/lib/gen2/data/types.zig +3 -3
  36. package/src/lib/gen2/data.zig +33 -22
  37. package/src/lib/gen2/helpers.zig +9 -11
  38. package/src/lib/gen2/mechanics.zig +5 -4
  39. package/src/lib/pkmn.zig +61 -2
package/build.zig CHANGED
@@ -1,13 +1,20 @@
1
1
  const std = @import("std");
2
2
  const builtin = @import("builtin");
3
3
 
4
- pub const Options = struct { showdown: ?bool = null, log: ?bool = null };
4
+ pub const Options = struct {
5
+ showdown: ?bool = null,
6
+ log: ?bool = null,
7
+ chance: ?bool = null,
8
+ calc: ?bool = null,
9
+ };
5
10
 
6
11
  pub fn module(b: *std.Build, options: Options) *std.Build.Module {
7
12
  const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
8
13
  const build_options = b.addOptions();
9
14
  build_options.addOption(?bool, "showdown", options.showdown);
10
15
  build_options.addOption(?bool, "log", options.log);
16
+ build_options.addOption(?bool, "chance", options.chance);
17
+ build_options.addOption(?bool, "calc", options.calc);
11
18
  return b.createModule(.{
12
19
  .source_file = .{ .path = dirname ++ "/src/lib/pkmn.zig" },
13
20
  .dependencies = &.{.{ .name = "build_options", .module = build_options.createModule() }},
@@ -28,25 +35,29 @@ pub fn build(b: *std.Build) !void {
28
35
  const strip = b.option(bool, "strip", "Strip debugging symbols from binary") orelse false;
29
36
  const pic = b.option(bool, "pic", "Force position independent code") orelse false;
30
37
  const emit_asm = b.option(bool, "emit-asm", "Output .s (assembly code)") orelse false;
38
+ const emit_ll = b.option(bool, "emit-ll", "Output .ll (LLVM IR)") orelse false;
31
39
 
32
40
  const cmd = b.findProgram(&.{"strip"}, &.{}) catch null;
33
41
 
34
- var parser = std.json.Parser.init(b.allocator, .alloc_if_needed);
35
- defer parser.deinit();
36
- var tree = try parser.parse(@embedFile("package.json"));
37
- defer tree.deinit();
38
- const version = tree.root.object.get("version").?.string;
39
- const description = tree.root.object.get("description").?.string;
40
- var repository = std.mem.split(u8, tree.root.object.get("repository").?.string, ":");
42
+ const json = @embedFile("package.json");
43
+ var parsed = try std.json.parseFromSlice(std.json.Value, b.allocator, json, .{});
44
+ defer parsed.deinit();
45
+ const version = parsed.value.object.get("version").?.string;
46
+ const description = parsed.value.object.get("description").?.string;
47
+ var repository = std.mem.split(u8, parsed.value.object.get("repository").?.string, ":");
41
48
  std.debug.assert(std.mem.eql(u8, repository.first(), "github"));
42
49
 
43
50
  const showdown =
44
51
  b.option(bool, "showdown", "Enable Pokémon Showdown compatibility mode") orelse false;
45
52
  const log = b.option(bool, "log", "Enable protocol message logging") orelse false;
53
+ const chance = b.option(bool, "chance", "Enable update probability tracking") orelse false;
54
+ const calc = b.option(bool, "calc", "Enable damage calculator support") orelse false;
46
55
 
47
56
  const options = b.addOptions();
48
57
  options.addOption(?bool, "showdown", showdown);
49
58
  options.addOption(?bool, "log", log);
59
+ options.addOption(?bool, "chance", chance);
60
+ options.addOption(?bool, "calc", calc);
50
61
 
51
62
  const name = if (showdown) "pkmn-showdown" else "pkmn";
52
63
 
@@ -136,6 +147,7 @@ pub fn build(b: *std.Build) !void {
136
147
  maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
137
148
  if (pic) lib.force_pic = pic;
138
149
  if (emit_asm) lib.emit_asm = .emit;
150
+ if (emit_ll) lib.emit_llvm_ir = .emit;
139
151
  b.installArtifact(lib);
140
152
  c = true;
141
153
  }
@@ -178,14 +190,20 @@ pub fn build(b: *std.Build) !void {
178
190
  .strip = strip,
179
191
  .cmd = cmd,
180
192
  };
193
+
194
+ // TODO: tests can be run multiple times due to @imports
181
195
  const tests = TestStep.create(b, options, config);
182
196
 
183
197
  var exes = std.ArrayList(*std.Build.CompileStep).init(b.allocator);
184
198
  const tools: ToolConfig = .{
185
- .general = config,
186
- .tool = .{
199
+ .options = .{
187
200
  .showdown = showdown,
188
201
  .log = log,
202
+ .chance = chance,
203
+ .calc = calc,
204
+ },
205
+ .general = config,
206
+ .tool = .{
189
207
  .tests = if (tests.build) tests else null,
190
208
  .exes = &exes,
191
209
  },
@@ -199,23 +217,21 @@ pub fn build(b: *std.Build) !void {
199
217
  var fuzz_config = tools;
200
218
  fuzz_config.general.strip = false;
201
219
  fuzz_config.tool.name = "fuzz";
202
- const fuzz = tool(b, "src/test/benchmark.zig", fuzz_config);
220
+ const fuzz = tool(b, "src/test/fuzz.zig", fuzz_config);
203
221
 
222
+ const copies = tool(b, "src/tools/copies.zig", tools);
223
+ const dump = tool(b, "src/tools/dump.zig", tools);
204
224
  const serde = tool(b, "src/tools/serde.zig", tools);
205
- const protocol = tool(b, "src/tools/protocol.zig", tools);
206
-
207
- const lint_exe =
208
- b.addExecutable(.{ .name = "lint", .root_source_file = .{ .path = "src/tools/lint.zig" } });
209
- if (tests.build) tests.step.dependOn(&lint_exe.step);
210
- const lint = b.addRunArtifact(lint_exe);
225
+ const transitions = tool(b, "src/tools/transitions.zig", tools);
211
226
 
227
+ b.step("copies", "Run copy detector").dependOn(&copies.step);
212
228
  b.step("benchmark", "Run benchmark code").dependOn(&benchmark.step);
229
+ b.step("dump", "Run protocol dump tool").dependOn(&dump.step);
213
230
  b.step("fuzz", "Run fuzz tester").dependOn(&fuzz.step);
214
- b.step("lint", "Lint source files").dependOn(&lint.step);
215
- b.step("protocol", "Run protocol dump tool").dependOn(&protocol.step);
216
231
  b.step("serde", "Run serialization/deserialization tool").dependOn(&serde.step);
217
232
  b.step("test", "Run all tests").dependOn(&tests.step);
218
233
  b.step("tools", "Install tools").dependOn(&ToolsStep.create(b, &exes).step);
234
+ b.step("transitions", "Visualize transitions algorithm search").dependOn(&transitions.step);
219
235
  }
220
236
 
221
237
  fn maybeStrip(
@@ -245,12 +261,6 @@ const Config = struct {
245
261
  cmd: ?[]const u8,
246
262
  };
247
263
 
248
- const TESTS = .{
249
- "src/lib/common/test.zig",
250
- "src/lib/gen1/test.zig",
251
- "src/lib/gen2/test.zig",
252
- };
253
-
254
264
  const TestStep = struct {
255
265
  step: std.Build.Step,
256
266
  build: bool,
@@ -265,35 +275,35 @@ const TestStep = struct {
265
275
  const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
266
276
  self.* = TestStep{ .step = step, .build = test_filter == null };
267
277
 
268
- const paths: []const []const u8 =
269
- if (test_file) |t| &.{t} else if (coverage != null) &.{"src/lib/test.zig"} else &TESTS;
270
- for (paths) |path| {
271
- const tests = b.addTest(.{
272
- .name = std.fs.path.basename(std.fs.path.dirname(path).?),
273
- .root_source_file = .{ .path = path },
274
- .optimize = config.optimize,
275
- .target = config.target,
276
- .filter = test_filter,
277
- });
278
- tests.setMainPkgPath("./");
279
- tests.addOptions("build_options", options);
280
- tests.single_threaded = true;
281
- maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
282
- if (config.pic) tests.force_pic = config.pic;
283
- if (coverage) |c| {
284
- tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
285
- }
286
- self.step.dependOn(&b.addRunArtifact(tests).step);
278
+ const path = test_file orelse "src/lib/test.zig";
279
+ const tests = b.addTest(.{
280
+ .name = b.fmt("{s}-{s}", .{
281
+ std.fs.path.basename(std.fs.path.dirname(path).?),
282
+ std.fs.path.stem(std.fs.path.basename(path)),
283
+ }),
284
+ .root_source_file = .{ .path = path },
285
+ .optimize = config.optimize,
286
+ .target = config.target,
287
+ .filter = test_filter,
288
+ });
289
+ tests.setMainPkgPath("./");
290
+ tests.addOptions("build_options", options);
291
+ tests.single_threaded = true;
292
+ maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
293
+ if (config.pic) tests.force_pic = config.pic;
294
+ if (coverage) |c| {
295
+ tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
287
296
  }
297
+ self.step.dependOn(&b.addRunArtifact(tests).step);
298
+
288
299
  return self;
289
300
  }
290
301
  };
291
302
 
292
303
  const ToolConfig = struct {
304
+ options: Options,
293
305
  general: Config,
294
306
  tool: struct {
295
- showdown: bool,
296
- log: bool,
297
307
  tests: ?*TestStep,
298
308
  name: ?[]const u8 = null,
299
309
  exes: *std.ArrayList(*std.Build.CompileStep),
@@ -304,7 +314,7 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
304
314
  var name = config.tool.name orelse std.fs.path.basename(path);
305
315
  const index = std.mem.lastIndexOfScalar(u8, name, '.');
306
316
  if (index) |i| name = name[0..i];
307
- if (config.tool.showdown) name = b.fmt("{s}-showdown", .{name});
317
+ if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
308
318
 
309
319
  const exe = b.addExecutable(.{
310
320
  .name = name,
@@ -312,10 +322,8 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
312
322
  .target = config.general.target,
313
323
  .optimize = config.general.optimize,
314
324
  });
315
- exe.addModule("pkmn", module(b, .{
316
- .showdown = config.tool.showdown,
317
- .log = config.tool.log,
318
- }));
325
+ exe.addModule("pkmn", module(b, config.options));
326
+
319
327
  exe.single_threaded = true;
320
328
  if (config.general.pic) exe.force_pic = config.general.pic;
321
329
  if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pkmn/engine",
3
- "version": "0.1.0-dev.7679dad9",
3
+ "version": "0.1.0-dev.7963b917",
4
4
  "description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
5
5
  "repository": "github:pkmn/engine",
6
6
  "license": "MIT",
@@ -34,11 +34,18 @@
34
34
  "src/bin/install-pkmn-engine",
35
35
  "src/lib/binding/node.zig",
36
36
  "src/lib/binding/wasm.zig",
37
+ "src/lib/common/battle.zig",
37
38
  "src/lib/common/data.zig",
38
39
  "src/lib/common/debug.zig",
40
+ "src/lib/common/js.zig",
41
+ "src/lib/common/optional.zig",
39
42
  "src/lib/common/options.zig",
40
43
  "src/lib/common/protocol.zig",
44
+ "src/lib/common/rational.zig",
41
45
  "src/lib/common/rng.zig",
46
+ "src/lib/common/util.zig",
47
+ "src/lib/gen1/calc.zig",
48
+ "src/lib/gen1/chance.zig",
42
49
  "src/lib/gen1/data.zig",
43
50
  "src/lib/gen1/data/moves.zig",
44
51
  "src/lib/gen1/data/species.zig",
@@ -66,30 +73,30 @@
66
73
  "access": "public"
67
74
  },
68
75
  "dependencies": {
69
- "@pkmn/data": "^0.7.43",
76
+ "@pkmn/data": "^0.7.46",
70
77
  "@pkmn/protocol": "^0.6.12"
71
78
  },
72
79
  "devDependencies": {
73
- "@pkmn/eslint-config": "^3.2.0",
74
- "@pkmn/img": "^0.2.11",
80
+ "@pkmn/eslint-config": "^5.0.0",
81
+ "@pkmn/img": "^0.2.13",
75
82
  "@pkmn/sets": "^5.0.4",
76
- "@pkmn/sim": "0.7.43",
83
+ "@pkmn/sim": "0.7.46",
77
84
  "@types/html-minifier": "^4.0.2",
78
- "@types/jest": "^29.5.2",
85
+ "@types/jest": "^29.5.3",
79
86
  "@types/minimist": "^1.2.2",
80
87
  "@types/mustache": "^4.2.2",
81
- "@types/node": "^20.3.1",
82
- "@vitest/coverage-c8": "^0.32.2",
83
- "binaryen": "^113.0.0",
84
- "eslint": "^8.43.0",
88
+ "@types/node": "^20.4.2",
89
+ "@vitest/coverage-c8": "^0.33.0",
90
+ "binaryen": "^114.0.0",
91
+ "eslint": "^8.44.0",
85
92
  "html-minifier": "^4.0.0",
86
- "json-stringify-pretty-compact": "4.0.0",
93
+ "json-stringify-pretty-compact": "3.0.0",
87
94
  "minimist": "^1.2.8",
88
95
  "mustache": "^4.2.0",
89
96
  "source-map-support": "^0.5.21",
90
97
  "trakr": "^0.2.0",
91
- "typescript": "^5.1.3",
92
- "vitest": "^0.32.2"
98
+ "typescript": "^5.1.6",
99
+ "vitest": "^0.33.0"
93
100
  },
94
101
  "scripts": {
95
102
  "lint": "eslint --cache src --ext ts,js && eslint src/bin/*",
@@ -140,7 +147,8 @@
140
147
  "rules": {
141
148
  "no-control-regex": "off",
142
149
  "@typescript-eslint/no-empty-interface": "off",
143
- "@typescript-eslint/no-shadow": "off"
150
+ "@typescript-eslint/no-shadow": "off",
151
+ "@typescript-eslint/no-unsafe-declaration-merging": "off"
144
152
  }
145
153
  },
146
154
  {
@@ -156,7 +164,8 @@
156
164
  "src/test/benchmark*.ts"
157
165
  ],
158
166
  "rules": {
159
- "@typescript-eslint/no-unused-vars": "off"
167
+ "@typescript-eslint/no-unused-vars": "off",
168
+ "@typescript-eslint/no-redundant-type-constituents": "off"
160
169
  }
161
170
  },
162
171
  {
@@ -10,7 +10,7 @@ const path = require('path');
10
10
  const {pipeline} = require('stream/promises');
11
11
  const tty = require('tty');
12
12
 
13
- const ZIG_VERSION = {major: 0, minor: 11, patch: 0, dev: 3681};
13
+ const ZIG_VERSION = {major: 0, minor: 11, patch: 0, dev: 3859};
14
14
  const DEV = ZIG_VERSION.dev ? `-dev.${ZIG_VERSION.dev}` : '';
15
15
  const VERSION = `${ZIG_VERSION.major}.${ZIG_VERSION.minor}.${ZIG_VERSION.patch}${DEV}`;
16
16
  const INDEX = 'https://ziglang.org/download/index.json';
@@ -336,14 +336,18 @@ const downloadImportLib = async () => {
336
336
  node = true;
337
337
  if (!options) {
338
338
  const addon = require(copy);
339
- if (addon.options.showdown) opts.push('-Dshowdown');
340
- if (addon.options.log) opts.push('-Dlog');
339
+ if (addon.engine.options.showdown) opts.push('-Dshowdown');
340
+ if (addon.engine.options.log) opts.push('-Dlog');
341
+ if (addon.engine.options.chance) opts.push('-Dchance');
342
+ if (addon.engine.options.calc) opts.push('-Dcalc');
341
343
  }
342
344
  } else if (!options) {
343
345
  const addon = await WebAssembly.instantiate(fs.readFileSync(copy));
344
346
  const values = new Uint8Array(addon.instance.exports.memory.buffer);
345
347
  if (values[addon.instance.exports.SHOWDOWN.value]) opts.push('-Dshowdown');
346
348
  if (values[addon.instance.exports.LOG.value]) opts.push('-Dlog');
349
+ if (values[addon.instance.exports.CHANCE.value]) opts.push('-Dchance');
350
+ if (values[addon.instance.exports.CALC.value]) opts.push('-Dcalc');
347
351
  }
348
352
  const key = `${type} ${opts.sort().join(' ')}`;
349
353
  if (!configs.has(key)) configs.set(key, {type, options: opts});
@@ -354,8 +358,9 @@ const downloadImportLib = async () => {
354
358
  // either the default options or whatever was passed in
355
359
  if (!configs.size) {
356
360
  node = true;
357
- configs.set('node', {type: 'node', options: options || ['-Dshowdown']});
358
- configs.set('wasm', {type: 'wasm', options: options || ['-Dshowdown']});
361
+ const DEFAULT = ['-Dshowdown'];
362
+ configs.set('node', {type: 'node', options: options || DEFAULT});
363
+ configs.set('wasm', {type: 'wasm', options: options || DEFAULT});
359
364
  }
360
365
 
361
366
  const headers = node ? await downloadHeaders() : undefined;
@@ -1,6 +1,8 @@
1
1
  const std = @import("std");
2
2
  const pkmn = @import("../pkmn.zig");
3
3
 
4
+ const js = @import("../common/js.zig");
5
+
4
6
  const assert = std.debug.assert;
5
7
 
6
8
  const c = @cImport({
@@ -10,38 +12,49 @@ const c = @cImport({
10
12
 
11
13
  export fn napi_register_module_v1(env: c.napi_env, exports: c.napi_value) c.napi_value {
12
14
  const properties = [_]c.napi_property_descriptor{
13
- Property.init("options", .{ .value = options(env) }),
14
- Property.init("bindings", .{ .value = bindings(env) }),
15
+ js.Property.init("engine", .{ .value = register(env) }),
15
16
  };
16
17
  assert(c.napi_define_properties(env, exports, properties.len, &properties) == c.napi_ok);
17
18
  return exports;
18
19
  }
19
20
 
21
+ pub fn register(env: c.napi_env) c.napi_value {
22
+ var object = js.Object.init(env);
23
+ const properties = [_]c.napi_property_descriptor{
24
+ js.Property.init("options", .{ .value = options(env) }),
25
+ js.Property.init("bindings", .{ .value = bindings(env) }),
26
+ };
27
+ assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
28
+ return object;
29
+ }
30
+
20
31
  fn options(env: c.napi_env) c.napi_value {
21
- var object = Object.init(env);
32
+ var object = js.Object.init(env);
22
33
  const properties = [_]c.napi_property_descriptor{
23
- Property.init("showdown", .{ .value = Boolean.init(env, pkmn.options.showdown) }),
24
- Property.init("log", .{ .value = Boolean.init(env, pkmn.options.log) }),
34
+ js.Property.init("showdown", .{ .value = js.Boolean.init(env, pkmn.options.showdown) }),
35
+ js.Property.init("log", .{ .value = js.Boolean.init(env, pkmn.options.log) }),
36
+ js.Property.init("chance", .{ .value = js.Boolean.init(env, pkmn.options.chance) }),
37
+ js.Property.init("calc", .{ .value = js.Boolean.init(env, pkmn.options.calc) }),
25
38
  };
26
39
  assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
27
40
  return object;
28
41
  }
29
42
 
30
43
  fn bindings(env: c.napi_env) c.napi_value {
31
- var array = Array.init(env, .{ .length = 1 });
32
- Array.set(env, array, 0, bind(env, pkmn.gen1));
44
+ var array = js.Array.init(env, .{ .length = 1 });
45
+ js.Array.set(env, array, 0, bind(env, pkmn.gen1));
33
46
  return array;
34
47
  }
35
48
 
36
49
  fn bind(env: c.napi_env, gen: anytype) c.napi_value {
37
- const choices_size = @intCast(u32, gen.CHOICES_SIZE);
38
- const logs_size = @intCast(u32, gen.LOGS_SIZE);
39
- var object = Object.init(env);
50
+ const choices_size: u32 = @intCast(gen.CHOICES_SIZE);
51
+ const logs_size: u32 = @intCast(gen.LOGS_SIZE);
52
+ var object = js.Object.init(env);
40
53
  const properties = [_]c.napi_property_descriptor{
41
- Property.init("CHOICES_SIZE", .{ .value = Number.init(env, choices_size) }),
42
- Property.init("LOGS_SIZE", .{ .value = Number.init(env, logs_size) }),
43
- Property.init("update", .{ .method = update(gen) }),
44
- Property.init("choices", .{ .method = choices(gen) }),
54
+ js.Property.init("CHOICES_SIZE", .{ .value = js.Number.init(env, choices_size) }),
55
+ js.Property.init("LOGS_SIZE", .{ .value = js.Number.init(env, logs_size) }),
56
+ js.Property.init("update", .{ .method = update(gen) }),
57
+ js.Property.init("choices", .{ .method = choices(gen) }),
45
58
  };
46
59
  assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
47
60
  return object;
@@ -61,28 +74,32 @@ fn update(gen: anytype) c.napi_callback {
61
74
  assert(len == @sizeOf(gen.Battle(gen.PRNG)));
62
75
  assert(data != null);
63
76
 
64
- var aligned = @alignCast(@alignOf(*gen.Battle(gen.PRNG)), data.?);
65
- var battle = @ptrCast(*gen.Battle(gen.PRNG), aligned);
66
- const c1 = @bitCast(pkmn.Choice, Number.get(env, argv[1], u8));
67
- const c2 = @bitCast(pkmn.Choice, Number.get(env, argv[2], u8));
77
+ var battle: *gen.Battle(gen.PRNG) = @alignCast(@ptrCast(data.?));
78
+ const c1: pkmn.Choice = @bitCast(js.Number.get(env, argv[1], u8));
79
+ const c2: pkmn.Choice = @bitCast(js.Number.get(env, argv[2], u8));
68
80
 
69
81
  var vtype: c.napi_valuetype = undefined;
70
82
  assert(c.napi_typeof(env, argv[3], &vtype) == c.napi_ok);
71
83
  const result = switch (vtype) {
72
- c.napi_undefined, c.napi_null => battle.update(c1, c2, pkmn.protocol.NULL),
84
+ c.napi_undefined, c.napi_null => battle.update(c1, c2, &gen.NULL),
73
85
  else => result: {
74
86
  assert(c.napi_get_arraybuffer_info(env, argv[3], &data, &len) == c.napi_ok);
75
87
  assert(len == gen.LOGS_SIZE);
76
88
  assert(data != null);
77
89
 
78
- var buf = @ptrCast([*]u8, data.?)[0..gen.LOGS_SIZE];
90
+ var buf = @as([*]u8, @ptrCast(data.?))[0..gen.LOGS_SIZE];
79
91
  var stream = pkmn.protocol.ByteStream{ .buffer = buf };
80
- var log = pkmn.protocol.FixedLog{ .writer = stream.writer() };
81
- break :result battle.update(c1, c2, log);
92
+ // TODO: extract out
93
+ var opts = pkmn.battle.options(
94
+ pkmn.protocol.FixedLog{ .writer = stream.writer() },
95
+ gen.chance.NULL,
96
+ gen.calc.NULL,
97
+ );
98
+ break :result battle.update(c1, c2, &opts);
82
99
  },
83
100
  } catch unreachable;
84
101
 
85
- return Number.init(env, @bitCast(u8, result));
102
+ return js.Number.init(env, @as(u8, @bitCast(result)));
86
103
  }
87
104
  }.call;
88
105
  }
@@ -101,129 +118,17 @@ fn choices(gen: anytype) c.napi_callback {
101
118
  assert(len == @sizeOf(gen.Battle(gen.PRNG)));
102
119
  assert(data != null);
103
120
 
104
- var aligned = @alignCast(@alignOf(*gen.Battle(gen.PRNG)), data.?);
105
- var battle = @ptrCast(*gen.Battle(gen.PRNG), aligned);
106
-
107
- const player = @intToEnum(pkmn.Player, Number.get(env, argv[1], u8));
108
- const request = @intToEnum(pkmn.Choice.Type, Number.get(env, argv[2], u8));
121
+ var battle: *gen.Battle(gen.PRNG) = @alignCast(@ptrCast(data.?));
122
+ const player: pkmn.Player = @enumFromInt(js.Number.get(env, argv[1], u8));
123
+ const request: pkmn.Choice.Type = @enumFromInt(js.Number.get(env, argv[2], u8));
109
124
 
110
125
  assert(c.napi_get_arraybuffer_info(env, argv[3], &data, &len) == c.napi_ok);
111
126
  assert(len == gen.CHOICES_SIZE);
112
127
  assert(data != null);
113
128
 
114
- var out = @ptrCast([*]pkmn.Choice, data.?)[0..gen.CHOICES_SIZE];
129
+ var out = @as([*]pkmn.Choice, @ptrCast(data.?))[0..gen.CHOICES_SIZE];
115
130
  const n = battle.choices(player, request, out);
116
- return Number.init(env, @bitCast(u8, n));
131
+ return js.Number.init(env, @as(u8, @bitCast(n)));
117
132
  }
118
133
  }.call;
119
134
  }
120
-
121
- const Array = struct {
122
- fn init(env: c.napi_env, o: struct { length: ?usize }) c.napi_value {
123
- var result: c.napi_value = undefined;
124
- assert(c.napi_ok == if (o.length) |n|
125
- c.napi_create_array_with_length(env, n, &result)
126
- else
127
- c.napi_create_array(env, &result));
128
- return result;
129
- }
130
-
131
- fn set(env: c.napi_env, array: c.napi_value, index: u32, value: c.napi_value) void {
132
- assert(c.napi_set_element(env, array, index, value) == c.napi_ok);
133
- }
134
- };
135
-
136
- const Boolean = struct {
137
- fn init(env: c.napi_env, value: bool) c.napi_value {
138
- var result: c.napi_value = undefined;
139
- assert(c.napi_get_boolean(env, value, &result) == c.napi_ok);
140
- return result;
141
- }
142
- };
143
-
144
- const Number = struct {
145
- fn init(env: c.napi_env, value: anytype) c.napi_value {
146
- const T = @TypeOf(value);
147
- var result: c.napi_value = undefined;
148
- assert(c.napi_ok == switch (@typeInfo(T)) {
149
- .Int => |info| switch (info.bits) {
150
- 0...32 => switch (info.signedness) {
151
- .signed => c.napi_create_int32(env, @as(i32, value), &result),
152
- .unsigned => c.napi_create_uint32(env, @as(u32, value), &result),
153
- },
154
- 33...52 => c.napi_create_int64(env, @as(i64, value), &result),
155
- else => @compileError("int can't be represented as JS number"),
156
- },
157
- else => @compileError("expected number, got: " ++ @typeName(T)),
158
- });
159
- return result;
160
- }
161
-
162
- fn get(env: c.napi_env, value: c.napi_value, comptime T: type) T {
163
- switch (@typeInfo(T)) {
164
- .Int => |info| switch (info.bits) {
165
- 0...32 => switch (info.signedness) {
166
- .signed => {
167
- var result: i32 = undefined;
168
- assert(c.napi_get_value_int32(env, value, &result) == c.napi_ok);
169
- return if (info.bits == 32) result else @intCast(T, result);
170
- },
171
- .unsigned => {
172
- var result: u32 = undefined;
173
- assert(c.napi_get_value_uint32(env, value, &result) == c.napi_ok);
174
- return if (info.bits == 32) result else @intCast(T, result);
175
- },
176
- },
177
- 33...63 => {
178
- var result: i64 = undefined;
179
- assert(c.napi_get_value_int64(env, value, &result) == c.napi_ok);
180
- return @intCast(T, result);
181
- },
182
- else => {
183
- var result: i64 = undefined;
184
- assert(c.napi_get_value_int64(env, value, &result) == c.napi_ok);
185
- return switch (info.signedness) {
186
- .signed => @as(T, value),
187
- .unsigned => if (0 <= value) @intCast(T, value) else unreachable,
188
- };
189
- },
190
- },
191
- else => @compileError("expected number, got: " ++ @typeName(T)),
192
- }
193
- }
194
- };
195
-
196
- const Object = struct {
197
- fn init(env: c.napi_env) c.napi_value {
198
- var result: c.napi_value = undefined;
199
- assert(c.napi_create_object(env, &result) == c.napi_ok);
200
- return result;
201
- }
202
- };
203
-
204
- const Property = union(enum) {
205
- method: c.napi_callback,
206
- value: c.napi_value,
207
-
208
- fn init(comptime name: [:0]const u8, property: Property) c.napi_property_descriptor {
209
- return .{
210
- .utf8name = name,
211
- .name = null,
212
- .method = switch (property) {
213
- .method => |m| m,
214
- .value => null,
215
- },
216
- .getter = null,
217
- .setter = null,
218
- .value = switch (property) {
219
- .method => null,
220
- .value => |v| v,
221
- },
222
- .attributes = switch (property) {
223
- .method => c.napi_default,
224
- .value => c.napi_enumerable,
225
- },
226
- .data = null,
227
- };
228
- }
229
- };
@@ -3,8 +3,10 @@ const pkmn = @import("../pkmn.zig");
3
3
 
4
4
  export const SHOWDOWN = pkmn.options.showdown;
5
5
  export const LOG = pkmn.options.log;
6
+ export const CHANCE = pkmn.options.chance;
7
+ export const CALC = pkmn.options.calc;
6
8
 
7
9
  export const GEN1_CHOICES_SIZE =
8
- std.math.ceilPowerOfTwo(u32, @intCast(u32, pkmn.gen1.CHOICES_SIZE)) catch unreachable;
10
+ std.math.ceilPowerOfTwo(u32, @as(u32, @intCast(pkmn.gen1.CHOICES_SIZE))) catch unreachable;
9
11
  export const GEN1_LOGS_SIZE =
10
- std.math.ceilPowerOfTwo(u32, @intCast(u32, pkmn.gen1.LOGS_SIZE)) catch unreachable;
12
+ std.math.ceilPowerOfTwo(u32, @as(u32, @intCast(pkmn.gen1.LOGS_SIZE))) catch unreachable;
@@ -0,0 +1,17 @@
1
+ /// Stores state required by optional features to the engine that can be passed to a generation's
2
+ /// `Battle.update` function. All generations generically support protocol logging (enabled via
3
+ /// `-Dlog`), chance actions and probability tracking (enabled via `-Dchance`), and damage
4
+ /// computation and chance overrides (`-Dcalc`), though the concrete types for these features are
5
+ /// generation dependent.
6
+ pub fn Options(comptime Log: type, comptime Chance: type, comptime Calc: type) type {
7
+ return struct { log: Log, chance: Chance, calc: Calc };
8
+ }
9
+
10
+ /// Helper to create a battle `Options` object with the provided `log`, `chance`, and `calc`.
11
+ pub fn options(
12
+ log: anytype,
13
+ chance: anytype,
14
+ calc: anytype,
15
+ ) Options(@TypeOf(log), @TypeOf(chance), @TypeOf(calc)) {
16
+ return .{ .log = log, .chance = chance, .calc = calc };
17
+ }