@pkmn/engine 0.1.0-dev.3ed876db → 0.1.0-dev.3f3af84c
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/README.md +5 -4
- package/build/pkg/addon/browser.js +4 -1
- package/build/pkg/addon/browser.js.map +1 -1
- package/build/pkg/addon/node.js +3 -0
- package/build/pkg/addon/node.js.map +1 -1
- package/build/pkg/addon/wasm.js +41 -9
- package/build/pkg/addon/wasm.js.map +1 -1
- package/build/pkg/addon.d.ts +5 -5
- package/build/pkg/addon.js +8 -17
- package/build/pkg/addon.js.map +1 -1
- package/build/pkg/data/layout.json +15 -2
- package/build/pkg/data/protocol.json +23 -9
- package/build/pkg/gen1.d.ts +15 -18
- package/build/pkg/gen1.js +11 -12
- package/build/pkg/gen1.js.map +1 -1
- package/build/pkg/index.d.ts +37 -101
- package/build/pkg/index.js +6 -69
- package/build/pkg/index.js.map +1 -1
- package/build/tools/debug.js +0 -1
- package/build/tools/debug.js.map +1 -1
- package/build/tools/display/index.js +1 -0
- package/build/tools/display/index.js.map +1 -1
- package/build/tools/display/ui.jsx.map +1 -1
- package/build/tools/display/util.js +16 -1
- package/build/tools/display/util.js.map +1 -1
- package/build.zig +100 -27
- package/package.json +22 -123
- package/src/bin/install-pkmn-engine +3 -2
- package/src/lib/bindings/c.zig +255 -0
- package/src/lib/bindings/node.zig +121 -0
- package/src/lib/bindings/wasm.zig +59 -0
- package/src/lib/common/array.zig +1 -1
- package/src/lib/common/optional.zig +1 -1
- package/src/lib/common/util.zig +1 -1
- package/src/lib/gen1/calc.zig +8 -8
- package/src/lib/gen1/mechanics.zig +8 -3
- package/src/lib/gen2/mechanics.zig +19 -8
- package/src/lib/node.zig +2 -113
- package/src/lib/pkmn.zig +3 -2
- package/src/lib/wasm.zig +14 -9
|
@@ -0,0 +1,255 @@
|
|
|
1
|
+
const pkmn = @import("../pkmn.zig");
|
|
2
|
+
const std = @import("std");
|
|
3
|
+
|
|
4
|
+
const assert = std.debug.assert;
|
|
5
|
+
|
|
6
|
+
const ERROR: u8 = 0b1100;
|
|
7
|
+
|
|
8
|
+
const Enum = if (@hasField(std.builtin.Type, "enum")) .@"enum" else .Enum;
|
|
9
|
+
const Strong = if (@hasField(std.builtin.GlobalLinkage, "strong")) .strong else .Strong;
|
|
10
|
+
|
|
11
|
+
pub const OPTIONS: extern struct {
|
|
12
|
+
showdown: bool,
|
|
13
|
+
log: bool,
|
|
14
|
+
chance: bool,
|
|
15
|
+
calc: bool,
|
|
16
|
+
} = .{
|
|
17
|
+
.showdown = pkmn.options.showdown,
|
|
18
|
+
.log = pkmn.options.log,
|
|
19
|
+
.chance = pkmn.options.chance,
|
|
20
|
+
.calc = pkmn.options.calc,
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
pub const MAX_CHOICES = pkmn.MAX_CHOICES;
|
|
24
|
+
pub const CHOICES_SIZE = pkmn.CHOICES_SIZE;
|
|
25
|
+
pub const MAX_LOGS = pkmn.MAX_LOGS;
|
|
26
|
+
pub const LOGS_SIZE = pkmn.LOGS_SIZE;
|
|
27
|
+
|
|
28
|
+
pub fn choice_init(choice: u8, data: u8) callconv(.C) u8 {
|
|
29
|
+
assert(choice <= @field(@typeInfo(pkmn.Choice.Type), @tagName(Enum)).fields.len);
|
|
30
|
+
assert(data <= 6);
|
|
31
|
+
return @bitCast(pkmn.Choice{ .type = @enumFromInt(choice), .data = @intCast(data) });
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
pub fn choice_type(choice: u8) callconv(.C) u8 {
|
|
35
|
+
return @intFromEnum(@as(pkmn.Choice, @bitCast(choice)).type);
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
pub fn choice_data(choice: u8) callconv(.C) u8 {
|
|
39
|
+
return @as(u8, @as(pkmn.Choice, @bitCast(choice)).data);
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
pub fn result_type(result: u8) callconv(.C) u8 {
|
|
43
|
+
return @intFromEnum(@as(pkmn.Result, @bitCast(result)).type);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
pub fn result_p1(result: u8) callconv(.C) u8 {
|
|
47
|
+
assert(!err(result));
|
|
48
|
+
return @intFromEnum(@as(pkmn.Result, @bitCast(result)).p1);
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
pub fn result_p2(result: u8) callconv(.C) u8 {
|
|
52
|
+
assert(!err(result));
|
|
53
|
+
return @intFromEnum(@as(pkmn.Result, @bitCast(result)).p2);
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
pub fn err(result: u8) callconv(.C) bool {
|
|
57
|
+
return result == ERROR;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
pub fn psrng_init(prng: *pkmn.PSRNG, seed: u64) callconv(.C) void {
|
|
61
|
+
prng.src = .{ .seed = seed };
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
pub fn psrng_next(prng: *pkmn.PSRNG) callconv(.C) u32 {
|
|
65
|
+
return prng.next();
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
pub fn rational_init(rational: *pkmn.Rational(f64)) callconv(.C) void {
|
|
69
|
+
rational.reset();
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
pub fn rational_reduce(rational: *pkmn.Rational(f64)) callconv(.C) void {
|
|
73
|
+
rational.reduce();
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
pub fn rational_numerator(rational: *const pkmn.Rational(f64)) callconv(.C) f64 {
|
|
77
|
+
return rational.p;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
pub fn rational_denominator(rational: *const pkmn.Rational(f64)) callconv(.C) f64 {
|
|
81
|
+
return rational.q;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
const log_options = extern struct {
|
|
85
|
+
buf: [*]u8,
|
|
86
|
+
len: usize,
|
|
87
|
+
};
|
|
88
|
+
|
|
89
|
+
pub fn gen(comptime num: comptime_int) type {
|
|
90
|
+
const g = @field(pkmn, "gen" ++ std.fmt.comptimePrint("{d}", .{num}));
|
|
91
|
+
|
|
92
|
+
return struct {
|
|
93
|
+
pub const MAX_CHOICES = g.MAX_CHOICES;
|
|
94
|
+
pub const CHOICES_SIZE = g.CHOICES_SIZE;
|
|
95
|
+
pub const MAX_LOGS = g.MAX_LOGS;
|
|
96
|
+
pub const LOGS_SIZE = g.LOGS_SIZE;
|
|
97
|
+
|
|
98
|
+
const chance_options = extern struct {
|
|
99
|
+
probability: pkmn.Rational(f64),
|
|
100
|
+
actions: g.chance.Actions,
|
|
101
|
+
durations: g.chance.Durations,
|
|
102
|
+
};
|
|
103
|
+
|
|
104
|
+
const calc_options = extern struct {
|
|
105
|
+
overrides: g.chance.Actions,
|
|
106
|
+
};
|
|
107
|
+
|
|
108
|
+
const battle_options = struct {
|
|
109
|
+
stream: pkmn.protocol.ByteStream,
|
|
110
|
+
log: pkmn.protocol.FixedLog,
|
|
111
|
+
chance: g.Chance(pkmn.Rational(f64)),
|
|
112
|
+
calc: g.Calc,
|
|
113
|
+
|
|
114
|
+
comptime {
|
|
115
|
+
assert(@sizeOf(battle_options) <= 128);
|
|
116
|
+
}
|
|
117
|
+
};
|
|
118
|
+
|
|
119
|
+
pub fn battle_options_set(
|
|
120
|
+
options: *battle_options,
|
|
121
|
+
log: ?*const log_options,
|
|
122
|
+
chance: ?*const chance_options,
|
|
123
|
+
calc: ?*const calc_options,
|
|
124
|
+
) callconv(.C) void {
|
|
125
|
+
if (pkmn.options.log) {
|
|
126
|
+
if (log) |l| {
|
|
127
|
+
options.stream = .{ .buffer = l.buf[0..l.len] };
|
|
128
|
+
options.log = .{ .writer = options.stream.writer() };
|
|
129
|
+
} else {
|
|
130
|
+
options.stream.reset();
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
if (pkmn.options.chance) {
|
|
134
|
+
if (chance) |c| {
|
|
135
|
+
options.chance = .{
|
|
136
|
+
.probability = c.probability,
|
|
137
|
+
.actions = c.actions,
|
|
138
|
+
.durations = c.durations,
|
|
139
|
+
};
|
|
140
|
+
} else {
|
|
141
|
+
options.chance.reset();
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
if (pkmn.options.calc) {
|
|
145
|
+
if (calc) |c| {
|
|
146
|
+
options.calc = .{ .overrides = c.overrides };
|
|
147
|
+
} else {
|
|
148
|
+
options.calc = .{};
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
pub fn battle_options_chance_probability(
|
|
154
|
+
options: *battle_options,
|
|
155
|
+
) callconv(.C) *pkmn.Rational(f64) {
|
|
156
|
+
return &options.chance.probability;
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
pub fn battle_options_chance_actions(
|
|
160
|
+
options: *battle_options,
|
|
161
|
+
) callconv(.C) *g.chance.Actions {
|
|
162
|
+
return &options.chance.actions;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
pub fn battle_options_chance_durations(
|
|
166
|
+
options: *battle_options,
|
|
167
|
+
) callconv(.C) *g.chance.Durations {
|
|
168
|
+
return &options.chance.durations;
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
pub fn battle_options_calc_summaries(
|
|
172
|
+
options: *battle_options,
|
|
173
|
+
) callconv(.C) *g.calc.Summaries {
|
|
174
|
+
return &options.calc.summaries;
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
pub fn battle_update(
|
|
178
|
+
battle: *g.Battle(g.PRNG),
|
|
179
|
+
c1: pkmn.Choice,
|
|
180
|
+
c2: pkmn.Choice,
|
|
181
|
+
opts: ?*battle_options,
|
|
182
|
+
) callconv(.C) pkmn.Result {
|
|
183
|
+
if ((pkmn.options.log or pkmn.options.chance or pkmn.options.calc) and opts != null) {
|
|
184
|
+
return battle.update(c1, c2, opts.?) catch return @bitCast(ERROR);
|
|
185
|
+
}
|
|
186
|
+
return battle.update(c1, c2, &g.NULL) catch unreachable;
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
pub fn battle_choices(
|
|
190
|
+
battle: *const g.Battle(g.PRNG),
|
|
191
|
+
player: u8,
|
|
192
|
+
request: u8,
|
|
193
|
+
out: [*]u8,
|
|
194
|
+
n: usize,
|
|
195
|
+
) callconv(.C) u8 {
|
|
196
|
+
assert(player <= @field(@typeInfo(pkmn.Player), @tagName(Enum)).fields.len);
|
|
197
|
+
assert(request <= @field(@typeInfo(pkmn.Choice.Type), @tagName(Enum)).fields.len);
|
|
198
|
+
|
|
199
|
+
assert(!pkmn.options.showdown or n > 0);
|
|
200
|
+
return battle.choices(@enumFromInt(player), @enumFromInt(request), @ptrCast(out[0..n]));
|
|
201
|
+
}
|
|
202
|
+
};
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
pub fn exports() type {
|
|
206
|
+
@export(choice_init, .{ .name = "pkmn_choice_init", .linkage = Strong });
|
|
207
|
+
@export(choice_type, .{ .name = "pkmn_choice_type", .linkage = Strong });
|
|
208
|
+
@export(choice_data, .{ .name = "pkmn_choice_data", .linkage = Strong });
|
|
209
|
+
|
|
210
|
+
@export(result_type, .{ .name = "pkmn_result_type", .linkage = Strong });
|
|
211
|
+
@export(result_p1, .{ .name = "pkmn_result_p1", .linkage = Strong });
|
|
212
|
+
@export(result_p2, .{ .name = "pkmn_result_p2", .linkage = Strong });
|
|
213
|
+
|
|
214
|
+
@export(err, .{ .name = "pkmn_error", .linkage = Strong });
|
|
215
|
+
|
|
216
|
+
@export(psrng_init, .{ .name = "pkmn_psrng_init", .linkage = Strong });
|
|
217
|
+
@export(psrng_next, .{ .name = "pkmn_psrng_next", .linkage = Strong });
|
|
218
|
+
|
|
219
|
+
@export(rational_init, .{ .name = "pkmn_rational_init", .linkage = Strong });
|
|
220
|
+
@export(rational_reduce, .{ .name = "pkmn_rational_reduce", .linkage = Strong });
|
|
221
|
+
@export(rational_numerator, .{ .name = "pkmn_rational_numerator", .linkage = Strong });
|
|
222
|
+
@export(rational_denominator, .{ .name = "pkmn_rational_denominator", .linkage = Strong });
|
|
223
|
+
|
|
224
|
+
@export(
|
|
225
|
+
gen(1).battle_options_set,
|
|
226
|
+
.{ .name = "pkmn_gen1_battle_options_set", .linkage = Strong },
|
|
227
|
+
);
|
|
228
|
+
@export(
|
|
229
|
+
gen(1).battle_options_chance_probability,
|
|
230
|
+
.{ .name = "pkmn_gen1_battle_options_chance_probability", .linkage = Strong },
|
|
231
|
+
);
|
|
232
|
+
@export(
|
|
233
|
+
gen(1).battle_options_chance_actions,
|
|
234
|
+
.{ .name = "pkmn_gen1_battle_options_chance_actions", .linkage = Strong },
|
|
235
|
+
);
|
|
236
|
+
@export(
|
|
237
|
+
gen(1).battle_options_chance_durations,
|
|
238
|
+
.{ .name = "pkmn_gen1_battle_options_chance_durations", .linkage = Strong },
|
|
239
|
+
);
|
|
240
|
+
@export(
|
|
241
|
+
gen(1).battle_options_calc_summaries,
|
|
242
|
+
.{ .name = "pkmn_gen1_battle_options_calc_summaries", .linkage = Strong },
|
|
243
|
+
);
|
|
244
|
+
|
|
245
|
+
@export(
|
|
246
|
+
gen(1).battle_update,
|
|
247
|
+
.{ .name = "pkmn_gen1_battle_update", .linkage = Strong },
|
|
248
|
+
);
|
|
249
|
+
@export(
|
|
250
|
+
gen(1).battle_choices,
|
|
251
|
+
.{ .name = "pkmn_gen1_battle_choices", .linkage = Strong },
|
|
252
|
+
);
|
|
253
|
+
|
|
254
|
+
return struct {};
|
|
255
|
+
}
|
|
@@ -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,59 @@
|
|
|
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
|
+
const Strong = if (@hasField(std.builtin.GlobalLinkage, "strong")) .strong else .Strong;
|
|
8
|
+
|
|
9
|
+
pub const options = pkmn.options;
|
|
10
|
+
|
|
11
|
+
pub fn gen(comptime num: comptime_int) type {
|
|
12
|
+
const g = @field(pkmn, "gen" ++ std.fmt.comptimePrint("{d}", .{num}));
|
|
13
|
+
return struct {
|
|
14
|
+
pub const CHOICES_SIZE = size(g.CHOICES_SIZE);
|
|
15
|
+
pub const LOGS_SIZE = size(g.LOGS_SIZE);
|
|
16
|
+
|
|
17
|
+
pub fn update(
|
|
18
|
+
battle: *g.Battle(g.PRNG),
|
|
19
|
+
c1: pkmn.Choice,
|
|
20
|
+
c2: pkmn.Choice,
|
|
21
|
+
options_: ?[*]u8,
|
|
22
|
+
) callconv(.C) pkmn.Result {
|
|
23
|
+
return (if (options_) |o| result: {
|
|
24
|
+
const buf = @as([*]u8, @ptrCast(o))[0..g.LOGS_SIZE];
|
|
25
|
+
var stream: pkmn.protocol.ByteStream = .{ .buffer = buf };
|
|
26
|
+
// TODO: extract out
|
|
27
|
+
var opts = pkmn.battle.options(
|
|
28
|
+
pkmn.protocol.FixedLog{ .writer = stream.writer() },
|
|
29
|
+
g.chance.NULL,
|
|
30
|
+
g.calc.NULL,
|
|
31
|
+
);
|
|
32
|
+
break :result battle.update(c1, c2, &opts);
|
|
33
|
+
} else battle.update(c1, c2, &g.NULL)) catch unreachable;
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
pub fn choices(
|
|
37
|
+
battle: *g.Battle(g.PRNG),
|
|
38
|
+
player: u8,
|
|
39
|
+
request: u8,
|
|
40
|
+
buf: [*]u8,
|
|
41
|
+
) callconv(.C) u8 {
|
|
42
|
+
assert(player <= @field(@typeInfo(pkmn.Player), @tagName(Enum)).fields.len);
|
|
43
|
+
assert(request <= @field(@typeInfo(pkmn.Choice.Type), @tagName(Enum)).fields.len);
|
|
44
|
+
|
|
45
|
+
const n = CHOICES_SIZE;
|
|
46
|
+
return battle.choices(@enumFromInt(player), @enumFromInt(request), @ptrCast(buf[0..n]));
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
pub fn exports() type {
|
|
52
|
+
@export(gen(1).update, .{ .name = "GEN1_update", .linkage = Strong });
|
|
53
|
+
@export(gen(1).choices, .{ .name = "GEN1_choices", .linkage = Strong });
|
|
54
|
+
return struct {};
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
fn size(n: usize) u32 {
|
|
58
|
+
return std.math.ceilPowerOfTwo(u32, @as(u32, @intCast(n))) catch unreachable;
|
|
59
|
+
}
|
package/src/lib/common/array.zig
CHANGED
|
@@ -11,7 +11,7 @@ const Enum = if (@hasField(std.builtin.Type, "enum")) .@"enum" else .Enum;
|
|
|
11
11
|
pub fn Array(comptime n: comptime_int, comptime U: type) type {
|
|
12
12
|
return struct {
|
|
13
13
|
const size = @bitSizeOf(U);
|
|
14
|
-
const options = .{ .signedness = .unsigned, .bits = size * n };
|
|
14
|
+
const options: std.builtin.Type.Int = .{ .signedness = .unsigned, .bits = size * n };
|
|
15
15
|
pub const T = @Type(if (@hasField(std.builtin.Type, "int"))
|
|
16
16
|
.{ .int = options }
|
|
17
17
|
else
|
package/src/lib/common/util.zig
CHANGED
|
@@ -44,7 +44,7 @@ fn CopyPtrAttrs(
|
|
|
44
44
|
comptime child: type,
|
|
45
45
|
) type {
|
|
46
46
|
const info = @field(@typeInfo(source), @tagName(Pointer));
|
|
47
|
-
const args = .{
|
|
47
|
+
const args: std.builtin.Type.Pointer = .{
|
|
48
48
|
.size = size,
|
|
49
49
|
.is_const = info.is_const,
|
|
50
50
|
.is_volatile = info.is_volatile,
|
package/src/lib/gen1/calc.zig
CHANGED
|
@@ -298,9 +298,9 @@ pub fn transitions(
|
|
|
298
298
|
const p1_max: u9 = if (p2_dmg.min != p2_min)
|
|
299
299
|
p1_dmg.min
|
|
300
300
|
else
|
|
301
|
-
|
|
301
|
+
Rolls.coalesce(.P1, @as(u8, @intCast(p1_dmg.min)), summaries, cap);
|
|
302
302
|
const p2_max: u9 =
|
|
303
|
-
|
|
303
|
+
Rolls.coalesce(.P2, @as(u8, @intCast(p2_dmg.min)), summaries, cap);
|
|
304
304
|
|
|
305
305
|
if (opts.chance.actions.matches(f)) {
|
|
306
306
|
if (!opts.chance.actions.relax().eql(a)) {
|
|
@@ -744,7 +744,7 @@ pub const Rolls = struct {
|
|
|
744
744
|
|
|
745
745
|
/// Returns the max damage roll which will produce the same damage as `roll`
|
|
746
746
|
/// given the base damage in `summaries`.
|
|
747
|
-
pub fn coalesce(player: Player, roll: u8, summaries: *Summaries, cap: bool)
|
|
747
|
+
pub fn coalesce(player: Player, roll: u8, summaries: *Summaries, cap: bool) u8 {
|
|
748
748
|
if (roll == 0) return roll;
|
|
749
749
|
|
|
750
750
|
const dmg = summaries.get(player.foe()).damage;
|
|
@@ -854,12 +854,12 @@ test "Rolls.damage" {
|
|
|
854
854
|
|
|
855
855
|
test "Rolls.coalesce" {
|
|
856
856
|
var summaries = Summaries{ .p1 = .{ .damage = .{ .base = 74, .final = 69, .capped = true } } };
|
|
857
|
-
try expectEqual(@as(u8, 0),
|
|
858
|
-
try expectEqual(@as(u8, 241),
|
|
859
|
-
try expectEqual(@as(u8, 255),
|
|
857
|
+
try expectEqual(@as(u8, 0), Rolls.coalesce(.P2, 0, &summaries, false));
|
|
858
|
+
try expectEqual(@as(u8, 241), Rolls.coalesce(.P2, 238, &summaries, false));
|
|
859
|
+
try expectEqual(@as(u8, 255), Rolls.coalesce(.P2, 238, &summaries, true));
|
|
860
860
|
summaries.p1.damage.final = 74;
|
|
861
|
-
try expectEqual(@as(u8, 217),
|
|
862
|
-
try expectEqual(@as(u8, 255),
|
|
861
|
+
try expectEqual(@as(u8, 217), Rolls.coalesce(.P2, 217, &summaries, false));
|
|
862
|
+
try expectEqual(@as(u8, 255), Rolls.coalesce(.P2, 217, &summaries, true));
|
|
863
863
|
}
|
|
864
864
|
|
|
865
865
|
test "Rolls.hit" {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
const DEBUG = @import("../common/debug.zig").print;
|
|
2
2
|
|
|
3
|
+
const builtin = @import("builtin");
|
|
3
4
|
const chance = @import("chance.zig");
|
|
4
5
|
const common = @import("../common/data.zig");
|
|
5
6
|
const data = @import("data.zig");
|
|
@@ -456,7 +457,7 @@ fn executeMove(
|
|
|
456
457
|
// selection glitch - if the move was proced due to Metronome / Mirror Move it either subtracts
|
|
457
458
|
// from the Hyper Beam slot if present or skips PP deduction entirely...
|
|
458
459
|
if (showdown and !skip_pp and side.last_selected_move == .HyperBeam and
|
|
459
|
-
side.last_selected_move != side.active.move(
|
|
460
|
+
side.last_selected_move != side.active.move(mslot).id)
|
|
460
461
|
{
|
|
461
462
|
assert(mslot == 1);
|
|
462
463
|
const has_beam = has_beam: {
|
|
@@ -1169,7 +1170,7 @@ fn calcDamage(
|
|
|
1169
1170
|
// encountered so we need to make sure that in the event of a miss we commit the status of the
|
|
1170
1171
|
// crit roll. The alternative to doing this extra work is to *always* commit the crit roll but
|
|
1171
1172
|
// that results in counter intuitive probabilities in the common case
|
|
1172
|
-
if (pkmn.options.chance and !pkmn.options.mod) {
|
|
1173
|
+
if (pkmn.options.chance and !pkmn.options.mod and move.effect != .Explode) {
|
|
1173
1174
|
atk = attack(side, !crit, special);
|
|
1174
1175
|
def = defense(target, !crit, special, false);
|
|
1175
1176
|
if ((atk > 255 or def > 255) and (def / 4) & 255 == 0) options.chance.glitch();
|
|
@@ -1302,7 +1303,11 @@ fn counterDamage(battle: anytype, player: Player, move: Move.Data, options: anyt
|
|
|
1302
1303
|
return null;
|
|
1303
1304
|
}
|
|
1304
1305
|
|
|
1305
|
-
|
|
1306
|
+
// NOTE: llvm/llvm-project#58557
|
|
1307
|
+
battle.last_damage = if (comptime builtin.target.isWasm())
|
|
1308
|
+
@max(battle.last_damage *% 2, std.math.maxInt(u16))
|
|
1309
|
+
else
|
|
1310
|
+
battle.last_damage *| 2;
|
|
1306
1311
|
|
|
1307
1312
|
// Pokémon Showdown calls moveHit before Counter
|
|
1308
1313
|
if (!showdown and !try checkHit(battle, player, move, options)) return null;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
const DEBUG = @import("../common/debug.zig").print;
|
|
2
2
|
|
|
3
|
+
const builtin = @import("builtin");
|
|
3
4
|
const common = @import("../common/data.zig");
|
|
4
5
|
const data = @import("data.zig");
|
|
5
6
|
const generated = @import("generated.zig");
|
|
@@ -1426,7 +1427,8 @@ pub const Effects = struct {
|
|
|
1426
1427
|
if (move.type.special() != (last == .MirrorCoat)) return;
|
|
1427
1428
|
if (state.damage == 0) return;
|
|
1428
1429
|
|
|
1429
|
-
|
|
1430
|
+
// NOTE: llvm/llvm-project#58557
|
|
1431
|
+
state.damage = smul(state.damage, 2);
|
|
1430
1432
|
state.miss = false;
|
|
1431
1433
|
}
|
|
1432
1434
|
|
|
@@ -1521,15 +1523,18 @@ pub const Effects = struct {
|
|
|
1521
1523
|
|
|
1522
1524
|
pub const double = struct {
|
|
1523
1525
|
pub fn flying(battle: anytype, player: Player, state: *State, _: anytype) !void {
|
|
1524
|
-
if (battle.foe(player).active.volatiles.Flying)
|
|
1526
|
+
if (!battle.foe(player).active.volatiles.Flying) return;
|
|
1527
|
+
state.damage = smul(state.damage, 2);
|
|
1525
1528
|
}
|
|
1526
1529
|
|
|
1527
1530
|
pub fn underground(battle: anytype, player: Player, state: *State, _: anytype) !void {
|
|
1528
|
-
if (battle.foe(player).active.volatiles.Underground)
|
|
1531
|
+
if (!battle.foe(player).active.volatiles.Underground) return;
|
|
1532
|
+
state.damage = smul(state.damage, 2);
|
|
1529
1533
|
}
|
|
1530
1534
|
|
|
1531
1535
|
pub fn minimize(battle: anytype, player: Player, state: *State, _: anytype) !void {
|
|
1532
|
-
if (battle.foe(player).active.volatiles.minimized)
|
|
1536
|
+
if (!battle.foe(player).active.volatiles.minimized) return;
|
|
1537
|
+
state.damage = smul(state.damage, 2);
|
|
1533
1538
|
}
|
|
1534
1539
|
};
|
|
1535
1540
|
|
|
@@ -1727,7 +1732,7 @@ pub const Effects = struct {
|
|
|
1727
1732
|
state.bp *= 2;
|
|
1728
1733
|
assert(state.bp <= 160);
|
|
1729
1734
|
} else {
|
|
1730
|
-
state.damage
|
|
1735
|
+
state.damage = smul(state.damage, 2);
|
|
1731
1736
|
}
|
|
1732
1737
|
}
|
|
1733
1738
|
|
|
@@ -2198,7 +2203,7 @@ pub const Effects = struct {
|
|
|
2198
2203
|
|
|
2199
2204
|
pub fn pursuit(battle: anytype, player: Player, state: *State, _: anytype) !void {
|
|
2200
2205
|
// TODO: remove switching variable and just look at Choice saved in Battle struct?
|
|
2201
|
-
if (battle.foe(player).active.volatiles.switching) state.damage
|
|
2206
|
+
if (battle.foe(player).active.volatiles.switching) state.damage = smul(state.damage, 2);
|
|
2202
2207
|
}
|
|
2203
2208
|
|
|
2204
2209
|
pub const rage = struct {
|
|
@@ -2211,7 +2216,7 @@ pub const Effects = struct {
|
|
|
2211
2216
|
const side = battle.side(player);
|
|
2212
2217
|
|
|
2213
2218
|
assert(side.active.volatiles.Rage);
|
|
2214
|
-
state.damage
|
|
2219
|
+
state.damage = smul(state.damage, (side.active.volatiles.rage +| 1)); // TODO: |+
|
|
2215
2220
|
}
|
|
2216
2221
|
};
|
|
2217
2222
|
|
|
@@ -2306,7 +2311,7 @@ pub const Effects = struct {
|
|
|
2306
2311
|
side.active.volatiles.attacks += 1;
|
|
2307
2312
|
side.active.volatiles.Rollout = side.active.volatiles.attacks != 5;
|
|
2308
2313
|
|
|
2309
|
-
if (side.active.volatiles.DefenseCurl) state.damage
|
|
2314
|
+
if (side.active.volatiles.DefenseCurl) state.damage = smul(state.damage, 2);
|
|
2310
2315
|
}
|
|
2311
2316
|
};
|
|
2312
2317
|
|
|
@@ -2834,6 +2839,12 @@ fn convertible(active: ActivePokemon, m: Move) bool {
|
|
|
2834
2839
|
return t != .@"???" and !active.types.includes(t);
|
|
2835
2840
|
}
|
|
2836
2841
|
|
|
2842
|
+
// NOTE: llvm/llvm-project#58557
|
|
2843
|
+
fn smul(a: anytype, b: @TypeOf(a)) @TypeOf(a) {
|
|
2844
|
+
if (!comptime builtin.target.isWasm()) return a *| b;
|
|
2845
|
+
return @max(a *% b, std.math.maxInt(@TypeOf(a)));
|
|
2846
|
+
}
|
|
2847
|
+
|
|
2837
2848
|
pub const Rolls = struct {
|
|
2838
2849
|
fn speedTie(battle: anytype, options: anytype) !bool {
|
|
2839
2850
|
const p1 = if (options.calc.overridden(.P1, 0, .speed_tie)) |player|
|