From 29870c61b580cf9205bf0c5f1b0c47b466be2dea Mon Sep 17 00:00:00 2001 From: Louis Pearson Date: Mon, 1 Aug 2022 16:37:44 -0600 Subject: [PATCH] Refine bundle/push scripts, remove death --- .gitignore | 1 + bundle.sh | 10 ++++++++++ flake.nix | 1 + push.sh | 7 +++++++ src/game.zig | 12 +++++++----- 5 files changed, 26 insertions(+), 5 deletions(-) create mode 100755 bundle.sh create mode 100755 push.sh diff --git a/.gitignore b/.gitignore index 2583e32..6b457db 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /zig-cache /zig-out /src/zig-cache/ +/bundle/ diff --git a/bundle.sh b/bundle.sh new file mode 100755 index 0000000..ce33bd6 --- /dev/null +++ b/bundle.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +zig build opt -Drelease-small +mkdir -p bundle/html +mkdir -p bundle/linux +mkdir -p bundle/windows +mkdir -p bundle/mac +mkdir -p bundle/cart +npx wasm4 bundle --html bundle/html/index.html --linux bundle/linux/wired --windows bundle/windows/wired.exe --mac bundle/mac/wired zig-out/lib/opt.wasm +cp zig-out/lib/opt.wasm bundle/cart/cart.wasm diff --git a/flake.nix b/flake.nix index d747893..f3ead0d 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,7 @@ buildInputs = [ zig.packages.${system}.master.latest pkgs.butler + pkgs.binaryen ]; }; diff --git a/push.sh b/push.sh new file mode 100755 index 0000000..c86907e --- /dev/null +++ b/push.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +butler push bundle/windows/ desttinghim/wired:windows --userversion $1 +butler push bundle/linux/ desttinghim/wired:linux --userversion $1 +butler push bundle/mac/ desttinghim/wired:mac --userversion $1 +butler push bundle/html/ desttinghim/wired:html --userversion $1 +butler push bundle/cart/ desttinghim/wired:cart --userversion $1 diff --git a/src/game.zig b/src/game.zig index e3c253c..2e2a251 100644 --- a/src/game.zig +++ b/src/game.zig @@ -313,11 +313,13 @@ pub fn update(time: usize) !State { { const pos = player.pos.pos; if (getNearestWireInteraction(pos, 8)) |i| { - const wire = wires.get(i.details.wire.id); - const node = wire.nodes.get(i.details.wire.which); - if (i.active and !node.pinned) { - try start(); - } + _ = i; + // Uncomment for death + // const wire = wires.get(i.details.wire.id); + // const node = wire.nodes.get(i.details.wire.which); + // if (i.active and !node.pinned) { + // try start(); + // } } }