@pkmn/engine 0.1.0-dev.15f64810 → 0.1.0-dev.1d311928

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 (78) hide show
  1. package/README.md +9 -6
  2. package/build/pkg/addon/browser.d.ts +3 -0
  3. package/build/pkg/addon/browser.js +44 -0
  4. package/build/pkg/addon/browser.js.map +1 -0
  5. package/build/pkg/addon/node.d.ts +3 -0
  6. package/build/pkg/addon/node.js +97 -0
  7. package/build/pkg/addon/node.js.map +1 -0
  8. package/build/pkg/addon/wasm.d.ts +2 -0
  9. package/build/pkg/addon/wasm.js +53 -0
  10. package/build/pkg/addon/wasm.js.map +1 -0
  11. package/build/pkg/addon.d.ts +25 -3
  12. package/build/pkg/addon.js +34 -65
  13. package/build/pkg/addon.js.map +1 -1
  14. package/build/pkg/data/layout.json +15 -2
  15. package/build/pkg/data/protocol.json +23 -9
  16. package/build/pkg/data.d.ts +23 -1
  17. package/build/pkg/data.js.map +1 -1
  18. package/build/pkg/gen1.d.ts +13 -17
  19. package/build/pkg/gen1.js +6 -10
  20. package/build/pkg/gen1.js.map +1 -1
  21. package/build/pkg/index.d.ts +38 -90
  22. package/build/pkg/index.js +6 -63
  23. package/build/pkg/index.js.map +1 -1
  24. package/build/pkg/protocol.d.ts +20 -1
  25. package/build/pkg/protocol.js +105 -103
  26. package/build/pkg/protocol.js.map +1 -1
  27. package/build/tools/debug.js +35 -69
  28. package/build/tools/debug.js.map +1 -1
  29. package/build/tools/display/debug.jsx +141 -0
  30. package/build/tools/display/debug.jsx.map +1 -0
  31. package/build/tools/display/index.js +142 -0
  32. package/build/tools/display/index.js.map +1 -0
  33. package/build/tools/display/ui.jsx +349 -0
  34. package/build/tools/display/ui.jsx.map +1 -0
  35. package/build/tools/display/util.js +18 -0
  36. package/build/tools/display/util.js.map +1 -0
  37. package/build.zig +256 -77
  38. package/package.json +52 -134
  39. package/src/bin/install-pkmn-engine +9 -7
  40. package/src/bin/pkmn-debug +1 -1
  41. package/src/lib/bindings/node.zig +121 -0
  42. package/src/lib/bindings/wasm.zig +52 -0
  43. package/src/lib/common/array.zig +77 -0
  44. package/src/lib/common/data.zig +8 -8
  45. package/src/lib/common/debug.zig +39 -8
  46. package/src/lib/common/js.zig +4 -2
  47. package/src/lib/common/optional.zig +13 -9
  48. package/src/lib/common/options.zig +4 -0
  49. package/src/lib/common/protocol.zig +45 -44
  50. package/src/lib/common/rational.zig +120 -27
  51. package/src/lib/common/rng.zig +5 -7
  52. package/src/lib/common/util.zig +50 -1
  53. package/src/lib/gen1/calc.zig +610 -186
  54. package/src/lib/gen1/chance.zig +366 -240
  55. package/src/lib/gen1/data/moves.zig +2 -4
  56. package/src/lib/gen1/data/species.zig +1 -3
  57. package/src/lib/gen1/data/types.zig +1 -2
  58. package/src/lib/gen1/data.zig +35 -38
  59. package/src/lib/gen1/helpers.zig +17 -560
  60. package/src/lib/gen1/mechanics.zig +290 -193
  61. package/src/lib/gen2/calc.zig +37 -27
  62. package/src/lib/gen2/chance.zig +90 -503
  63. package/src/lib/gen2/data/items.zig +1 -3
  64. package/src/lib/gen2/data/moves.zig +2 -4
  65. package/src/lib/gen2/data/species.zig +1 -3
  66. package/src/lib/gen2/data/types.zig +1 -2
  67. package/src/lib/gen2/data.zig +26 -29
  68. package/src/lib/gen2/generated.zig +18 -23
  69. package/src/lib/gen2/helpers.zig +9 -18
  70. package/src/lib/gen2/mechanics.zig +88 -115
  71. package/src/lib/node.zig +3 -116
  72. package/src/lib/pkmn.zig +14 -7
  73. package/src/lib/wasm.zig +18 -9
  74. package/src/tools/display/dom.ts +96 -0
  75. package/src/tools/display/ui.css +354 -0
  76. package/build/test/display.js +0 -400
  77. package/build/test/display.js.map +0 -1
  78. package/src/test/display/pkmn.html.tmpl +0 -368
package/package.json CHANGED
@@ -1,19 +1,31 @@
1
1
  {
2
2
  "name": "@pkmn/engine",
3
- "version": "0.1.0-dev.15f64810",
3
+ "version": "0.1.0-dev.1d311928",
4
4
  "description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
5
5
  "repository": "github:pkmn/engine",
6
6
  "license": "MIT",
7
7
  "sideEffects": false,
8
8
  "main": "build/pkg/index.js",
9
9
  "types": "build/pkg/index.d.ts",
10
+ "browser": {
11
+ "./build/pkg/addon/node.js": "./build/pkg/addon/browser.js"
12
+ },
10
13
  "files": [
11
14
  "build.zig",
12
- "build/pkg/data.d.ts",
13
- "build/pkg/data.js.map",
14
15
  "build/pkg/addon.d.ts",
15
16
  "build/pkg/addon.js.map",
16
17
  "build/pkg/addon.js",
18
+ "build/pkg/addon/browser.d.ts",
19
+ "build/pkg/addon/browser.js.map",
20
+ "build/pkg/addon/browser.js",
21
+ "build/pkg/addon/node.d.ts",
22
+ "build/pkg/addon/node.js.map",
23
+ "build/pkg/addon/node.js",
24
+ "build/pkg/addon/wasm.d.ts",
25
+ "build/pkg/addon/wasm.js.map",
26
+ "build/pkg/addon/wasm.js",
27
+ "build/pkg/data.d.ts",
28
+ "build/pkg/data.js.map",
17
29
  "build/pkg/data.js",
18
30
  "build/pkg/data/ids.json",
19
31
  "build/pkg/data/layout.json",
@@ -27,10 +39,19 @@
27
39
  "build/pkg/protocol.d.ts",
28
40
  "build/pkg/protocol.js.map",
29
41
  "build/pkg/protocol.js",
30
- "build/test/display.js.map",
31
- "build/test/display.js",
32
42
  "build/tools/debug.js.map",
33
43
  "build/tools/debug.js",
44
+ "build/tools/display/index.js.map",
45
+ "build/tools/display/index.js",
46
+ "build/tools/display/debug.jsx.map",
47
+ "build/tools/display/debug.jsx",
48
+ "build/tools/display/ui.jsx.map",
49
+ "build/tools/display/ui.jsx",
50
+ "build/tools/display/util.js.map",
51
+ "build/tools/display/util.js",
52
+ "src/lib/bindings/node.zig",
53
+ "src/lib/bindings/wasm.zig",
54
+ "src/lib/common/array.zig",
34
55
  "src/lib/common/battle.zig",
35
56
  "src/lib/common/data.zig",
36
57
  "src/lib/common/debug.zig",
@@ -62,7 +83,8 @@
62
83
  "src/lib/node.zig",
63
84
  "src/lib/pkmn.zig",
64
85
  "src/lib/wasm.zig",
65
- "src/test/display/pkmn.html.tmpl"
86
+ "src/tools/display/dom.ts",
87
+ "src/tools/display/ui.css"
66
88
  ],
67
89
  "engines": {
68
90
  "node": ">=16.0.0"
@@ -75,158 +97,54 @@
75
97
  "access": "public"
76
98
  },
77
99
  "dependencies": {
78
- "@pkmn/data": "^0.9.11",
79
- "@pkmn/protocol": "^0.6.25"
100
+ "@pkmn/data": "^0.9.20",
101
+ "@pkmn/protocol": "^0.6.27"
80
102
  },
81
103
  "devDependencies": {
82
- "@pkmn/eslint-config": "^8.1.0",
83
- "@pkmn/img": "^0.2.31",
104
+ "@pkmn/eslint-config": "^9.0.0",
105
+ "@pkmn/img": "^0.2.32",
84
106
  "@pkmn/sets": "^5.1.2",
85
- "@pkmn/sim": "0.9.11",
107
+ "@pkmn/sim": "0.9.20",
108
+ "@pkmn/smogon": "^0.5.14",
86
109
  "@types/html-minifier": "^4.0.5",
87
- "@types/jest": "^29.5.12",
110
+ "@types/jest": "^29.5.13",
88
111
  "@types/minimist": "^1.2.5",
89
112
  "@types/mustache": "^4.2.5",
90
- "@types/node": "^22.0.2",
91
- "@vitest/coverage-v8": "^2.0.5",
92
- "binaryen": "^118.0.0",
93
- "eslint": "<=8",
113
+ "@types/node": "^22.7.6",
114
+ "@types/react": "^18.3.11",
115
+ "@types/semver": "^7.5.8",
116
+ "@types/vscode": "^1.94.0",
117
+ "@vitest/coverage-v8": "^2.1.3",
118
+ "@vscode/vsce": "^3.2.0",
119
+ "binaryen": "^119.0.0",
120
+ "esbuild": "^0.24.0",
121
+ "eslint": "^9.12.0",
94
122
  "html-minifier": "^4.0.0",
95
- "json-stringify-pretty-compact": "4.0.0",
123
+ "json-stringify-pretty-compact": "3.0.0",
96
124
  "minimist": "^1.2.8",
97
125
  "mustache": "^4.2.0",
126
+ "semver": "^7.6.3",
98
127
  "source-map-support": "^0.5.21",
99
128
  "table": "^6.8.2",
100
129
  "trakr": "^0.2.0",
101
- "typescript": "^5.5.4",
102
- "vitest": "^2.0.5"
130
+ "typescript": "^5.6.3",
131
+ "vitest": "^2.1.3"
103
132
  },
104
133
  "scripts": {
105
- "lint": "eslint --cache src --ext ts,js && eslint src/bin/*",
106
- "fix": "eslint --fix src --ext ts,js && eslint --fix src/bin/*",
134
+ "lint": "eslint --cache src",
135
+ "fix": "eslint --fix src",
107
136
  "compile": "tsc -p .",
108
137
  "build": "npm run compile",
109
138
  "test": "vitest src/pkg",
110
139
  "test:integration": "vitest src/test",
111
140
  "debug": "npm run compile && node build/tools/debug",
141
+ "demo": "npm run compile && node build/tools/demo",
112
142
  "fuzz": "npm run compile && node build/test/fuzz",
113
143
  "generate": "npm run compile && node build/tools/generate",
114
144
  "release": "npm run compile && node build/tools/release",
115
145
  "benchmark": "npm run compile && node build/test/benchmark",
116
146
  "integration": "npm run compile && node build/test/integration",
147
+ "extension": "npm -C src/tools/vscode run build",
117
148
  "postinstall": "node src/bin/install-pkmn-engine"
118
- },
119
- "eslintConfig": {
120
- "extends": "@pkmn",
121
- "ignorePatterns": [
122
- "dist/",
123
- "node_modules/",
124
- "examples/zig",
125
- "build/"
126
- ],
127
- "env": {
128
- "es6": true,
129
- "node": true,
130
- "browser": true
131
- },
132
- "overrides": [
133
- {
134
- "files": [
135
- "**/*.ts"
136
- ],
137
- "parserOptions": {
138
- "project": [
139
- "./tsconfig.json",
140
- "./examples/js/tsconfig.json"
141
- ]
142
- }
143
- },
144
- {
145
- "files": [
146
- "src/test/display.ts"
147
- ],
148
- "rules": {
149
- "@typescript-eslint/no-unnecessary-type-assertion": "off"
150
- }
151
- },
152
- {
153
- "files": [
154
- "src/pkg/index.ts",
155
- "src/test/display.ts",
156
- "src/test/integration.ts"
157
- ],
158
- "rules": {
159
- "no-control-regex": "off",
160
- "@typescript-eslint/no-empty-interface": "off",
161
- "@typescript-eslint/no-shadow": "off",
162
- "@typescript-eslint/no-unsafe-declaration-merging": "off"
163
- }
164
- },
165
- {
166
- "files": [
167
- "src/pkg/addon.ts"
168
- ],
169
- "rules": {
170
- "@typescript-eslint/no-var-requires": "off"
171
- }
172
- },
173
- {
174
- "files": [
175
- "src/test/benchmark*.ts"
176
- ],
177
- "rules": {
178
- "@typescript-eslint/no-unused-vars": "off",
179
- "@typescript-eslint/no-redundant-type-constituents": "off"
180
- }
181
- },
182
- {
183
- "files": [
184
- "src/pkg/protocol.test.ts"
185
- ],
186
- "rules": {
187
- "jest/no-standalone-expect": "off",
188
- "jest/no-conditional-expect": "off"
189
- }
190
- },
191
- {
192
- "files": [
193
- "src/test/*.test.ts",
194
- "src/test/regression/*.test.ts"
195
- ],
196
- "rules": {
197
- "jest/no-standalone-expect": "off"
198
- }
199
- },
200
- {
201
- "files": [
202
- "src/test/showdown/**"
203
- ],
204
- "rules": {
205
- "jest/expect-expect": [
206
- "warn",
207
- {
208
- "assertFunctionNames": [
209
- "expect",
210
- "expectLog",
211
- "verify"
212
- ]
213
- }
214
- ]
215
- }
216
- },
217
- {
218
- "files": [
219
- "src/tools/generate.ts"
220
- ],
221
- "rules": {
222
- "@typescript-eslint/restrict-template-expressions": [
223
- "error",
224
- {
225
- "allowBoolean": true
226
- }
227
- ]
228
- }
229
- }
230
- ]
231
149
  }
232
150
  }
@@ -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: 13, patch: 0};
13
+ const ZIG_VERSION = {major: 0, minor: 11, patch: 0};
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';
@@ -163,8 +163,10 @@ const install = async () => {
163
163
  }
164
164
 
165
165
  const index = JSON.parse(await fetch(INDEX));
166
- const version = Object.keys(index)[+!ZIG_VERSION.dev];
167
- const release = index[version][`${arch}-${platform}`];
166
+ // TODO: ziglang/zig#17768
167
+ // const version = Object.keys(index)[+!ZIG_VERSION.dev];
168
+ const version = VERSION;
169
+ const release = index[VERSION][`${arch}-${platform}`];
168
170
  const url = release.tarball;
169
171
 
170
172
  let base = path.basename(url);
@@ -255,7 +257,7 @@ const downloadImportLib = async () => {
255
257
  }
256
258
 
257
259
  const dir = path.join(ROOT, 'build', 'lib');
258
- const url = new URL('./win-x64/node.lib', process.release.headersUrl).href;
260
+ const url = process.release.libUrl;
259
261
  const dest = path.join(dir, path.basename(url));
260
262
  if (fs.existsSync(path.join(dest))) {
261
263
  log('Node import library:', dest);
@@ -389,11 +391,11 @@ const downloadImportLib = async () => {
389
391
  const ext = process.platform === 'darwin'
390
392
  ? 'dylib' : process.platform === 'win32' ? 'dll' : 'so';
391
393
  try {
392
- const actual = path.join('build', 'lib', `${prefix}pkmn${suffix}.node.${ext}`);
394
+ const actual = path.join(ROOT, 'build', 'lib', `${prefix}pkmn${suffix}.node.${ext}`);
393
395
  fs.renameSync(actual, artifact);
394
- } catch (err) {
396
+ } catch {
395
397
  // ziglang/zig#19743 changed this path
396
- const actual = path.join('build', 'bin', `${prefix}pkmn${suffix}.node.${ext}`);
398
+ const actual = path.join(ROOT, 'build', 'bin', `${prefix}pkmn${suffix}.node.${ext}`);
397
399
  fs.renameSync(actual, artifact);
398
400
  }
399
401
  }
@@ -15,7 +15,7 @@ const ROOT = resolve(__dirname, '..', '..');
15
15
  const packageJSON = JSON.parse(readFileSync(join(ROOT, 'package.json'), 'utf8'));
16
16
 
17
17
  const missing = [];
18
- for (const dep of ['@pkmn/img', 'html-minifier', 'mustache']) {
18
+ for (const dep of ['@pkmn/img', 'html-minifier', 'esbuild']) {
19
19
  try {
20
20
  require.resolve(dep);
21
21
  } catch (e) {
@@ -0,0 +1,121 @@
1
+ const js = @import("../common/js.zig");
2
+ const pkmn = @import("../pkmn.zig");
3
+ const std = @import("std");
4
+
5
+ const assert = std.debug.assert;
6
+
7
+ const c = @cImport({
8
+ @cDefine("NAPI_VERSION", "8");
9
+ @cInclude("node_api.h");
10
+ });
11
+
12
+ pub fn register(env: c.napi_env) c.napi_value {
13
+ const object = js.Object.init(env);
14
+ const properties = [_]c.napi_property_descriptor{
15
+ js.Property.init("options", .{ .value = options(env) }),
16
+ js.Property.init("bindings", .{ .value = bindings(env) }),
17
+ };
18
+ assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
19
+ return object;
20
+ }
21
+
22
+ fn options(env: c.napi_env) c.napi_value {
23
+ const object = js.Object.init(env);
24
+ const properties = [_]c.napi_property_descriptor{
25
+ js.Property.init("showdown", .{ .value = js.Boolean.init(env, pkmn.options.showdown) }),
26
+ js.Property.init("log", .{ .value = js.Boolean.init(env, pkmn.options.log) }),
27
+ js.Property.init("chance", .{ .value = js.Boolean.init(env, pkmn.options.chance) }),
28
+ js.Property.init("calc", .{ .value = js.Boolean.init(env, pkmn.options.calc) }),
29
+ };
30
+ assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
31
+ return object;
32
+ }
33
+
34
+ fn bindings(env: c.napi_env) c.napi_value {
35
+ const array = js.Array.init(env, .{ .length = 1 });
36
+ js.Array.set(env, array, 0, bind(env, pkmn.gen1));
37
+ return array;
38
+ }
39
+
40
+ fn bind(env: c.napi_env, gen: anytype) c.napi_value {
41
+ const choices_size: u32 = @intCast(gen.CHOICES_SIZE);
42
+ const logs_size: u32 = @intCast(gen.LOGS_SIZE);
43
+ const object = js.Object.init(env);
44
+ const properties = [_]c.napi_property_descriptor{
45
+ js.Property.init("CHOICES_SIZE", .{ .value = js.Number.init(env, choices_size) }),
46
+ js.Property.init("LOGS_SIZE", .{ .value = js.Number.init(env, logs_size) }),
47
+ js.Property.init("update", .{ .method = update(gen) }),
48
+ js.Property.init("choices", .{ .method = choices(gen) }),
49
+ };
50
+ assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
51
+ return object;
52
+ }
53
+
54
+ fn update(gen: anytype) c.napi_callback {
55
+ return struct {
56
+ fn call(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
57
+ var argc: usize = 4;
58
+ var argv: [4]c.napi_value = undefined;
59
+ assert(c.napi_get_cb_info(env, info, &argc, &argv, null, null) == c.napi_ok);
60
+ assert(argc == 4);
61
+
62
+ var data: ?*anyopaque = undefined;
63
+ var len: usize = 0;
64
+ assert(c.napi_get_arraybuffer_info(env, argv[0], &data, &len) == c.napi_ok);
65
+ assert(len == @sizeOf(gen.Battle(gen.PRNG)));
66
+
67
+ var battle: *gen.Battle(gen.PRNG) = @alignCast(@ptrCast(data.?));
68
+ const c1: pkmn.Choice = @bitCast(js.Number.get(env, argv[1], u8));
69
+ const c2: pkmn.Choice = @bitCast(js.Number.get(env, argv[2], u8));
70
+
71
+ var vtype: c.napi_valuetype = undefined;
72
+ assert(c.napi_typeof(env, argv[3], &vtype) == c.napi_ok);
73
+ const result = switch (vtype) {
74
+ c.napi_undefined, c.napi_null => battle.update(c1, c2, &gen.NULL),
75
+ else => result: {
76
+ assert(c.napi_get_arraybuffer_info(env, argv[3], &data, &len) == c.napi_ok);
77
+ assert(len == gen.LOGS_SIZE);
78
+
79
+ const buf = @as([*]u8, @ptrCast(data.?))[0..gen.LOGS_SIZE];
80
+ var stream: pkmn.protocol.ByteStream = .{ .buffer = buf };
81
+ // TODO: extract out
82
+ var opts = pkmn.battle.options(
83
+ pkmn.protocol.FixedLog{ .writer = stream.writer() },
84
+ gen.chance.NULL,
85
+ gen.calc.NULL,
86
+ );
87
+ break :result battle.update(c1, c2, &opts);
88
+ },
89
+ } catch unreachable;
90
+
91
+ return js.Number.init(env, @as(u8, @bitCast(result)));
92
+ }
93
+ }.call;
94
+ }
95
+
96
+ fn choices(gen: anytype) c.napi_callback {
97
+ return struct {
98
+ fn call(env: c.napi_env, info: c.napi_callback_info) callconv(.C) c.napi_value {
99
+ var argc: usize = 4;
100
+ var argv: [4]c.napi_value = undefined;
101
+ assert(c.napi_get_cb_info(env, info, &argc, &argv, null, null) == c.napi_ok);
102
+ assert(argc == 4);
103
+
104
+ var data: ?*anyopaque = undefined;
105
+ var len: usize = 0;
106
+ assert(c.napi_get_arraybuffer_info(env, argv[0], &data, &len) == c.napi_ok);
107
+ assert(len == @sizeOf(gen.Battle(gen.PRNG)));
108
+
109
+ var battle: *gen.Battle(gen.PRNG) = @alignCast(@ptrCast(data.?));
110
+ const player: pkmn.Player = @enumFromInt(js.Number.get(env, argv[1], u8));
111
+ const request: pkmn.Choice.Type = @enumFromInt(js.Number.get(env, argv[2], u8));
112
+
113
+ assert(c.napi_get_arraybuffer_info(env, argv[3], &data, &len) == c.napi_ok);
114
+ assert(len == gen.CHOICES_SIZE);
115
+
116
+ const out = @as([*]pkmn.Choice, @ptrCast(data.?))[0..gen.CHOICES_SIZE];
117
+ const n = battle.choices(player, request, out);
118
+ return js.Number.init(env, @as(u8, @bitCast(n)));
119
+ }
120
+ }.call;
121
+ }
@@ -0,0 +1,52 @@
1
+ const pkmn = @import("../pkmn.zig");
2
+ const std = @import("std");
3
+
4
+ const assert = std.debug.assert;
5
+
6
+ const Enum = if (@hasField(std.builtin.Type, "enum")) .@"enum" else .Enum;
7
+
8
+ pub const options = pkmn.options;
9
+
10
+ pub fn gen(comptime num: comptime_int) type {
11
+ const g = @field(pkmn, "gen" ++ std.fmt.comptimePrint("{d}", .{num}));
12
+ return struct {
13
+ pub const CHOICES_SIZE = size(g.CHOICES_SIZE);
14
+ pub const LOGS_SIZE = size(g.LOGS_SIZE);
15
+
16
+ pub fn update(
17
+ battle: *g.Battle(g.PRNG),
18
+ c1: pkmn.Choice,
19
+ c2: pkmn.Choice,
20
+ options_: ?[*]u8,
21
+ ) callconv(.C) pkmn.Result {
22
+ return (if (options_) |o| result: {
23
+ const buf = @as([*]u8, @ptrCast(o))[0..g.LOGS_SIZE];
24
+ var stream: pkmn.protocol.ByteStream = .{ .buffer = buf };
25
+ // TODO: extract out
26
+ var opts = pkmn.battle.options(
27
+ pkmn.protocol.FixedLog{ .writer = stream.writer() },
28
+ g.chance.NULL,
29
+ g.calc.NULL,
30
+ );
31
+ break :result battle.update(c1, c2, &opts);
32
+ } else battle.update(c1, c2, &g.NULL)) catch unreachable;
33
+ }
34
+
35
+ pub fn choices(
36
+ battle: *g.Battle(g.PRNG),
37
+ player: u8,
38
+ request: u8,
39
+ buf: [*]u8,
40
+ ) callconv(.C) u8 {
41
+ assert(player <= @field(@typeInfo(pkmn.Player), @tagName(Enum)).fields.len);
42
+ assert(request <= @field(@typeInfo(pkmn.Choice.Type), @tagName(Enum)).fields.len);
43
+
44
+ const n = CHOICES_SIZE;
45
+ return battle.choices(@enumFromInt(player), @enumFromInt(request), @ptrCast(buf[0..n]));
46
+ }
47
+ };
48
+ }
49
+
50
+ fn size(n: usize) u32 {
51
+ return std.math.ceilPowerOfTwo(u32, @as(u32, @intCast(n))) catch unreachable;
52
+ }
@@ -0,0 +1,77 @@
1
+ const std = @import("std");
2
+
3
+ const expectEqual = std.testing.expectEqual;
4
+ const assert = std.debug.assert;
5
+
6
+ const Int = if (@hasField(std.builtin.Type, "int")) .int else .Int;
7
+ const Enum = if (@hasField(std.builtin.Type, "enum")) .@"enum" else .Enum;
8
+
9
+ /// Helpers for working with bit-packed arrays of non-powers-of-2 types.
10
+ /// NOTE: ziglang/zig#12547
11
+ pub fn Array(comptime n: comptime_int, comptime U: type) type {
12
+ return struct {
13
+ const size = @bitSizeOf(U);
14
+ const options = .{ .signedness = .unsigned, .bits = size * n };
15
+ pub const T = @Type(if (@hasField(std.builtin.Type, "int"))
16
+ .{ .int = options }
17
+ else
18
+ .{ .Int = options });
19
+
20
+ /// Returns the value stored at index `i` in the array `a`.
21
+ pub fn get(a: T, i: usize) U {
22
+ assert(i < n);
23
+ const shift = i * size;
24
+ const mask: T = (1 << size) - 1;
25
+ const result = (a >> @intCast(shift)) & mask;
26
+ return switch (@typeInfo(U)) {
27
+ Enum => @enumFromInt(result),
28
+ Int => @intCast(result),
29
+ else => unreachable,
30
+ };
31
+ }
32
+
33
+ /// Sets the value at index `i` to `val` in the array `a`.
34
+ pub fn set(a: T, i: usize, val: U) T {
35
+ assert(i < n);
36
+ const v: T = switch (@typeInfo(U)) {
37
+ Enum => @intFromEnum(val),
38
+ Int => @intCast(val),
39
+ else => unreachable,
40
+ };
41
+ const shift = i * size;
42
+ const mask: T = @as(T, @intCast((1 << size) - 1)) << @intCast(shift);
43
+ const result: T = a & ~mask;
44
+ return result | (v << @intCast(shift));
45
+ }
46
+ };
47
+ }
48
+
49
+ test Array {
50
+ const A = Array(5, u8);
51
+ var a: A.T = 0;
52
+ try expectEqual(u40, @TypeOf(a));
53
+
54
+ a = A.set(a, 4, 241);
55
+ try expectEqual(@as(u8, 241), A.get(a, 4));
56
+ a = A.set(a, 4, 1);
57
+ try expectEqual(@as(u8, 1), A.get(a, 4));
58
+
59
+ for (0..5) |i| a = A.set(a, i, @intCast(i));
60
+ for (0..5) |i| try expectEqual(@as(u8, @intCast(i)), A.get(a, i));
61
+
62
+ const Optional = @import("optional.zig").Optional;
63
+
64
+ const B = Array(4, Optional(bool));
65
+ var b: B.T = 0;
66
+ try expectEqual(u8, @TypeOf(b));
67
+
68
+ b = B.set(b, 2, .true);
69
+ try expectEqual(Optional(bool).None, B.get(b, 1));
70
+ try expectEqual(Optional(bool).true, B.get(b, 2));
71
+ try expectEqual(@as(u8, 0b00100000), b);
72
+ b = B.set(b, 2, .None);
73
+ b = B.set(b, 0, .false);
74
+ try expectEqual(Optional(bool).None, B.get(b, 2));
75
+ try expectEqual(Optional(bool).false, B.get(b, 0));
76
+ try expectEqual(@as(u8, 0b0000001), b);
77
+ }
@@ -22,8 +22,8 @@ pub const Player = enum(u1) {
22
22
 
23
23
  test Player {
24
24
  try expectEqual(Player.P2, Player.P1.foe());
25
- try expectEqual(0b0001, @as(u8, @bitCast(Player.P1.ident(1))));
26
- try expectEqual(0b1101, @as(u8, @bitCast(Player.P2.ident(5))));
25
+ try expectEqual(@as(u8, 0b0001), @as(u8, @bitCast(Player.P1.ident(1))));
26
+ try expectEqual(@as(u8, 0b1101), @as(u8, @bitCast(Player.P2.ident(5))));
27
27
  }
28
28
 
29
29
  /// An identifier for a specific Pokémon in battle.
@@ -46,8 +46,8 @@ pub const ID = packed struct(u8) {
46
46
  };
47
47
 
48
48
  test ID {
49
- try expectEqual(0b0001, @as(u8, @bitCast(ID{ .player = .P1, .id = 1 })));
50
- try expectEqual(0b1101, @as(u8, @bitCast(ID{ .player = .P2, .id = 5 })));
49
+ try expectEqual(@as(u8, 0b0001), @as(u8, @bitCast(ID{ .player = .P1, .id = 1 })));
50
+ try expectEqual(@as(u8, 0b1101), @as(u8, @bitCast(ID{ .player = .P2, .id = 5 })));
51
51
  const id: ID = .{ .player = .P2, .id = 4 };
52
52
  try expectEqual(id, ID.from(id.int()));
53
53
  }
@@ -76,8 +76,8 @@ test Choice {
76
76
  const p2: Choice = .{ .type = .Switch, .data = 5 };
77
77
  try expectEqual(5, p2.data);
78
78
  try expectEqual(Choice.Type.Move, p1.type);
79
- try expectEqual(0b0001_0001, @as(u8, @bitCast(p1)));
80
- try expectEqual(0b0001_0110, @as(u8, @bitCast(p2)));
79
+ try expectEqual(@as(u8, 0b0001_0001), @as(u8, @bitCast(p1)));
80
+ try expectEqual(@as(u8, 0b0001_0110), @as(u8, @bitCast(p2)));
81
81
  }
82
82
 
83
83
  /// The result of the battle - all results other than 'None' should be considered terminal.
@@ -112,6 +112,6 @@ pub const Result = packed struct(u8) {
112
112
  };
113
113
 
114
114
  test Result {
115
- try expectEqual(0b0101_0000, @as(u8, @bitCast(Result.Default)));
116
- try expectEqual(0b1000_0000, @as(u8, @bitCast(Result{ .p2 = .Switch })));
115
+ try expectEqual(@as(u8, 0b0101_0000), @as(u8, @bitCast(Result.Default)));
116
+ try expectEqual(@as(u8, 0b1000_0000), @as(u8, @bitCast(Result{ .p2 = .Switch })));
117
117
  }
@@ -3,9 +3,19 @@ const std = @import("std");
3
3
  const debug = std.debug;
4
4
  const io = std.io;
5
5
 
6
+ const Array = if (@hasField(std.builtin.Type, "array")) .array else .Array;
7
+ const Enum = if (@hasField(std.builtin.Type, "enum")) .@"enum" else .Enum;
8
+ const Optional = if (@hasField(std.builtin.Type, "optional")) .optional else .Optional;
9
+ const Pointer = if (@hasField(std.builtin.Type, "pointer")) .pointer else .Pointer;
10
+ const Struct = if (@hasField(std.builtin.Type, "struct")) .@"struct" else .Struct;
11
+ const Union = if (@hasField(std.builtin.Type, "union")) .@"union" else .Union;
12
+
6
13
  pub fn print(value: anytype) void {
7
- debug.lockStdErr();
8
- defer debug.unlockStdErr();
14
+ if (@hasDecl(debug, "lockStdErr")) debug.lockStdErr() else debug.getStderrMutex().lock();
15
+ defer if (@hasDecl(debug, "unlockStdErr"))
16
+ debug.unlockStdErr()
17
+ else
18
+ debug.getStderrMutex().unlock();
9
19
  const stderr = io.getStdErr().writer();
10
20
 
11
21
  nosuspend {
@@ -19,7 +29,7 @@ pub fn print(value: anytype) void {
19
29
  }) catch return;
20
30
  } else {
21
31
  switch (@typeInfo(@TypeOf(value))) {
22
- .Struct => |info| {
32
+ Struct => |info| {
23
33
  if (info.is_tuple) {
24
34
  inline for (info.fields, 0..) |f, i| {
25
35
  inspect(@field(value, f.name));
@@ -42,17 +52,17 @@ fn inspect(value: anytype) void {
42
52
  nosuspend {
43
53
  const err = "Unable to format type '" ++ @typeName(@TypeOf(value)) ++ "'";
44
54
  switch (@typeInfo(@TypeOf(value))) {
45
- .Array => |info| {
55
+ Array => |info| {
46
56
  if (info.child == u8) return stderr.print("{s}", .{value}) catch return;
47
57
  @compileError(err);
48
58
  },
49
- .Pointer => |ptr_info| switch (ptr_info.size) {
59
+ Pointer => |ptr_info| switch (ptr_info.size) {
50
60
  .One => switch (@typeInfo(ptr_info.child)) {
51
- .Array => |info| {
61
+ Array => |info| {
52
62
  if (info.child == u8) return stderr.print("{s}", .{value}) catch return;
53
63
  @compileError(err);
54
64
  },
55
- .Enum, .Union, .Struct => return inspect(value.*),
65
+ Enum, Union, Struct => return inspect(value.*),
56
66
  else => @compileError(err),
57
67
  },
58
68
  .Many, .C => {
@@ -67,8 +77,29 @@ fn inspect(value: anytype) void {
67
77
  @compileError(err);
68
78
  },
69
79
  },
70
- .Optional => stderr.print("{?}", .{value}) catch return,
80
+ Optional => stderr.print("{?}", .{value}) catch return,
71
81
  else => stderr.print("{}", .{value}) catch return,
72
82
  }
73
83
  }
74
84
  }
85
+
86
+ const showdown = @import("./options.zig").showdown;
87
+ const Result = @import("./data.zig").Result;
88
+ const Choice = @import("./data.zig").Choice;
89
+
90
+ pub fn dump(gen: u8, battle: anytype, frame: ?struct { Result, Choice, Choice }) void {
91
+ const file = std.fs.cwd().createFile("logs/dump.bin", .{}) catch return;
92
+ defer file.close();
93
+ var w = file.writer();
94
+ w.writeByte(@intFromBool(showdown)) catch return;
95
+ w.writeByte(gen) catch return;
96
+ w.writeInt(i16, 0, .little) catch return;
97
+ w.writeInt(i32, 0, .little) catch return;
98
+ w.writeStruct(battle) catch return;
99
+ w.writeStruct(battle) catch return;
100
+ if (frame) |f| {
101
+ w.writeStruct(f[0]) catch return;
102
+ w.writeStruct(f[1]) catch return;
103
+ w.writeStruct(f[2]) catch return;
104
+ }
105
+ }