diff --git a/assets/images/tetrisattack/background-klaxon-r1.png b/assets/images/tetrisattack/background-klaxon-r1.png new file mode 100644 index 0000000..d50141c Binary files /dev/null and b/assets/images/tetrisattack/background-klaxon-r1.png differ diff --git a/assets/images/tetrisattack/background-klaxon-r2.png b/assets/images/tetrisattack/background-klaxon-r2.png new file mode 100644 index 0000000..18b35f4 Binary files /dev/null and b/assets/images/tetrisattack/background-klaxon-r2.png differ diff --git a/assets/images/tetrisattack/background-klaxon-r3.png b/assets/images/tetrisattack/background-klaxon-r3.png new file mode 100644 index 0000000..d11bab3 Binary files /dev/null and b/assets/images/tetrisattack/background-klaxon-r3.png differ diff --git a/assets/images/tetrisattack/background-klaxon-r4.png b/assets/images/tetrisattack/background-klaxon-r4.png new file mode 100644 index 0000000..3ef1c0a Binary files /dev/null and b/assets/images/tetrisattack/background-klaxon-r4.png differ diff --git a/assets/images/tetrisattack/background-klaxon-r5.png b/assets/images/tetrisattack/background-klaxon-r5.png new file mode 100644 index 0000000..af53856 Binary files /dev/null and b/assets/images/tetrisattack/background-klaxon-r5.png differ diff --git a/assets/images/tetrisattack/background-steve-r1.png b/assets/images/tetrisattack/background-steve-r1.png new file mode 100644 index 0000000..cacfa0a Binary files /dev/null and b/assets/images/tetrisattack/background-steve-r1.png differ diff --git a/assets/images/tetrisattack/background-steve-r2.png b/assets/images/tetrisattack/background-steve-r2.png new file mode 100644 index 0000000..82e7157 Binary files /dev/null and b/assets/images/tetrisattack/background-steve-r2.png differ diff --git a/assets/images/tetrisattack/background-steve-r3.png b/assets/images/tetrisattack/background-steve-r3.png new file mode 100644 index 0000000..0e9637c Binary files /dev/null and b/assets/images/tetrisattack/background-steve-r3.png differ diff --git a/assets/images/tetrisattack/background-steve-r4.png b/assets/images/tetrisattack/background-steve-r4.png new file mode 100644 index 0000000..91746da Binary files /dev/null and b/assets/images/tetrisattack/background-steve-r4.png differ diff --git a/assets/images/tetrisattack/background-steve-r5.png b/assets/images/tetrisattack/background-steve-r5.png new file mode 100644 index 0000000..e758255 Binary files /dev/null and b/assets/images/tetrisattack/background-steve-r5.png differ diff --git a/assets/images/tetrisattack/background-victor-r1.png b/assets/images/tetrisattack/background-victor-r1.png new file mode 100644 index 0000000..8f27a56 Binary files /dev/null and b/assets/images/tetrisattack/background-victor-r1.png differ diff --git a/assets/images/tetrisattack/background-victor-r2.png b/assets/images/tetrisattack/background-victor-r2.png new file mode 100644 index 0000000..bb2f361 Binary files /dev/null and b/assets/images/tetrisattack/background-victor-r2.png differ diff --git a/assets/images/tetrisattack/background-victor-r3.png b/assets/images/tetrisattack/background-victor-r3.png new file mode 100644 index 0000000..8f02aa1 Binary files /dev/null and b/assets/images/tetrisattack/background-victor-r3.png differ diff --git a/assets/images/tetrisattack/background-victor-r4.png b/assets/images/tetrisattack/background-victor-r4.png new file mode 100644 index 0000000..c83f7b7 Binary files /dev/null and b/assets/images/tetrisattack/background-victor-r4.png differ diff --git a/assets/images/tetrisattack/background-victor-r5.png b/assets/images/tetrisattack/background-victor-r5.png new file mode 100644 index 0000000..a97b0a7 Binary files /dev/null and b/assets/images/tetrisattack/background-victor-r5.png differ diff --git a/assets/images/tetrisattack/tetrisattack-characters.png b/assets/images/tetrisattack/tetrisattack-characters.png index b936e2c..58f1f1d 100644 Binary files a/assets/images/tetrisattack/tetrisattack-characters.png and b/assets/images/tetrisattack/tetrisattack-characters.png differ diff --git a/assets/images/tetrisattack/tetrisattack-characters.psd b/assets/images/tetrisattack/tetrisattack-characters.psd index fbd30d0..4215f35 100644 Binary files a/assets/images/tetrisattack/tetrisattack-characters.psd and b/assets/images/tetrisattack/tetrisattack-characters.psd differ diff --git a/src/games/civilization/CivilizationGame.js b/src/games/civilization/CivilizationGame.js index 06af087..af1701d 100644 --- a/src/games/civilization/CivilizationGame.js +++ b/src/games/civilization/CivilizationGame.js @@ -84,7 +84,8 @@ export default class CivilizationGame extends Phaser.Scene { this.setupRoot = null; this.toasts = []; - this.keys = this.input.keyboard.addKeys('UP,DOWN,LEFT,RIGHT,Q,E,Z,C,W,A,S,D,B,F,G,I,M,N,O,R,T,SPACE,ENTER'); + this.hotkeyList = 'UP,DOWN,LEFT,RIGHT,Q,E,Z,C,W,A,S,D,B,F,G,I,M,N,O,R,T,SPACE,ENTER'; + this.keys = this.input.keyboard.addKeys(this.hotkeyList); this.escHandler = () => this.onEscape(); this.input.keyboard.on('keydown-ESC', this.escHandler); this.events.once('shutdown', () => { @@ -966,6 +967,9 @@ export default class CivilizationGame extends Phaser.Scene { promptCityName(defaultName, onConfirm) { this.modalOpen = true; + // Gameplay hotkeys capture (preventDefault) these keys at the window level, + // which blocks the browser from typing them into the name field below. + this.input.keyboard.clearCaptures(); const cx = GAME_WIDTH / 2; const cy = GAME_HEIGHT / 2; const root = this.add.container(0, 0).setDepth(D.modal); @@ -985,7 +989,10 @@ export default class CivilizationGame extends Phaser.Scene { input.focus(); input.el.select(); - const close = () => { input.destroy(); root.destroy(true); this.modalOpen = false; }; + const close = () => { + input.destroy(); root.destroy(true); this.modalOpen = false; + this.input.keyboard.addCapture(this.hotkeyList); + }; const confirm = () => { const name = input.value.trim() || defaultName; close();