Update npm dependencies

This reverts commit 9219b6c475.

Cargo.lock

@@ -89,9 +89,15 @@ checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
 
 [[package]]
 name = "autocfg"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "base-x"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
 
 [[package]]
 name = "bindgen"
@@ -139,7 +145,7 @@ version = "0.8.2"
 source = "git+https://github.com/amethyst/bracket-lib#cf8eec60ae17f2534a14f3ae643c871202aed192"
 dependencies = [
  "lazy_static",
- "parking_lot",
+ "parking_lot 0.11.2",
 ]
 
 [[package]]
@@ -148,7 +154,7 @@ version = "0.8.0"
 source = "git+https://github.com/amethyst/bracket-lib#cf8eec60ae17f2534a14f3ae643c871202aed192"
 dependencies = [
  "lazy_static",
- "parking_lot",
+ "parking_lot 0.11.2",
 ]
 
 [[package]]
@@ -233,7 +239,7 @@ dependencies = [
  "image",
  "lazy_static",
  "object-pool",
- "parking_lot",
+ "parking_lot 0.11.2",
  "rand",
  "spin_sleep",
  "ultraviolet",
@@ -343,7 +349,7 @@ dependencies = [
  "bitflags",
  "block",
  "cocoa-foundation",
- "core-foundation 0.9.2",
+ "core-foundation 0.9.3",
  "core-graphics 0.22.3",
  "foreign-types",
  "libc",
@@ -358,7 +364,7 @@ checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318"
 dependencies = [
  "bitflags",
  "block",
- "core-foundation 0.9.2",
+ "core-foundation 0.9.3",
  "core-graphics-types",
  "foreign-types",
  "libc",
@@ -403,9 +409,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
 dependencies = [
  "core-foundation-sys 0.8.3",
  "libc",
@@ -442,7 +448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
 dependencies = [
  "bitflags",
- "core-foundation 0.9.2",
+ "core-foundation 0.9.3",
  "core-graphics-types",
  "foreign-types",
  "libc",
@@ -455,7 +461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
 dependencies = [
  "bitflags",
- "core-foundation 0.9.2",
+ "core-foundation 0.9.3",
  "foreign-types",
  "libc",
 ]
@@ -494,35 +500,35 @@ dependencies = [
 
 [[package]]
 name = "cpal"
-version = "0.13.5"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116"
+checksum = "e73413ddcb69c398125f5529714492e070c64c6a090ad5b01d8c082b320a0809"
 dependencies = [
  "alsa",
  "core-foundation-sys 0.8.3",
  "coreaudio-rs",
  "jni",
  "js-sys",
- "lazy_static",
  "libc",
  "mach",
- "ndk 0.6.0",
+ "ndk 0.7.0",
- "ndk-glue 0.6.0",
+ "ndk-context",
- "nix 0.23.1",
+ "nix 0.25.0",
  "oboe",
- "parking_lot",
+ "once_cell",
+ "parking_lot 0.12.1",
  "stdweb",
  "thiserror",
  "wasm-bindgen",
  "web-sys",
- "winapi 0.3.9",
+ "windows",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.3.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -538,7 +544,7 @@ dependencies = [
  "crossbeam-deque",
  "crossbeam-epoch",
  "crossbeam-queue",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.7",
 ]
 
 [[package]]
@@ -548,7 +554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.7",
 ]
 
 [[package]]
@@ -559,17 +565,17 @@ checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-epoch",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.7",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.6"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"
+checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.7",
  "lazy_static",
  "memoffset",
  "scopeguard",
@@ -577,12 +583,12 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b979d76c9fcb84dffc80a73f7290da0f83e4c95773494674cb44b76d13a7a110"
+checksum = "4dd435b205a4842da59efd07628f921c096bc1cc0a156835b4fa0bcb9a19bcce"
 dependencies = [
  "cfg-if 1.0.0",
- "crossbeam-utils 0.8.6",
+ "crossbeam-utils 0.8.7",
 ]
 
 [[package]]
@@ -598,9 +604,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
+checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6"
 dependencies = [
  "cfg-if 1.0.0",
  "lazy_static",
@@ -723,6 +729,12 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "discard"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
+
 [[package]]
 name = "dispatch"
 version = "0.2.0"
@@ -802,37 +814,12 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
 
-[[package]]
-name = "fundsp"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914385c9ea3226815d12f436c2c60b2e6f88a89af684ed9e24d62e55f1b0dba1"
-dependencies = [
- "generic-array",
- "lazy_static",
- "num-complex",
- "numeric-array",
- "rsor",
- "rustfft",
- "tinyvec",
-]
-
 [[package]]
 name = "futures"
 version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
 
-[[package]]
-name = "generic-array"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.4"
@@ -840,8 +827,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
 dependencies = [
  "cfg-if 1.0.0",
+ "js-sys",
  "libc",
  "wasi",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -882,7 +871,7 @@ dependencies = [
  "android_glue",
  "cgl",
  "cocoa",
- "core-foundation 0.9.2",
+ "core-foundation 0.9.3",
  "glutin_egl_sys",
  "glutin_emscripten_sys",
  "glutin_gles2_sys",
@@ -893,7 +882,7 @@ dependencies = [
  "log",
  "objc",
  "osmesa-sys",
- "parking_lot",
+ "parking_lot 0.11.2",
  "wayland-client",
  "wayland-egl",
  "winapi 0.3.9",
@@ -947,20 +936,21 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.11.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
  "ahash",
 ]
 
 [[package]]
 name = "hecs"
-version = "0.5.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddd0e227c3f78ad06fcc590966b327a2f8fef03ef51812dad4fbff5b0a6424bd"
+checksum = "11b81e962a0576ee276c1e6cbdce16bed83c7357ce8ff4e9efc8f49e43d2d1a1"
 dependencies = [
  "hashbrown",
+ "spin",
 ]
 
 [[package]]
@@ -1006,6 +996,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "itoa"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+
 [[package]]
 name = "jni"
 version = "0.19.0"
@@ -1073,10 +1069,11 @@ dependencies = [
  "bracket-lib",
  "console_error_panic_hook",
  "cpal",
- "fundsp",
+ "getrandom",
  "hecs",
  "instant",
  "oddio",
+ "rand",
  "specs-derive",
  "typenum",
  "wasm-bindgen",
@@ -1097,9 +1094,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.117"
+version = "0.2.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c"
+checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
 
 [[package]]
 name = "libloading"
@@ -1326,6 +1323,26 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "ndk"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
+dependencies = [
+ "bitflags",
+ "jni-sys",
+ "ndk-sys 0.4.1+23.1.7779620",
+ "num_enum 0.5.6",
+ "raw-window-handle 0.5.0",
+ "thiserror",
+]
+
+[[package]]
+name = "ndk-context"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
+
 [[package]]
 name = "ndk-glue"
 version = "0.2.1"
@@ -1409,6 +1426,15 @@ dependencies = [
  "jni-sys",
 ]
 
+[[package]]
+name = "ndk-sys"
+version = "0.4.1+23.1.7779620"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
+dependencies = [
+ "jni-sys",
+]
+
 [[package]]
 name = "net2"
 version = "0.2.37"
@@ -1457,6 +1483,20 @@ dependencies = [
  "memoffset",
 ]
 
+[[package]]
+name = "nix"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
+dependencies = [
+ "autocfg",
+ "bitflags",
+ "cfg-if 1.0.0",
+ "libc",
+ "memoffset",
+ "pin-utils",
+]
+
 [[package]]
 name = "nom"
 version = "5.1.2"
@@ -1487,15 +1527,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "num-complex"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "num-derive"
 version = "0.3.3"
@@ -1602,16 +1633,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "numeric-array"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c59a9b227913a685ed84aa0de5ded58274e8bcfa55760faae07bc82aee64ccf"
-dependencies = [
- "generic-array",
- "num-traits",
-]
-
 [[package]]
 name = "objc"
 version = "0.2.7"
@@ -1627,7 +1648,7 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee9a3e7196d09ec86002b939f1576e8e446d58def8fd48fe578e2c72d5328d68"
 dependencies = [
- "parking_lot",
+ "parking_lot 0.11.2",
 ]
 
 [[package]]
@@ -1655,18 +1676,18 @@ dependencies = [
 
 [[package]]
 name = "oddio"
-version = "0.5.0"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33f6d5a128f26322b02ba2741cbdc9f14f1431e757db3b15fd893d5c416f3e20"
+checksum = "f0f3379cc7e854d0b0d4a0e310f276faafc46896843b720efe4646faa1b0c734"
 dependencies = [
  "mint",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.9.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
 
 [[package]]
 name = "osmesa-sys"
@@ -1694,7 +1715,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.8.5",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.4",
 ]
 
 [[package]]
@@ -1711,6 +1742,19 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "parking_lot_core"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-sys",
+]
+
 [[package]]
 name = "peeking_take_while"
 version = "0.1.2"
@@ -1723,6 +1767,12 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
 [[package]]
 name = "pkg-config"
 version = "0.3.24"
@@ -1742,13 +1792,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "primal-check"
+name = "ppv-lite86"
-version = "0.3.1"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01419cee72c1a1ca944554e23d83e483e1bccf378753344e881de28b5487511d"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-dependencies = [
- "num-integer",
-]
 
 [[package]]
 name = "proc-macro-crate"
@@ -1789,10 +1836,22 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
  "rand_core",
 ]
 
@@ -1801,6 +1860,9 @@ name = "rand_core"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+dependencies = [
+ "getrandom",
+]
 
 [[package]]
 name = "rand_xorshift"
@@ -1830,6 +1892,15 @@ dependencies = [
  "cty",
 ]
 
+[[package]]
+name = "raw-window-handle"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a"
+dependencies = [
+ "cty",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.2.10"
@@ -1866,12 +1937,6 @@ version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
-[[package]]
-name = "rsor"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b57e3964dc31a38416366d2e8f7675755402a10832d5cf4e4112d66ac77cdda"
-
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -1879,17 +1944,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
-name = "rustfft"
+name = "rustc_version"
-version = "6.0.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d089e5c57521629a59f5f39bca7434849ff89bd6873b521afe389c1c602543"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 dependencies = [
- "num-complex",
+ "semver",
- "num-integer",
- "num-traits",
- "primal-check",
- "strength_reduce",
- "transpose",
 ]
 
 [[package]]
@@ -1902,6 +1962,12 @@ dependencies = [
  "owned_ttf_parser",
 ]
 
+[[package]]
+name = "ryu"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+
 [[package]]
 name = "safe_arch"
 version = "0.5.2"
@@ -1932,6 +1998,21 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
 [[package]]
 name = "send_wrapper"
 version = "0.2.0"
@@ -1944,6 +2025,43 @@ version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
 
+[[package]]
+name = "serde_derive"
+version = "1.0.136"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
+dependencies = [
+ "sha1_smol",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+
 [[package]]
 name = "shared_library"
 version = "0.1.9"
@@ -2011,6 +2129,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "spin"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
+
 [[package]]
 name = "spin_sleep"
 version = "1.0.0"
@@ -2023,15 +2147,52 @@ dependencies = [
 
 [[package]]
 name = "stdweb"
-version = "0.1.3"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e"
+checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
+dependencies = [
+ "discard",
+ "rustc_version",
+ "stdweb-derive",
+ "stdweb-internal-macros",
+ "stdweb-internal-runtime",
+ "wasm-bindgen",
+]
 
 [[package]]
-name = "strength_reduce"
+name = "stdweb-derive"
-version = "0.2.3"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3ff2f71c82567c565ba4b3009a9350a96a7269eaa4001ebedae926230bc2254"
+checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_derive",
+ "syn",
+]
+
+[[package]]
+name = "stdweb-internal-macros"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
+dependencies = [
+ "base-x",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sha1",
+ "syn",
+]
+
+[[package]]
+name = "stdweb-internal-runtime"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
 
 [[package]]
 name = "strsim"
@@ -2076,21 +2237,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "tinyvec"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
 [[package]]
 name = "tokio-executor"
 version = "0.1.10"
@@ -2122,16 +2268,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "transpose"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95f9c900aa98b6ea43aee227fd680550cdec726526aab8ac801549eadb25e39f"
-dependencies = [
- "num-integer",
- "strength_reduce",
-]
-
 [[package]]
 name = "ttf-parser"
 version = "0.6.2"
@@ -2396,6 +2532,106 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647"
+dependencies = [
+ "windows_aarch64_msvc 0.37.0",
+ "windows_i686_gnu 0.37.0",
+ "windows_i686_msvc 0.37.0",
+ "windows_x86_64_gnu 0.37.0",
+ "windows_x86_64_msvc 0.37.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc 0.42.0",
+ "windows_i686_gnu 0.42.0",
+ "windows_i686_msvc 0.42.0",
+ "windows_x86_64_gnu 0.42.0",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc 0.42.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+
 [[package]]
 name = "winit"
 version = "0.24.0"
@@ -2404,7 +2640,7 @@ checksum = "da4eda6fce0eb84bd0a33e3c8794eb902e1033d0a1d5a31bc4f19b1b4bbff597"
 dependencies = [
  "bitflags",
  "cocoa",
- "core-foundation 0.9.2",
+ "core-foundation 0.9.3",
  "core-graphics 0.22.3",
  "core-video-sys",
  "dispatch",
@@ -2418,7 +2654,7 @@ dependencies = [
  "ndk-glue 0.2.1",
  "ndk-sys 0.2.2",
  "objc",
- "parking_lot",
+ "parking_lot 0.11.2",
  "percent-encoding",
  "raw-window-handle 0.3.4",
  "smithay-client-toolkit",
@@ -2437,7 +2673,7 @@ checksum = "79610794594d5e86be473ef7763f604f2159cbac8c94debd00df8fb41e86c2f8"
 dependencies = [
  "bitflags",
  "cocoa",
- "core-foundation 0.9.2",
+ "core-foundation 0.9.3",
  "core-graphics 0.22.3",
  "core-video-sys",
  "dispatch",
@@ -2451,7 +2687,7 @@ dependencies = [
  "ndk-glue 0.3.0",
  "ndk-sys 0.2.2",
  "objc",
- "parking_lot",
+ "parking_lot 0.11.2",
  "percent-encoding",
  "raw-window-handle 0.3.4",
  "scopeguard",

Cargo.toml

@@ -15,15 +15,21 @@ path = "src/main.rs"
 [dependencies]
 # bracket-lib = { path = "extern/bracket-lib" }
 bracket-lib = { git = "https://github.com/amethyst/bracket-lib" }
-hecs = "0.5.1"
+hecs = "0.9.0"
 specs-derive = "0.4.1"
-cpal = { version = "0.13.0", features = ["wasm-bindgen"] }
+cpal = { version = "0.14.1", features = ["wasm-bindgen"] }
-oddio = "0.5"
+oddio = "0.6.2"
-fundsp = "0.1.0"
 typenum = "1.15.0"
 console_error_panic_hook = "0.1.7"
 wasm-bindgen = "0.2.79"
 instant = "0.1.12"
+rand = "0.8.5"
+getrandom = { version = "0.2.4", features = ["js"] }
 
 [target.'cfg(windows)'.build-dependencies]
-winres = "0.1"
+winres = "0.1.12"
+
+[profile.release]
+lto = true
+opt-level = 's'
+

package.json

@@ -4,15 +4,15 @@
   "version": "0.1.0",
   "scripts": {
     "build": "rimraf dist pkg && webpack",
-    "start": "rimraf dist pkg && webpack-dev-server --open -d",
+    "start": "rimraf dist pkg && webpack-dev-server --open",
     "test": "cargo test && wasm-pack test --headless"
   },
   "devDependencies": {
     "@wasm-tool/wasm-pack-plugin": "^1.1.0",
-    "copy-webpack-plugin": "^5.0.3",
+    "copy-webpack-plugin": "^11.0.0",
-    "webpack": "^4.42.0",
+    "rimraf": "^3.0.0",
-    "webpack-cli": "^3.3.3",
+    "webpack": "^5.75.0",
-    "webpack-dev-server": "^3.7.1",
+    "webpack-cli": "^5.0.0",
-    "rimraf": "^3.0.0"
+    "webpack-dev-server": "^4.11.1"
   }
 }

src/constants.rs

@@ -13,3 +13,5 @@ pub const MAP_SIZE: usize = MAP_WIDTH * MAP_HEIGHT;
 
 pub const MAP_X: usize = 1;
 pub const MAP_Y: usize = 1;
+
+pub const BASE_WHIP_POWER: u32 = 2;

src/graphics/sidebar.rs

@@ -1,4 +1,4 @@
-use crate::constants::{SIDEBAR_POS_X, SIDEBAR_POS_Y};
+use crate::constants::*;
 use crate::graphics::vga_color as vga;
 use crate::resources::Resources;
 use bracket_lib::prelude::*;
@@ -48,7 +48,15 @@ pub fn draw(resources: &Resources, bterm: &mut BTerm) {
     let stats = &resources.stats;
     bterm.print_centered_at(SIDEBAR_POS_X + 6, SIDEBAR_POS_Y + 1, stats.score * 10);
     bterm.print_centered_at(SIDEBAR_POS_X + 6, SIDEBAR_POS_Y + 7, stats.gems);
-    bterm.print_centered_at(SIDEBAR_POS_X + 6, SIDEBAR_POS_Y + 10, stats.whips);
+    bterm.print_centered_at(
+        SIDEBAR_POS_X + 6,
+        SIDEBAR_POS_Y + 10,
+        if stats.whip_power <= BASE_WHIP_POWER {
+            stats.whips.to_string()
+        } else {
+            format!("{}+{}", stats.whips, stats.whip_power - BASE_WHIP_POWER)
+        },
+    );
     bterm.print_centered_at(SIDEBAR_POS_X + 6, SIDEBAR_POS_Y + 13, stats.teleports);
     bterm.print_centered_at(SIDEBAR_POS_X + 6, SIDEBAR_POS_Y + 16, stats.keys);
 
@@ -103,12 +111,22 @@ pub fn draw(resources: &Resources, bterm: &mut BTerm) {
             &format!("{}", bterm.fps),
         );
 
+        let mut debug_string = format!("{}", resources.clock.ticks);
+
+        if resources.speed_time_ticks > 0 {
+            debug_string += " SPEED"
+        }
+
+        if resources.slow_time_ticks > 0 {
+            debug_string += " SLOW"
+        }
+
         bterm.print_color(
             0,
             0,
             RGB::named(vga::YELLOW_BRIGHT),
             RGB::named(vga::BLACK),
-            &format!("{}", resources.clock.ticks),
+            &debug_string,
         );
     }
 }

src/input/mod.rs

@@ -25,6 +25,9 @@ pub fn handle_intent(bterm: &mut BTerm, _world: &mut World, resources: &mut Reso
                     FlashingMessageIntent::Save => todo!(),
                     FlashingMessageIntent::Restore => todo!(),
                     FlashingMessageIntent::Restart => todo!(),
+                    &FlashingMessageIntent::NextLevel => {
+                        resources.should_advance_level = true;
+                    }
                 }
             }
         }

src/input/player.rs

@@ -2,21 +2,23 @@ use instant::Instant;
 use std::time::Duration;
 
 use bracket_lib::prelude::*;
-use hecs::{Entity, With, Without, World};
+use hecs::{Entity, Without, World};
 
 use crate::{
-    components::monster::*, components::*, constants::*, resources::*, systems, tile_data::TileType,
+    components::monster::*,
+    components::*,
+    constants::*,
+    resources::{flashing_message::FlashingMessageIntent, *},
+    systems,
+    tile_data::TileType,
 };
 
 pub fn try_move(delta_x: i32, delta_y: i32, world: &mut World, resources: &mut Resources) {
     let mut to_kill: Vec<Entity> = Vec::new();
 
-    for (player_entity, (player, pos)) in &mut world.query::<(&mut Player, &mut Position)>() {
+    for (player_entity, (player, pos)) in
-        // The player shouldn't be able to move while whipping
+        &mut world.query::<Without<(&mut Player, &mut Position), &WantsToWhip>>()
-        if let Ok(_wants_to_whip) = world.get::<WantsToWhip>(player_entity) {
+    {
-            continue;
-        }
-
         let now = Instant::now();
         if now - player.last_moved > Duration::from_secs_f32(PLAYER_STEP_PERIOD) {
             let destination = Point {
@@ -27,7 +29,7 @@ pub fn try_move(delta_x: i32, delta_y: i32, world: &mut World, resources: &mut R
             if resources.map.in_bounds(destination) {
                 if try_step(destination, world, resources) {
                     if let Some(monster_entity) = resources.map.get_tile_content_at(destination) {
-                        if let Ok(monster) = world.get::<Monster>(monster_entity) {
+                        if let Ok(monster) = world.get::<&Monster>(monster_entity) {
                             resources.stats.add_score(damage_for_kind(monster.kind));
                             resources.stats.take_gems(damage_for_kind(monster.kind));
                             if let (Some(sound_effects), Some(sound_output)) =
@@ -60,6 +62,12 @@ pub fn try_move(delta_x: i32, delta_y: i32, world: &mut World, resources: &mut R
             } else if let (Some(sound_effects), Some(sound_output)) =
                 (&mut resources.sound_effects, &mut resources.sound_output)
             {
+                if !resources.message_shown.touched_boundary {
+                    resources.flashing_message = Some(FlashingMessage::from(
+                        "An Electrified Wall blocks your way.",
+                    ));
+                    resources.message_shown.touched_boundary = true;
+                }
                 let static_sound = sound_effects.get_new_static_effect(sound_output);
                 sound_output.play_sound(static_sound);
             }
@@ -78,16 +86,45 @@ fn try_step(point: Point, _world: &World, resources: &mut Resources) -> bool {
         crate::tile_data::TileType::Floor
         | crate::tile_data::TileType::Slow
         | crate::tile_data::TileType::Medium
-        | crate::tile_data::TileType::Fast => true,
+        | crate::tile_data::TileType::Fast
-        crate::tile_data::TileType::Block | crate::tile_data::TileType::Wall => {
+        | crate::tile_data::TileType::Player => true,
+        crate::tile_data::TileType::Block => {
             if let (Some(sound_effects), Some(sound_output)) =
                 (&mut resources.sound_effects, &mut resources.sound_output)
             {
                 sound_output.play_sound(sound_effects.blocked.clone());
             }
+
+            if !resources.message_shown.touched_boundary {
+                resources.flashing_message = Some(FlashingMessage::from(
+                    "An Electrified Wall blocks your way.",
+                ));
+                resources.message_shown.touched_boundary = true;
+            }
+
             if resources.stats.score > 2 {
                 resources.stats.take_score(2);
             }
+
+            false
+        }
+        crate::tile_data::TileType::Wall => {
+            if let (Some(sound_effects), Some(sound_output)) =
+                (&mut resources.sound_effects, &mut resources.sound_output)
+            {
+                sound_output.play_sound(sound_effects.blocked.clone());
+            }
+
+            if !resources.message_shown.touched_boundary {
+                resources.flashing_message =
+                    Some(FlashingMessage::from("A Solid Wall blocks your way."));
+                resources.message_shown.touched_boundary = true;
+            }
+
+            if resources.stats.score > 2 {
+                resources.stats.take_score(2);
+            }
+
             false
         }
         crate::tile_data::TileType::Whip => {
@@ -96,23 +133,62 @@ fn try_step(point: Point, _world: &World, resources: &mut Resources) -> bool {
             {
                 sound_output.play_sound(sound_effects.grab.clone());
             }
+
+            if !resources.message_shown.whip {
+                resources.flashing_message = Some(FlashingMessage::from("You found a Whip."));
+                resources.message_shown.whip = true;
+            }
+
             resources.stats.give_whips(1);
             resources.stats.add_score(1);
             resources.map.set_tile_at(point, TileType::Floor);
             true
         }
         crate::tile_data::TileType::Stairs => {
-            resources.should_advance_level = true;
+            if !resources.message_shown.stairs {
+                resources.flashing_message = Some(FlashingMessage::new(
+                    "Stairs take you to the next lower level.",
+                    Some(FlashingMessageIntent::NextLevel),
+                ));
+                resources.message_shown.stairs = true;
+            } else {
+                resources.should_advance_level = true;
+            }
             true
         }
         crate::tile_data::TileType::Chest => todo!(),
-        crate::tile_data::TileType::SlowTime => todo!(),
+        crate::tile_data::TileType::SlowTime => {
+            if let (Some(sound_effects), Some(sound_output)) =
+                (&mut resources.sound_effects, &mut resources.sound_output)
+            {
+                sound_output.play_sound(sound_effects.slow_time.clone());
+            }
+
+            if !resources.message_shown.slow_time {
+                resources.flashing_message = Some(FlashingMessage::from(
+                    "You activated a Slow Creature spell.",
+                ));
+                resources.message_shown.slow_time = true;
+            }
+
+            resources.slow_time_ticks = 100;
+            resources.map.set_tile_at(point, TileType::Floor);
+            true
+        }
         crate::tile_data::TileType::Gem => {
             if let (Some(sound_effects), Some(sound_output)) =
                 (&mut resources.sound_effects, &mut resources.sound_output)
             {
                 sound_output.play_sound(sound_effects.grab.clone());
             }
+
+            if !resources.message_shown.gem {
+                resources.flashing_message = Some(FlashingMessage::from(
+                    "Gems give you both points and strength.",
+                ));
+                resources.message_shown.gem = true;
+            }
+
             resources.stats.give_gems(1);
             resources.stats.add_score(1);
             resources.map.set_tile_at(point, TileType::Floor);
@@ -125,6 +201,13 @@ fn try_step(point: Point, _world: &World, resources: &mut Resources) -> bool {
             {
                 sound_output.play_sound(sound_effects.grab.clone());
             }
+
+            if !resources.message_shown.teleport_scroll {
+                resources.flashing_message =
+                    Some(FlashingMessage::from("You found a Teleport scroll."));
+                resources.message_shown.teleport_scroll = true;
+            }
+
             resources.stats.give_teleports(1);
             resources.stats.add_score(1);
             resources.map.set_tile_at(point, TileType::Floor);
@@ -132,7 +215,24 @@ fn try_step(point: Point, _world: &World, resources: &mut Resources) -> bool {
         }
         crate::tile_data::TileType::Key => todo!(),
         crate::tile_data::TileType::Door => todo!(),
-        crate::tile_data::TileType::SpeedTime => todo!(),
+        crate::tile_data::TileType::SpeedTime => {
+            if let (Some(sound_effects), Some(sound_output)) =
+                (&mut resources.sound_effects, &mut resources.sound_output)
+            {
+                sound_output.play_sound(sound_effects.speed_time.clone());
+            }
+
+            if !resources.message_shown.speed_time {
+                resources.flashing_message = Some(FlashingMessage::from(
+                    "You activated a Speed Creature spell.",
+                ));
+                resources.message_shown.speed_time = true;
+            }
+
+            resources.speed_time_ticks = 80;
+            resources.map.set_tile_at(point, TileType::Floor);
+            true
+        }
         crate::tile_data::TileType::Trap => todo!(),
         crate::tile_data::TileType::River => todo!(),
         crate::tile_data::TileType::Power => todo!(),
@@ -165,7 +265,6 @@ fn try_step(point: Point, _world: &World, resources: &mut Resources) -> bool {
         crate::tile_data::TileType::Trap11 => todo!(),
         crate::tile_data::TileType::Trap12 => todo!(),
         crate::tile_data::TileType::Trap13 => todo!(),
-        crate::tile_data::TileType::Player => true,
         crate::tile_data::TileType::Punctuation => todo!(),
         crate::tile_data::TileType::Letter(_) => todo!(),
     }
@@ -174,7 +273,7 @@ fn try_step(point: Point, _world: &World, resources: &mut Resources) -> bool {
 pub fn whip(world: &mut World, resources: &mut Resources) {
     let mut to_add: Vec<Entity> = Vec::new();
 
-    for (entity, _) in world.query_mut::<With<Player, With<Position, Without<WantsToWhip, ()>>>>() {
+    for (entity, _) in world.query_mut::<Without<(&Player, &Position), &WantsToWhip>>() {
         if resources.stats.whips > 0 {
             to_add.push(entity);
         }

src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::unused_unit)]
+
 use std::panic;
 
 use bracket_lib::prelude::*;

src/resources/difficulty.rs

@@ -1,5 +1,14 @@
+use crate::constants::*;
+
+pub enum Difficulty {
+    Novice,
+    Experienced,
+    Advanced,
+    Secret,
+}
+
 #[derive(Debug, Eq, PartialEq, Copy, Clone, Hash)]
-pub struct Difficulty {
+pub struct DifficultySettings {
     pub value: u32,
     pub starting_gems: u32,
     pub starting_whips: u32,
@@ -8,38 +17,49 @@ pub struct Difficulty {
     pub starting_whip_power: u32,
 }
 
-pub const SECRET: Difficulty = Difficulty {
+impl From<&Difficulty> for DifficultySettings {
+    fn from(difficulty: &Difficulty) -> Self {
+        match difficulty {
+            Difficulty::Novice => NOVICE,
+            Difficulty::Experienced => EXPERIENCED,
+            Difficulty::Advanced => ADVANCED,
+            Difficulty::Secret => SECRET,
+        }
+    }
+}
+
+const SECRET: DifficultySettings = DifficultySettings {
     value: 9,
     starting_gems: 250,
     starting_whips: 100,
     starting_teleports: 50,
     starting_keys: 1,
-    starting_whip_power: 3,
+    starting_whip_power: BASE_WHIP_POWER + 1,
 };
 
-pub const NOVICE: Difficulty = Difficulty {
+const NOVICE: DifficultySettings = DifficultySettings {
     value: 8,
     starting_gems: 20,
     starting_whips: 10,
     starting_teleports: 0,
     starting_keys: 0,
-    starting_whip_power: 0,
+    starting_whip_power: BASE_WHIP_POWER,
 };
 
-pub const EXPERIENCED: Difficulty = Difficulty {
+const EXPERIENCED: DifficultySettings = DifficultySettings {
     value: 5,
     starting_gems: 15,
     starting_whips: 0,
     starting_teleports: 0,
     starting_keys: 0,
-    starting_whip_power: 0,
+    starting_whip_power: BASE_WHIP_POWER,
 };
 
-pub const ADVANCED: Difficulty = Difficulty {
+const ADVANCED: DifficultySettings = DifficultySettings {
     value: 2,
     starting_gems: 10,
     starting_whips: 0,
     starting_teleports: 0,
     starting_keys: 0,
-    starting_whip_power: 0,
+    starting_whip_power: BASE_WHIP_POWER,
 };

src/resources/flashing_message.rs

@@ -9,6 +9,7 @@ pub enum FlashingMessageIntent {
     Save,
     Restore,
     Restart,
+    NextLevel,
 }
 
 pub struct FlashingMessage {

src/resources/message_shown.rs

@@ -0,0 +1,24 @@
+#[derive(Debug, Default)]
+pub struct MessageShown {
+    pub touched_boundary: bool,
+    pub slow_time: bool,
+    pub speed_time: bool,
+    pub whip: bool,
+    pub gem: bool,
+    pub teleport_scroll: bool,
+    pub stairs: bool,
+}
+
+impl MessageShown {
+    pub fn all_shown() -> Self {
+        MessageShown {
+            touched_boundary: true,
+            slow_time: true,
+            speed_time: true,
+            whip: true,
+            gem: true,
+            teleport_scroll: true,
+            stairs: true,
+        }
+    }
+}

src/resources/mod.rs

@@ -2,15 +2,17 @@ pub mod clock;
 pub mod difficulty;
 pub mod flashing_message;
 pub mod map;
+pub mod message_shown;
 pub mod sound_effects;
 pub mod sound_output;
 pub mod stats;
 
 use bracket_lib::prelude::*;
 pub use clock::{Clock, StopClock};
-pub use difficulty::Difficulty;
+pub use difficulty::DifficultySettings;
 pub use flashing_message::FlashingMessage;
 pub use map::Map;
+pub use message_shown::MessageShown;
 pub use sound_effects::SoundEffects;
 pub use sound_output::SoundOutput;
 pub use stats::Stats;
@@ -23,9 +25,12 @@ pub struct Resources {
     pub clock: Clock,
     pub stop_clock: bool,
     pub map: Map,
-    pub selected_difficulty: Option<Difficulty>,
+    pub difficulty: Option<DifficultySettings>,
     pub sound_effects: Option<SoundEffects>,
     pub sound_output: Option<SoundOutput>,
     pub flashing_message: Option<FlashingMessage>,
+    pub message_shown: MessageShown,
     pub should_advance_level: bool,
+    pub speed_time_ticks: u32,
+    pub slow_time_ticks: u32,
 }

src/resources/sound_effects.rs

@@ -1,19 +1,16 @@
-use std::{array, iter, time::Duration};
+use std::{cmp, iter, time::Duration};
 
 use bracket_lib::random::RandomNumberGenerator;
 
 use crate::resources::sound_output::{SoundOutput, SoundSamples};
 
 type Frequency = u32;
-type StartFrequency = u32;
-type EndFrequency = u32;
 type MinFrequency = u32;
 type MaxFrequency = u32;
 
 pub enum SoundType {
     Silence,
     Tone(Frequency),
-    Sweep(StartFrequency, EndFrequency),
     Noise(MinFrequency, MaxFrequency),
 }
 
@@ -34,28 +31,34 @@ pub struct SoundEffects {
     pub blocked: SoundSamples,
     pub whipping: SoundSamples,
     pub whipping_hit: SoundSamples,
-    pub whipping_hit_end: SoundSamples,
+    pub whipping_hit_enemy: SoundSamples,
+    pub whipping_hit_block: SoundSamples,
     pub slow_hit: SoundSamples,
     pub medium_hit: SoundSamples,
     pub fast_hit: SoundSamples,
     pub pause: SoundSamples,
+    pub speed_time: SoundSamples,
+    pub slow_time: SoundSamples,
     rng: RandomNumberGenerator,
 }
 
 impl SoundEffects {
     pub fn new(sound_output: &SoundOutput) -> Self {
+        let mut rng = RandomNumberGenerator::new();
         Self {
             startup: sound_output.render_sound_effect(&SoundEffect {
-                sounds: vec![Sound {
+                sounds: (1..800)
-                    sound_type: SoundType::Sweep(1, 350),
+                    .map(|x| Sound {
-                    duration: Duration::from_secs(1),
+                        sound_type: SoundType::Tone(x / 2),
-                }],
+                        duration: Duration::from_millis(1),
+                    })
+                    .collect(),
             }),
             step: sound_output.render_sound_effect(&SoundEffect {
                 sounds: vec![
                     Sound {
                         sound_type: SoundType::Noise(350, 900),
-                        duration: Duration::from_millis(6),
+                        duration: Duration::from_millis(5),
                     },
                     Sound {
                         sound_type: SoundType::Silence,
@@ -89,7 +92,7 @@ impl SoundEffects {
                     duration: Duration::from_millis(40),
                 })
                 .chain((0..4).flat_map(|_| {
-                    array::IntoIter::new([
+                    [
                         Sound {
                             sound_type: SoundType::Tone(100),
                             duration: Duration::from_millis(15),
@@ -98,7 +101,7 @@ impl SoundEffects {
                             sound_type: SoundType::Silence,
                             duration: Duration::from_millis(15),
                         },
-                    ])
+                    ]
                 }))
                 .collect(),
             }),
@@ -119,23 +122,27 @@ impl SoundEffects {
                 }],
             }),
             whipping_hit: sound_output.render_sound_effect(&SoundEffect {
-                sounds: vec![
+                sounds: vec![Sound {
-                    Sound {
+                    sound_type: SoundType::Tone(90),
-                        sound_type: SoundType::Tone(400),
+                    duration: Duration::from_secs(3),
-                        duration: Duration::from_millis(20),
+                }],
-                    },
-                    Sound {
-                        sound_type: SoundType::Tone(90),
-                        duration: Duration::from_secs(3),
-                    },
-                ],
             }),
-            whipping_hit_end: sound_output.render_sound_effect(&SoundEffect {
+            whipping_hit_enemy: sound_output.render_sound_effect(&SoundEffect {
                 sounds: vec![Sound {
                     sound_type: SoundType::Tone(400),
                     duration: Duration::from_millis(20),
                 }],
             }),
+            whipping_hit_block: sound_output.render_sound_effect(&SoundEffect {
+                sounds: (20_i32..=5700_i32)
+                    .rev()
+                    .step_by(5)
+                    .map(|x| Sound {
+                        sound_type: SoundType::Tone(cmp::max(0, rng.range(0, x * 2) - x) as u32),
+                        duration: Duration::from_micros(665),
+                    })
+                    .collect(),
+            }),
             slow_hit: sound_output.render_sound_effect(&SoundEffect {
                 sounds: vec![Sound {
                     sound_type: SoundType::Tone(400),
@@ -167,7 +174,24 @@ impl SoundEffects {
                     sounds
                 },
             }),
-            rng: RandomNumberGenerator::new(),
+            speed_time: sound_output.render_sound_effect(&SoundEffect {
+                sounds: (1..=7)
+                    .map(|x| Sound {
+                        sound_type: SoundType::Tone(x * 50 + 300),
+                        duration: Duration::from_millis(x as u64 * 10 + 40),
+                    })
+                    .collect(),
+            }),
+            slow_time: sound_output.render_sound_effect(&SoundEffect {
+                sounds: (1..=7)
+                    .rev()
+                    .map(|x| Sound {
+                        sound_type: SoundType::Tone(x * 50 + 300),
+                        duration: Duration::from_millis(x as u64 * 10 + 40),
+                    })
+                    .collect(),
+            }),
+            rng,
         }
     }
 

src/resources/sound_output.rs

@@ -4,8 +4,8 @@ use cpal::{
     traits::{DeviceTrait, HostTrait, StreamTrait},
     SampleRate, Stream,
 };
-use fundsp::prelude::*;
 use oddio::{Frames, FramesSignal, Gain, Handle, Mixer, MonoToStereo, Stop};
+use rand::Rng;
 
 use super::sound_effects::{SoundEffect, SoundType};
 
@@ -61,39 +61,65 @@ impl SoundOutput {
     }
 
     pub fn render_sound_effect(&self, effect: &SoundEffect) -> SoundSamples {
+        // Keep these outside the loop to remember phase
+        let mut half_cycle_counter: u32 = 0;
+        let mut speaker_out: bool = false;
+
         let effect_buffer: Vec<f32> = effect
             .sounds
             .iter()
             .flat_map(|sound| match sound.sound_type {
-                SoundType::Silence => (0
+                SoundType::Silence => {
-                    ..(self.sample_rate.0 as f32 * sound.duration.as_secs_f32()) as usize)
+                    // Reset phase on silence
-                    .map(|_| 0f32)
+                    half_cycle_counter = 0;
-                    .collect::<Vec<f32>>(),
+                    speaker_out = false;
-                SoundType::Tone(freq) => {
-                    let mut c = square_hz(freq as f32);
-                    c.reset(Some(self.sample_rate.0 as f64));
                     (0..(self.sample_rate.0 as f32 * sound.duration.as_secs_f32()) as usize)
-                        .map(|_| c.get_mono())
+                        .map(|_| 0f32)
                         .collect::<Vec<f32>>()
                 }
-                SoundType::Sweep(start_freq, end_freq) => {
+                SoundType::Tone(freq) => {
-                    let mut c = lfo(|t| {
+                    // A frequency of 0 is silence
-                        lerp(
+                    if freq == 0 {
-                            start_freq as f32,
+                        half_cycle_counter = 0;
-                            end_freq as f32,
+                        speaker_out = false;
-                            t * sound.duration.as_secs_f32(),
+
-                        )
+                        return (0..(self.sample_rate.0 as f32 * sound.duration.as_secs_f32())
-                    }) >> square();
+                            as usize)
-                    c.reset(Some(self.sample_rate.0 as f64));
+                            .map(|_| 0f32)
-                    (0..(self.sample_rate.0 as f32 * sound.duration.as_secs_f32()) as usize)
+                            .collect::<Vec<f32>>();
-                        .map(|_| c.get_mono())
+                    }
-                        .collect::<Vec<f32>>()
+
+                    let mut buffer: Vec<f32> = vec![
+                        0.;
+                        (self.sample_rate.0 as f32 * sound.duration.as_secs_f32())
+                            as usize
+                    ];
+                    let half_cycle_counter_upper_bound: u32 = self.sample_rate.0 / freq;
+
+                    for sample in &mut buffer {
+                        if speaker_out {
+                            *sample = 0.75;
+                        }
+
+                        half_cycle_counter += 2;
+                        if half_cycle_counter >= half_cycle_counter_upper_bound {
+                            half_cycle_counter %= half_cycle_counter_upper_bound;
+                            speaker_out = !speaker_out;
+                        }
+                    }
+
+                    buffer
                 }
                 SoundType::Noise(min, max) => {
-                    let mut c =
-                        (((white() + dc(1.0)) * dc(max as f32 / 2.0)) + dc(min as f32)) >> square();
                     (0..(self.sample_rate.0 as f32 * sound.duration.as_secs_f32()) as usize)
-                        .map(|_| c.get_mono())
+                        .map(|i| {
+                            let t = i as f32 / self.sample_rate.0 as f32;
+                            (t * (rand::thread_rng().gen_range(min as f32..max as f32))
+                                * 2.0
+                                * std::f32::consts::PI)
+                                .sin()
+                                .signum()
+                        })
                         .collect::<Vec<f32>>()
                 }
             })
@@ -103,11 +129,10 @@ impl SoundOutput {
     }
 
     pub fn play_sound(&mut self, samples: SoundSamples) -> SoundEffectHandle {
+        let mut gain = oddio::Gain::new(oddio::FramesSignal::from(samples));
+        gain.set_gain(-10.0);
         self.mixer_handle
             .control::<oddio::Mixer<_>, _>()
-            .play(oddio::MonoToStereo::new(oddio::Gain::new(
+            .play(oddio::MonoToStereo::new(gain))
-                oddio::FramesSignal::from(samples),
-                0.50,
-            )))
     }
 }

src/state.rs

@@ -1,10 +1,10 @@
 use instant::Instant;
 
 use crate::resources::clock::Clock;
-use crate::resources::difficulty::*;
 use crate::resources::flashing_message::{FlashingMessage, FlashingMessageIntent};
 use crate::resources::sound_effects::SoundEffects;
 use crate::resources::stats::Stats;
+use crate::resources::{difficulty::*, MessageShown};
 use crate::resources::{Map, Resources, SoundOutput};
 use crate::{graphics, input, levels, systems};
 use bracket_lib::prelude::*;
@@ -43,7 +43,8 @@ impl State {
         }
 
         let starting_level = 0;
-        let selected_difficulty = SECRET;
+        let selected_difficulty = Difficulty::Secret;
+        let difficulty_settings = DifficultySettings::from(&selected_difficulty);
 
         let mut world = World::new();
 
@@ -56,11 +57,11 @@ impl State {
             player_input: None,
             stats: Stats {
                 score: 0,
-                gems: selected_difficulty.starting_gems,
+                gems: difficulty_settings.starting_gems,
-                whips: selected_difficulty.starting_whips,
+                whips: difficulty_settings.starting_whips,
-                whip_power: selected_difficulty.starting_whip_power,
+                whip_power: difficulty_settings.starting_whip_power,
-                teleports: selected_difficulty.starting_teleports,
+                teleports: difficulty_settings.starting_teleports,
-                keys: selected_difficulty.starting_keys,
+                keys: difficulty_settings.starting_keys,
             },
             clock: Clock {
                 last_ticked: Instant::now(),
@@ -71,12 +72,18 @@ impl State {
             map,
             sound_effects,
             sound_output,
-            selected_difficulty: Some(selected_difficulty),
+            difficulty: Some(difficulty_settings),
             flashing_message: Some(FlashingMessage::new(
                 "Press any key to begin this level.",
                 Some(FlashingMessageIntent::Start),
             )),
+            message_shown: match selected_difficulty {
+                Difficulty::Novice | Difficulty::Experienced => Default::default(),
+                _ => MessageShown::all_shown(),
+            },
             should_advance_level: false,
+            speed_time_ticks: 0,
+            slow_time_ticks: 0,
         };
 
         State { world, resources }
@@ -89,9 +96,6 @@ impl State {
         self.resources.map = Map::from(levels::get_level(self.resources.level_number));
         self.resources.map.spawn_entities(&mut self.world);
 
-        self.resources.flashing_message =
-            Some(FlashingMessage::from("Press any key to begin this level."));
-
         self.resources.should_advance_level = false;
     }
 }

src/systems/mod.rs

@@ -1,4 +1,5 @@
 pub mod monster_ai;
+pub mod powerups;
 pub mod time;
 pub mod whip;
 
@@ -7,6 +8,7 @@ use hecs::World;
 use crate::resources::Resources;
 
 pub fn run(world: &mut World, resources: &mut Resources) {
+    powerups::run(resources);
     whip::run(world, resources);
     monster_ai::run(world, resources);
     time::run(resources);

src/systems/monster_ai.rs

@@ -52,7 +52,7 @@ pub fn run(world: &mut World, resources: &mut Resources) {
                     };
 
                     if let Some(e) = resources.map.get_tile_content_at(destination) {
-                        if let Ok(_player) = world.get::<Player>(e) {
+                        if let Ok(_player) = world.get::<&Player>(e) {
                             // TODO: Sound
                             resources.map.clear_tile_content_at(Point::from(*position));
                             resources.stats.take_gems(damage_for_kind(monster.kind));
@@ -91,7 +91,13 @@ pub fn run(world: &mut World, resources: &mut Resources) {
                         }
                     }
 
-                    monster.ticks_until_move = ticks_for_kind(monster.kind);
+                    if resources.speed_time_ticks > 0 {
+                        monster.ticks_until_move = 3;
+                    } else if resources.slow_time_ticks > 0 {
+                        monster.ticks_until_move = ticks_for_kind(monster.kind) * 5;
+                    } else {
+                        monster.ticks_until_move = ticks_for_kind(monster.kind);
+                    }
                 }
             }
         }

src/systems/powerups.rs

@@ -0,0 +1,12 @@
+use crate::resources::Resources;
+
+pub fn run(resources: &mut Resources) {
+    if resources.clock.has_ticked {
+        if let Some(t) = resources.speed_time_ticks.checked_sub(1) {
+            resources.speed_time_ticks = t;
+        }
+        if let Some(t) = resources.slow_time_ticks.checked_sub(1) {
+            resources.slow_time_ticks = t;
+        }
+    }
+}

src/systems/whip.rs

@@ -7,6 +7,7 @@ use hecs::{Entity, World};
 use crate::{
     components::{monster::damage_for_kind, Monster, Position, WantsToWhip},
     resources::Resources,
+    tile_data::TileType,
 };
 
 pub fn run(world: &mut World, resources: &mut Resources) {
@@ -69,27 +70,19 @@ pub fn run(world: &mut World, resources: &mut Resources) {
 
             if let Some(dest) = destination {
                 if let Some(e) = resources.map.get_tile_content_at(dest) {
-                    if let Ok(monster) = world.get::<Monster>(e) {
+                    if let Ok(monster) = world.get::<&Monster>(e) {
                         resources.stats.add_score(damage_for_kind(monster.kind));
                         to_kill.push(e);
                         resources.map.clear_tile_content_at(dest);
-                        if let Some(sound) = &mut wants_to_whip.sound {
+                        if let (Some(sound_effects), Some(sound_output)) =
-                            sound.control::<oddio::Stop<_>, _>().stop();
-                        }
-                        if wants_to_whip.frame == 7 {
-                            wants_to_whip.sound = None;
-                            if let (Some(sound_effects), Some(sound_output)) =
-                                (&mut resources.sound_effects, &mut resources.sound_output)
-                            {
-                                sound_output.play_sound(sound_effects.whipping_hit_end.clone());
-                            }
-                        } else if let (Some(sound_effects), Some(sound_output)) =
                             (&mut resources.sound_effects, &mut resources.sound_output)
                         {
-                            wants_to_whip.sound =
+                            sound_output.play_sound(sound_effects.whipping_hit_enemy.clone());
-                                Some(sound_output.play_sound(sound_effects.whipping_hit.clone()));
                         }
+                        switch_to_hit_sound(resources, wants_to_whip);
                     }
+                } else {
+                    hit_tile(resources, wants_to_whip, dest);
                 }
             }
 
@@ -115,3 +108,36 @@ pub fn run(world: &mut World, resources: &mut Resources) {
         let _ = world.remove_one::<WantsToWhip>(e);
     }
 }
+
+fn hit_tile(resources: &mut Resources, wants_to_whip: &mut WantsToWhip, location: Point) {
+    let tile = resources.map.get_tile_at(location);
+    match tile {
+        TileType::Block | TileType::Tree => {
+            let mut rng = RandomNumberGenerator::new();
+
+            if (rng.range(0, 7) as u32) < resources.stats.whip_power {
+                resources.map.set_tile_at(location, TileType::Floor);
+                if let (Some(sound_effects), Some(sound_output)) =
+                    (&mut resources.sound_effects, &mut resources.sound_output)
+                {
+                    sound_output.play_sound(sound_effects.whipping_hit_block.clone());
+                }
+                switch_to_hit_sound(resources, wants_to_whip);
+            }
+        }
+        TileType::Forest => todo!(),
+        _ => (),
+    }
+}
+
+fn switch_to_hit_sound(resources: &mut Resources, wants_to_whip: &mut WantsToWhip) {
+    if let Some(sound) = &mut wants_to_whip.sound {
+        sound.control::<oddio::Stop<_>, _>().stop();
+    }
+
+    if let (Some(sound_effects), Some(sound_output)) =
+        (&mut resources.sound_effects, &mut resources.sound_output)
+    {
+        wants_to_whip.sound = Some(sound_output.play_sound(sound_effects.whipping_hit.clone()));
+    }
+}

src/tile_data.rs

@@ -2,7 +2,7 @@ use bracket_lib::prelude::*;
 
 use crate::graphics::vga_color as vga;
 
-#[derive(PartialEq, Copy, Clone)]
+#[derive(Eq, PartialEq, Copy, Clone)]
 pub struct TileData {
     pub glyph: FontCharType,
     pub color_fg: (u8, u8, u8),

webpack.config.js

@@ -5,24 +5,32 @@ const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
 const dist = path.resolve(__dirname, "dist");
 
 module.exports = {
-  mode: "production",
+    mode: "production",
-  entry: {
+    entry: {
-    index: "./js/index.js"
+        index: "./js/index.js"
-  },
+    },
-  output: {
+    output: {
-    path: dist,
+        path: dist,
-    filename: "[name].js"
+        filename: "[name].js"
-  },
+    },
-  devServer: {
+    experiments: {
-    contentBase: dist,
+        asyncWebAssembly: true,
-  },
+        syncWebAssembly: true
-  plugins: [
+    },
-    new CopyPlugin([
+    devServer: {
-      path.resolve(__dirname, "static")
+        static: {
-    ]),
+            directory: dist,
+        }
+    },
+    plugins: [
+        new CopyPlugin({
+            patterns: [
+                "static"
+            ]
+        }),
 
-    new WasmPackPlugin({
+        new WasmPackPlugin({
-      crateDirectory: __dirname,
+            crateDirectory: __dirname,
-    }),
+        }),
-  ]
+    ]
 };