Tweak shield bump distance

ibillingsley · Aug 25, 2022 · 04d40f5 · 04d40f5
1 parent df929e8
commit 04d40f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/dist/one-slime-army.wasm b/dist/one-slime-army.wasm
diff --git a/src/main.zig b/src/main.zig
@@ -302,7 +302,7 @@ const Cannon = struct {
         if (player.collideAttack(self.pos, 7)) {
             self.kill();
         } else if (player.collideBlock(self.pos, 3)) {
-            const bump = std.math.max(11 - distance, 1.5);
+            const bump = std.math.max(11.5 - distance, 1.5);
             self.pos.x += player.look_dir.x * bump;
             self.pos.y += player.look_dir.y * bump;
             self.speed.reflect(player.look_dir);
@@ -420,9 +420,11 @@ const Snake = struct {
         if (player.collideAttack(self.pos, radius)) {
             self.kill();
         } else if (player.collideBlock(self.pos, radius)) {
-            const bump = std.math.max(11 - distance, 1.5);
+            const bump = std.math.max(8.5 + radius - distance, 1.5) / 2;
             player.pos.x -= player.look_dir.x * bump;
             player.pos.y -= player.look_dir.y * bump;
+            self.pos.x += player.look_dir.x * bump;
+            self.pos.y += player.look_dir.y * bump;
             self.speed.reflect(player.look_dir);
             sound(500, toneDur(0, 0, 0, 3), sound_vol * 0.3, w4.TONE_NOISE);
         } else if (player.collideBody(self.pos, radius)) {

diff --git a/wapm.toml b/wapm.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ibillingsley/one-slime-army"
-version = "1.2.2"
+version = "1.2.3"
 description = "One Slime Army is an arcade endless wave survival game for the WASM-4 fantasy console"
 license = "ISC"
 readme = "README.md"