feat: split animated texture away from atlas texture details

feat: flood-filled based playable position with cache, debug mode
refactor: continue improving MovableEntity shared implementation
2025-12-06 11:15:46 -06:00 · 2025-07-23 16:25:40 -05:00 · 2025-07-23 15:06:38 -05:00 · 2025-07-23 15:06:09 -05:00 · 2025-07-23 14:08:28 -05:00 · 2025-07-22 14:37:26 -05:00
23 changed files with 1826 additions and 391 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
 /dist
 .idea
 *.dll
+rust-sdl2-emscripten/
+assets/build.css
+emsdk/
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,22 +1,34 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4

 [[package]]
 name = "aho-corasick"
-version = "1.0.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
 "memchr",
 ]

+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

+[[package]]
+name = "bitflags"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+
 [[package]]
 name = "c_vec"
 version = "2.0.0"
@@ -30,16 +42,71 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
-name = "lazy_static"
-version = "1.4.0"
+name = "deprecate-until"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "7a3767f826efbbe5a5ae093920b58b43b01734202be697e1354914e862e8e704"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "semver",
+ "syn",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+
+[[package]]
+name = "indexmap"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "integer-sqrt"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"

 [[package]]
 name = "log"
@@ -58,9 +125,9 @@ dependencies = [

 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"

 [[package]]
 name = "nu-ansi-term"
@@ -72,6 +139,15 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.18.0"
@@ -90,6 +166,8 @@ version = "0.1.0"
 dependencies = [
 "lazy_static",
 "libc",
+ "pathfinding",
+ "rand",
 "sdl2",
 "spin_sleep",
 "tracing",
@@ -98,6 +176,20 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "pathfinding"
+version = "4.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ac35caa284c08f3721fb33c2741b5f763decaf42d080c8a6a722154347017e"
+dependencies = [
+ "deprecate-until",
+ "indexmap",
+ "integer-sqrt",
+ "num-traits",
+ "rustc-hash",
+ "thiserror",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.13"
@@ -105,33 +197,77 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"

 [[package]]
-name = "proc-macro2"
-version = "1.0.66"
+name = "ppv-lite86"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
 "proc-macro2",
 ]

 [[package]]
-name = "regex"
-version = "1.9.1"
+name = "r-efi"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-automata 0.3.3",
- "regex-syntax 0.7.4",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]

 [[package]]
@@ -145,13 +281,13 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.3.3"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-syntax 0.7.4",
+ "regex-syntax 0.8.5",
 ]

 [[package]]
@@ -162,9 +298,15 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"

 [[package]]
 name = "regex-syntax"
-version = "0.7.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"

 [[package]]
 name = "sdl2"
@@ -172,7 +314,7 @@ version = "0.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d42407afc6a8ab67e36f92e80b8ba34cbdc55aaeed05249efe9a2e8d0e9feef"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 "c_vec",
 "lazy_static",
 "libc",
@@ -191,6 +333,12 @@ dependencies = [
 "version-compare",
 ]

+[[package]]
+name = "semver"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.4"
@@ -208,25 +356,44 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"

 [[package]]
 name = "spin_sleep"
-version = "1.1.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cafa7900db085f4354dbc7025e25d7a839a14360ea13b5fc4fd717f2d3b23134"
+checksum = "14ac0e4b54d028c2000a13895bcd84cd02a1d63c4f78e08e4ec5ec8f53efd4b9"
 dependencies = [
- "once_cell",
- "winapi",
+ "windows-sys",
 ]

 [[package]]
 name = "syn"
-version = "2.0.31"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
 "proc-macro2",
 "quote",
 "unicode-ident",
 ]

+[[package]]
+name = "thiserror"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "thread_local"
 version = "1.1.7"
@@ -239,11 +406,10 @@ dependencies = [

 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
- "cfg-if",
 "pin-project-lite",
 "tracing-attributes",
 "tracing-core",
@@ -251,9 +417,9 @@ dependencies = [

 [[package]]
 name = "tracing-attributes"
-version = "0.1.26"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -262,9 +428,9 @@ dependencies = [

 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
 "once_cell",
 "valuable",
@@ -272,9 +438,9 @@ dependencies = [

 [[package]]
 name = "tracing-error"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db"
 dependencies = [
 "tracing",
 "tracing-subscriber",
@@ -282,20 +448,20 @@ dependencies = [

 [[package]]
 name = "tracing-log"
-version = "0.1.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "lazy_static",
 "log",
+ "once_cell",
 "tracing-core",
 ]

 [[package]]
 name = "tracing-subscriber"
-version = "0.3.17"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
 "matchers",
 "nu-ansi-term",
@@ -333,6 +499,15 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29"

+[[package]]
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -354,3 +529,105 @@ name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags 2.9.1",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,12 +6,18 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-lazy_static = "1.4.0"
-spin_sleep = "1.1.1"
-tracing = { version = "0.1.37", features = ["max_level_debug", "release_max_level_debug"]}
+tracing = { version = "0.1.40", features = ["max_level_debug", "release_max_level_debug"]}
 tracing-error = "0.2.0"
 tracing-subscriber = {version = "0.3.17", features = ["env-filter"]}
-winapi = { version = "0.3", features = ["consoleapi", "fileapi", "handleapi", "processenv", "winbase", "wincon", "winnt", "winuser", "windef", "minwindef"] }
+lazy_static = "1.5.0"
+sdl2 = { version = "0.38.0", features = ["image", "ttf"] }
+spin_sleep = "1.3.2"
+rand = "0.9.2"
+pathfinding = "4.14"
+
+[target.'cfg(target_os = "windows")'.dependencies.winapi]
+version = "0.3"
+features = ["consoleapi", "fileapi", "handleapi", "processenv", "winbase", "wincon", "winnt", "winuser", "windef", "minwindef"]


 [target.'cfg(target_os = "emscripten")'.dependencies.sdl2]
--- a/assets/TerminalVector.ttf
+++ b/assets/TerminalVector.ttf
--- a/assets/favicon.ico
+++ b/assets/favicon.ico
--- a/assets/index.html
+++ b/assets/index.html
@@ -1,27 +1,65 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-</head>
-<style>
-    body {
-        margin: 0;
-        padding: 0;
-        background: #000;
-    }
-    canvas {
-        display: block;
-        margin: 0 auto;
-        background: #000;
-    }
-</style>
-<body>
-    <canvas id="canvas"></canvas>
-    <script>
-        var Module = {
-            'canvas': document.getElementById('canvas'),
-        };
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Pac-Man Arcade</title>
+    <link rel="stylesheet" href="build.css" />
+    <style>
+    </style>
+  </head>
+  <body class="bg-black text-yellow-400 text-center">
+    <a
+      href="https://github.com/Xevion/Pac-Man"
+      class="absolute top-0 right-0"
+      aria-label="View source on GitHub"
+    >
+      <svg
+        width="80"
+        height="80"
+        viewBox="0 0 250 250"
+        class="fill-yellow-400 text-black"
+        aria-hidden="true"
+      >
+        <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
+        <path
+          d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2"
+          class="octo-arm"
+        ></path>
+        <path
+          d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z"
+          class="octo-body"
+        ></path>
+      </svg>
+    </a>
+    <h1 class="text-4xl mt-10 scaled-text">Pac-Man Arcade</h1>
+    <p class="text-lg mt-5 scaled-text">
+      Welcome to the Pac-Man Arcade! Use the controls below to play.
+    </p>
+    <canvas
+      id="canvas"
+      class="block mx-auto mt-5"
+      width="800"
+      height="600"
+    ></canvas>
+    <div class="mt-10">
+      <span
+        class="inline-block mx-2 px-4 py-2 bg-yellow-400 text-black rounded scaled-text"
+        >&larr; &uarr; &rarr; &darr; Move</span
+      >
+      <span
+        class="inline-block mx-2 px-4 py-2 bg-yellow-400 text-black rounded scaled-text"
+        >Space Change Sprite</span
+      >
+      <span
+        class="inline-block mx-2 px-4 py-2 bg-yellow-400 text-black rounded scaled-text"
+        >Shift + &uarr;&darr; Change Volume</span
+      >
+    </div>
+    <script type="text/javascript">
+      var Module = {
+        canvas: document.getElementById("canvas"),
+      };
    </script>
-    <script src="pacman.js"></script>
-</body>
+    <script type="text/javascript" src="pacman.js"></script>
+  </body>
 </html>
--- a/assets/styles.scss
+++ b/assets/styles.scss
@@ -0,0 +1,21 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+@font-face {
+    font-family: "Liberation Mono";
+    src:
+        url("LiberationMono.woff2") format("woff2"),
+        url("LiberationMono.woff") format("woff");
+    font-weight: normal;
+    font-style: normal;
+    font-display: swap;
+}
+
+canvas {
+    @apply w-full h-[65vh] min-h-[200px] block mx-auto bg-black;
+}
+
+.code {
+    @apply px-1 rounded font-mono bg-zinc-900 border border-zinc-700 lowercase;
+}
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -38,7 +38,7 @@ fi
 if [ "$skip_emsdk" = 'false' ]; then
    echo "Activating Emscripten"
    # SDL2-TTF requires 3.1.43, fails to build on latest
-    ./../emsdk/emsdk activate 3.1.43
+    ../emsdk/emsdk activate 3.1.43
    source ../emsdk/emsdk_env.sh
 fi

@@ -59,15 +59,15 @@ mkdir -p dist
 output_folder="target/wasm32-unknown-emscripten/$build_type"
 cp assets/index.html dist

-cp assets/*.woff* dist
+# cp assets/*.woff* dist
 cp assets/build.css dist
 cp assets/favicon.ico dist
-cp $output_folder/spiritus.wasm dist
-cp $output_folder/spiritus.js dist
+cp $output_folder/pacman.wasm dist
+cp $output_folder/pacman.js dist
 # only if .data file exists
-cp $output_folder/deps/spiritus.data dist
-if [ -f $output_folder/spiritus.wasm.map ]; then
-    cp $output_folder/spiritus.wasm.map dist
+cp $output_folder/deps/pacman.data dist
+if [ -f $output_folder/pacman.wasm.map ]; then
+    cp $output_folder/pacman.wasm.map dist
 fi

 if [ "$serve" = 'true' ]; then
--- a/build.ts
+++ b/build.ts
@@ -0,0 +1,194 @@
+import { $ } from "bun";
+
+// This is a bun script, run with `bun run build.ts`
+
+import * as path from "path";
+import * as fs from "fs/promises";
+
+async function clean() {
+  console.log("Cleaning...");
+  await $`cargo clean`;
+  await $`rm -rf ./dist/`;
+  console.log("Cleaned...");
+}
+
+async function setupEmscripten() {
+  const emsdkDir = "./emsdk";
+  const emsdkExists = await fs
+    .access(emsdkDir)
+    .then(() => true)
+    .catch(() => false);
+
+  if (!emsdkExists) {
+    console.log("Cloning Emscripten SDK...");
+    await $`git clone https://github.com/emscripten-core/emsdk.git`;
+  } else {
+    console.log("Emscripten SDK already exists, skipping clone.");
+  }
+
+  const emscriptenToolchainPath = path.join(emsdkDir, "upstream", "emscripten");
+  const toolchainInstalled = await fs
+    .access(emscriptenToolchainPath)
+    .then(() => true)
+    .catch(() => false);
+
+  if (!toolchainInstalled) {
+    console.log("Installing Emscripten toolchain...");
+    await $`./emsdk/emsdk install 3.1.43`;
+  } else {
+    console.log(
+      "Emscripten toolchain 3.1.43 already installed, skipping install."
+    );
+  }
+
+  console.log("Activating Emscripten...");
+  await $`./emsdk/emsdk activate 3.1.43`;
+  console.log("Emscripten activated.");
+
+  // Set EMSDK environment variable for subsequent commands
+  process.env.EMSDK = path.resolve(emsdkDir);
+
+  const emsdkPython = path.join(path.resolve(emsdkDir), "python");
+  const emsdkNode = path.join(path.resolve(emsdkDir), "node", "16.20.0_64bit"); // Adjust node version if needed
+  const emsdkBin = path.join(path.resolve(emsdkDir), "upstream", "emscripten");
+  process.env.PATH = `${emsdkPython}:${emsdkNode}:${emsdkBin}:${process.env.PATH}`;
+}
+
+async function buildWeb(release: boolean) {
+  console.log("Building WASM with Emscripten...");
+  if (release) {
+    await $`cargo build --target=wasm32-unknown-emscripten --release`;
+  } else {
+    await $`cargo build --target=wasm32-unknown-emscripten`;
+  }
+
+  console.log("Generating CSS...");
+  await $`pnpx postcss-cli ./assets/styles.scss -o ./assets/build.css`;
+
+  console.log("Copying WASM files...");
+  const buildType = release ? "release" : "debug";
+  const outputFolder = `target/wasm32-unknown-emscripten/${buildType}`;
+  await $`mkdir -p dist`;
+  await $`cp assets/index.html dist`;
+  await $`cp assets/*.woff* dist`;
+  await $`cp assets/build.css dist`;
+  await $`cp assets/favicon.ico dist`;
+  await $`cp ${outputFolder}/spiritus.wasm dist`;
+  await $`cp ${outputFolder}/spiritus.js dist`;
+
+  // Check if .data file exists before copying
+  try {
+    await fs.access(`${outputFolder}/deps/spiritus.data`);
+    await $`cp ${outputFolder}/deps/spiritus.data dist`;
+  } catch (e) {
+    console.log("No spiritus.data file found, skipping copy.");
+  }
+
+  // Check if .map file exists before copying
+  try {
+    await fs.access(`${outputFolder}/spiritus.wasm.map`);
+    await $`cp ${outputFolder}/spiritus.wasm.map dist`;
+  } catch (e) {
+    console.log("No spiritus.wasm.map file found, skipping copy.");
+  }
+
+  console.log("WASM files copied.");
+}
+
+async function serve() {
+  console.log("Serving WASM with Emscripten...");
+  await $`python3 -m http.server -d ./dist/ 8080`;
+}
+
+async function main() {
+  const args = process.argv.slice(2);
+
+  let release = false;
+  let serveFiles = false;
+  let skipEmscriptenSetup = false;
+  let cleanProject = false;
+  let target = "web"; // Default target
+
+  for (const arg of args) {
+    switch (arg) {
+      case "-r":
+        release = true;
+        break;
+      case "-s":
+        serveFiles = true;
+        break;
+      case "-e":
+        skipEmscriptenSetup = true;
+        break;
+      case "-c":
+        cleanProject = true;
+        break;
+      case "--target=linux":
+        target = "linux";
+        break;
+      case "--target=windows":
+        target = "windows";
+        break;
+      case "--target=web":
+        target = "web";
+        break;
+      case "-h":
+      case "--help":
+        console.log(`
+Usage: ts-node build.ts [options]
+
+Options:
+  -r              Build in release mode
+  -s              Serve the WASM files once built (for web target)
+  -e              Skip EMSDK setup (GitHub workflow only)
+  -c              Clean the target/dist directory
+  --target=[web|linux|windows] Specify target platform (default: web)
+  -h, --help      Show this help message
+        `);
+        return;
+    }
+  }
+
+  if (cleanProject) {
+    await clean();
+  }
+
+  if (!skipEmscriptenSetup && target === "web") {
+    await setupEmscripten();
+  }
+
+  switch (target) {
+    case "web":
+      await buildWeb(release);
+      if (serveFiles) {
+        await serve();
+      }
+      break;
+    case "linux":
+      console.log("Building for Linux...");
+      if (release) {
+        await $`cargo build --release`;
+      } else {
+        await $`cargo build`;
+      }
+      console.log("Linux build complete.");
+      break;
+    case "windows":
+      console.log("Building for Windows...");
+      if (release) {
+        await $`cargo build --release --target=x86_64-pc-windows-msvc`; // Assuming MSVC toolchain
+      } else {
+        await $`cargo build --target=x86_64-pc-windows-msvc`;
+      }
+      console.log("Windows build complete.");
+      break;
+    default:
+      console.error("Invalid target specified.");
+      process.exit(1);
+  }
+}
+
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});
--- a/src/animation.rs
+++ b/src/animation.rs
@@ -1,3 +1,4 @@
+//! This module provides a simple animation and atlas system for textures.
 use sdl2::{
    rect::Rect,
    render::{Canvas, Texture},
@@ -6,31 +7,36 @@ use sdl2::{

 use crate::direction::Direction;

-pub struct AnimatedTexture<'a> {
-    raw_texture: Texture<'a>,
-    ticker: u32,
-    reversed: bool,
-    offset: (i32, i32),
-    ticks_per_frame: u32,
-    frame_count: u32,
-    frame_width: u32,
-    frame_height: u32,
+/// Trait for drawable atlas-based textures
+pub trait FrameDrawn {
+    fn render(
+        &mut self,
+        canvas: &mut Canvas<Window>,
+        position: (i32, i32),
+        direction: Direction,
+        frame: Option<u32>,
+    );
 }

-impl<'a> AnimatedTexture<'a> {
+/// A texture atlas abstraction for static (non-animated) rendering.
+pub struct AtlasTexture<'a> {
+    pub raw_texture: Texture<'a>,
+    pub offset: (i32, i32),
+    pub frame_count: u32,
+    pub frame_width: u32,
+    pub frame_height: u32,
+}
+
+impl<'a> AtlasTexture<'a> {
    pub fn new(
        texture: Texture<'a>,
-        ticks_per_frame: u32,
        frame_count: u32,
        frame_width: u32,
        frame_height: u32,
        offset: Option<(i32, i32)>,
    ) -> Self {
-        AnimatedTexture {
+        AtlasTexture {
            raw_texture: texture,
-            ticker: 0,
-            reversed: false,
-            ticks_per_frame,
            frame_count,
            frame_width,
            frame_height,
@@ -38,90 +44,43 @@ impl<'a> AnimatedTexture<'a> {
        }
    }

-    // Get the current frame number
-    fn current_frame(&self) -> u32 {
-        self.ticker / self.ticks_per_frame
-    }
-
-    // Move to the next frame. If we are at the end of the animation, reverse the direction
-    pub fn tick(&mut self) {
-        if self.reversed {
-            self.ticker -= 1;
-
-            if self.ticker == 0 {
-                self.reversed = !self.reversed;
-            }
-        } else {
-            self.ticker += 1;
-
-            if self.ticker + 1 == self.ticks_per_frame * self.frame_count {
-                self.reversed = !self.reversed;
-            }
-        }
-    }
-
-    // Calculate the frame rect (portion of the texture to render) for the given frame.
-    fn get_frame_rect(&self, frame: u32) -> Rect {
+    pub fn get_frame_rect(&self, frame: u32) -> Option<Rect> {
        if frame >= self.frame_count {
-            panic!("Frame {} is out of bounds for this texture", frame);
+            return None;
        }
-
-        Rect::new(
+        Some(Rect::new(
            frame as i32 * self.frame_width as i32,
            0,
            self.frame_width,
            self.frame_height,
-        )
+        ))
    }

-    pub fn render(
-        &mut self,
-        canvas: &mut Canvas<Window>,
-        position: (i32, i32),
-        direction: Direction,
-    ) {
-        self.render_static(canvas, position, direction, Some(self.current_frame()));
-        self.tick();
+    pub fn set_color_modulation(&mut self, r: u8, g: u8, b: u8) {
+        self.raw_texture.set_color_mod(r, g, b);
    }
+}

-    // Functions like render, but only ticks the animation until the given frame is reached.
-    pub fn render_until(
-        &mut self,
-        canvas: &mut Canvas<Window>,
-        position: (i32, i32),
-        direction: Direction,
-        frame: u32,
-    ) {
-        // TODO: If the frame we're targeting is in the opposite direction (due to self.reverse), we should pre-emptively reverse.
-        let current = self.current_frame();
-        self.render_static(canvas, position, direction, Some(current));
-
-        if frame != current {
-            self.tick();
-        }
-    }
-
-    // Renders a specific frame of the animation. Defaults to the current frame.
-    pub fn render_static(
+impl<'a> FrameDrawn for AtlasTexture<'a> {
+    fn render(
        &mut self,
        canvas: &mut Canvas<Window>,
        position: (i32, i32),
        direction: Direction,
        frame: Option<u32>,
    ) {
-        let frame_rect = self.get_frame_rect(frame.unwrap_or(self.current_frame()));
-        let position_rect = Rect::new(
+        let texture_source_frame_rect = self.get_frame_rect(frame.unwrap_or(0));
+        let canvas_destination_rect = Rect::new(
            position.0 + self.offset.0,
            position.1 + self.offset.1,
            self.frame_width,
            self.frame_height,
        );
-
        canvas
            .copy_ex(
                &self.raw_texture,
-                Some(frame_rect),
-                Some(position_rect),
+                texture_source_frame_rect,
+                Some(canvas_destination_rect),
                direction.angle(),
                None,
                false,
@@ -130,3 +89,87 @@ impl<'a> AnimatedTexture<'a> {
            .expect("Could not render texture on canvas");
    }
 }
+
+/// An animated texture using a texture atlas.
+pub struct AnimatedAtlasTexture<'a> {
+    pub atlas: AtlasTexture<'a>,
+    pub ticks_per_frame: u32,
+    pub ticker: u32,
+    pub reversed: bool,
+    pub paused: bool,
+}
+
+impl<'a> AnimatedAtlasTexture<'a> {
+    pub fn new(
+        texture: Texture<'a>,
+        ticks_per_frame: u32,
+        frame_count: u32,
+        width: u32,
+        height: u32,
+        offset: Option<(i32, i32)>,
+    ) -> Self {
+        AnimatedAtlasTexture {
+            atlas: AtlasTexture::new(texture, frame_count, width, height, offset),
+            ticks_per_frame,
+            ticker: 0,
+            reversed: false,
+            paused: false,
+        }
+    }
+
+    fn current_frame(&self) -> u32 {
+        self.ticker / self.ticks_per_frame
+    }
+
+    /// Advances the animation by one tick, unless paused.
+    pub fn tick(&mut self) {
+        if self.paused {
+            return;
+        }
+        if self.reversed {
+            if self.ticker > 0 {
+                self.ticker -= 1;
+            }
+            if self.ticker == 0 {
+                self.reversed = !self.reversed;
+            }
+        } else {
+            self.ticker += 1;
+            if self.ticker + 1 == self.ticks_per_frame * self.atlas.frame_count {
+                self.reversed = !self.reversed;
+            }
+        }
+    }
+
+    pub fn pause(&mut self) {
+        self.paused = true;
+    }
+    pub fn resume(&mut self) {
+        self.paused = false;
+    }
+    pub fn is_paused(&self) -> bool {
+        self.paused
+    }
+
+    pub fn set_color_modulation(&mut self, r: u8, g: u8, b: u8) {
+        self.atlas.set_color_modulation(r, g, b);
+    }
+}
+
+impl<'a> FrameDrawn for AnimatedAtlasTexture<'a> {
+    fn render(
+        &mut self,
+        canvas: &mut Canvas<Window>,
+        position: (i32, i32),
+        direction: Direction,
+        frame: Option<u32>,
+    ) {
+        self.atlas.render(
+            canvas,
+            position,
+            direction,
+            frame.or(Some(self.current_frame())),
+        );
+        self.tick();
+    }
+}
--- a/src/audio.rs
+++ b/src/audio.rs
@@ -1,16 +1,21 @@
+//! This module handles the audio playback for the game.
 use sdl2::{
    mixer::{self, Chunk, InitFlag, LoaderRWops, DEFAULT_FORMAT},
    rwops::RWops,
 };

-// Embed sound files directly into the executable
 const SOUND_1_DATA: &[u8] = include_bytes!("../assets/wav/1.ogg");
 const SOUND_2_DATA: &[u8] = include_bytes!("../assets/wav/2.ogg");
 const SOUND_3_DATA: &[u8] = include_bytes!("../assets/wav/3.ogg");
 const SOUND_4_DATA: &[u8] = include_bytes!("../assets/wav/4.ogg");

+/// An array of all the sound effect data.
 const SOUND_DATA: [&[u8]; 4] = [SOUND_1_DATA, SOUND_2_DATA, SOUND_3_DATA, SOUND_4_DATA];

+/// The audio system for the game.
+///
+/// This struct is responsible for initializing the audio device, loading sounds,
+/// and playing them.
 pub struct Audio {
    _mixer_context: mixer::Sdl2MixerContext,
    sounds: Vec<Chunk>,
@@ -18,6 +23,7 @@ pub struct Audio {
 }

 impl Audio {
+    /// Creates a new `Audio` instance.
    pub fn new() -> Self {
        let frequency = 44100;
        let format = DEFAULT_FORMAT;
@@ -53,6 +59,9 @@ impl Audio {
        }
    }

+    /// Plays the "eat" sound effect.
+    ///
+    /// This function also logs the time since the last sound effect was played.
    pub fn eat(&mut self) {
        if let Some(chunk) = self.sounds.get(self.next_sound_index) {
            match mixer::Channel(0).play(chunk, 0) {
--- a/src/constants.rs
+++ b/src/constants.rs
@@ -1,21 +1,42 @@
+//! This module contains all the constants used in the game.
+
+/// The width of the game board, in cells.
 pub const BOARD_WIDTH: u32 = 28;
-pub const BOARD_HEIGHT: u32 = 31; // Adjusted to fit map texture?
+/// The height of the game board, in cells.
+pub const BOARD_HEIGHT: u32 = 31;
+/// The size of each cell, in pixels.
 pub const CELL_SIZE: u32 = 24;

-pub const BOARD_OFFSET: (u32, u32) = (0, 3); // Relative cell offset for where map text / grid starts
+/// The offset of the game board from the top-left corner of the window, in
+/// cells.
+pub const BOARD_OFFSET: (u32, u32) = (0, 3);

+/// The width of the window, in pixels.
 pub const WINDOW_WIDTH: u32 = CELL_SIZE * BOARD_WIDTH;
-pub const WINDOW_HEIGHT: u32 = CELL_SIZE * (BOARD_HEIGHT + 6); // Map texture is 6 cells taller (3 above, 3 below) than the grid
+/// The height of the window, in pixels.
+///
+/// The map texture is 6 cells taller than the grid (3 above, 3 below), so we
+/// add 6 to the board height to get the window height.
+pub const WINDOW_HEIGHT: u32 = CELL_SIZE * (BOARD_HEIGHT + 6);

-#[derive(Debug, Copy, Clone, PartialEq)]
+/// An enum representing the different types of tiles on the map.
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum MapTile {
+    /// An empty tile.
    Empty,
+    /// A wall tile.
    Wall,
+    /// A regular pellet.
    Pellet,
+    /// A power pellet.
    PowerPellet,
+    /// A starting position for an entity.
    StartingPosition(u8),
+    /// A tunnel tile.
+    Tunnel,
 }

+/// The raw layout of the game board, as a 2D array of characters.
 pub const RAW_BOARD: [&str; BOARD_HEIGHT as usize] = [
    "############################",
    "#............##............#",
@@ -31,7 +52,7 @@ pub const RAW_BOARD: [&str; BOARD_HEIGHT as usize] = [
    "     #.##    1     ##.#     ",
    "     #.## ###==### ##.#     ",
    "######.## #      # ##.######",
-    "      .   #2 3 4 #   .      ",
+    "T     .   #2 3 4 #   .     T",
    "######.## #      # ##.######",
    "     #.## ######## ##.#     ",
    "     #.##          ##.#     ",
--- a/src/direction.rs
+++ b/src/direction.rs
@@ -1,5 +1,8 @@
+//! This module defines the `Direction` enum, which is used to represent the
+//! direction of an entity.
 use sdl2::keyboard::Keycode;

+/// An enum representing the direction of an entity.
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub enum Direction {
    Up,
@@ -9,6 +12,7 @@ pub enum Direction {
 }

 impl Direction {
+    /// Returns the angle of the direction in degrees.
    pub fn angle(&self) -> f64 {
        match self {
            Direction::Right => 0f64,
@@ -18,6 +22,7 @@ impl Direction {
        }
    }

+    /// Returns the offset of the direction as a tuple of (x, y).
    pub fn offset(&self) -> (i32, i32) {
        match self {
            Direction::Right => (1, 0),
@@ -27,16 +32,27 @@ impl Direction {
        }
    }

+    /// Returns the opposite direction.
+    pub fn opposite(&self) -> Direction {
+        match self {
+            Direction::Right => Direction::Left,
+            Direction::Down => Direction::Up,
+            Direction::Left => Direction::Right,
+            Direction::Up => Direction::Down,
+        }
+    }
+
+    /// Creates a `Direction` from a `Keycode`.
+    ///
+    /// # Arguments
+    ///
+    /// * `keycode` - The keycode to convert.
    pub fn from_keycode(keycode: Keycode) -> Option<Direction> {
        match keycode {
-            Keycode::D => Some(Direction::Right),
-            Keycode::Right => Some(Direction::Right),
-            Keycode::A => Some(Direction::Left),
-            Keycode::Left => Some(Direction::Left),
-            Keycode::W => Some(Direction::Up),
-            Keycode::Up => Some(Direction::Up),
-            Keycode::S => Some(Direction::Down),
-            Keycode::Down => Some(Direction::Down),
+            Keycode::D | Keycode::Right => Some(Direction::Right),
+            Keycode::A | Keycode::Left => Some(Direction::Left),
+            Keycode::W | Keycode::Up => Some(Direction::Up),
+            Keycode::S | Keycode::Down => Some(Direction::Down),
            _ => None,
        }
    }
--- a/src/entity.rs
+++ b/src/entity.rs
@@ -1,11 +1,166 @@
+use crate::{
+    constants::{MapTile, BOARD_OFFSET, BOARD_WIDTH, CELL_SIZE},
+    direction::Direction,
+    map::Map,
+    modulation::SimpleTickModulator,
+};
+use std::cell::RefCell;
+use std::rc::Rc;
+
+/// A trait for game objects that can be moved and rendered.
 pub trait Entity {
-    // Returns true if the entity is colliding with the other entity
-    fn is_colliding(&self, other: &dyn Entity) -> bool;
-    // Returns the absolute position of the entity
-    fn position(&self) -> (i32, i32);
-    // Returns the cell position of the entity (XY position within the grid)
-    fn cell_position(&self) -> (u32, u32);
-    fn internal_position(&self) -> (u32, u32);
-    // Tick the entity (move it, perform collision checks, etc)
+    /// Returns a reference to the base MovableEntity.
+    fn base(&self) -> &MovableEntity;
+
+    /// Returns true if the entity is colliding with the other entity.
+    fn is_colliding(&self, other: &dyn Entity) -> bool {
+        let (x, y) = self.base().pixel_position;
+        let (other_x, other_y) = other.base().pixel_position;
+        x == other_x && y == other_y
+    }
+
+    /// Ticks the entity, which updates its state and position.
    fn tick(&mut self);
 }
+
+/// A struct for movable game entities with position, direction, speed, and modulation.
+pub struct MovableEntity {
+    /// The absolute position of the entity on the board, in pixels.
+    pub pixel_position: (i32, i32),
+    /// The position of the entity on the board, in grid coordinates.
+    pub cell_position: (u32, u32),
+    /// The current direction of the entity.
+    pub direction: Direction,
+    /// Movement speed (pixels per tick).
+    pub speed: u32,
+    /// Movement modulator for controlling speed.
+    pub modulation: SimpleTickModulator,
+    /// Whether the entity is currently in a tunnel.
+    pub in_tunnel: bool,
+    /// Reference to the game map.
+    pub map: Rc<RefCell<Map>>,
+}
+
+impl MovableEntity {
+    /// Creates a new MovableEntity.
+    pub fn new(
+        pixel_position: (i32, i32),
+        cell_position: (u32, u32),
+        direction: Direction,
+        speed: u32,
+        modulation: SimpleTickModulator,
+        map: Rc<RefCell<Map>>,
+    ) -> Self {
+        Self {
+            pixel_position,
+            cell_position,
+            direction,
+            speed,
+            modulation,
+            in_tunnel: false,
+            map,
+        }
+    }
+
+    /// Returns the position within the current cell, in pixels.
+    pub fn internal_position(&self) -> (u32, u32) {
+        (
+            self.pixel_position.0 as u32 % CELL_SIZE,
+            self.pixel_position.1 as u32 % CELL_SIZE,
+        )
+    }
+
+    /// Move the entity in its current direction by its speed.
+    pub fn move_forward(&mut self) {
+        let speed = self.speed as i32;
+        match self.direction {
+            Direction::Right => self.pixel_position.0 += speed,
+            Direction::Left => self.pixel_position.0 -= speed,
+            Direction::Up => self.pixel_position.1 -= speed,
+            Direction::Down => self.pixel_position.1 += speed,
+        }
+    }
+
+    /// Updates the cell position based on the current pixel position.
+    pub fn update_cell_position(&mut self) {
+        self.cell_position = (
+            (self.pixel_position.0 as u32 / CELL_SIZE) - BOARD_OFFSET.0,
+            (self.pixel_position.1 as u32 / CELL_SIZE) - BOARD_OFFSET.1,
+        );
+    }
+
+    /// Calculates the next cell in the given direction.
+    pub fn next_cell(&self, direction: Option<Direction>) -> (i32, i32) {
+        let (x, y) = direction.unwrap_or(self.direction).offset();
+        (
+            self.cell_position.0 as i32 + x,
+            self.cell_position.1 as i32 + y,
+        )
+    }
+
+    /// Returns true if the next cell in the given direction is a wall.
+    pub fn is_wall_ahead(&self, direction: Option<Direction>) -> bool {
+        let next_cell = self.next_cell(direction);
+        matches!(self.map.borrow().get_tile(next_cell), Some(MapTile::Wall))
+    }
+
+    /// Handles tunnel movement and wrapping.
+    /// Returns true if the entity is in a tunnel and was handled.
+    pub fn handle_tunnel(&mut self) -> bool {
+        if !self.in_tunnel {
+            let current_tile = self
+                .map
+                .borrow()
+                .get_tile((self.cell_position.0 as i32, self.cell_position.1 as i32));
+            if matches!(current_tile, Some(MapTile::Tunnel)) {
+                self.in_tunnel = true;
+            }
+        }
+
+        if self.in_tunnel {
+            // If out of bounds, teleport to the opposite side and exit tunnel
+            if self.cell_position.0 == 0 {
+                self.cell_position.0 = BOARD_WIDTH - 2;
+                self.pixel_position =
+                    Map::cell_to_pixel((self.cell_position.0, self.cell_position.1));
+                self.in_tunnel = false;
+                true
+            } else if self.cell_position.0 == BOARD_WIDTH - 1 {
+                self.cell_position.0 = 1;
+                self.pixel_position =
+                    Map::cell_to_pixel((self.cell_position.0, self.cell_position.1));
+                self.in_tunnel = false;
+                true
+            } else {
+                // Still in tunnel, keep moving
+                true
+            }
+        } else {
+            false
+        }
+    }
+
+    /// Returns true if the entity is aligned with the grid.
+    pub fn is_grid_aligned(&self) -> bool {
+        self.internal_position() == (0, 0)
+    }
+
+    /// Attempts to set the direction if the next cell is not a wall.
+    /// Returns true if the direction was changed.
+    pub fn set_direction_if_valid(&mut self, new_direction: Direction) -> bool {
+        if new_direction == self.direction {
+            return false;
+        }
+        if self.is_wall_ahead(Some(new_direction)) {
+            return false;
+        }
+        self.direction = new_direction;
+        true
+    }
+}
+
+/// A trait for entities that can be rendered to the screen.
+pub trait Renderable {
+    /// Renders the entity to the canvas.
+    fn render(&mut self, canvas: &mut sdl2::render::Canvas<sdl2::video::Window>);
+}
--- a/src/game.rs
+++ b/src/game.rs
@@ -1,5 +1,8 @@
+//! This module contains the main game logic and state.
+use std::cell::RefCell;
 use std::rc::Rc;

+use rand::seq::IteratorRandom;
 use sdl2::image::LoadTexture;
 use sdl2::keyboard::Keycode;
 use sdl2::render::{Texture, TextureCreator};
@@ -10,11 +13,15 @@ use sdl2::{pixels::Color, render::Canvas, video::Window};
 use tracing::event;

 use crate::audio::Audio;
-use crate::constants::{MapTile, BOARD_HEIGHT, BOARD_WIDTH, RAW_BOARD};
-use crate::direction::Direction;
-use crate::entity::Entity;
-use crate::map::Map;
-use crate::pacman::Pacman;
+use crate::{
+    animation::{AtlasTexture, FrameDrawn},
+    constants::{MapTile, BOARD_HEIGHT, BOARD_WIDTH, RAW_BOARD},
+    direction::Direction,
+    entity::{Entity, Renderable},
+    ghosts::blinky::Blinky,
+    map::Map,
+    pacman::Pacman,
+};

 // Embed texture data directly into the executable
 static PACMAN_TEXTURE_DATA: &[u8] = include_bytes!("../assets/32/pacman.png");
@@ -23,20 +30,46 @@ static POWER_PELLET_TEXTURE_DATA: &[u8] = include_bytes!("../assets/24/energizer
 static MAP_TEXTURE_DATA: &[u8] = include_bytes!("../assets/map.png");
 static FONT_DATA: &[u8] = include_bytes!("../assets/font/konami.ttf");

+// Add ghost texture data
+static GHOST_BODY_TEXTURE_DATA: &[u8] = include_bytes!("../assets/32/ghost_body.png");
+static GHOST_EYES_TEXTURE_DATA: &[u8] = include_bytes!("../assets/32/ghost_eyes.png");
+
+/// The main game state.
+///
+/// This struct contains all the information necessary to run the game, including
+/// the canvas, textures, fonts, game objects, and the current score.
+#[derive(PartialEq, Eq, Clone, Copy)]
+pub enum DebugMode {
+    None,
+    Grid,
+    Pathfinding,
+    ValidPositions,
+}
+
 pub struct Game<'a> {
    canvas: &'a mut Canvas<Window>,
    map_texture: Texture<'a>,
-    pellet_texture: Texture<'a>,
-    power_pellet_texture: Texture<'a>,
+    pellet_texture: AtlasTexture<'a>,
+    power_pellet_texture: AtlasTexture<'a>,
    font: Font<'a, 'static>,
-    pacman: Pacman<'a>,
+    pacman: Rc<RefCell<Pacman<'a>>>,
    map: Rc<std::cell::RefCell<Map>>,
-    debug: bool,
+    debug_mode: DebugMode,
    score: u32,
-    audio: Audio,
+    audio: crate::audio::Audio,
+    // Add ghost
+    blinky: Blinky<'a>,
 }

 impl Game<'_> {
+    /// Creates a new `Game` instance.
+    ///
+    /// # Arguments
+    ///
+    /// * `canvas` - The SDL canvas to render to.
+    /// * `texture_creator` - The SDL texture creator.
+    /// * `ttf_context` - The SDL TTF context.
+    /// * `_audio_subsystem` - The SDL audio subsystem (currently unused).
    pub fn new<'a>(
        canvas: &'a mut Canvas<Window>,
        texture_creator: &'a TextureCreator<WindowContext>,
@@ -49,17 +82,48 @@ impl Game<'_> {
        let pacman_atlas = texture_creator
            .load_texture_bytes(PACMAN_TEXTURE_DATA)
            .expect("Could not load pacman texture from embedded data");
-        let pacman = Pacman::new((1, 1), pacman_atlas, Rc::clone(&map));
+        let pacman = Rc::new(std::cell::RefCell::new(Pacman::new(
+            (1, 1),
+            pacman_atlas,
+            Rc::clone(&map),
+        )));
+
+        // Load ghost textures
+        let ghost_body = texture_creator
+            .load_texture_bytes(GHOST_BODY_TEXTURE_DATA)
+            .expect("Could not load ghost body texture from embedded data");
+        let ghost_eyes = texture_creator
+            .load_texture_bytes(GHOST_EYES_TEXTURE_DATA)
+            .expect("Could not load ghost eyes texture from embedded data");
+
+        // Create Blinky
+        let blinky = Blinky::new(
+            (13, 11), // Starting position just above ghost house
+            ghost_body,
+            ghost_eyes,
+            Rc::clone(&map),
+            Rc::clone(&pacman),
+        );

        // Load pellet texture from embedded data
-        let pellet_texture = texture_creator
-            .load_texture_bytes(PELLET_TEXTURE_DATA)
-            .expect("Could not load pellet texture from embedded data");
-
-        // Load power pellet texture from embedded data
-        let power_pellet_texture = texture_creator
-            .load_texture_bytes(POWER_PELLET_TEXTURE_DATA)
-            .expect("Could not load power pellet texture from embedded data");
+        let pellet_texture = AtlasTexture::new(
+            texture_creator
+                .load_texture_bytes(PELLET_TEXTURE_DATA)
+                .expect("Could not load pellet texture from embedded data"),
+            1,
+            24,
+            24,
+            None,
+        );
+        let power_pellet_texture = AtlasTexture::new(
+            texture_creator
+                .load_texture_bytes(POWER_PELLET_TEXTURE_DATA)
+                .expect("Could not load power pellet texture from embedded data"),
+            1,
+            24,
+            24,
+            None,
+        );

        // Load font from embedded data
        let font_rwops = RWops::from_bytes(FONT_DATA).expect("Failed to create RWops for font");
@@ -77,26 +141,37 @@ impl Game<'_> {

        Game {
            canvas,
-            pacman: pacman,
-            debug: false,
-            map: map,
+            pacman,
+            debug_mode: DebugMode::None,
+            map,
            map_texture,
            pellet_texture,
            power_pellet_texture,
            font,
            score: 0,
            audio,
+            blinky,
        }
    }

+    /// Handles a keyboard event.
+    ///
+    /// # Arguments
+    ///
+    /// * `keycode` - The keycode of the key that was pressed.
    pub fn keyboard_event(&mut self, keycode: Keycode) {
        // Change direction
        let direction = Direction::from_keycode(keycode);
-        self.pacman.next_direction = direction;
+        self.pacman.borrow_mut().next_direction = direction;

        // Toggle debug mode
        if keycode == Keycode::Space {
-            self.debug = !self.debug;
+            self.debug_mode = match self.debug_mode {
+                DebugMode::None => DebugMode::Grid,
+                DebugMode::Grid => DebugMode::Pathfinding,
+                DebugMode::Pathfinding => DebugMode::ValidPositions,
+                DebugMode::ValidPositions => DebugMode::None,
+            };
        }

        // Reset game
@@ -105,10 +180,16 @@ impl Game<'_> {
        }
    }

+    /// Adds points to the score.
+    ///
+    /// # Arguments
+    ///
+    /// * `points` - The number of points to add.
    pub fn add_score(&mut self, points: u32) {
        self.score += points;
    }

+    /// Resets the game to its initial state.
    pub fn reset(&mut self) {
        // Reset the map to restore all pellets
        {
@@ -119,20 +200,43 @@ impl Game<'_> {
        // Reset the score
        self.score = 0;

-        // Reset Pacman position (you might want to customize this)
-        // For now, we'll keep Pacman where he is, but you could add:
-        // self.pacman.position = Map::cell_to_pixel((1, 1));
+        // Get valid positions from the cached flood fill
+        let mut map = self.map.borrow_mut();
+        let valid_positions = map.get_valid_playable_positions();
+        let mut rng = rand::rng();

-        event!(tracing::Level::INFO, "Game reset - map and score cleared");
+        // Randomize Pac-Man position
+        if let Some(pos) = valid_positions.iter().choose(&mut rng) {
+            let mut pacman = self.pacman.borrow_mut();
+            pacman.base.pixel_position = Map::cell_to_pixel((pos.x, pos.y));
+            pacman.base.cell_position = (pos.x, pos.y);
+            pacman.base.in_tunnel = false;
+            pacman.base.direction = Direction::Right;
+            pacman.next_direction = None;
+            pacman.stopped = false;
+        }
+
+        // Randomize ghost position
+        if let Some(pos) = valid_positions.iter().choose(&mut rng) {
+            self.blinky.base.pixel_position = Map::cell_to_pixel((pos.x, pos.y));
+            self.blinky.base.cell_position = (pos.x, pos.y);
+            self.blinky.base.in_tunnel = false;
+            self.blinky.base.direction = Direction::Left;
+            self.blinky.mode = crate::ghost::GhostMode::Chase;
+        }
    }

+    /// Advances the game by one tick.
    pub fn tick(&mut self) {
-        self.pacman.tick();
        self.check_pellet_eating();
+        self.pacman.borrow_mut().tick();
+        self.blinky.tick();
    }

+    /// Checks if Pac-Man is currently eating a pellet and updates the game state
+    /// accordingly.
    fn check_pellet_eating(&mut self) {
-        let cell_pos = self.pacman.cell_position();
+        let cell_pos = self.pacman.borrow().base.cell_position;

        // Check if there's a pellet at the current position
        let tile = {
@@ -164,6 +268,7 @@ impl Game<'_> {
        }
    }

+    /// Draws the entire game to the canvas.
    pub fn draw(&mut self) {
        // Clear the screen (black)
        self.canvas.set_draw_color(Color::RGB(0, 0, 0));
@@ -175,16 +280,49 @@ impl Game<'_> {
            .expect("Could not render texture on canvas");

        // Render pellets
-        self.render_pellets();
+        for x in 0..BOARD_WIDTH {
+            for y in 0..BOARD_HEIGHT {
+                let tile = self
+                    .map
+                    .borrow()
+                    .get_tile((x as i32, y as i32))
+                    .unwrap_or(MapTile::Empty);

-        // Render the pacman
-        self.pacman.render(self.canvas);
+                match tile {
+                    MapTile::Pellet => {
+                        let position = Map::cell_to_pixel((x, y));
+                        self.pellet_texture.render(
+                            self.canvas,
+                            position,
+                            Direction::Right,
+                            Some(0),
+                        );
+                    }
+                    MapTile::PowerPellet => {
+                        let position = Map::cell_to_pixel((x, y));
+                        self.power_pellet_texture.render(
+                            self.canvas,
+                            position,
+                            Direction::Right,
+                            Some(0),
+                        );
+                    }
+                    _ => {}
+                }
+            }
+        }
+
+        // Render Pac-Man
+        self.pacman.borrow_mut().render(self.canvas);
+
+        // Render ghost
+        self.blinky.render(self.canvas);

        // Render score
-        self.render_score();
+        self.render_ui();

        // Draw the debug grid
-        if self.debug {
+        if self.debug_mode == DebugMode::Grid {
            for x in 0..BOARD_WIDTH {
                for y in 0..BOARD_HEIGHT {
                    let tile = self
@@ -194,7 +332,7 @@ impl Game<'_> {
                        .unwrap_or(MapTile::Empty);
                    let mut color = None;

-                    if (x, y) == self.pacman.cell_position() {
+                    if (x, y) == self.pacman.borrow().base.cell_position {
                        self.draw_cell((x, y), Color::CYAN);
                    } else {
                        color = match tile {
@@ -203,6 +341,7 @@ impl Game<'_> {
                            MapTile::Pellet => Some(Color::RED),
                            MapTile::PowerPellet => Some(Color::MAGENTA),
                            MapTile::StartingPosition(_) => Some(Color::GREEN),
+                            MapTile::Tunnel => Some(Color::CYAN),
                        };
                    }

@@ -213,14 +352,44 @@ impl Game<'_> {
            }

            // Draw the next cell
-            let next_cell = self.pacman.next_cell(None);
+            let next_cell = self.pacman.borrow().base.next_cell(None);
            self.draw_cell((next_cell.0 as u32, next_cell.1 as u32), Color::YELLOW);
        }

+        // Show valid playable positions
+        if self.debug_mode == DebugMode::ValidPositions {
+            let valid_positions_vec = {
+                let mut map = self.map.borrow_mut();
+                map.get_valid_playable_positions().clone()
+            };
+            for &pos in &valid_positions_vec {
+                self.draw_cell((pos.x, pos.y), Color::RGB(255, 140, 0)); // ORANGE
+            }
+        }
+
+        // Pathfinding debug mode
+        if self.debug_mode == DebugMode::Pathfinding {
+            // Show the current path for Blinky
+            if let Some((path, _)) = self.blinky.get_path_to_target({
+                let (tx, ty) = self.blinky.get_target_tile();
+                (tx as u32, ty as u32)
+            }) {
+                for &(x, y) in &path {
+                    self.draw_cell((x, y), Color::YELLOW);
+                }
+            }
+        }
+
        // Present the canvas
        self.canvas.present();
    }

+    /// Draws a single cell to the canvas with the given color.
+    ///
+    /// # Arguments
+    ///
+    /// * `cell` - The cell to draw, in grid coordinates.
+    /// * `color` - The color to draw the cell with.
    fn draw_cell(&mut self, cell: (u32, u32), color: Color) {
        let position = Map::cell_to_pixel(cell);

@@ -235,37 +404,8 @@ impl Game<'_> {
            .expect("Could not draw rectangle");
    }

-    fn render_pellets(&mut self) {
-        for x in 0..BOARD_WIDTH {
-            for y in 0..BOARD_HEIGHT {
-                let tile = self
-                    .map
-                    .borrow()
-                    .get_tile((x as i32, y as i32))
-                    .unwrap_or(MapTile::Empty);
-
-                match tile {
-                    MapTile::Pellet => {
-                        let position = Map::cell_to_pixel((x, y));
-                        let dst_rect = sdl2::rect::Rect::new(position.0, position.1, 24, 24);
-                        self.canvas
-                            .copy(&self.pellet_texture, None, Some(dst_rect))
-                            .expect("Could not render pellet");
-                    }
-                    MapTile::PowerPellet => {
-                        let position = Map::cell_to_pixel((x, y));
-                        let dst_rect = sdl2::rect::Rect::new(position.0, position.1, 24, 24);
-                        self.canvas
-                            .copy(&self.power_pellet_texture, None, Some(dst_rect))
-                            .expect("Could not render power pellet");
-                    }
-                    _ => {}
-                }
-            }
-        }
-    }
-
-    fn render_score(&mut self) {
+    /// Renders the user interface, including the score and lives.
+    fn render_ui(&mut self) {
        let lives = 3;
        let score_text = format!("{:02}", self.score);

@@ -275,6 +415,7 @@ impl Game<'_> {
        let score_offset = 7 - (score_text.len() as i32);
        let gap_offset = 6;

+        // Render the score and high score
        self.render_text(
            &format!("{}UP   HIGH SCORE   ", lives),
            (24 * lives_offset + x_offset, y_offset),
@@ -287,6 +428,7 @@ impl Game<'_> {
        );
    }

+    /// Renders text to the screen at the given position.
    fn render_text(&mut self, text: &str, position: (i32, i32), color: Color) {
        let surface = self
            .font
@@ -298,11 +440,9 @@ impl Game<'_> {
        let texture = texture_creator
            .create_texture_from_surface(&surface)
            .expect("Could not create texture from surface");
-
        let query = texture.query();

-        let dst_rect =
-            sdl2::rect::Rect::new(position.0, position.1, query.width + 4, query.height + 4);
+        let dst_rect = sdl2::rect::Rect::new(position.0, position.1, query.width, query.height);

        self.canvas
            .copy(&texture, None, Some(dst_rect))
--- a/src/ghost.rs
+++ b/src/ghost.rs
@@ -0,0 +1,324 @@
+use pathfinding::prelude::dijkstra;
+use rand::Rng;
+
+use crate::{
+    animation::{AnimatedAtlasTexture, FrameDrawn},
+    constants::{MapTile, BOARD_WIDTH},
+    direction::Direction,
+    entity::{Entity, MovableEntity, Renderable},
+    map::Map,
+    modulation::{SimpleTickModulator, TickModulator},
+    pacman::Pacman,
+};
+
+/// The different modes a ghost can be in
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum GhostMode {
+    /// Chase mode - ghost actively pursues Pac-Man using its unique strategy
+    Chase,
+    /// Scatter mode - ghost heads to its home corner
+    Scatter,
+    /// Frightened mode - ghost moves randomly and can be eaten
+    Frightened,
+    /// Eyes mode - ghost returns to the ghost house after being eaten
+    Eyes,
+    /// House mode - ghost is in the ghost house, waiting to exit
+    House,
+}
+
+/// The different ghost personalities
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum GhostType {
+    Blinky, // Red - Shadow
+    Pinky,  // Pink - Speedy
+    Inky,   // Cyan - Bashful
+    Clyde,  // Orange - Pokey
+}
+
+impl GhostType {
+    /// Returns the color of the ghost.
+    pub fn color(&self) -> sdl2::pixels::Color {
+        match self {
+            GhostType::Blinky => sdl2::pixels::Color::RGB(255, 0, 0),
+            GhostType::Pinky => sdl2::pixels::Color::RGB(255, 184, 255),
+            GhostType::Inky => sdl2::pixels::Color::RGB(0, 255, 255),
+            GhostType::Clyde => sdl2::pixels::Color::RGB(255, 184, 82),
+        }
+    }
+}
+
+/// Base ghost struct that contains common functionality
+pub struct Ghost<'a> {
+    /// Shared movement and position fields.
+    pub base: MovableEntity,
+    /// The current mode of the ghost
+    pub mode: GhostMode,
+    /// The type/personality of this ghost
+    pub ghost_type: GhostType,
+    /// Reference to Pac-Man for targeting
+    pub pacman: std::rc::Rc<std::cell::RefCell<Pacman<'a>>>,
+    /// Ghost body sprite
+    body_sprite: AnimatedAtlasTexture<'a>,
+    /// Ghost eyes sprite
+    eyes_sprite: AnimatedAtlasTexture<'a>,
+}
+
+impl Ghost<'_> {
+    /// Creates a new ghost instance
+    pub fn new<'a>(
+        ghost_type: GhostType,
+        starting_position: (u32, u32),
+        body_texture: sdl2::render::Texture<'a>,
+        eyes_texture: sdl2::render::Texture<'a>,
+        map: std::rc::Rc<std::cell::RefCell<Map>>,
+        pacman: std::rc::Rc<std::cell::RefCell<Pacman<'a>>>,
+    ) -> Ghost<'a> {
+        let color = ghost_type.color();
+        let mut body_sprite = AnimatedAtlasTexture::new(body_texture, 8, 2, 32, 32, Some((-4, -4)));
+        body_sprite.set_color_modulation(color.r, color.g, color.b);
+        let pixel_position = Map::cell_to_pixel(starting_position);
+        Ghost {
+            base: MovableEntity::new(
+                pixel_position,
+                starting_position,
+                Direction::Left,
+                3,
+                SimpleTickModulator::new(1.0),
+                map,
+            ),
+            mode: GhostMode::Chase,
+            ghost_type,
+            pacman,
+            body_sprite,
+            eyes_sprite: AnimatedAtlasTexture::new(eyes_texture, 1, 4, 32, 32, Some((-4, -4))),
+        }
+    }
+
+    /// Gets the target tile for this ghost based on its current mode
+    pub fn get_target_tile(&self) -> (i32, i32) {
+        match self.mode {
+            GhostMode::Scatter => self.get_scatter_target(),
+            GhostMode::Chase => self.get_chase_target(),
+            GhostMode::Frightened => self.get_random_target(),
+            GhostMode::Eyes => self.get_house_target(),
+            GhostMode::House => self.get_house_exit_target(),
+        }
+    }
+
+    /// Gets this ghost's home corner target for scatter mode
+    fn get_scatter_target(&self) -> (i32, i32) {
+        match self.ghost_type {
+            GhostType::Blinky => (25, 0), // Top right
+            GhostType::Pinky => (2, 0),   // Top left
+            GhostType::Inky => (27, 35),  // Bottom right
+            GhostType::Clyde => (0, 35),  // Bottom left
+        }
+    }
+
+    /// Gets a random adjacent tile for frightened mode
+    fn get_random_target(&self) -> (i32, i32) {
+        let mut rng = rand::rng();
+        let mut possible_moves = Vec::new();
+
+        // Check all four directions
+        for dir in &[
+            Direction::Up,
+            Direction::Down,
+            Direction::Left,
+            Direction::Right,
+        ] {
+            // Don't allow reversing direction
+            if *dir == self.base.direction.opposite() {
+                continue;
+            }
+
+            let next_cell = self.base.next_cell(Some(*dir));
+            if !matches!(
+                self.base.map.borrow().get_tile(next_cell),
+                Some(MapTile::Wall)
+            ) {
+                possible_moves.push(next_cell);
+            }
+        }
+
+        if possible_moves.is_empty() {
+            // No valid moves, must reverse
+            self.base.next_cell(Some(self.base.direction.opposite()))
+        } else {
+            // Choose a random valid move
+            possible_moves[rng.random_range(0..possible_moves.len())]
+        }
+    }
+
+    /// Gets the ghost house target for returning eyes
+    fn get_house_target(&self) -> (i32, i32) {
+        (13, 14) // Center of ghost house
+    }
+
+    /// Gets the exit point target when leaving house
+    fn get_house_exit_target(&self) -> (i32, i32) {
+        (13, 11) // Just above ghost house
+    }
+
+    /// Gets this ghost's chase mode target (to be implemented by each ghost type)
+    fn get_chase_target(&self) -> (i32, i32) {
+        // Default implementation just targets Pac-Man directly
+        let pacman = self.pacman.borrow();
+        let cell = pacman.base().cell_position;
+        (cell.0 as i32, cell.1 as i32)
+    }
+
+    /// Calculates the path to the target tile using the A* algorithm.
+    pub fn get_path_to_target(&self, target: (u32, u32)) -> Option<(Vec<(u32, u32)>, u32)> {
+        let start = self.base.cell_position;
+        let map = self.base.map.borrow();
+
+        dijkstra(
+            &start,
+            |&p| {
+                let mut successors = vec![];
+                let tile = map.get_tile((p.0 as i32, p.1 as i32));
+                // Tunnel wrap: if currently in a tunnel, add the opposite exit as a neighbor
+                if let Some(MapTile::Tunnel) = tile {
+                    if p.0 == 0 {
+                        successors.push(((BOARD_WIDTH - 2, p.1), 1));
+                    } else if p.0 == BOARD_WIDTH - 1 {
+                        successors.push(((1, p.1), 1));
+                    }
+                }
+                for dir in &[
+                    Direction::Up,
+                    Direction::Down,
+                    Direction::Left,
+                    Direction::Right,
+                ] {
+                    let (dx, dy) = dir.offset();
+                    let next_p = (p.0 as i32 + dx, p.1 as i32 + dy);
+                    if let Some(tile) = map.get_tile(next_p) {
+                        if tile == MapTile::Wall {
+                            continue;
+                        }
+                        successors.push(((next_p.0 as u32, next_p.1 as u32), 1));
+                    }
+                }
+                successors
+            },
+            |&p| p == target,
+        )
+    }
+
+    /// Changes the ghost's mode and handles direction reversal
+    pub fn set_mode(&mut self, new_mode: GhostMode) {
+        // Don't reverse if going to/from frightened or if in house
+        let should_reverse = self.mode != GhostMode::House
+            && new_mode != GhostMode::Frightened
+            && self.mode != GhostMode::Frightened;
+
+        self.mode = new_mode;
+
+        self.base.speed = match new_mode {
+            GhostMode::Chase => 3,
+            GhostMode::Scatter => 2,
+            GhostMode::Frightened => 2,
+            GhostMode::Eyes => 7,
+            GhostMode::House => 0,
+        };
+
+        if should_reverse {
+            self.base
+                .set_direction_if_valid(self.base.direction.opposite());
+        }
+    }
+}
+
+impl Entity for Ghost<'_> {
+    fn base(&self) -> &MovableEntity {
+        &self.base
+    }
+
+    fn tick(&mut self) {
+        if self.mode == GhostMode::House {
+            // For now, do nothing in the house
+            return;
+        }
+
+        if self.base.is_grid_aligned() {
+            self.base.update_cell_position();
+
+            if !self.base.handle_tunnel() {
+                // Pathfinding logic (only if not in tunnel)
+                let target_tile = self.get_target_tile();
+                if let Some((path, _)) =
+                    self.get_path_to_target((target_tile.0 as u32, target_tile.1 as u32))
+                {
+                    if path.len() > 1 {
+                        let next_move = path[1];
+                        let (x, y) = self.base.cell_position;
+                        let dx = next_move.0 as i32 - x as i32;
+                        let dy = next_move.1 as i32 - y as i32;
+                        let new_direction = if dx > 0 {
+                            Direction::Right
+                        } else if dx < 0 {
+                            Direction::Left
+                        } else if dy > 0 {
+                            Direction::Down
+                        } else {
+                            Direction::Up
+                        };
+                        self.base.set_direction_if_valid(new_direction);
+                    }
+                }
+            }
+
+            // Don't move if the next tile is a wall
+            if self.base.is_wall_ahead(None) {
+                return;
+            }
+        }
+
+        if self.base.modulation.next() {
+            self.base.move_forward();
+
+            if self.base.is_grid_aligned() {
+                self.base.update_cell_position();
+            }
+        }
+    }
+}
+
+impl Renderable for Ghost<'_> {
+    fn render(&mut self, canvas: &mut sdl2::render::Canvas<sdl2::video::Window>) {
+        // Render body
+        if self.mode != GhostMode::Eyes {
+            let color = if self.mode == GhostMode::Frightened {
+                sdl2::pixels::Color::RGB(0, 0, 255)
+            } else {
+                self.ghost_type.color()
+            };
+
+            self.body_sprite
+                .set_color_modulation(color.r, color.g, color.b);
+            self.body_sprite
+                .render(canvas, self.base.pixel_position, Direction::Right, None);
+        }
+
+        // Always render eyes on top
+        let eye_frame = if self.mode == GhostMode::Frightened {
+            4 // Frightened frame
+        } else {
+            match self.base.direction {
+                Direction::Right => 0,
+                Direction::Up => 1,
+                Direction::Left => 2,
+                Direction::Down => 3,
+            }
+        };
+
+        self.eyes_sprite.render(
+            canvas,
+            self.base.pixel_position,
+            Direction::Right,
+            Some(eye_frame),
+        );
+    }
+}
--- a/src/ghosts/blinky.rs
+++ b/src/ghosts/blinky.rs
@@ -0,0 +1,81 @@
+use std::cell::RefCell;
+use std::rc::Rc;
+
+use sdl2::render::{Canvas, Texture};
+use sdl2::video::Window;
+
+use crate::{
+    entity::{Entity, MovableEntity, Renderable},
+    ghost::{Ghost, GhostMode, GhostType},
+    map::Map,
+    pacman::Pacman,
+};
+
+pub struct Blinky<'a> {
+    ghost: Ghost<'a>,
+}
+
+impl<'a> Blinky<'a> {
+    pub fn new(
+        starting_position: (u32, u32),
+        body_texture: Texture<'a>,
+        eyes_texture: Texture<'a>,
+        map: Rc<RefCell<Map>>,
+        pacman: Rc<RefCell<Pacman<'a>>>,
+    ) -> Blinky<'a> {
+        Blinky {
+            ghost: Ghost::new(
+                GhostType::Blinky,
+                starting_position,
+                body_texture,
+                eyes_texture,
+                map,
+                pacman,
+            ),
+        }
+    }
+
+    /// Gets Blinky's chase target - directly targets Pac-Man's current position
+    fn get_chase_target(&self) -> (i32, i32) {
+        let pacman = self.ghost.pacman.borrow();
+        let cell = pacman.base().cell_position;
+        (cell.0 as i32, cell.1 as i32)
+    }
+
+    pub fn set_mode(&mut self, mode: GhostMode) {
+        self.ghost.set_mode(mode);
+    }
+
+    pub fn render(&mut self, canvas: &mut Canvas<Window>) {
+        Renderable::render(&mut self.ghost, canvas);
+    }
+}
+
+impl<'a> Entity for Blinky<'a> {
+    fn base(&self) -> &MovableEntity {
+        self.ghost.base()
+    }
+
+    fn is_colliding(&self, other: &dyn Entity) -> bool {
+        self.ghost.is_colliding(other)
+    }
+
+    fn tick(&mut self) {
+        self.ghost.tick()
+    }
+}
+
+// Allow direct access to ghost fields
+impl<'a> std::ops::Deref for Blinky<'a> {
+    type Target = Ghost<'a>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.ghost
+    }
+}
+
+impl<'a> std::ops::DerefMut for Blinky<'a> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.ghost
+    }
+}
--- a/src/ghosts/mod.rs
+++ b/src/ghosts/mod.rs
@@ -0,0 +1 @@
+pub mod blinky;
--- a/src/helper.rs
+++ b/src/helper.rs
@@ -1,3 +1,5 @@
+//! This module contains helper functions that are used throughout the game.
+
 /// Checks if two grid positions are adjacent to each other
 ///
 /// # Arguments
--- a/src/main.rs
+++ b/src/main.rs
@@ -22,6 +22,11 @@ use winapi::{
    },
 };

+/// Attaches the process to the parent console on Windows.
+///
+/// This allows the application to print to the console when run from a terminal,
+/// which is useful for debugging purposes. If the application is not run from a
+/// terminal, this function does nothing.
 #[cfg(windows)]
 unsafe fn attach_console() {
    if GetConsoleWindow() != std::ptr::null_mut() as HWND {
@@ -53,12 +58,19 @@ mod constants;
 mod direction;
 mod entity;
 mod game;
+mod ghost;
+mod ghosts;
 mod helper;
 mod map;
 mod modulation;
 mod pacman;

+/// The main entry point of the application.
+///
+/// This function initializes SDL, the window, the game state, and then enters
+/// the main game loop.
 pub fn main() {
+    // Attaches the console on Windows for debugging purposes.
    #[cfg(windows)]
    unsafe {
        attach_console();
@@ -109,13 +121,11 @@ pub fn main() {
    game.draw();
    game.tick();

+    // The target time for each frame of the game loop (60 FPS).
    let loop_time = Duration::from_secs(1) / 60;
-    let mut tick_no = 0u32;

-    // The start of a period of time over which we average the frame time.
-    let mut last_averaging_time = Instant::now();
-    let mut sleep_time = Duration::ZERO;
    let mut paused = false;
+    // Whether the window is currently shown.
    let mut shown = false;

    event!(
@@ -126,7 +136,9 @@ pub fn main() {
    let mut main_loop = || {
        let start = Instant::now();

-        // TODO: Fix key repeat delay issues by using VecDeque for instant key repeat
+        // TODO: Fix key repeat delay issues by using a queue for keyboard events.
+        // This would allow for instant key repeat without being affected by the
+        // main loop's tick rate.
        for event in event_pump.poll_iter() {
            match event {
                Event::Window { win_event, .. } => match win_event {
@@ -167,9 +179,9 @@ pub fn main() {
            }
        }

-        // TODO: Proper pausing implementation that does not interfere with statistic gathering
+        // TODO: Implement a proper pausing mechanism that does not interfere with
+        // statistic gathering and other background tasks.
        if !paused {
-            // game.audio_demo_tick();
            game.tick();
            game.draw();
        }
@@ -186,7 +198,6 @@ pub fn main() {
                    std::thread::sleep(time);
                }
            }
-            sleep_time += time;
        } else {
            event!(
                tracing::Level::WARN,
@@ -195,19 +206,6 @@ pub fn main() {
            );
        }

-        tick_no += 1;
-
-        const PERIOD: u32 = 60 * 60;
-        let tick_mod = tick_no % PERIOD;
-        if tick_mod % PERIOD == 0 {
-            let average_fps = PERIOD as f32 / last_averaging_time.elapsed().as_secs_f32();
-            let average_sleep = sleep_time / PERIOD;
-            let average_process = loop_time - average_sleep;
-
-            sleep_time = Duration::ZERO;
-            last_averaging_time = Instant::now();
-        }
-
        true
    };

--- a/src/map.rs
+++ b/src/map.rs
@@ -1,12 +1,62 @@
-use crate::constants::MapTile;
-use crate::constants::{BOARD_HEIGHT, BOARD_WIDTH, RAW_BOARD};
+//! This module defines the game map and provides functions for interacting with it.
+use rand::seq::IteratorRandom;

+use crate::constants::{MapTile, BOARD_OFFSET, CELL_SIZE};
+use crate::constants::{BOARD_HEIGHT, BOARD_WIDTH};
+use std::collections::{HashSet, VecDeque};
+use std::ops::Add;
+
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct SignedPosition {
+    pub x: i32,
+    pub y: i32,
+}
+
+#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct Position {
+    pub x: u32,
+    pub y: u32,
+}
+
+impl Add<SignedPosition> for Position {
+    type Output = Position;
+    fn add(self, rhs: SignedPosition) -> Self::Output {
+        Position {
+            x: (self.x as i32 + rhs.x) as u32,
+            y: (self.y as i32 + rhs.y) as u32,
+        }
+    }
+}
+
+impl Position {
+    pub fn as_i32(&self) -> (i32, i32) {
+        (self.x as i32, self.y as i32)
+    }
+    pub fn wrapping_add(&self, dx: i32, dy: i32) -> Position {
+        Position {
+            x: (self.x as i32 + dx) as u32,
+            y: (self.y as i32 + dy) as u32,
+        }
+    }
+}
+
+/// The game map.
+///
+/// The map is represented as a 2D array of `MapTile`s. It also stores a copy of
+/// the original map, which can be used to reset the map to its initial state.
 pub struct Map {
+    /// The current state of the map.
    current: [[MapTile; BOARD_HEIGHT as usize]; BOARD_WIDTH as usize],
+    /// The default state of the map.
    default: [[MapTile; BOARD_HEIGHT as usize]; BOARD_WIDTH as usize],
 }

 impl Map {
+    /// Creates a new `Map` instance from a raw board layout.
+    ///
+    /// # Arguments
+    ///
+    /// * `raw_board` - A 2D array of characters representing the board layout.
    pub fn new(raw_board: [&str; BOARD_HEIGHT as usize]) -> Map {
        let mut map = [[MapTile::Empty; BOARD_HEIGHT as usize]; BOARD_WIDTH as usize];

@@ -29,6 +79,7 @@ impl Map {
                    '.' => MapTile::Pellet,
                    'o' => MapTile::PowerPellet,
                    ' ' => MapTile::Empty,
+                    'T' => MapTile::Tunnel,
                    c @ '0' | c @ '1' | c @ '2' | c @ '3' | c @ '4' => {
                        MapTile::StartingPosition(c.to_digit(10).unwrap() as u8)
                    }
@@ -46,6 +97,7 @@ impl Map {
        }
    }

+    /// Resets the map to its original state.
    pub fn reset(&mut self) {
        // Restore the map to its original state
        for x in 0..BOARD_WIDTH as usize {
@@ -55,6 +107,11 @@ impl Map {
        }
    }

+    /// Returns the tile at the given cell coordinates.
+    ///
+    /// # Arguments
+    ///
+    /// * `cell` - The cell coordinates, in grid coordinates.
    pub fn get_tile(&self, cell: (i32, i32)) -> Option<MapTile> {
        let x = cell.0 as usize;
        let y = cell.1 as usize;
@@ -66,6 +123,12 @@ impl Map {
        Some(self.current[x][y])
    }

+    /// Sets the tile at the given cell coordinates.
+    ///
+    /// # Arguments
+    ///
+    /// * `cell` - The cell coordinates, in grid coordinates.
+    /// * `tile` - The tile to set.
    pub fn set_tile(&mut self, cell: (i32, i32), tile: MapTile) -> bool {
        let x = cell.0 as usize;
        let y = cell.1 as usize;
@@ -78,7 +141,85 @@ impl Map {
        true
    }

+    /// Converts cell coordinates to pixel coordinates.
+    ///
+    /// # Arguments
+    ///
+    /// * `cell` - The cell coordinates, in grid coordinates.
    pub fn cell_to_pixel(cell: (u32, u32)) -> (i32, i32) {
-        ((cell.0 as i32) * 24, ((cell.1 + 3) as i32) * 24)
+        (
+            (cell.0 * CELL_SIZE) as i32,
+            ((cell.1 + BOARD_OFFSET.1) * CELL_SIZE) as i32,
+        )
+    }
+
+    /// Returns a reference to a cached vector of all valid playable positions in the maze.
+    /// This is computed once using a flood fill from a random pellet, and then cached.
+    pub fn get_valid_playable_positions(&mut self) -> &Vec<Position> {
+        use MapTile::*;
+        static mut CACHE: Option<Vec<Position>> = None;
+        // SAFETY: This is only mutated once, and only in this function.
+        unsafe {
+            if let Some(ref cached) = CACHE {
+                return cached;
+            }
+        }
+        // Find a random starting pellet
+        let mut pellet_positions = vec![];
+        for x in 0..BOARD_WIDTH as u32 {
+            for y in 0..BOARD_HEIGHT as u32 {
+                match self.current[x as usize][y as usize] {
+                    Pellet | PowerPellet => pellet_positions.push(Position { x, y }),
+                    _ => {}
+                }
+            }
+        }
+        let mut rng = rand::rng();
+        let &start = pellet_positions
+            .iter()
+            .choose(&mut rng)
+            .expect("No pellet found for flood fill");
+        // Flood fill
+        let mut visited = HashSet::new();
+        let mut queue = VecDeque::new();
+
+        queue.push_back(start);
+        while let Some(pos) = queue.pop_front() {
+            // Mark visited, skip if already visited
+            if !visited.insert(pos) {
+                continue;
+            }
+
+            // Check if the current tile is valid
+            match self.current[pos.x as usize][pos.y as usize] {
+                Empty | Pellet | PowerPellet => {
+                    // Valid, continue flood
+                    for offset in [
+                        SignedPosition { x: -1, y: 0 },
+                        SignedPosition { x: 1, y: 0 },
+                        SignedPosition { x: 0, y: -1 },
+                        SignedPosition { x: 0, y: 1 },
+                    ] {
+                        let neighbor = pos + offset;
+                        if neighbor.x < BOARD_WIDTH as u32 && neighbor.y < BOARD_HEIGHT as u32 {
+                            let neighbor_tile =
+                                self.current[neighbor.x as usize][neighbor.y as usize];
+                            if matches!(neighbor_tile, Empty | Pellet | PowerPellet) {
+                                queue.push_back(neighbor);
+                            }
+                        }
+                    }
+                }
+                StartingPosition(_) | Wall | Tunnel => {
+                    // Not valid, do not continue
+                }
+            }
+        }
+        let mut result: Vec<Position> = visited.into_iter().collect();
+        result.sort_unstable();
+        unsafe {
+            CACHE = Some(result);
+            CACHE.as_ref().unwrap()
+        }
    }
 }
--- a/src/modulation.rs
+++ b/src/modulation.rs
@@ -1,3 +1,5 @@
+//! This module provides a tick modulator, which can be used to slow down
+//! operations by a percentage.
 /// A tick modulator allows you to slow down operations by a percentage.
 ///
 /// Unfortunately, switching to floating point numbers for entities can induce floating point errors, slow down calculations
@@ -12,17 +14,25 @@
 ///
 /// For example, if we want to slow down the speed by 10%, we would need to skip every 10th tick.
 pub trait TickModulator {
+    /// Creates a new tick modulator.
+    ///
+    /// # Arguments
+    ///
+    /// * `percent` - The percentage to slow down by, from 0.0 to 1.0.
    fn new(percent: f32) -> Self;
+    /// Returns whether or not the operation should be performed on this tick.
    fn next(&mut self) -> bool;
 }

+/// A simple tick modulator that skips every Nth tick.
 pub struct SimpleTickModulator {
    tick_count: u32,
    ticks_left: u32,
 }

-// TODO: Add tests
-// TODO: Look into average precision, binary code modulation strategy
+// TODO: Add tests for the tick modulator to ensure that it is working correctly.
+// TODO: Look into average precision and binary code modulation strategies to see
+// if they would be a better fit for this use case.
 impl TickModulator for SimpleTickModulator {
    fn new(percent: f32) -> Self {
        let ticks_required: u32 = (1f32 / (1f32 - percent)).round() as u32;
@@ -34,15 +44,12 @@ impl TickModulator for SimpleTickModulator {
    }

    fn next(&mut self) -> bool {
-        self.ticks_left -= 1;
-
-        // Return whether or not we should skip this tick
        if self.ticks_left == 0 {
-            // We've reached the tick to skip, reset the counter
            self.ticks_left = self.tick_count;
-            false
-        } else {
-            true
+            return false;
        }
+
+        self.ticks_left -= 1;
+        true
    }
 }
--- a/src/pacman.rs
+++ b/src/pacman.rs
@@ -1,3 +1,4 @@
+//! This module defines the Pac-Man entity, including its behavior and rendering.
 use std::cell::RefCell;
 use std::rc::Rc;

@@ -8,156 +9,113 @@ use sdl2::{
 use tracing::event;

 use crate::{
-    animation::AnimatedTexture,
-    constants::MapTile,
-    constants::{BOARD_OFFSET, CELL_SIZE},
+    animation::{AnimatedAtlasTexture, FrameDrawn},
    direction::Direction,
-    entity::Entity,
+    entity::{Entity, MovableEntity, Renderable},
    map::Map,
    modulation::{SimpleTickModulator, TickModulator},
 };

+/// The Pac-Man entity.
 pub struct Pacman<'a> {
-    // Absolute position on the board (precise)
-    pub position: (i32, i32),
-    pub direction: Direction,
+    /// Shared movement and position fields.
+    pub base: MovableEntity,
+    /// The next direction of Pac-Man, which will be applied when Pac-Man is next aligned with the grid.
    pub next_direction: Option<Direction>,
+    /// Whether Pac-Man is currently stopped.
    pub stopped: bool,
-    map: Rc<RefCell<Map>>,
-    speed: u32,
-    modulation: SimpleTickModulator,
-    sprite: AnimatedTexture<'a>,
+    sprite: AnimatedAtlasTexture<'a>,
 }

 impl Pacman<'_> {
+    /// Creates a new `Pacman` instance.
    pub fn new<'a>(
        starting_position: (u32, u32),
        atlas: Texture<'a>,
        map: Rc<RefCell<Map>>,
    ) -> Pacman<'a> {
+        let pixel_position = Map::cell_to_pixel(starting_position);
        Pacman {
-            position: Map::cell_to_pixel(starting_position),
-            direction: Direction::Right,
+            base: MovableEntity::new(
+                pixel_position,
+                starting_position,
+                Direction::Right,
+                3,
+                SimpleTickModulator::new(1.0),
+                map,
+            ),
            next_direction: None,
-            speed: 3,
-            map,
            stopped: false,
-            modulation: SimpleTickModulator::new(1.0),
-            sprite: AnimatedTexture::new(atlas, 2, 3, 32, 32, Some((-4, -4))),
+            sprite: AnimatedAtlasTexture::new(atlas, 2, 3, 32, 32, Some((-4, -4))),
        }
    }

-    pub fn render(&mut self, canvas: &mut Canvas<Window>) {
-        // When stopped, render the last frame of the animation
-        if self.stopped {
-            self.sprite
-                .render_until(canvas, self.position, self.direction, 2);
-        } else {
-            self.sprite.render(canvas, self.position, self.direction);
-        }
-    }
-
-    pub fn next_cell(&self, direction: Option<Direction>) -> (i32, i32) {
-        let (x, y) = direction.unwrap_or(self.direction).offset();
-        let cell = self.cell_position();
-        (cell.0 as i32 + x, cell.1 as i32 + y)
-    }
-
-    fn handle_requested_direction(&mut self) {
-        if self.next_direction.is_none() {
-            return;
-        }
-        if self.next_direction.unwrap() == self.direction {
-            self.next_direction = None;
-            return;
-        }
-
-        let proposed_next_cell = self.next_cell(self.next_direction);
-        let proposed_next_tile = self
-            .map
-            .borrow()
-            .get_tile(proposed_next_cell)
-            .unwrap_or(MapTile::Empty);
-        if proposed_next_tile != MapTile::Wall {
-            event!(
-                tracing::Level::DEBUG,
-                "Direction change: {:?} -> {:?} at position ({}, {}) internal ({}, {})",
-                self.direction,
-                self.next_direction.unwrap(),
-                self.position.0,
-                self.position.1,
-                self.internal_position().0,
-                self.internal_position().1
-            );
-            self.direction = self.next_direction.unwrap();
-            self.next_direction = None;
+    /// Handles a requested direction change.
+    fn handle_direction_change(&mut self) -> bool {
+        match self.next_direction {
+            None => return false,
+            Some(next_direction) => {
+                if self.base.set_direction_if_valid(next_direction) {
+                    self.next_direction = None;
+                    return true;
+                }
+            }
        }
+        false
    }

+    /// Returns the internal position of Pac-Man, rounded down to the nearest even number.
    fn internal_position_even(&self) -> (u32, u32) {
-        let (x, y) = self.internal_position();
+        let (x, y) = self.base.internal_position();
        ((x / 2u32) * 2u32, (y / 2u32) * 2u32)
    }
 }

 impl Entity for Pacman<'_> {
-    fn is_colliding(&self, other: &dyn Entity) -> bool {
-        let (x, y) = self.position();
-        let (other_x, other_y) = other.position();
-        x == other_x && y == other_y
-    }
-
-    fn position(&self) -> (i32, i32) {
-        self.position
-    }
-
-    fn cell_position(&self) -> (u32, u32) {
-        let (x, y) = self.position;
-        (
-            (x as u32 / CELL_SIZE) - BOARD_OFFSET.0,
-            (y as u32 / CELL_SIZE) - BOARD_OFFSET.1,
-        )
-    }
-
-    fn internal_position(&self) -> (u32, u32) {
-        let (x, y) = self.position();
-        (x as u32 % CELL_SIZE, y as u32 % CELL_SIZE)
+    fn base(&self) -> &MovableEntity {
+        &self.base
    }

    fn tick(&mut self) {
        let can_change = self.internal_position_even() == (0, 0);

        if can_change {
-            self.handle_requested_direction();
+            self.base.update_cell_position();

-            let next = self.next_cell(None);
-            let next_tile = self.map.borrow().get_tile(next).unwrap_or(MapTile::Empty);
+            if !self.base.handle_tunnel() {
+                // Handle direction change as normal if not in tunnel
+                self.handle_direction_change();

-            if !self.stopped && next_tile == MapTile::Wall {
-                event!(tracing::Level::DEBUG, "Wall collision. Stopping.");
-                self.stopped = true;
-            } else if self.stopped && next_tile != MapTile::Wall {
-                event!(tracing::Level::DEBUG, "Wall collision resolved. Moving.");
-                self.stopped = false;
+                // Check if the next tile in the current direction is a wall
+                if !self.stopped && self.base.is_wall_ahead(None) {
+                    self.stopped = true;
+                } else if self.stopped && !self.base.is_wall_ahead(None) {
+                    self.stopped = false;
+                }
            }
        }

-        if !self.stopped && self.modulation.next() {
-            let speed = self.speed as i32;
-            match self.direction {
-                Direction::Right => {
-                    self.position.0 += speed;
-                }
-                Direction::Left => {
-                    self.position.0 -= speed;
-                }
-                Direction::Up => {
-                    self.position.1 -= speed;
-                }
-                Direction::Down => {
-                    self.position.1 += speed;
-                }
+        if !self.stopped && self.base.modulation.next() {
+            self.base.move_forward();
+            if self.internal_position_even() == (0, 0) {
+                self.base.update_cell_position();
            }
        }
    }
 }
+
+impl Renderable for Pacman<'_> {
+    fn render(&mut self, canvas: &mut Canvas<Window>) {
+        if self.stopped {
+            self.sprite.render(
+                canvas,
+                self.base.pixel_position,
+                self.base.direction,
+                Some(2),
+            );
+        } else {
+            self.sprite
+                .render(canvas, self.base.pixel_position, self.base.direction, None);
+        }
+    }
+}
Author	SHA1	Message	Date
Xevion	66b6cdf01b	feat: split animated texture away from atlas texture details	2025-07-23 16:25:40 -05:00
Xevion	5a48e83b1a	feat: flood-filled based playable position with cache, debug mode	2025-07-23 15:06:38 -05:00
Xevion	df8f858651	refactor: continue improving MovableEntity shared implementation	2025-07-23 15:06:09 -05:00
Xevion	1fa7a0807f	refactor: abstract entity details into MovableEntity	2025-07-23 14:08:28 -05:00
Xevion	6d3d3bf49c	feat: tunnel implementation, pathfinding debug mode	2025-07-22 14:37:26 -05:00
Xevion	0a46f64866	feat: pathfinding, ghost and blinky state, update dependencies	2025-07-22 13:18:09 -05:00
Xevion	fd7eecf53e	feat: allow instant direction reversal, improve cell position state tracking	2025-07-22 12:12:41 -05:00
Xevion	f540dc5373	docs: minor documentation commentsa cross project	2025-07-22 12:12:41 -05:00
Xevion	f51a3ddeb0	chore: web frontend files	2025-07-22 10:06:30 -05:00
Xevion	9f7c460369	chore: ignore ephemeral submodules, build.css	2025-07-22 10:06:13 -05:00