From f5fcce110a915fca1b114001962170733276e5df Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Thu, 29 Jun 2023 11:40:46 -0400 Subject: [PATCH] audio, finalize gameplay, wrap around map, stuff --- client/css/editor.css | 7 +- client/css/main.css | 10 +- client/img/atlas.png | Bin 9345 -> 10213 bytes client/index.html | 22 ++-- client/mapeditor.html | 27 ++-- client/sfx/death.mp3 | Bin 0 -> 15885 bytes client/sfx/ghost.wav | Bin 0 -> 70768 bytes client/sfx/intro.mp3 | Bin 0 -> 32733 bytes client/sfx/move.wav | Bin 0 -> 156530 bytes client/src/editor.ts | 37 +++++- client/src/logic/ai.ts | 237 +++++++++++++++++++++++++++++++---- client/src/logic/items.ts | 16 ++- client/src/logic/logic.ts | 83 +++++++++--- client/src/logic/movement.ts | 113 ++++++++++++++++- client/src/logic/players.ts | 5 + client/src/main.ts | 2 +- client/src/map.ts | 17 ++- client/src/renderer.ts | 181 +++++++++++++++++++++----- client/src/types.ts | 106 +++++++++++++++- 19 files changed, 743 insertions(+), 120 deletions(-) create mode 100644 client/sfx/death.mp3 create mode 100644 client/sfx/ghost.wav create mode 100644 client/sfx/intro.mp3 create mode 100644 client/sfx/move.wav diff --git a/client/css/editor.css b/client/css/editor.css index 51c7571..23486da 100644 --- a/client/css/editor.css +++ b/client/css/editor.css @@ -11,10 +11,13 @@ canvas { padding: 1rem; } -#mapgen { +#mapgen, #mapload { display: flex; flex-direction: column; - position: absolute; +} + +#mapload { + margin-top: 3rem; } #export { diff --git a/client/css/main.css b/client/css/main.css index 26fab00..e40cbff 100644 --- a/client/css/main.css +++ b/client/css/main.css @@ -19,10 +19,16 @@ body { #center { width: 100vw; height: 100vh; - display: flex; + position: absolute; +} + +#center-inner { + width: 100%; + height: 100%; + position: relative; align-items: center; justify-content: center; - position: absolute; + display: flex; flex-direction: column; } diff --git a/client/img/atlas.png b/client/img/atlas.png index 135b9601eb473433c24df0989df721f6a7424181..b01108c05dec6c6a1034efe2e4bae49cda2f9b7c 100644 GIT binary patch delta 4891 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 bFkJXQA|u~+{D&k}00000NkvXXu0mjfJhD0| diff --git a/client/index.html b/client/index.html index 251c33d..3145ab0 100644 --- a/client/index.html +++ b/client/index.html @@ -8,16 +8,18 @@
-
- - - -
- - diff --git a/client/mapeditor.html b/client/mapeditor.html index 6fbb158..ed63190 100644 --- a/client/mapeditor.html +++ b/client/mapeditor.html @@ -10,20 +10,27 @@
-
- - - -
-