From f8a0ac16861daad28db639055b13c8bdcc956b4e Mon Sep 17 00:00:00 2001 From: Isaiah Billingsley Date: Mon, 22 Aug 2022 14:44:42 -0400 Subject: [PATCH] Fix diagonal shield collision detection --- dist/one-slime-army.wasm | Bin 27169 -> 27157 bytes src/main.zig | 4 +--- wapm.toml | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dist/one-slime-army.wasm b/dist/one-slime-army.wasm index fe01132b2495cdf22464f8731a2ab6d9dd6e48ee..a9dab0d46f9486ae33574b7bded5ec8636fac5b6 100755 GIT binary patch delta 34 qcmZ2@g>mW?#toc|jQ2KkG5TvT&Yc{k*} delta 46 xcmbPwg>m5(#toc|jITCxG5TvTuACgD*&*b@00pV8ybKDg3T%ruztGfm002XD3@!iw diff --git a/src/main.zig b/src/main.zig index 99a41de..0d5d872 100644 --- a/src/main.zig +++ b/src/main.zig @@ -143,9 +143,7 @@ const Player = struct { .x = self.pos.x + self.look_dir.x * 2 - target.x, .y = self.pos.y + self.look_dir.y * 2 - target.y, }; - return diff.length() < (7.5 + radius) and - diff.x * self.look_dir.x <= 0 and - diff.y * self.look_dir.y <= 0; + return diff.length() < 7.5 + radius and diff.dot(self.look_dir) <= 0; } fn collideAttack(self: @This(), target: Vec(f64), radius: f64) bool { diff --git a/wapm.toml b/wapm.toml index 9de79df..3dab10c 100644 --- a/wapm.toml +++ b/wapm.toml @@ -1,6 +1,6 @@ [package] name = "ibillingsley/one-slime-army" -version = "1.1.1" +version = "1.2.0" description = "One Slime Army is an arcade endless wave survival game for the WASM-4 fantasy console" license = "ISC" readme = "README.md"