diff --git a/public/assets/images/opponents.png b/public/assets/images/opponents.png index 6d1b2a7..c4f6a90 100644 Binary files a/public/assets/images/opponents.png and b/public/assets/images/opponents.png differ diff --git a/public/assets/images/opponents.psd b/public/assets/images/opponents.psd index 99ee6cb..12a5c1c 100644 Binary files a/public/assets/images/opponents.psd and b/public/assets/images/opponents.psd differ diff --git a/public/assets/images/originals/nadia.png b/public/assets/images/originals/nadia.png new file mode 100644 index 0000000..5cab004 Binary files /dev/null and b/public/assets/images/originals/nadia.png differ diff --git a/public/assets/images/originals/smasher.png b/public/assets/images/originals/smasher.png new file mode 100644 index 0000000..8fe02e4 Binary files /dev/null and b/public/assets/images/originals/smasher.png differ diff --git a/public/assets/speech/nadia-happy-01.mp3 b/public/assets/speech/nadia-happy-01.mp3 new file mode 100644 index 0000000..70c6dca Binary files /dev/null and b/public/assets/speech/nadia-happy-01.mp3 differ diff --git a/public/assets/speech/nadia-happy-02.mp3 b/public/assets/speech/nadia-happy-02.mp3 new file mode 100644 index 0000000..e251e3e Binary files /dev/null and b/public/assets/speech/nadia-happy-02.mp3 differ diff --git a/public/assets/speech/nadia-happy-03.mp3 b/public/assets/speech/nadia-happy-03.mp3 new file mode 100644 index 0000000..72ebef2 Binary files /dev/null and b/public/assets/speech/nadia-happy-03.mp3 differ diff --git a/public/assets/speech/nadia-happy-04.mp3 b/public/assets/speech/nadia-happy-04.mp3 new file mode 100644 index 0000000..6e07791 Binary files /dev/null and b/public/assets/speech/nadia-happy-04.mp3 differ diff --git a/public/assets/speech/nadia-happy-05.mp3 b/public/assets/speech/nadia-happy-05.mp3 new file mode 100644 index 0000000..54b4579 Binary files /dev/null and b/public/assets/speech/nadia-happy-05.mp3 differ diff --git a/public/assets/speech/nadia-intro-01.mp3 b/public/assets/speech/nadia-intro-01.mp3 new file mode 100644 index 0000000..c221512 Binary files /dev/null and b/public/assets/speech/nadia-intro-01.mp3 differ diff --git a/public/assets/speech/nadia-intro-02.mp3 b/public/assets/speech/nadia-intro-02.mp3 new file mode 100644 index 0000000..0135c24 Binary files /dev/null and b/public/assets/speech/nadia-intro-02.mp3 differ diff --git a/public/assets/speech/nadia-pick.mp3 b/public/assets/speech/nadia-pick.mp3 new file mode 100644 index 0000000..1ea8adb Binary files /dev/null and b/public/assets/speech/nadia-pick.mp3 differ diff --git a/public/assets/speech/nadia-upset-01.mp3 b/public/assets/speech/nadia-upset-01.mp3 new file mode 100644 index 0000000..e183c7c Binary files /dev/null and b/public/assets/speech/nadia-upset-01.mp3 differ diff --git a/public/assets/speech/nadia-upset-02.mp3 b/public/assets/speech/nadia-upset-02.mp3 new file mode 100644 index 0000000..a46d23b Binary files /dev/null and b/public/assets/speech/nadia-upset-02.mp3 differ diff --git a/public/assets/speech/nadia-upset-03.mp3 b/public/assets/speech/nadia-upset-03.mp3 new file mode 100644 index 0000000..28906bd Binary files /dev/null and b/public/assets/speech/nadia-upset-03.mp3 differ diff --git a/public/assets/speech/nadia-upset-04.mp3 b/public/assets/speech/nadia-upset-04.mp3 new file mode 100644 index 0000000..3bca37d Binary files /dev/null and b/public/assets/speech/nadia-upset-04.mp3 differ diff --git a/public/assets/speech/nadia-upset-05.mp3 b/public/assets/speech/nadia-upset-05.mp3 new file mode 100644 index 0000000..1e6468e Binary files /dev/null and b/public/assets/speech/nadia-upset-05.mp3 differ diff --git a/public/assets/speech/smasher-happy-01.mp3 b/public/assets/speech/smasher-happy-01.mp3 new file mode 100644 index 0000000..fb88007 Binary files /dev/null and b/public/assets/speech/smasher-happy-01.mp3 differ diff --git a/public/assets/speech/smasher-happy-02.mp3 b/public/assets/speech/smasher-happy-02.mp3 new file mode 100644 index 0000000..2fc895c Binary files /dev/null and b/public/assets/speech/smasher-happy-02.mp3 differ diff --git a/public/assets/speech/smasher-happy-03.mp3 b/public/assets/speech/smasher-happy-03.mp3 new file mode 100644 index 0000000..316a7a1 Binary files /dev/null and b/public/assets/speech/smasher-happy-03.mp3 differ diff --git a/public/assets/speech/smasher-happy-04.mp3 b/public/assets/speech/smasher-happy-04.mp3 new file mode 100644 index 0000000..2bb0fc9 Binary files /dev/null and b/public/assets/speech/smasher-happy-04.mp3 differ diff --git a/public/assets/speech/smasher-happy-05.mp3 b/public/assets/speech/smasher-happy-05.mp3 new file mode 100644 index 0000000..cd216cd Binary files /dev/null and b/public/assets/speech/smasher-happy-05.mp3 differ diff --git a/public/assets/speech/smasher-intro-01.mp3 b/public/assets/speech/smasher-intro-01.mp3 new file mode 100644 index 0000000..959c91d Binary files /dev/null and b/public/assets/speech/smasher-intro-01.mp3 differ diff --git a/public/assets/speech/smasher-intro-02.mp3 b/public/assets/speech/smasher-intro-02.mp3 new file mode 100644 index 0000000..80dcb33 Binary files /dev/null and b/public/assets/speech/smasher-intro-02.mp3 differ diff --git a/public/assets/speech/smasher-pick.mp3 b/public/assets/speech/smasher-pick.mp3 new file mode 100644 index 0000000..42aef6d Binary files /dev/null and b/public/assets/speech/smasher-pick.mp3 differ diff --git a/public/assets/speech/smasher-upset-01.mp3 b/public/assets/speech/smasher-upset-01.mp3 new file mode 100644 index 0000000..4c0a18e Binary files /dev/null and b/public/assets/speech/smasher-upset-01.mp3 differ diff --git a/public/assets/speech/smasher-upset-02.mp3 b/public/assets/speech/smasher-upset-02.mp3 new file mode 100644 index 0000000..992ff99 Binary files /dev/null and b/public/assets/speech/smasher-upset-02.mp3 differ diff --git a/public/assets/speech/smasher-upset-03.mp3 b/public/assets/speech/smasher-upset-03.mp3 new file mode 100644 index 0000000..c7f491e Binary files /dev/null and b/public/assets/speech/smasher-upset-03.mp3 differ diff --git a/public/assets/speech/smasher-upset-04.mp3 b/public/assets/speech/smasher-upset-04.mp3 new file mode 100644 index 0000000..4813fee Binary files /dev/null and b/public/assets/speech/smasher-upset-04.mp3 differ diff --git a/public/assets/speech/smasher-upset-05.mp3 b/public/assets/speech/smasher-upset-05.mp3 new file mode 100644 index 0000000..2acc4d8 Binary files /dev/null and b/public/assets/speech/smasher-upset-05.mp3 differ diff --git a/public/assets/videos/nadia-happy.mp4 b/public/assets/videos/nadia-happy.mp4 new file mode 100644 index 0000000..7886ffc Binary files /dev/null and b/public/assets/videos/nadia-happy.mp4 differ diff --git a/public/assets/videos/nadia-idle.mp4 b/public/assets/videos/nadia-idle.mp4 new file mode 100644 index 0000000..6c7cbae Binary files /dev/null and b/public/assets/videos/nadia-idle.mp4 differ diff --git a/public/assets/videos/nadia-upset.mp4 b/public/assets/videos/nadia-upset.mp4 new file mode 100644 index 0000000..43ee20a Binary files /dev/null and b/public/assets/videos/nadia-upset.mp4 differ diff --git a/public/assets/videos/smasher-happy.mp4 b/public/assets/videos/smasher-happy.mp4 new file mode 100644 index 0000000..9de6602 Binary files /dev/null and b/public/assets/videos/smasher-happy.mp4 differ diff --git a/public/assets/videos/smasher-idle.mp4 b/public/assets/videos/smasher-idle.mp4 new file mode 100644 index 0000000..faa29ae Binary files /dev/null and b/public/assets/videos/smasher-idle.mp4 differ diff --git a/public/assets/videos/smasher-upset.mp4 b/public/assets/videos/smasher-upset.mp4 new file mode 100644 index 0000000..008eeb8 Binary files /dev/null and b/public/assets/videos/smasher-upset.mp4 differ diff --git a/public/data/opponents.json b/public/data/opponents.json index 620455b..08eb8e2 100644 --- a/public/data/opponents.json +++ b/public/data/opponents.json @@ -558,6 +558,64 @@ "blackwind-pick" ] } + }, + { + "id": "nadia", + "spriteIndex": 20, + "name": "Nadia", + "bio": "She's here from the future to learn our games and study our culture.", + "speech": { + "intro": [ + "nadia-intro-01", + "nadia-intro-02" + ], + "happy": [ + "nadia-happy-01", + "nadia-happy-02", + "nadia-happy-03", + "nadia-happy-04", + "nadia-happy-05" + ], + "upset": [ + "nadia-upset-01", + "nadia-upset-02", + "nadia-upset-03", + "nadia-upset-04", + "nadia-upset-05" + ], + "pick": [ + "nadia-pick" + ] + } + }, + { + "id": "smasher", + "spriteIndex": 19, + "name": "The Smasher", + "bio": "Oooooooh yeah brother!!! You wanna play with The Smasher?!", + "speech": { + "intro": [ + "smasher-intro-01", + "smasher-intro-02" + ], + "happy": [ + "smasher-happy-01", + "smasher-happy-02", + "smasher-happy-03", + "smasher-happy-04", + "smasher-happy-05" + ], + "upset": [ + "smasher-upset-01", + "smasher-upset-02", + "smasher-upset-03", + "smasher-upset-04", + "smasher-upset-05" + ], + "pick": [ + "smasher-pick" + ] + } } ] } \ No newline at end of file diff --git a/public/src/games/2048/2048Game.js b/public/src/games/2048/2048Game.js index 852a7a0..5d0a54a 100644 --- a/public/src/games/2048/2048Game.js +++ b/public/src/games/2048/2048Game.js @@ -117,8 +117,9 @@ export default class Game2048 extends Phaser.Scene { fontFamily: FONT_TITLE, fontSize: '44px', color: COLORS.textHex, }).setOrigin(0.5, 0).setDepth(D.ui); - new Button(this, GAME_WIDTH - 270, 65, 'New Game', () => this._newGame(), { variant: 'ghost', width: 200, height: 54, fontSize: 22 }).setDepth(D.ui); - new Button(this, GAME_WIDTH - 60, 65, 'Theme', () => this._showSchemePicker(), { variant: 'ghost', width: 110, height: 54, fontSize: 22 }).setDepth(D.ui); + new Button(this, GAME_WIDTH - 270, 165, 'New Game', () => this._newGame(), { variant: 'ghost', width: 200, height: 54, fontSize: 22 }).setDepth(D.ui); + new Button(this, GAME_WIDTH - 60, 165, 'Theme', () => this._showSchemePicker(), { variant: 'ghost', width: 110, height: 54, fontSize: 22 }).setDepth(D.ui); + new Button(this, GAME_WIDTH - 60, GAME_HEIGHT - 60, 'Leave', () => this.scene.start('GameMenu'), { variant: 'ghost', width: 110, height: 54, fontSize: 22 }).setDepth(D.ui); } _drawScoreBox(x, y, label) {