@pkmn/engine 0.1.0-dev.3393edb3 → 0.1.0-dev.36b5d56b
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.
- package/build/pkg/addon/browser.d.ts +1 -1
- package/build/pkg/addon/browser.js +2 -1
- package/build/pkg/addon/browser.js.map +1 -1
- package/build/pkg/addon/node.js +2 -1
- package/build/pkg/addon/node.js.map +1 -1
- package/build/pkg/addon/wasm.d.ts +2 -0
- package/build/pkg/addon/wasm.js +21 -0
- package/build/pkg/addon/wasm.js.map +1 -0
- package/build/pkg/addon.d.ts +20 -0
- package/build/pkg/addon.js.map +1 -1
- package/build/tools/debug.js +1 -1
- package/build/tools/debug.js.map +1 -1
- package/build/tools/display/index.js +17 -8
- package/build/tools/display/index.js.map +1 -1
- package/build.zig +89 -68
- package/package.json +19 -16
- package/src/lib/common/debug.zig +9 -4
- package/src/lib/common/options.zig +2 -0
- package/src/lib/common/protocol.zig +4 -8
- package/src/lib/common/rational.zig +7 -5
- package/src/lib/common/rng.zig +1 -3
- package/src/lib/gen1/calc.zig +82 -88
- package/src/lib/gen1/chance.zig +34 -18
- package/src/lib/gen1/data/moves.zig +2 -4
- package/src/lib/gen1/data/species.zig +1 -3
- package/src/lib/gen1/data/types.zig +1 -2
- package/src/lib/gen1/data.zig +7 -11
- package/src/lib/gen1/helpers.zig +4 -11
- package/src/lib/gen1/mechanics.zig +68 -56
- package/src/lib/gen2/calc.zig +9 -17
- package/src/lib/gen2/data/items.zig +1 -3
- package/src/lib/gen2/data/moves.zig +2 -4
- package/src/lib/gen2/data/species.zig +1 -3
- package/src/lib/gen2/data/types.zig +1 -2
- package/src/lib/gen2/data.zig +11 -15
- package/src/lib/gen2/generated.zig +18 -23
- package/src/lib/gen2/helpers.zig +5 -12
- package/src/lib/gen2/mechanics.zig +22 -30
- package/src/lib/node.zig +2 -4
- package/src/lib/pkmn.zig +4 -0
- package/src/lib/wasm.zig +1 -2
- package/src/tools/display/ui.css +8 -5
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { Argument } from '../addon';
|
|
2
|
-
export declare function load(showdown: boolean, addon?: Argument): Promise<
|
|
2
|
+
export declare function load(showdown: boolean, addon?: Argument): Promise<import("../addon").Bindings<boolean>>;
|
|
3
3
|
export declare function loadSync(): void;
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.load = load;
|
|
4
4
|
exports.loadSync = loadSync;
|
|
5
|
+
const wasm_1 = require("./wasm");
|
|
5
6
|
async function load(showdown, addon) {
|
|
6
7
|
if (typeof addon === 'string' && addon !== 'wasm') {
|
|
7
8
|
throw new Error('Unable to load native addons in the browser!');
|
|
@@ -35,7 +36,7 @@ async function load(showdown, addon) {
|
|
|
35
36
|
throw new Error(`${message}\n${err.message}`);
|
|
36
37
|
}
|
|
37
38
|
}
|
|
38
|
-
return wasm.exports;
|
|
39
|
+
return (0, wasm_1.toBindings)(wasm.exports);
|
|
39
40
|
}
|
|
40
41
|
function loadSync() {
|
|
41
42
|
throw new Error('You must `initialize` the WASM addon before using the engine!');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/pkg/addon/browser.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/pkg/addon/browser.ts"],"names":[],"mappings":";;AAKA,oBA+BC;AAED,4BAEC;AArCD,iCAAkC;AAE3B,KAAK,UAAU,IAAI,CAAC,QAAiB,EAAE,KAAgB;IAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,IAA0B,CAAC;IAC/B,IAAI,KAAK,YAAY,WAAW,CAAC,MAAM,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,IAAI,GAAG,CAAC,MAAM,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC;gBAAE,MAAM,GAAG,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,uCAAuC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,GAAG,OAAO,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC;QACvD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,CAAC,KAAK,IAAI,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;gBACvD,CAAC,CAAE,KAAiC,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC7E,IAAI,GAAG,CAAC,MAAM,WAAW,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;QACrE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC;gBAAE,MAAM,GAAG,CAAC;YACvC,MAAM,OAAO,GAAG,CAAC,KAAK,IAAI,KAAK,KAAK,MAAM;gBACxC,CAAC,CAAC,kBAAkB,IAAI,6CAA6C;gBACrE,CAAC,CAAE,KAAiC,YAAY,GAAG;oBACjD,CAAC,CAAC,qCAAsC,KAAa,CAAC,IAAI,IAAI;oBAC9D,CAAC,CAAC,oCAAoC,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,OAAO,IAAA,iBAAU,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,SAAgB,QAAQ;IACtB,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;AACnF,CAAC"}
|
package/build/pkg/addon/node.js
CHANGED
|
@@ -27,6 +27,7 @@ exports.load = load;
|
|
|
27
27
|
exports.loadSync = loadSync;
|
|
28
28
|
const fs = __importStar(require("fs"));
|
|
29
29
|
const path = __importStar(require("path"));
|
|
30
|
+
const wasm_1 = require("./wasm");
|
|
30
31
|
const ROOT = path.join(__dirname, '..', '..', '..');
|
|
31
32
|
const LIB = path.join(ROOT, 'build', 'lib');
|
|
32
33
|
const NODE = [path.join(LIB, 'pkmn.node'), path.join(LIB, 'pkmn-showdown.node')];
|
|
@@ -77,7 +78,7 @@ async function load(showdown, addon) {
|
|
|
77
78
|
throw new Error(`Could not instantiate WASM module!\n${err.message}`);
|
|
78
79
|
}
|
|
79
80
|
}
|
|
80
|
-
return wasm.exports;
|
|
81
|
+
return (0, wasm_1.toBindings)(wasm.exports);
|
|
81
82
|
}
|
|
82
83
|
function loadSync(showdown) {
|
|
83
84
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../../src/pkg/addon/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../../src/pkg/addon/node.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.toBindings = toBindings;
|
|
4
|
+
function toBindings(w) {
|
|
5
|
+
return {
|
|
6
|
+
options: {
|
|
7
|
+
showdown: w.SHOWDOWN.valueOf(),
|
|
8
|
+
log: w.LOG.valueOf(),
|
|
9
|
+
chance: w.CHANCE.valueOf(),
|
|
10
|
+
calc: w.CALC.valueOf(),
|
|
11
|
+
},
|
|
12
|
+
bindings: [toBinding('GEN1', w)],
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
function toBinding(prefix, w) {
|
|
16
|
+
return {
|
|
17
|
+
CHOICES_SIZE: w[`${prefix}_CHOICES_SIZE`].valueOf(),
|
|
18
|
+
LOGS_SIZE: w[`${prefix}_LOGS_SIZE`].valueOf(),
|
|
19
|
+
}; // FIXME
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=wasm.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wasm.js","sourceRoot":"","sources":["../../../src/pkg/addon/wasm.ts"],"names":[],"mappings":";;AAEA,gCAUC;AAVD,SAAgB,UAAU,CAAoB,CAAsB;IAClE,OAAO;QACL,OAAO,EAAE;YACP,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE;YAC9B,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE;YACpB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE;YAC1B,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE;SACvB;QACD,QAAQ,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;KACjC,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,MAAc,EAAE,CAAsB;IACvD,OAAO;QACL,YAAY,EAAE,CAAC,CAAC,GAAG,MAAM,eAAe,CAAC,CAAC,OAAO,EAAE;QACnD,SAAS,EAAE,CAAC,CAAC,GAAG,MAAM,YAAY,CAAC,CAAC,OAAO,EAAE;KACxB,CAAC,CAAC,QAAQ;AACnC,CAAC"}
|
package/build/pkg/addon.d.ts
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
import { Choice, Player, Result } from '.';
|
|
2
2
|
export type Argument = string | URL | WebAssembly.Module | Promise<Response>;
|
|
3
|
+
export interface Bindings<T extends boolean> {
|
|
4
|
+
/**
|
|
5
|
+
* The compile-time options the bindings were built with. showdown is special
|
|
6
|
+
* cased because it changes the name of addon.
|
|
7
|
+
*/
|
|
8
|
+
options: {
|
|
9
|
+
showdown: T;
|
|
10
|
+
log: boolean;
|
|
11
|
+
chance: boolean;
|
|
12
|
+
calc: boolean;
|
|
13
|
+
};
|
|
14
|
+
/** Bindings are per-generation, Generation I is index 0. */
|
|
15
|
+
bindings: Binding[];
|
|
16
|
+
}
|
|
17
|
+
export interface Binding {
|
|
18
|
+
CHOICES_SIZE: number;
|
|
19
|
+
LOGS_SIZE: number;
|
|
20
|
+
update(battle: ArrayBuffer, c1: number, c2: number, log: ArrayBuffer | undefined): number;
|
|
21
|
+
choices(battle: ArrayBuffer, player: number, request: number, options: ArrayBuffer): number;
|
|
22
|
+
}
|
|
3
23
|
export declare function initialize(showdown: boolean, addon?: Argument): Promise<void | undefined>;
|
|
4
24
|
export declare function check(showdown: boolean): void;
|
|
5
25
|
export declare function supports(showdown: boolean, log?: boolean): boolean;
|
package/build/pkg/addon.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addon.js","sourceRoot":"","sources":["../../src/pkg/addon.ts"],"names":[],"mappings":";;AA0BA,gCAWC;AAED,sBASC;AAED,4BAIC;AASD,wBAUC;AAED,0BA+BC;AAED,wBAaC;AAED,oBAGC;AA9HD,uCAA4C;AAE5C,wBAAyC;
|
|
1
|
+
{"version":3,"file":"addon.js","sourceRoot":"","sources":["../../src/pkg/addon.ts"],"names":[],"mappings":";;AA0BA,gCAWC;AAED,sBASC;AAED,4BAIC;AASD,wBAUC;AAED,0BA+BC;AAED,wBAaC;AAED,oBAGC;AA9HD,uCAA4C;AAE5C,wBAAyC;AAqBzC,MAAM,MAAM,GAAwC,EAAE,CAAC;AACvD,MAAM,OAAO,GAA0D,EAAE,CAAC;AAEnE,KAAK,UAAU,UAAU,CAAC,QAAiB,EAAE,KAAgB;IAClE,IAAI,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,uDAAuD,QAAQ,EAAE,CAAC,CAAC;IACrF,CAAC;IACD,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC3C,OAAO,CAAC,CAAC,QAAQ,CAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;QAC3B,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;QACZ,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC;IACjC,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,SAAgB,KAAK,CAAC,QAAiB;IACrC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,IAAI,QAAQ;YAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtC,MAAM,IAAI,KAAK,CACb,oBAAoB,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,+CAA+C;YAC5F,mDAAmD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAC5F,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAgB,QAAQ,CAAC,QAAiB,EAAE,GAAa;IACvD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IAC/C,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACnC,OAAO,MAAM,CAAC,CAAC,QAAQ,CAAE,CAAC,OAAO,CAAC,GAAG,KAAK,GAAG,CAAC;AAChD,CAAC;AAED,SAAS,MAAM,CAAC,QAAiB;IAC/B,IAAI,MAAM,CAAC,CAAC,QAAQ,CAAC;QAAE,OAAO,MAAM,CAAC;IACrC,sEAAsE;IACtE,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAA,eAAQ,EAAC,QAAQ,CAAC,CAAC;IACvC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,MAAM,CACpB,KAAa,EACb,QAAiB,EACjB,MAAmB,EACnB,EAAW,EACX,EAAW,EACX,GAAiB;IAEjB,OAAO,SAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAE,CAAC,QAAQ,CAAC,KAAK,CAAC;SACpD,MAAM,CAAC,MAAM,EAAE,SAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,SAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;AAChE,CAAC;AAED,SAAgB,OAAO,CACrB,KAAa,EACb,QAAiB,EACjB,MAAmB,EACnB,MAAc,EACd,MAAsB,EACtB,GAAgB;IAEhB,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,QAAQ,CAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IAC/F,uEAAuE;IACvE,8EAA8E;IAC9E,8EAA8E;IAC9E,oEAAoE;IACpE,0EAA0E;IAC1E,2EAA2E;IAC3E,4EAA4E;IAC5E,8EAA8E;IAC9E,4EAA4E;IAC5E,2EAA2E;IAC3E,uEAAuE;IACvE,8EAA8E;IAC9E,yEAAyE;IACzE,8EAA8E;IAC9E,8EAA8E;IAC9E,0EAA0E;IAC1E,UAAU;IACV,MAAM,OAAO,GAAG,IAAI,KAAK,CAAS,CAAC,CAAC,CAAC;IACrC,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;IACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QAAE,OAAO,CAAC,CAAC,CAAC,GAAG,SAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAgB,MAAM,CACpB,KAAa,EACb,QAAiB,EACjB,MAAmB,EACnB,MAAc,EACd,MAAsB,EACtB,GAAgB,EAChB,EAAyB;IAEzB,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,QAAQ,CAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IAC/F,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;IACjC,OAAO,SAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,SAAgB,IAAI,CAAC,KAAa,EAAE,IAAuB;IACzD,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC3D,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;AACtE,CAAC"}
|
package/build/tools/debug.js
CHANGED
|
@@ -69,7 +69,7 @@ function render(gens, buffer, err, seed) {
|
|
|
69
69
|
buf: buffer.toString('base64'),
|
|
70
70
|
error: err && error(err),
|
|
71
71
|
seed: seed?.toString(),
|
|
72
|
-
});
|
|
72
|
+
}, { styles: [path.join(ROOT, 'src', 'tools', 'display', 'debug.css')] });
|
|
73
73
|
}
|
|
74
74
|
async function run(gens) {
|
|
75
75
|
let input;
|
package/build/tools/debug.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../src/tools/debug.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAcA,sBAKC;AAED,wBAsCC;AAED,kBAkBC;AA/ED,iDAA2C;AAC3C,uCAAyB;AACzB,2CAA6B;AAE7B,qCAAmD;AAEnD,kDAAoC;AACpC,kDAAoC;AAEpC,mDAAqC;AAErC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AACjD,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAA,4BAAY,EAAC,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;AAE/F,SAAgB,KAAK,CAAC,GAAW;IAC/B,OAAO,CAAC,GAAG;SACR,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;SAC/B,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC;SACvB,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,SAAgB,MAAM,CACpB,IAA8B,EAC9B,MAAc,EACd,GAAY,EACZ,IAAa;IAEb,IAAI,CAAC,MAAM,CAAC,MAAM;QAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IAErD,4FAA4F;IAC5F,uDAAuD;IACvD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEpC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IACpC,MAAM,GAAG,GAAG,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACjD,IAAI,GAAG,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,8BAA8B,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,IAAI,CAAC,CAAC;IAEZ,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;IAEnD,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE;QAClC,QAAQ,GAAG,CAAC,GAAG,EAAE,CAAC;YAChB,KAAK,CAAC,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAC,CAAC,CAAC;YACrF,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC;IAEpE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC,EAAE;QAC/E,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;QAC/B,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAC9B,KAAK,EAAE,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC;QACxB,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE;KACvB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../src/tools/debug.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,13 +28,15 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.render = render;
|
|
30
30
|
exports.prune = prune;
|
|
31
|
+
exports.pruneSpecies = pruneSpecies;
|
|
32
|
+
exports.pruneMove = pruneMove;
|
|
31
33
|
const fs = __importStar(require("fs"));
|
|
32
34
|
const path = __importStar(require("path"));
|
|
33
35
|
const esbuild = __importStar(require("esbuild"));
|
|
34
36
|
const html_minifier_1 = require("html-minifier");
|
|
35
37
|
__exportStar(require("./util"), exports);
|
|
36
38
|
const ROOT = path.resolve(__dirname, '..', '..', '..');
|
|
37
|
-
function render(entryPoint, json) {
|
|
39
|
+
function render(entryPoint, json, options = {}) {
|
|
38
40
|
const result = esbuild.buildSync({
|
|
39
41
|
jsx: 'transform',
|
|
40
42
|
jsxFactory: 'h',
|
|
@@ -49,6 +51,7 @@ function render(entryPoint, json) {
|
|
|
49
51
|
bundle: true,
|
|
50
52
|
write: false,
|
|
51
53
|
});
|
|
54
|
+
const styles = options.styles?.map(style => fs.readFileSync(style, 'utf8')) ?? [];
|
|
52
55
|
return (0, html_minifier_1.minify)(`<!DOCTYPE html>
|
|
53
56
|
<html lang="en">
|
|
54
57
|
<head>
|
|
@@ -56,7 +59,10 @@ function render(entryPoint, json) {
|
|
|
56
59
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
57
60
|
<link rel="icon" href="https://pkmn.cc/favicon.ico">
|
|
58
61
|
<title>@pkmn/engine</title>
|
|
59
|
-
<style
|
|
62
|
+
<style>
|
|
63
|
+
${fs.readFileSync(path.join(ROOT, 'src', 'tools', 'display', 'ui.css'), 'utf8')}
|
|
64
|
+
${styles.join('')}
|
|
65
|
+
</style>
|
|
60
66
|
</head>
|
|
61
67
|
<body>
|
|
62
68
|
<noscript>You need to enable JavaScript to run this app.</noscript>
|
|
@@ -92,12 +98,7 @@ function prune(gen, battle) {
|
|
|
92
98
|
// we just greedily include all formes of a species just to be safe
|
|
93
99
|
for (const forme of [s.id, ...(s.formes ?? [])]) {
|
|
94
100
|
const species = gen.species.get(forme);
|
|
95
|
-
pruned.species[species.id] =
|
|
96
|
-
name: species.name,
|
|
97
|
-
num: species.num,
|
|
98
|
-
genderRatio: species.genderRatio,
|
|
99
|
-
gender: species.gender,
|
|
100
|
-
};
|
|
101
|
+
pruned.species[species.id] = pruneSpecies(gen, species);
|
|
101
102
|
}
|
|
102
103
|
// Similarly - Metronome can proc pretty much any other move. If any Pokémon
|
|
103
104
|
// has Metronome we just give up and include the whole set of moves
|
|
@@ -120,6 +121,14 @@ function prune(gen, battle) {
|
|
|
120
121
|
}
|
|
121
122
|
return pruned;
|
|
122
123
|
}
|
|
124
|
+
function pruneSpecies(gen, species) {
|
|
125
|
+
return {
|
|
126
|
+
name: species.name,
|
|
127
|
+
num: species.num,
|
|
128
|
+
genderRatio: species.genderRatio,
|
|
129
|
+
gender: species.gender,
|
|
130
|
+
};
|
|
131
|
+
}
|
|
123
132
|
function pruneMove(gen, move) {
|
|
124
133
|
return {
|
|
125
134
|
name: move.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/display/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAeA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tools/display/index.ts"],"names":[],"mappings":"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"}
|
package/build.zig
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const std = @import("std");
|
|
2
1
|
const builtin = @import("builtin");
|
|
2
|
+
const std = @import("std");
|
|
3
3
|
|
|
4
4
|
pub const Options = struct {
|
|
5
5
|
showdown: ?bool = null,
|
|
@@ -131,73 +131,7 @@ pub fn build(b: *std.Build) !void {
|
|
|
131
131
|
// rename the file ourself in install-pkmn-engine
|
|
132
132
|
b.installArtifact(lib);
|
|
133
133
|
} else if (wasm) {
|
|
134
|
-
|
|
135
|
-
const mode = switch (optimize) {
|
|
136
|
-
.ReleaseFast, .ReleaseSafe => .ReleaseSmall,
|
|
137
|
-
else => optimize,
|
|
138
|
-
};
|
|
139
|
-
const freestanding = if (@hasDecl(std.Build, "resolveTargetQuery"))
|
|
140
|
-
b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding })
|
|
141
|
-
else
|
|
142
|
-
ResolvedTarget{ .cpu_arch = .wasm32, .os_tag = .freestanding };
|
|
143
|
-
const path = if (has_path) .{ .path = "src/lib/wasm.zig" } else b.path("src/lib/wasm.zig");
|
|
144
|
-
const bin = if (entry) bin: {
|
|
145
|
-
const exe = b.addExecutable(if (force_pic) .{
|
|
146
|
-
.name = name,
|
|
147
|
-
.root_source_file = path,
|
|
148
|
-
.optimize = mode,
|
|
149
|
-
.target = freestanding,
|
|
150
|
-
} else .{
|
|
151
|
-
.name = name,
|
|
152
|
-
.root_source_file = path,
|
|
153
|
-
.optimize = mode,
|
|
154
|
-
.target = freestanding,
|
|
155
|
-
.strip = strip,
|
|
156
|
-
.pic = pic,
|
|
157
|
-
});
|
|
158
|
-
(if (root_module) exe.root_module else exe).export_symbol_names = &[_][]const u8{
|
|
159
|
-
"SHOWDOWN",
|
|
160
|
-
"LOG",
|
|
161
|
-
"CHANCE",
|
|
162
|
-
"CALC",
|
|
163
|
-
"GEN1_CHOICES_SIZE",
|
|
164
|
-
"GEN1_LOGS_SIZE",
|
|
165
|
-
};
|
|
166
|
-
exe.entry = .disabled;
|
|
167
|
-
break :bin exe;
|
|
168
|
-
} else bin: {
|
|
169
|
-
const lib = b.addSharedLibrary(.{
|
|
170
|
-
.name = name,
|
|
171
|
-
.root_source_file = path,
|
|
172
|
-
.optimize = mode,
|
|
173
|
-
.target = freestanding,
|
|
174
|
-
});
|
|
175
|
-
lib.rdynamic = true;
|
|
176
|
-
break :bin lib;
|
|
177
|
-
};
|
|
178
|
-
bin.stack_size = wasm_stack_size;
|
|
179
|
-
if (@hasDecl(@TypeOf(bin.*), "strip")) bin.strip = strip orelse false;
|
|
180
|
-
if (force_pic and pic orelse false) bin.force_pic = pic;
|
|
181
|
-
(if (root_module) bin.root_module else bin).addOptions("build_options", options);
|
|
182
|
-
|
|
183
|
-
const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
|
|
184
|
-
if (optimize != .Debug and opt != null) {
|
|
185
|
-
const out = b.fmt("build/lib/{s}.wasm", .{name});
|
|
186
|
-
const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
|
|
187
|
-
sh.addArtifactArg(bin);
|
|
188
|
-
sh.addArg("-o");
|
|
189
|
-
if (@hasDecl(@TypeOf(sh.*), "addFileSourceArg")) {
|
|
190
|
-
sh.addFileSourceArg(if (has_path) .{ .path = out } else b.path(out));
|
|
191
|
-
} else {
|
|
192
|
-
sh.addFileArg(if (has_path) .{ .path = out } else b.path(out));
|
|
193
|
-
}
|
|
194
|
-
b.getInstallStep().dependOn(&sh.step);
|
|
195
|
-
if (!entry) b.installArtifact(bin);
|
|
196
|
-
} else if (entry) {
|
|
197
|
-
b.getInstallStep().dependOn(&b.addInstallArtifact(bin, .{
|
|
198
|
-
.dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
|
|
199
|
-
}).step);
|
|
200
|
-
}
|
|
134
|
+
try buildWasm(b, name, "src/lib/wasm.zig", optimize, strip, pic, wasm_stack_size, options);
|
|
201
135
|
} else if (dynamic) {
|
|
202
136
|
const path = if (has_path) .{ .path = "src/lib/c.zig" } else b.path("src/lib/c.zig");
|
|
203
137
|
const lib = b.addSharedLibrary(if (force_pic) .{
|
|
@@ -350,6 +284,78 @@ pub fn build(b: *std.Build) !void {
|
|
|
350
284
|
}
|
|
351
285
|
}
|
|
352
286
|
|
|
287
|
+
fn buildWasm(
|
|
288
|
+
b: *std.Build,
|
|
289
|
+
name: []const u8,
|
|
290
|
+
root_src_file: []const u8,
|
|
291
|
+
optimize: std.builtin.OptimizeMode,
|
|
292
|
+
strip: ?bool,
|
|
293
|
+
pic: ?bool,
|
|
294
|
+
wasm_stack_size: u64,
|
|
295
|
+
options: anytype,
|
|
296
|
+
) !void {
|
|
297
|
+
const entry = @hasDecl(Step.Compile, "Entry");
|
|
298
|
+
const mode = switch (optimize) {
|
|
299
|
+
.ReleaseFast, .ReleaseSafe => .ReleaseSmall,
|
|
300
|
+
else => optimize,
|
|
301
|
+
};
|
|
302
|
+
const freestanding = if (@hasDecl(std.Build, "resolveTargetQuery"))
|
|
303
|
+
b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding })
|
|
304
|
+
else
|
|
305
|
+
ResolvedTarget{ .cpu_arch = .wasm32, .os_tag = .freestanding };
|
|
306
|
+
const path = if (has_path) .{ .path = root_src_file } else b.path(root_src_file);
|
|
307
|
+
const bin = if (entry) bin: {
|
|
308
|
+
const exe = b.addExecutable(if (force_pic) .{
|
|
309
|
+
.name = name,
|
|
310
|
+
.root_source_file = path,
|
|
311
|
+
.optimize = mode,
|
|
312
|
+
.target = freestanding,
|
|
313
|
+
} else .{
|
|
314
|
+
.name = name,
|
|
315
|
+
.root_source_file = path,
|
|
316
|
+
.optimize = mode,
|
|
317
|
+
.target = freestanding,
|
|
318
|
+
.strip = strip,
|
|
319
|
+
.pic = pic,
|
|
320
|
+
});
|
|
321
|
+
(if (root_module) exe.root_module else exe).export_symbol_names = try exports(b);
|
|
322
|
+
exe.entry = .disabled;
|
|
323
|
+
break :bin exe;
|
|
324
|
+
} else bin: {
|
|
325
|
+
const lib = b.addSharedLibrary(.{
|
|
326
|
+
.name = name,
|
|
327
|
+
.root_source_file = path,
|
|
328
|
+
.optimize = mode,
|
|
329
|
+
.target = freestanding,
|
|
330
|
+
});
|
|
331
|
+
lib.rdynamic = true;
|
|
332
|
+
break :bin lib;
|
|
333
|
+
};
|
|
334
|
+
bin.stack_size = wasm_stack_size;
|
|
335
|
+
if (@hasDecl(@TypeOf(bin.*), "strip")) bin.strip = strip orelse false;
|
|
336
|
+
if (force_pic and pic orelse false) bin.force_pic = pic;
|
|
337
|
+
(if (root_module) bin.root_module else bin).addOptions("build_options", options);
|
|
338
|
+
|
|
339
|
+
const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
|
|
340
|
+
if (optimize != .Debug and opt != null) {
|
|
341
|
+
const out = b.fmt("build/lib/{s}.wasm", .{name});
|
|
342
|
+
const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
|
|
343
|
+
sh.addArtifactArg(bin);
|
|
344
|
+
sh.addArg("-o");
|
|
345
|
+
if (@hasDecl(@TypeOf(sh.*), "addFileSourceArg")) {
|
|
346
|
+
sh.addFileSourceArg(if (has_path) .{ .path = out } else b.path(out));
|
|
347
|
+
} else {
|
|
348
|
+
sh.addFileArg(if (has_path) .{ .path = out } else b.path(out));
|
|
349
|
+
}
|
|
350
|
+
b.getInstallStep().dependOn(&sh.step);
|
|
351
|
+
if (!entry) b.installArtifact(bin);
|
|
352
|
+
} else if (entry) {
|
|
353
|
+
b.getInstallStep().dependOn(&b.addInstallArtifact(bin, .{
|
|
354
|
+
.dest_dir = .{ .override = std.Build.InstallDir{ .lib = {} } },
|
|
355
|
+
}).step);
|
|
356
|
+
}
|
|
357
|
+
}
|
|
358
|
+
|
|
353
359
|
fn maybeStrip(
|
|
354
360
|
b: *std.Build,
|
|
355
361
|
artifact: *Step.Compile,
|
|
@@ -494,3 +500,18 @@ fn detect(target: anytype) std.Target {
|
|
|
494
500
|
if (@hasField(@TypeOf(target), "result")) return target.result;
|
|
495
501
|
return (std.zig.system.NativeTargetInfo.detect(target) catch unreachable).target;
|
|
496
502
|
}
|
|
503
|
+
|
|
504
|
+
const WASM = @embedFile("src/lib/wasm.zig");
|
|
505
|
+
|
|
506
|
+
fn exports(b: *std.Build) ![][]const u8 {
|
|
507
|
+
var symbols = std.ArrayList([]const u8).init(b.allocator);
|
|
508
|
+
|
|
509
|
+
var it = std.mem.splitSequence(u8, WASM, "export const ");
|
|
510
|
+
_ = it.next();
|
|
511
|
+
while (it.next()) |s| {
|
|
512
|
+
const i = std.mem.indexOf(u8, s, " ").?;
|
|
513
|
+
try symbols.append(s[0..i]);
|
|
514
|
+
}
|
|
515
|
+
|
|
516
|
+
return symbols.items;
|
|
517
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pkmn/engine",
|
|
3
|
-
"version": "0.1.0-dev.
|
|
3
|
+
"version": "0.1.0-dev.36b5d56b",
|
|
4
4
|
"description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
|
|
5
5
|
"repository": "github:pkmn/engine",
|
|
6
6
|
"license": "MIT",
|
|
@@ -21,6 +21,9 @@
|
|
|
21
21
|
"build/pkg/addon/node.d.ts",
|
|
22
22
|
"build/pkg/addon/node.js.map",
|
|
23
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",
|
|
24
27
|
"build/pkg/data.d.ts",
|
|
25
28
|
"build/pkg/data.js.map",
|
|
26
29
|
"build/pkg/data.js",
|
|
@@ -92,37 +95,38 @@
|
|
|
92
95
|
"access": "public"
|
|
93
96
|
},
|
|
94
97
|
"dependencies": {
|
|
95
|
-
"@pkmn/data": "^0.9.
|
|
98
|
+
"@pkmn/data": "^0.9.19",
|
|
96
99
|
"@pkmn/protocol": "^0.6.26"
|
|
97
100
|
},
|
|
98
101
|
"devDependencies": {
|
|
99
|
-
"@pkmn/eslint-config": "^8.
|
|
102
|
+
"@pkmn/eslint-config": "^8.4.0",
|
|
100
103
|
"@pkmn/img": "^0.2.32",
|
|
101
104
|
"@pkmn/sets": "^5.1.2",
|
|
102
|
-
"@pkmn/sim": "0.9.
|
|
105
|
+
"@pkmn/sim": "0.9.19",
|
|
106
|
+
"@pkmn/smogon": "^0.5.14",
|
|
103
107
|
"@types/html-minifier": "^4.0.5",
|
|
104
|
-
"@types/jest": "^29.5.
|
|
108
|
+
"@types/jest": "^29.5.13",
|
|
105
109
|
"@types/minimist": "^1.2.5",
|
|
106
110
|
"@types/mustache": "^4.2.5",
|
|
107
|
-
"@types/node": "^22.
|
|
108
|
-
"@types/react": "^18.
|
|
111
|
+
"@types/node": "^22.7.4",
|
|
112
|
+
"@types/react": "^18.3.10",
|
|
109
113
|
"@types/semver": "^7.5.8",
|
|
110
114
|
"@types/vscode": "^1.93.0",
|
|
111
|
-
"@vitest/coverage-v8": "^2.
|
|
112
|
-
"@vscode/vsce": "^3.1.
|
|
113
|
-
"binaryen": "^
|
|
114
|
-
"esbuild": "^0.
|
|
115
|
+
"@vitest/coverage-v8": "^2.1.1",
|
|
116
|
+
"@vscode/vsce": "^3.1.1",
|
|
117
|
+
"binaryen": "^119.0.0",
|
|
118
|
+
"esbuild": "^0.24.0",
|
|
115
119
|
"eslint": "<=8",
|
|
116
120
|
"html-minifier": "^4.0.0",
|
|
117
|
-
"json-stringify-pretty-compact": "
|
|
121
|
+
"json-stringify-pretty-compact": "3.0.0",
|
|
118
122
|
"minimist": "^1.2.8",
|
|
119
123
|
"mustache": "^4.2.0",
|
|
120
124
|
"semver": "^7.6.3",
|
|
121
125
|
"source-map-support": "^0.5.21",
|
|
122
126
|
"table": "^6.8.2",
|
|
123
127
|
"trakr": "^0.2.0",
|
|
124
|
-
"typescript": "^5.
|
|
125
|
-
"vitest": "^2.
|
|
128
|
+
"typescript": "^5.6.2",
|
|
129
|
+
"vitest": "^2.1.1"
|
|
126
130
|
},
|
|
127
131
|
"scripts": {
|
|
128
132
|
"lint": "eslint --cache src --ext ts,js && eslint src/bin/*",
|
|
@@ -207,8 +211,7 @@
|
|
|
207
211
|
},
|
|
208
212
|
{
|
|
209
213
|
"files": [
|
|
210
|
-
"src/test/*.test.ts"
|
|
211
|
-
"src/test/regression/*.test.ts"
|
|
214
|
+
"src/test/*.test.ts"
|
|
212
215
|
],
|
|
213
216
|
"rules": {
|
|
214
217
|
"jest/no-standalone-expect": "off"
|
package/src/lib/common/debug.zig
CHANGED
|
@@ -4,13 +4,18 @@ const debug = std.debug;
|
|
|
4
4
|
const io = std.io;
|
|
5
5
|
|
|
6
6
|
const Array = if (@hasField(std.builtin.Type, "array")) .array else .Array;
|
|
7
|
+
const Enum = if (@hasField(std.builtin.Type, "enum")) .@"enum" else .Enum;
|
|
7
8
|
const Optional = if (@hasField(std.builtin.Type, "optional")) .optional else .Optional;
|
|
8
9
|
const Pointer = if (@hasField(std.builtin.Type, "pointer")) .pointer else .Pointer;
|
|
9
10
|
const Struct = if (@hasField(std.builtin.Type, "struct")) .@"struct" else .Struct;
|
|
11
|
+
const Union = if (@hasField(std.builtin.Type, "union")) .@"union" else .Union;
|
|
10
12
|
|
|
11
13
|
pub fn print(value: anytype) void {
|
|
12
|
-
debug.lockStdErr();
|
|
13
|
-
defer debug
|
|
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();
|
|
14
19
|
const stderr = io.getStdErr().writer();
|
|
15
20
|
|
|
16
21
|
nosuspend {
|
|
@@ -53,11 +58,11 @@ fn inspect(value: anytype) void {
|
|
|
53
58
|
},
|
|
54
59
|
Pointer => |ptr_info| switch (ptr_info.size) {
|
|
55
60
|
.One => switch (@typeInfo(ptr_info.child)) {
|
|
56
|
-
|
|
61
|
+
Array => |info| {
|
|
57
62
|
if (info.child == u8) return stderr.print("{s}", .{value}) catch return;
|
|
58
63
|
@compileError(err);
|
|
59
64
|
},
|
|
60
|
-
|
|
65
|
+
Enum, Union, Struct => return inspect(value.*),
|
|
61
66
|
else => @compileError(err),
|
|
62
67
|
},
|
|
63
68
|
.Many, .C => {
|
|
@@ -7,6 +7,7 @@ pub const Options = struct {
|
|
|
7
7
|
log: ?bool = null,
|
|
8
8
|
chance: ?bool = null,
|
|
9
9
|
calc: ?bool = null,
|
|
10
|
+
mod: ?bool = null,
|
|
10
11
|
advance: ?bool = null,
|
|
11
12
|
ebc: ?bool = null,
|
|
12
13
|
key: ?bool = null,
|
|
@@ -24,6 +25,7 @@ pub const chance = get("chance", false);
|
|
|
24
25
|
/// Whether or not damage calculator support is enabled.
|
|
25
26
|
pub const calc = get("calc", false);
|
|
26
27
|
|
|
28
|
+
pub const mod = showdown or get("mod", false);
|
|
27
29
|
pub const advance = get("advance", true);
|
|
28
30
|
pub const ebc = get("ebc", true);
|
|
29
31
|
pub const key = get("key", false);
|
|
@@ -1,18 +1,14 @@
|
|
|
1
|
-
const std = @import("std");
|
|
2
1
|
const builtin = @import("builtin");
|
|
3
|
-
|
|
4
|
-
const pkmn = @import("../pkmn.zig");
|
|
5
|
-
|
|
6
2
|
const data = @import("data.zig");
|
|
7
3
|
const options = @import("options.zig");
|
|
4
|
+
const pkmn = @import("../pkmn.zig");
|
|
5
|
+
const std = @import("std");
|
|
8
6
|
|
|
9
7
|
const assert = std.debug.assert;
|
|
10
|
-
const print = std.debug.print;
|
|
11
|
-
|
|
12
8
|
const enabled = options.log;
|
|
13
|
-
|
|
14
|
-
const Player = data.Player;
|
|
15
9
|
const ID = data.ID;
|
|
10
|
+
const Player = data.Player;
|
|
11
|
+
const print = std.debug.print;
|
|
16
12
|
|
|
17
13
|
const endian = builtin.cpu.arch.endian();
|
|
18
14
|
const Endian = std.builtin.Endian;
|
|
@@ -15,7 +15,9 @@ const ComptimeFloat =
|
|
|
15
15
|
|
|
16
16
|
/// Specialization of a rational number used by the engine to compute probabilties.
|
|
17
17
|
/// For performance reasons the rational is only reduced lazily and thus `reduce` must be
|
|
18
|
-
/// invoked explicitly before reading.
|
|
18
|
+
/// invoked explicitly before reading. Note that this laziness means that this implementation
|
|
19
|
+
/// sometimes overflows in places where an eager reduced implementation would not - to achieve
|
|
20
|
+
/// the same behavior as an eager implementation simply call `reduce` after each operation.
|
|
19
21
|
pub fn Rational(comptime T: type) type {
|
|
20
22
|
return extern struct {
|
|
21
23
|
const Self = @This();
|
|
@@ -25,10 +27,10 @@ pub fn Rational(comptime T: type) type {
|
|
|
25
27
|
/// Denominator. Must always be >= 1. Not guaranteed to be reduced in all cases.
|
|
26
28
|
q: T = 1,
|
|
27
29
|
|
|
28
|
-
// With floats we can't rely on an overflow bit to let us know when to reduce, so we
|
|
29
|
-
// start reducing when we get sufficiently close to the limit of the mantissa
|
|
30
|
-
// we expect updates to involve numbers < 2**10, so we should be safe
|
|
31
|
-
// are 2**10 away from "overflowing" the mantissa)
|
|
30
|
+
// With floats we can't rely on an overflow bit to let us know when to reduce, so we
|
|
31
|
+
// instead start reducing when we get sufficiently close to the limit of the mantissa
|
|
32
|
+
// (in our domain we expect updates to involve numbers < 2**10, so we should be safe
|
|
33
|
+
// not reducing before we are 2**10 away from "overflowing" the mantissa)
|
|
32
34
|
const REDUCE = if (@typeInfo(T) == Float)
|
|
33
35
|
std.math.pow(T, 2, std.math.floatMantissaBits(T) - 10)
|
|
34
36
|
else
|
package/src/lib/common/rng.zig
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
const std = @import("std");
|
|
2
|
-
|
|
3
1
|
const options = @import("options.zig");
|
|
2
|
+
const std = @import("std");
|
|
4
3
|
|
|
5
4
|
const assert = std.debug.assert;
|
|
6
5
|
const expectEqual = std.testing.expectEqual;
|
|
7
|
-
|
|
8
6
|
const showdown = options.showdown;
|
|
9
7
|
|
|
10
8
|
pub fn PRNG(comptime gen: comptime_int) type {
|