From f43aabb8e54c6bfbe960ea54e9e5afbcc441fd0b Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Mon, 6 Oct 2025 19:12:23 -0400 Subject: [PATCH 1/5] Added grid image functionality for backdrop of levels. --- package-lock.json | 412 ++++++++++++------ .../{Left Belt.png => Left_Belt.png} | Bin .../{Right belt.png => Right_belt.png} | Bin src/js/LevelImageMapper.Json | 8 + src/js/level1.js | 40 +- src/js/level1json.json | 9 + src/js/main.js | 6 +- 7 files changed, 328 insertions(+), 147 deletions(-) rename src/assets/conveyer_photos/{Left Belt.png => Left_Belt.png} (100%) rename src/assets/conveyer_photos/{Right belt.png => Right_belt.png} (100%) create mode 100644 src/js/LevelImageMapper.Json create mode 100644 src/js/level1json.json diff --git a/package-lock.json b/package-lock.json index f80cb7f..ef074b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -168,10 +168,11 @@ "dev": true }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dev": true, + "license": "MIT", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -181,7 +182,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -215,6 +216,7 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -231,17 +233,29 @@ "codemirror": "^6.0.1" } }, - "node_modules/call-bind": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", - "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", "dev": true, + "license": "MIT", "dependencies": { - "es-define-property": "^1.0.0", "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", - "set-function-length": "^1.2.1" + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" }, "engines": { "node": ">= 0.4" @@ -282,15 +296,17 @@ "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/cookie": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", - "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -312,32 +328,17 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.0.0" } }, - "node_modules/define-data-property": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", - "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "dev": true, - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -347,34 +348,50 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/es-define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", - "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", "dev": true, - "dependencies": { - "get-intrinsic": "^1.2.4" - }, + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -384,6 +401,20 @@ "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, "engines": { "node": ">= 0.4" } @@ -392,13 +423,15 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -410,37 +443,38 @@ "license": "MIT" }, "node_modules/express": { - "version": "4.18.3", - "resolved": "https://registry.npmjs.org/express/-/express-4.18.3.tgz", - "integrity": "sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==", + "version": "4.21.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", + "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", "dev": true, + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.5.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.12", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -449,16 +483,21 @@ }, "engines": { "node": ">= 0.10.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dev": true, + "license": "MIT", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -483,6 +522,7 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -492,21 +532,28 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/get-intrinsic": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", - "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", "dev": true, + "license": "MIT", "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -515,35 +562,26 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/gopd": { + "node_modules/get-proto": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dev": true, - "dependencies": { - "get-intrinsic": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-property-descriptors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", "dev": true, + "license": "MIT", "dependencies": { - "es-define-property": "^1.0.0" + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">= 0.4" } }, - "node_modules/has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -552,10 +590,11 @@ } }, "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -564,10 +603,11 @@ } }, "node_modules/hasown": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz", - "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", "dev": true, + "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -580,6 +620,7 @@ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "dev": true, + "license": "MIT", "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -596,6 +637,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -607,7 +649,8 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/ipaddr.js": { "version": "1.9.1", @@ -618,20 +661,35 @@ "node": ">= 0.10" } }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", - "dev": true + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/methods": { "version": "1.1.2", @@ -647,6 +705,7 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true, + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -679,7 +738,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/negotiator": { "version": "0.6.3", @@ -691,10 +751,14 @@ } }, "node_modules/object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -704,6 +768,7 @@ "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "dev": true, + "license": "MIT", "dependencies": { "ee-first": "1.1.1" }, @@ -724,15 +789,17 @@ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", - "dev": true + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "dev": true, + "license": "MIT" }, "node_modules/phaser": { "version": "3.86.0", @@ -757,12 +824,13 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -776,6 +844,7 @@ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -785,6 +854,7 @@ "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dev": true, + "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -819,13 +889,15 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dev": true, + "license": "MIT", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -845,60 +917,114 @@ "node": ">= 0.8.0" } }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dev": true, + "license": "MIT", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" } }, - "node_modules/set-function-length": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz", - "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==", + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "dev": true, + "license": "ISC" + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", "dev": true, + "license": "MIT", "dependencies": { - "define-data-property": "^1.1.2", "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.3", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.1" + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "node_modules/side-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", - "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.7", + "call-bound": "^1.0.2", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "object-inspect": "^1.13.1" + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" }, "engines": { "node": ">= 0.4" @@ -912,6 +1038,7 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -927,6 +1054,7 @@ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.6" } @@ -936,6 +1064,7 @@ "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "dev": true, + "license": "MIT", "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" @@ -949,6 +1078,7 @@ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } diff --git a/src/assets/conveyer_photos/Left Belt.png b/src/assets/conveyer_photos/Left_Belt.png similarity index 100% rename from src/assets/conveyer_photos/Left Belt.png rename to src/assets/conveyer_photos/Left_Belt.png diff --git a/src/assets/conveyer_photos/Right belt.png b/src/assets/conveyer_photos/Right_belt.png similarity index 100% rename from src/assets/conveyer_photos/Right belt.png rename to src/assets/conveyer_photos/Right_belt.png diff --git a/src/js/LevelImageMapper.Json b/src/js/LevelImageMapper.Json new file mode 100644 index 0000000..d165c9e --- /dev/null +++ b/src/js/LevelImageMapper.Json @@ -0,0 +1,8 @@ +{ + "0" : "src/assets/follower.png", + "1" : "src/assets/conveyer_photos/ConveyerDown.png", + "2" : "src/assets/conveyer_photos/Left Belt.png", + "3" : "src/assets/conveyer_photos/Right belt.png", + "4" : "src/assets/conveyer_photos/Connector.png", + "5" : "src/assets/conveyer_photos/ConnectorAll.png" +} \ No newline at end of file diff --git a/src/js/level1.js b/src/js/level1.js index 20c2507..e998fee 100644 --- a/src/js/level1.js +++ b/src/js/level1.js @@ -14,11 +14,32 @@ export default class Level1 extends Phaser.Scene { //Example candy implementation const blueStripedCircle = new Candy(Colors.BLUE, Shapes.CIRCLE, Patterns.STRIPED, '../assets/candy_photos/blue_circle_striped.png'); //console.log(blueStripedCircle.imagePath === '../assets/blue_circle_striped.png'); - this.load.image('background', 'assets/background.png'); + // this.load.image('background', 'assets/background.png'); this.load.image('follower', blueStripedCircle.imagePath); // Load the candy image //this.load.image('follower', 'assets/follower.png'); // Optional: Load a follower sprite + + + this.load.image('Connector', 'assets/conveyer_photos/Connector.png'); + this.load.image('ConveyerDown', 'assets/conveyer_photos/ConveyerDown.png'); + this.load.image('ConveyerAll', 'assets/conveyer_photos/ConnectorAll.png'); + this.load.image('ConveyerLeft', 'assets/conveyer_photos/Left_Belt.png'); + this.load.image('ConveyerRight', 'assets/conveyer_photos/Right_belt.png'); } + ConveyerMap = { + 1: "ConveyerDown", + 2: "ConveyerLeft", + 3: "ConveyerRight", + 4: "Connector", + 5: "ConveyerAll" + }; + + levelData = [ + [0, 1, 0], + [2, 4, 3], + [1, 0, 1] + ]; + create() { // Initialize the editor window C4C.Editor.Window.init(this); // Scene is passed in to this init function! @@ -43,7 +64,7 @@ export default class Level1 extends Phaser.Scene { }); // Add the background image - this.add.image(400, 300, 'background'); // Center the background + //this.add.image(400, 300, 'background'); // Center the background this.graphics = this.add.graphics(); this.initializePaths(); @@ -51,6 +72,21 @@ export default class Level1 extends Phaser.Scene { // Add event listener to the button document.getElementById("enableCommands").addEventListener("click", this.startTween); + + const tileSize = 64; // assuming each tile is 64x64 pixels + const offsetX = 200; + const offsetY = 100; + + + for (var row = 0; row < this.levelData.length; row++) { + for (var col = 0; col < this.levelData[row].length; col++) { + var tileType = this.levelData[row][col]; + var textureKey = this.ConveyerMap[tileType]; + var image = this.add.image(offsetX + col * tileSize, offsetY + row * tileSize, textureKey).setOrigin(0); + image.setScale(2); + } + } + } initializePaths() { diff --git a/src/js/level1json.json b/src/js/level1json.json new file mode 100644 index 0000000..343e8e2 --- /dev/null +++ b/src/js/level1json.json @@ -0,0 +1,9 @@ +{ + "rows" : 3, + "cols" : 3, + "data" : [ + [0, 1, 0], + [2, 4, 3], + [1, 0, 1] + ] +} \ No newline at end of file diff --git a/src/js/main.js b/src/js/main.js index 798be29..5d348a3 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -14,7 +14,7 @@ const config = { dom: { createContainer: true, }, - scene: Level2 + scene: Level1 }; //Setting up the theme for the text editor @@ -52,7 +52,7 @@ document.getElementById('level-select').addEventListener('change', (event) => { // Add more cases for additional levels later when added default: scene = 'DemoLevel'; - game.scene.start(scene, Level2); + game.scene.start(scene, Level1); break; } }); @@ -97,6 +97,4 @@ function preload() { this.load.image("redTriangleDotted", "src/assets/candy_photos/red-triangle-dotted.png"); this.load.image("redTriangle", "src/assets/candy_photos/red-triangle-nopattern.png"); this.load.image("redTriangleStriped", "src/assets/candy_photos/red-triangle-striped.png"); - - } \ No newline at end of file From fce9f7dcb0fd2fc50d61db4d1bd2af6def87ef5d Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Mon, 10 Nov 2025 19:15:46 -0500 Subject: [PATCH 2/5] Describe what you changed --- src/js/LevelImageMapper.Json | 8 -------- src/js/level1.js | 20 ++++++++++++++++++-- src/js/level1json.json | 9 --------- 3 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 src/js/LevelImageMapper.Json delete mode 100644 src/js/level1json.json diff --git a/src/js/LevelImageMapper.Json b/src/js/LevelImageMapper.Json deleted file mode 100644 index d165c9e..0000000 --- a/src/js/LevelImageMapper.Json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "0" : "src/assets/follower.png", - "1" : "src/assets/conveyer_photos/ConveyerDown.png", - "2" : "src/assets/conveyer_photos/Left Belt.png", - "3" : "src/assets/conveyer_photos/Right belt.png", - "4" : "src/assets/conveyer_photos/Connector.png", - "5" : "src/assets/conveyer_photos/ConnectorAll.png" -} \ No newline at end of file diff --git a/src/js/level1.js b/src/js/level1.js index e998fee..2f27f3e 100644 --- a/src/js/level1.js +++ b/src/js/level1.js @@ -24,6 +24,8 @@ export default class Level1 extends Phaser.Scene { this.load.image('ConveyerAll', 'assets/conveyer_photos/ConnectorAll.png'); this.load.image('ConveyerLeft', 'assets/conveyer_photos/Left_Belt.png'); this.load.image('ConveyerRight', 'assets/conveyer_photos/Right_belt.png'); + this.load.image('tester', 'assets/candy_photos/blue-square-dotted.png'); + this.load.image('tester2', 'assets/candy_photos/red-triangle-dotted.png'); } ConveyerMap = { @@ -35,8 +37,14 @@ export default class Level1 extends Phaser.Scene { }; levelData = [ + [0, 1, 0], + [0, 1, 0], + [0, 1, 0], + [0, 1, 0], [0, 1, 0], [2, 4, 3], + [1, 0, 1], + [1, 0, 1], [1, 0, 1] ]; @@ -74,8 +82,8 @@ export default class Level1 extends Phaser.Scene { document.getElementById("enableCommands").addEventListener("click", this.startTween); const tileSize = 64; // assuming each tile is 64x64 pixels - const offsetX = 200; - const offsetY = 100; + const offsetX = 305; + const offsetY = 0; for (var row = 0; row < this.levelData.length; row++) { @@ -84,9 +92,17 @@ export default class Level1 extends Phaser.Scene { var textureKey = this.ConveyerMap[tileType]; var image = this.add.image(offsetX + col * tileSize, offsetY + row * tileSize, textureKey).setOrigin(0); image.setScale(2); + image.setDepth(-1); } } + this.tester = this.add.image(700, 100, 'tester'); + this.tester.setScale(2); + + this.tester2 = this.add.image(700, 200, 'tester2'); + this.tester2.setScale(2); + + } initializePaths() { diff --git a/src/js/level1json.json b/src/js/level1json.json deleted file mode 100644 index 343e8e2..0000000 --- a/src/js/level1json.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "rows" : 3, - "cols" : 3, - "data" : [ - [0, 1, 0], - [2, 4, 3], - [1, 0, 1] - ] -} \ No newline at end of file From 2c6fda2b3dac8a760168ad45e801a5f36d6ac0dd Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Mon, 2 Feb 2026 20:01:36 -0500 Subject: [PATCH 3/5] Added Grid and candy graphic movement --- package-lock.json | 138 +++++++++++++++++++++++++++++++++------------- src/js/level1.js | 81 +++++++++++++++++++-------- src/js/main.js | 2 +- 3 files changed, 160 insertions(+), 61 deletions(-) diff --git a/package-lock.json b/package-lock.json index ef074b1..19ff25a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -168,30 +168,61 @@ "dev": true }, "node_modules/body-parser": { - "version": "1.20.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", - "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "version": "1.20.4", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz", + "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==", "dev": true, "license": "MIT", "dependencies": { - "bytes": "3.1.2", + "bytes": "~3.1.2", "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.13.0", - "raw-body": "2.5.2", + "destroy": "~1.2.0", + "http-errors": "~2.0.1", + "iconv-lite": "~0.4.24", + "on-finished": "~2.4.1", + "qs": "~6.14.0", + "raw-body": "~2.5.3", "type-is": "~1.6.18", - "unpipe": "1.0.0" + "unpipe": "~1.0.0" }, "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/body-parser/node_modules/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/body-parser/node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/bootstrap": { "version": "5.3.3", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", @@ -443,40 +474,40 @@ "license": "MIT" }, "node_modules/express": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", - "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", + "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", "dev": true, "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.3", - "content-disposition": "0.5.4", + "body-parser": "~1.20.3", + "content-disposition": "~0.5.4", "content-type": "~1.0.4", - "cookie": "0.7.1", - "cookie-signature": "1.0.6", + "cookie": "~0.7.1", + "cookie-signature": "~1.0.6", "debug": "2.6.9", "depd": "2.0.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.3.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", + "finalhandler": "~1.3.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.0", "merge-descriptors": "1.0.3", "methods": "~1.1.2", - "on-finished": "2.4.1", + "on-finished": "~2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.12", + "path-to-regexp": "~0.1.12", "proxy-addr": "~2.0.7", - "qs": "6.13.0", + "qs": "~6.14.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.19.0", - "serve-static": "1.16.2", + "send": "~0.19.0", + "serve-static": "~1.16.2", "setprototypeof": "1.2.0", - "statuses": "2.0.1", + "statuses": "~2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" @@ -824,13 +855,13 @@ } }, "node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", + "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.6" + "side-channel": "^1.1.0" }, "engines": { "node": ">=0.6" @@ -850,21 +881,52 @@ } }, "node_modules/raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz", + "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==", "dev": true, "license": "MIT", "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" + "bytes": "~3.1.2", + "http-errors": "~2.0.1", + "iconv-lite": "~0.4.24", + "unpipe": "~1.0.0" }, "engines": { "node": ">= 0.8" } }, + "node_modules/raw-body/node_modules/http-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/raw-body/node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", diff --git a/src/js/level1.js b/src/js/level1.js index 2f27f3e..196620b 100644 --- a/src/js/level1.js +++ b/src/js/level1.js @@ -29,6 +29,7 @@ export default class Level1 extends Phaser.Scene { } ConveyerMap = { + 0: "", // Empty space 1: "ConveyerDown", 2: "ConveyerLeft", 3: "ConveyerRight", @@ -72,7 +73,8 @@ export default class Level1 extends Phaser.Scene { }); // Add the background image - //this.add.image(400, 300, 'background'); // Center the background + //this.add.image(400, 300, 'background'); + // Center the background this.graphics = this.add.graphics(); this.initializePaths(); @@ -90,6 +92,7 @@ export default class Level1 extends Phaser.Scene { for (var col = 0; col < this.levelData[row].length; col++) { var tileType = this.levelData[row][col]; var textureKey = this.ConveyerMap[tileType]; + if (textureKey === "") continue; // Skip empty spaces var image = this.add.image(offsetX + col * tileSize, offsetY + row * tileSize, textureKey).setOrigin(0); image.setScale(2); image.setDepth(-1); @@ -102,9 +105,35 @@ export default class Level1 extends Phaser.Scene { this.tester2 = this.add.image(700, 200, 'tester2'); this.tester2.setScale(2); + //await delay(1000); + this.moveToCenter(this.tester); + //await delay(2000); + this.moveUpSpot(this.tester2); } + moveToCenter = (gameObject) => { + this.tweens.add({ + targets: gameObject, + x: 400, + y: 100, + ease: 'Power2', + duration: 2000 + }); +}; + + moveUpSpot = (gameObject) => { + this.tweens.add({ + targets: gameObject, + x: 700, + y: gameObject.y - 100, + ease: 'Power2', + duration: 2000 + }); +}; + + + initializePaths() { // Create the path using 3 separate lines const startline = new Phaser.Curves.Line([400, 0, 400, 300]); @@ -123,8 +152,11 @@ export default class Level1 extends Phaser.Scene { initializeFollower() { this.follower = { t: 0, vec: new Phaser.Math.Vector2() }; + this.followerSprite = this.add.image(400, 0, 'follower'); // use the candy texture + this.followerSprite.setScale(2); // scale up if needed } + startTween = () => { this.follower.t = 0; this.isMoving = true; @@ -196,30 +228,35 @@ export default class Level1 extends Phaser.Scene { }; update() { - //Clear the graphics object - this.graphics.clear(); - this.graphics.lineStyle(2, 0xffffff, 1); - - //Draw the paths - this.path1.draw(this.graphics); - this.path2.draw(this.graphics); - this.path3.draw(this.graphics); - - //Get the position of the follower on the path - if (this.isMoving) { - if (this.follower.t <= 1) { - this.path1.getPoint(this.follower.t, this.follower.vec); - } else if (this.follower.t > 1 && this.follower.t <= 2) { - this.path2.getPoint(this.follower.t - 1, this.follower.vec); - } else if (this.follower.t > 2 && this.follower.t <= 3) { - this.path3.getPoint(this.follower.t - 2, this.follower.vec); - } + // Clear debug graphics + this.graphics.clear(); + this.graphics.lineStyle(2, 0xffffff, 1); + + // Draw paths (optional, for debugging) + this.path1.draw(this.graphics); + this.path2.draw(this.graphics); + this.path3.draw(this.graphics); + + // Update follower position + if (this.isMoving) { + if (this.follower.t <= 1) { + this.path1.getPoint(this.follower.t, this.follower.vec); + } else if (this.follower.t > 1 && this.follower.t <= 2) { + this.path2.getPoint(this.follower.t - 1, this.follower.vec); + } else if (this.follower.t > 2 && this.follower.t <= 3) { + this.path3.getPoint(this.follower.t - 2, this.follower.vec); } - //Draw the follower as a red square - this.graphics.fillStyle(0xff0000, 1); - this.graphics.fillRect(this.follower.vec.x - 8, this.follower.vec.y - 8, 16, 16); + // Move the candy sprite instead of drawing a square + this.followerSprite.setPosition(this.follower.vec.x, this.follower.vec.y); + } } + + + /*delay(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); + }*/ + } //For debugging for casey later... diff --git a/src/js/main.js b/src/js/main.js index 5d348a3..616eb6f 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -47,7 +47,7 @@ document.getElementById('level-select').addEventListener('change', (event) => { break; case '3': scene = 'Level2'; - game.scene.start(scene, Level2); + game.scene.start(scene, Level1); break; // Add more cases for additional levels later when added default: From d62a0d234e2a83ff842a4af3b925eb8d6262b5a4 Mon Sep 17 00:00:00 2001 From: Daniel Bruce Date: Mon, 6 Apr 2026 19:29:17 -0400 Subject: [PATCH 4/5] added preview --- package-lock.json | 6 +- src/js/Oldlevel1.js | 264 +++++++++++++++++++++++ src/js/SceneClasses/AnimationExecutor.js | 59 ++++- src/js/SceneClasses/PathManager.js | 14 +- src/js/candy.js | 8 +- src/js/level1.js | 175 ++++++++++++--- 6 files changed, 470 insertions(+), 56 deletions(-) create mode 100644 src/js/Oldlevel1.js diff --git a/package-lock.json b/package-lock.json index 19ff25a..a069ed4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -855,9 +855,9 @@ } }, "node_modules/qs": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", - "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", + "version": "6.14.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz", + "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==", "dev": true, "license": "BSD-3-Clause", "dependencies": { diff --git a/src/js/Oldlevel1.js b/src/js/Oldlevel1.js new file mode 100644 index 0000000..196620b --- /dev/null +++ b/src/js/Oldlevel1.js @@ -0,0 +1,264 @@ +import Candy, {Colors, Shapes, Patterns } from './candy.js'; +export default class Level1 extends Phaser.Scene { + + graphics; + path1; + path2; + path3; + follower; + isMoving = false; + + preload() { + // Load the background image + //TO-DO: Add Texture manager: https://docs.phaser.io/phaser/concepts/textures + //Example candy implementation + const blueStripedCircle = new Candy(Colors.BLUE, Shapes.CIRCLE, Patterns.STRIPED, '../assets/candy_photos/blue_circle_striped.png'); + //console.log(blueStripedCircle.imagePath === '../assets/blue_circle_striped.png'); + // this.load.image('background', 'assets/background.png'); + this.load.image('follower', blueStripedCircle.imagePath); // Load the candy image + //this.load.image('follower', 'assets/follower.png'); // Optional: Load a follower sprite + + + this.load.image('Connector', 'assets/conveyer_photos/Connector.png'); + this.load.image('ConveyerDown', 'assets/conveyer_photos/ConveyerDown.png'); + this.load.image('ConveyerAll', 'assets/conveyer_photos/ConnectorAll.png'); + this.load.image('ConveyerLeft', 'assets/conveyer_photos/Left_Belt.png'); + this.load.image('ConveyerRight', 'assets/conveyer_photos/Right_belt.png'); + this.load.image('tester', 'assets/candy_photos/blue-square-dotted.png'); + this.load.image('tester2', 'assets/candy_photos/red-triangle-dotted.png'); + } + + ConveyerMap = { + 0: "", // Empty space + 1: "ConveyerDown", + 2: "ConveyerLeft", + 3: "ConveyerRight", + 4: "Connector", + 5: "ConveyerAll" + }; + + levelData = [ + [0, 1, 0], + [0, 1, 0], + [0, 1, 0], + [0, 1, 0], + [0, 1, 0], + [2, 4, 3], + [1, 0, 1], + [1, 0, 1], + [1, 0, 1] + ]; + + create() { + // Initialize the editor window + C4C.Editor.Window.init(this); // Scene is passed in to this init function! + C4C.Editor.Window.open(); + console.log("Text editor initialized."); + + // Define interpreter commands + C4C.Interpreter.define("moveleft", () => { + //console.log("moveleft in text editor"); + this.moveLeft(); + }); + + C4C.Interpreter.define("moveright", () => { + this.moveRight(); + }); + + document.getElementById("enableCommands").addEventListener("click", (event) => { + let programText = C4C.Editor.getText(); + console.log("Program text: ", programText); + C4C.Interpreter.run(programText); + runner.setProgram(programText); + }); + + // Add the background image + //this.add.image(400, 300, 'background'); + // Center the background + + this.graphics = this.add.graphics(); + this.initializePaths(); + this.initializeFollower(); + + // Add event listener to the button + document.getElementById("enableCommands").addEventListener("click", this.startTween); + + const tileSize = 64; // assuming each tile is 64x64 pixels + const offsetX = 305; + const offsetY = 0; + + + for (var row = 0; row < this.levelData.length; row++) { + for (var col = 0; col < this.levelData[row].length; col++) { + var tileType = this.levelData[row][col]; + var textureKey = this.ConveyerMap[tileType]; + if (textureKey === "") continue; // Skip empty spaces + var image = this.add.image(offsetX + col * tileSize, offsetY + row * tileSize, textureKey).setOrigin(0); + image.setScale(2); + image.setDepth(-1); + } + } + + this.tester = this.add.image(700, 100, 'tester'); + this.tester.setScale(2); + + this.tester2 = this.add.image(700, 200, 'tester2'); + this.tester2.setScale(2); + + //await delay(1000); + this.moveToCenter(this.tester); + //await delay(2000); + this.moveUpSpot(this.tester2); + + } + + moveToCenter = (gameObject) => { + this.tweens.add({ + targets: gameObject, + x: 400, + y: 100, + ease: 'Power2', + duration: 2000 + }); +}; + + moveUpSpot = (gameObject) => { + this.tweens.add({ + targets: gameObject, + x: 700, + y: gameObject.y - 100, + ease: 'Power2', + duration: 2000 + }); +}; + + + + initializePaths() { + // Create the path using 3 separate lines + const startline = new Phaser.Curves.Line([400, 0, 400, 300]); + const leftline = new Phaser.Curves.Line([400, 300, 300, 500]); + const rightline = new Phaser.Curves.Line([400, 300, 500, 500]); + + this.path1 = this.add.path(); + this.path1.add(startline); + + this.path2 = this.add.path(); + this.path2.add(leftline); + + this.path3 = this.add.path(); + this.path3.add(rightline); + } + + initializeFollower() { + this.follower = { t: 0, vec: new Phaser.Math.Vector2() }; + this.followerSprite = this.add.image(400, 0, 'follower'); // use the candy texture + this.followerSprite.setScale(2); // scale up if needed + } + + + startTween = () => { + this.follower.t = 0; + this.isMoving = true; + console.log("isMoving: ", this.isMoving); + this.tweens.add({ + targets: this.follower, + t: 1, + ease: 'Linear', + duration: 1000, + onUpdate: () => { + this.path1.getPoint(this.follower.t, this.follower.vec); + }, + onComplete: () => { + console.log("Start Path complete!"); + this.handlePathCompletion(); + } + }); + }; + + handlePathCompletion() { + // //Logic to determine the next move based on user input or pseudo code + // const nextMove = this.getNextMove(); // Implement this function to determine the next move + // if (nextMove === "left") { + // this.moveLeft(); + // } else if (nextMove === "right") { + // this.moveRight(); + // } else { + // this.isMoving = false; + // } + } + + // getNextMove() { + // } + + moveLeft = () => { + console.log("Move left function called"); + this.follower.t = 1; + this.tweens.add({ + targets: this.follower, + t: 2, + ease: 'Linear', + duration: 1000, + onUpdate: () => { + this.path2.getPoint(this.follower.t - 1, this.follower.vec); + }, + onComplete: () => { + console.log("Left Path complete!"); + this.handlePathCompletion(); + } + }); + }; + + moveRight = () => { + console.log("Move right function called"); + this.follower.t = 2.001; + this.tweens.add({ + targets: this.follower, + t: 3, + ease: 'Linear', + duration: 1000, + onUpdate: () => { + this.path3.getPoint(this.follower.t - 2, this.follower.vec); + }, + onComplete: () => { + console.log("Right Path complete!"); + this.handlePathCompletion(); + } + }); + }; + + update() { + // Clear debug graphics + this.graphics.clear(); + this.graphics.lineStyle(2, 0xffffff, 1); + + // Draw paths (optional, for debugging) + this.path1.draw(this.graphics); + this.path2.draw(this.graphics); + this.path3.draw(this.graphics); + + // Update follower position + if (this.isMoving) { + if (this.follower.t <= 1) { + this.path1.getPoint(this.follower.t, this.follower.vec); + } else if (this.follower.t > 1 && this.follower.t <= 2) { + this.path2.getPoint(this.follower.t - 1, this.follower.vec); + } else if (this.follower.t > 2 && this.follower.t <= 3) { + this.path3.getPoint(this.follower.t - 2, this.follower.vec); + } + + // Move the candy sprite instead of drawing a square + this.followerSprite.setPosition(this.follower.vec.x, this.follower.vec.y); + } + } + + + /*delay(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); + }*/ + +} + +//For debugging for casey later... +// const canvas = document.getElementById('my-custom-canvas'); +// if (canvas) {console.log("Found?");} else { console.log("Not found?"); } \ No newline at end of file diff --git a/src/js/SceneClasses/AnimationExecutor.js b/src/js/SceneClasses/AnimationExecutor.js index f307be0..5c2c37e 100644 --- a/src/js/SceneClasses/AnimationExecutor.js +++ b/src/js/SceneClasses/AnimationExecutor.js @@ -178,22 +178,65 @@ export default class AnimationExecutor { } } - drawFollower(graphics) { + createFollowerSprite(candyType) { + if (this.follower) return; + + this.follower = this.scene.add.image( + this.followerPosition.x, + this.followerPosition.y, + candyType + ); + + this.follower.setDisplaySize(64, 64); // normalize size + console.log("CREATING FOLLOWER SPRITE"); + +} + + +drawFollower(graphics) { const currentCandy = this.pathManager.getCurrentCandy(); - const candyType = currentCandy ? currentCandy.type : "default"; + if (!currentCandy) return; + + const candyType = currentCandy.path; - let color = 0xff0000; // Default red - if (candyType.includes("blue")) color = 0x0000ff; - else if (candyType.includes("green")) color = 0x00ff00; - else if (candyType.includes("red")) color = 0xff0000; + // Create follower sprite once + if (!this.follower) { + this.createFollowerSprite(candyType); + return; + } + + // Update texture if candy changed + if (this.follower.texture.key !== candyType) { + this.follower.setTexture(candyType); + } + + // Update follower position each frame + this.follower.x = this.followerPosition.x; + this.follower.y = this.followerPosition.y; + console.log( + "Rendered size:", + this.follower.displayWidth, + this.follower.displayHeight, + "Scale:", + this.follower.scaleX, + this.follower.scaleY +); - graphics.fillStyle(color); - graphics.fillCircle(this.followerPosition.x, this.followerPosition.y, 20); } + + reset() { this.commandQueue = []; this.isAnimating = false; + // This fixes sizing issues when resetting between candies, + // but may cause a brief flash if the follower is visible during reset. + // A more complex solution would be to hide the follower during reset + // and show it again after repositioning. + if (this.follower) { + this.follower.destroy(); + this.follower = null; + } const pos = this.pathManager.getCurrentPosition(); this.followerPosition = { x: pos.x, y: pos.y }; console.log( diff --git a/src/js/SceneClasses/PathManager.js b/src/js/SceneClasses/PathManager.js index 9d99444..fa6e2c5 100644 --- a/src/js/SceneClasses/PathManager.js +++ b/src/js/SceneClasses/PathManager.js @@ -126,7 +126,7 @@ export default class PathManager { this.currentCandy = this.candyQueue.shift(); this.resetPosition(); console.log( - `[PathManager] Starting next candy: ${this.currentCandy.type}. Remaining in queue: ${this.candyQueue.length}`, + `[PathManager] Starting next candy: ${this.currentCandy.path}. Remaining in queue: ${this.candyQueue.length}`, ); // MODIFIED/ADDED return true; } else { @@ -151,12 +151,12 @@ export default class PathManager { return false; } - const goalPosition = this.goalPositions.get(this.currentCandy.type); + const goalPosition = this.goalPositions.get(this.currentCandy.path); // console.log(`[Path Manager] Goal Position for Candy ${this.currentCandy}`); // Original log removed/consolidated if (!goalPosition) { console.warn( - `[PathManager] No goal position defined for candy type: ${this.currentCandy.type}`, + `[PathManager] No goal position defined for candy type: ${this.currentCandy.path}`, ); return false; } @@ -168,7 +168,7 @@ export default class PathManager { const isAtGoal = distanceX <= tolerance && distanceY <= tolerance; console.log( - `[PathManager] Checking goal for ${this.currentCandy.type} (Tolerance: ${tolerance}). Current: (${this.currentPosition.x}, ${this.currentPosition.y}) | Goal: (${goalPosition.x}, ${goalPosition.y}). Match: ${isAtGoal}`, + `[PathManager] Checking goal for ${this.currentCandy.path} (Tolerance: ${tolerance}). Current: (${this.currentPosition.x}, ${this.currentPosition.y}) | Goal: (${goalPosition.x}, ${goalPosition.y}). Match: ${isAtGoal}`, ); // MODIFIED/ADDED return isAtGoal; @@ -181,13 +181,13 @@ export default class PathManager { } console.log( - `[PathManager] Attempting to dump candy: ${this.currentCandy.type}`, + `[PathManager] Attempting to dump candy: ${this.currentCandy.path}`, ); const isAtGoal = this.checkCandyAtGoal(); if (isAtGoal) { console.log( - `[PathManager] Dump SUCCESS! Candy ${this.currentCandy.type} successfully delivered.`, + `[PathManager] Dump SUCCESS! Candy ${this.currentCandy.path} successfully delivered.`, ); //Callback for successful delivery @@ -201,7 +201,7 @@ export default class PathManager { return { success: true, hasMoreCandies }; } else { console.log( - `[PathManager] Dump FAILED! Candy ${this.currentCandy.type} is not at goal position.`, + `[PathManager] Dump FAILED! Candy ${this.currentCandy.path} is not at goal position.`, ); //Callback for failed delivery if (this.onCandyFailed) { diff --git a/src/js/candy.js b/src/js/candy.js index 6bea34a..3c835f8 100644 --- a/src/js/candy.js +++ b/src/js/candy.js @@ -1,11 +1,11 @@ export default class Candy { - constructor(color, shape, pattern, imagePath) { + constructor(color, shape, pattern, path) { this.color = color; this.shape = shape; this.pattern = pattern; - console.log("ImagePath: " + imagePath); - this.imagePath = imagePath; - console.log("ImagePath: " + imagePath); + console.log("ImagePath: " + path); + this.path = path; + console.log("ImagePath: " + this.path); } } diff --git a/src/js/level1.js b/src/js/level1.js index d12d189..e6d864c 100644 --- a/src/js/level1.js +++ b/src/js/level1.js @@ -3,6 +3,8 @@ import AnimationExecutor from "./SceneClasses/AnimationExecutor.js"; import CommandManager from "./SceneClasses/CommandManager.js"; import QueueManager from "./SceneClasses/QueueManager.js"; import LevelHelper from "./SceneClasses/LevelHelper.js"; +import Candy, { Colors, Shapes, Patterns } from "./candy.js"; + export default class Level1 extends Phaser.Scene { graphics; @@ -11,11 +13,46 @@ export default class Level1 extends Phaser.Scene { commandManager; currentLevel = "Level1"; + // --------------------------------------------------------- + // ADDED: Array to track preview candy sprites + // --------------------------------------------------------- + previewSprites = []; + // --------------------------------------------------------- + preload() { this.load.image("background", "assets/background.png"); console.log(`[${this.currentLevel}] Preloading background image.`); + this.load.image('Connector', 'assets/conveyer_photos/Connector.png'); + this.load.image('ConveyerDown', 'assets/conveyer_photos/ConveyerDown.png'); + this.load.image('ConveyerAll', 'assets/conveyer_photos/ConnectorAll.png'); + this.load.image('ConveyerLeft', 'assets/conveyer_photos/Left_Belt.png'); + this.load.image('ConveyerRight', 'assets/conveyer_photos/Right_belt.png'); + this.load.image('tester', 'assets/candy_photos/blue-square-dotted.png'); + this.load.image('tester2', 'assets/candy_photos/red-triangle-dotted.png'); + this.load.image('tester3', 'assets/candy_photos/green-triangle-dotted - Copy.png'); } + ConveyerMap = { + 0: "", + 1: "ConveyerDown", + 2: "ConveyerLeft", + 3: "ConveyerRight", + 4: "Connector", + 5: "ConveyerAll" + }; + + levelData = [ + [0, 1, 0], + [0, 1, 0], + [0, 1, 0], + [0, 1, 0], + [0, 1, 0], + [2, 4, 3], + [1, 0, 1], + [1, 0, 1], + [1, 0, 1] + ]; + initializeEditorWindow() { LevelHelper.initializeEditorWindow( this, @@ -24,9 +61,6 @@ export default class Level1 extends Phaser.Scene { } initializeBackgroundGraphics() { - this.add.image(400, 300, "background"); - console.log(`[${this.currentLevel}] Background image added.`); - this.graphics = this.add.graphics(); console.log(`[${this.currentLevel}] Graphics object created.`); } @@ -36,7 +70,6 @@ export default class Level1 extends Phaser.Scene { this.pathManager.addLineFrom("center", "left", { x: 200, y: 400 }); this.pathManager.addLineFrom('center', 'right', { x: 600, y: 400 }); this.pathManager.addLineFrom('center', 'leftDown', { x: 400, y: 500 }); - // this.pathManager.addLineFrom('center', 'rightDown', { x: 600, y: 150 }); } createIncrementalCommands() { @@ -48,23 +81,67 @@ export default class Level1 extends Phaser.Scene { }); } + // --------------------------------------------------------- + // ADDED: Render preview candies on the right side + // --------------------------------------------------------- + renderCandyPreview(candies) { + this.previewSprites.forEach(sprite => sprite.destroy()); + this.previewSprites = []; + + const startX = 750; + const startY = 150; + const spacing = 100; + + candies.forEach((candy, index) => { + const sprite = this.add.image(startX, startY + index * spacing, candy.path); + sprite.setScale(0.8); + sprite.setDepth(10); + this.previewSprites.push(sprite); + }); + } + // --------------------------------------------------------- + + // --------------------------------------------------------- + // ADDED: Remove first preview candy when used + // --------------------------------------------------------- + removeFirstPreviewCandy() { + if (this.previewSprites.length > 0) { + const sprite = this.previewSprites.shift(); + sprite.destroy(); + + this.previewSprites.forEach((sprite, index) => { + this.tweens.add({ + targets: sprite, + y: 150 + index * 100, + duration: 200, + ease: 'Power2' + }); + }); + } + } + // --------------------------------------------------------- + setupLevelCandies() { - //Define the candies for this level - //TODO: Adjust this to use the Candy class! const candies = [ - { type: "blue-circle", id: 1 }, - { type: "red-square", id: 2 }, - { type: "green-triangle", id: 3 }, + new Candy(Colors.BLUE, Shapes.SQUARE, Patterns.DOTTED, 'tester'), + new Candy(Colors.RED, Shapes.TRIANGLE, Patterns.DOTTED, 'tester2'), + new Candy(Colors.GREEN, Shapes.TRIANGLE, Patterns.DOTTED, 'tester3') ]; - //Define goal positions for each candy type. Again, adjust to using the Candy class + console.log(candies[0].path, candies[1].path, candies[2].path); + + // --------------------------------------------------------- + // ADDED: Show preview candies + // --------------------------------------------------------- + this.renderCandyPreview(candies); + // --------------------------------------------------------- + const goalPositions = { - "blue-circle": { x: 200, y: 400 }, // Left bin - "red-square": { x: 600, y: 400 }, // Right bin - "green-triangle": { x: 400, y: 500 }, // Bottom bin + 'tester': { x: 200, y: 400 }, + 'tester2': { x: 600, y: 400 }, + 'tester3': { x: 400, y: 200 }, }; - // Set up callbacks for candy completion this.pathManager.setCallbacks( (candy) => this.onCandySuccess(candy), (candy, position) => this.onCandyFailed(candy, position), @@ -73,13 +150,21 @@ export default class Level1 extends Phaser.Scene { this.pathManager.setupCandyQueueAndGoalPositions(candies, goalPositions); } - //Having these two methods below in Level1.js is fine for now- to be discussed if we just - //want the same behavior for each case anyways, if so we can just export it to CommandManager onCandySuccess(candy) { + // --------------------------------------------------------- + // ADDED: Remove preview candy on success + // --------------------------------------------------------- + this.removeFirstPreviewCandy(); + // --------------------------------------------------------- LevelHelper.onCandySuccess(this, candy); } onCandyFailed(candy, position) { + // --------------------------------------------------------- + // ADDED: Remove preview candy on failure + // --------------------------------------------------------- + this.removeFirstPreviewCandy(); + // --------------------------------------------------------- LevelHelper.onCandyFailed(this, candy, position); } @@ -87,16 +172,12 @@ export default class Level1 extends Phaser.Scene { LevelHelper.defineInterpreterCommands(this.commandManager, { immediate: { sampleCommand: () => { - console.log( - "This is an example custom command, should run immediately", - ); + console.log("This is an example custom command, should run immediately"); }, }, queued: { queuedCommand: () => { - console.log( - "This is an example custom command that is queued according to animation, should run in animation sequence", - ); + console.log("This is an example custom command that is queued according to animation, should run in animation sequence"); }, }, }); @@ -110,7 +191,7 @@ export default class Level1 extends Phaser.Scene { this.queueManager, ); } - // Add a button to reset the level completely + initializeResetButton() { LevelHelper.initializeResetButton( this, @@ -134,26 +215,52 @@ export default class Level1 extends Phaser.Scene { this.initializeBackgroundGraphics(); this.pathManager = new PathManager(this); this.animationExecutor = new AnimationExecutor(this, this.pathManager); - this.queueManager = new QueueManager( - this.pathManager, - this.animationExecutor, - ); - this.commandManager = new CommandManager( - this, - this.pathManager, - this.animationExecutor, - this.queueManager, - ); + this.queueManager = new QueueManager(this.pathManager, this.animationExecutor); + this.commandManager = new CommandManager(this, this.pathManager, this.animationExecutor, this.queueManager); - //Set up the level this.createLinesForConveyerBelt(); this.createIncrementalCommands(); this.setupLevelCandies(); this.defineInterpreterCommands(); this.initializeRunCodeButton(); this.initializeResetButton(); + + const tileSize = 64; + const offsetX = 305; + const offsetY = 0; + + for (var row = 0; row < this.levelData.length; row++) { + for (var col = 0; col < this.levelData[row].length; col++) { + var tileType = this.levelData[row][col]; + var textureKey = this.ConveyerMap[tileType]; + if (textureKey === "") continue; + var image = this.add.image(offsetX + col * tileSize, offsetY + row * tileSize, textureKey).setOrigin(0); + image.setScale(2); + image.setDepth(-1); + } + } } + moveToCenter = (gameObject) => { + this.tweens.add({ + targets: gameObject, + x: 400, + y: 100, + ease: 'Power2', + duration: 2000 + }); + }; + + moveUpSpot = (gameObject) => { + this.tweens.add({ + targets: gameObject, + x: 700, + y: gameObject.y - 100, + ease: 'Power2', + duration: 2000 + }); + }; + update() { this.graphics.clear(); this.graphics.lineStyle(4, 0xffffff, 1); From 2e3f8e0b9af88ea6be414580b3d0721482cd397f Mon Sep 17 00:00:00 2001 From: Casey Bartman Date: Mon, 20 Apr 2026 20:25:37 -0400 Subject: [PATCH 5/5] fix instance issue --- src/js/level1.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/level1.js b/src/js/level1.js index 5b33efb..fb385c0 100644 --- a/src/js/level1.js +++ b/src/js/level1.js @@ -182,7 +182,7 @@ export default class Level1 extends Phaser.Scene { // --------------------------------------------------------- this.removeFirstPreviewCandy(); // --------------------------------------------------------- - LevelHelper.onCandyFailed(this, candy, position); + this.levelHelper.onCandyFailed(this, candy, position); } defineInterpreterCommands() {