From 99d0231a9cc796f6e46abbf005843ab4e3c5033f Mon Sep 17 00:00:00 2001 From: Mashy Date: Tue, 5 Mar 2019 14:52:59 +1000 Subject: [PATCH] change to bitmap text --- client/src/scenes/combat.js | 2 +- client/src/scenes/cryps.js | 2 +- client/src/scenes/header.js | 4 +++- client/src/scenes/home.cryps.js | 8 ++++---- client/src/scenes/home.instances.js | 4 ++-- client/src/scenes/home.navigation.js | 8 ++++---- client/src/scenes/home.news.js | 4 ++-- client/src/scenes/home.rankings.js | 4 ++-- client/src/scenes/home.shop.js | 4 ++-- 9 files changed, 21 insertions(+), 19 deletions(-) diff --git a/client/src/scenes/combat.js b/client/src/scenes/combat.js index 7cc402f6..14a57ae8 100644 --- a/client/src/scenes/combat.js +++ b/client/src/scenes/combat.js @@ -112,7 +112,7 @@ class Combat extends Phaser.Scene { bText: 'Leave Game', callback: leaveGame, }; - this.box = this.add.existing(new Button(this, buttonProps)); + // this.box = this.add.existing(new Button(this, buttonProps)); } cleanUp() { diff --git a/client/src/scenes/cryps.js b/client/src/scenes/cryps.js index 04c286d6..b63c0512 100644 --- a/client/src/scenes/cryps.js +++ b/client/src/scenes/cryps.js @@ -9,7 +9,7 @@ const Combat = require('./combat'); function renderCryps() { const config = { - type: Phaser.AUTO, + type: Phaser.CANVAS, // backgroundColor: '#181818', resolution: window.devicePixelRatio, scale: { diff --git a/client/src/scenes/header.js b/client/src/scenes/header.js index bccae709..20859611 100644 --- a/client/src/scenes/header.js +++ b/client/src/scenes/header.js @@ -17,10 +17,12 @@ class Header extends Phaser.Scene { aztecImg.onload = () => { this.textures.addAtlas('aztec', aztecImg, aztecAtlas); }; + this.load.bitmapFont('gothic', 'https://labs.phaser.io/assets/fonts/bitmap/gothic.png', + 'https://labs.phaser.io/assets/fonts/bitmap/gothic.xml'); } create() { - this.add.text(0, 0, 'cryps.gg', TEXT.HEADER); + this.add.bitmapText(0, 0, 'gothic', 'cryps.gg', 20); } } diff --git a/client/src/scenes/home.cryps.js b/client/src/scenes/home.cryps.js index 74394d10..b0fa4ac7 100644 --- a/client/src/scenes/home.cryps.js +++ b/client/src/scenes/home.cryps.js @@ -86,7 +86,7 @@ class HomeCrypList extends Phaser.Scene { 'aztec', genAvatar(cryp.name) ); - this.add.text(ROW_X + BOX_WIDTH, ROW_Y, cryp.name, TEXT.HEADER) + this.add.bitmapText(ROW_X + BOX_WIDTH, ROW_Y, 'gothic', cryp.name, 20) .setOrigin(0.5, 0.5); } @@ -99,7 +99,7 @@ class HomeCrypList extends Phaser.Scene { this.game.events.emit('CRYP_SPAWN'); }); this.add - .text(spawn.getCenter().x, spawn.getCenter().y, '+', TEXT.HEADER) + .bitmapText(spawn.getCenter().x, spawn.getCenter().y, 'gothic', '+', 20) .setOrigin(0.5, 0.5); const joinNormal = this.add @@ -112,7 +112,7 @@ class HomeCrypList extends Phaser.Scene { ws.sendPlayerCrypsSet(NULL_UUID, playerCryps); }); this.add - .text(joinNormal.getCenter().x, joinNormal.getCenter().y, 'Join Normal', TEXT.HEADER) + .bitmapText(joinNormal.getCenter().x, joinNormal.getCenter().y, 'gothic', 'Join Normal', 20) .setOrigin(0.5, 0.5); const joinInstance = this.add @@ -125,7 +125,7 @@ class HomeCrypList extends Phaser.Scene { ws.sendInstanceJoin(playerCryps); }); this.add - .text(joinInstance.getCenter().x, joinInstance.getCenter().y, 'New Instance', TEXT.HEADER) + .bitmapText(joinInstance.getCenter().x, joinInstance.getCenter().y, 'gothic', 'New Instance', 20) .setOrigin(0.5, 0.5); return this; diff --git a/client/src/scenes/home.instances.js b/client/src/scenes/home.instances.js index 2d3bf5cb..a19ef9fb 100644 --- a/client/src/scenes/home.instances.js +++ b/client/src/scenes/home.instances.js @@ -12,7 +12,7 @@ class HomeRankings extends Phaser.Scene { } create() { - this.add.text(X, Y, 'Instances Scene', TEXT.HEADER); + this.add.bitmapText(X, Y, 'gothic', 'Instances Scene', 20); const playerList = this.registry.get('playerList'); const addInstance = (player, i) => { const joinNormal = this.add @@ -23,7 +23,7 @@ class HomeRankings extends Phaser.Scene { this.game.events.emit('SET_PLAYER', player); }); this.add - .text(joinNormal.getCenter().x, joinNormal.getCenter().y, `${player.instance}`, TEXT.NORMAL) + .bitmapText(joinNormal.getCenter().x, joinNormal.getCenter().y, 'gothic', `${player.instance}`, 20) .setOrigin(0.5, 0.5); }; diff --git a/client/src/scenes/home.navigation.js b/client/src/scenes/home.navigation.js index 8f2249f1..bbdec042 100644 --- a/client/src/scenes/home.navigation.js +++ b/client/src/scenes/home.navigation.js @@ -21,7 +21,7 @@ class HomeNavigation extends Phaser.Scene { .setInteractive() .setOrigin(0); this.add - .text(ranks.getCenter().x, ranks.getCenter().y, 'Rankings', TEXT.HEADER) + .bitmapText(ranks.getCenter().x, ranks.getCenter().y, 'gothic', 'Rankings', 20) .setOrigin(0.5, 0.5); ranks.on('pointerdown', () => this.registry.set('homeRankings', true)); @@ -30,7 +30,7 @@ class HomeNavigation extends Phaser.Scene { .setInteractive() .setOrigin(0); this.add - .text(news.getCenter().x, news.getCenter().y, 'News', TEXT.HEADER) + .bitmapText(news.getCenter().x, news.getCenter().y, 'gothic', 'News', 20) .setOrigin(0.5, 0.5); news.on('pointerdown', () => this.registry.set('homeNews', true)); @@ -39,7 +39,7 @@ class HomeNavigation extends Phaser.Scene { .setInteractive() .setOrigin(0); this.add - .text(shop.getCenter().x, shop.getCenter().y, 'Shop', TEXT.HEADER) + .bitmapText(shop.getCenter().x, shop.getCenter().y, 'gothic', 'Shop', 20) .setOrigin(0.5, 0.5); shop.on('pointerdown', () => this.registry.set('homeShop', true)); @@ -48,7 +48,7 @@ class HomeNavigation extends Phaser.Scene { .setInteractive() .setOrigin(0); this.add - .text(instances.getCenter().x, instances.getCenter().y, 'Instances', TEXT.HEADER) + .bitmapText(instances.getCenter().x, instances.getCenter().y, 'gothic', 'Instances', 20) .setOrigin(0.5, 0.5); instances.on('pointerdown', () => this.registry.set('homeInstances', true)); } diff --git a/client/src/scenes/home.news.js b/client/src/scenes/home.news.js index 3ef298b7..a015921f 100644 --- a/client/src/scenes/home.news.js +++ b/client/src/scenes/home.news.js @@ -12,8 +12,8 @@ class HomeNews extends Phaser.Scene { } create() { - this.add.text(X, Y, 'News Scene', TEXT.HEADER); - this.add.text(X, Y + HEIGHT * 0.1, 'some other stuff here', TEXT.NORMAL); + this.add.bitmapText(X, Y, 'gothic', 'News Scene', 20); + this.add.bitmapText(X, Y + HEIGHT * 0.1, 'gothic', 'some other stuff here', 20); } cleanUp() { diff --git a/client/src/scenes/home.rankings.js b/client/src/scenes/home.rankings.js index 062ade85..8574f67d 100644 --- a/client/src/scenes/home.rankings.js +++ b/client/src/scenes/home.rankings.js @@ -12,8 +12,8 @@ class HomeRankings extends Phaser.Scene { } create() { - this.add.text(X, Y, 'Rankings Scene', TEXT.HEADER); - this.add.text(X, Y + HEIGHT * 0.1, 'some stuff here', TEXT.NORMAL); + this.add.bitmapText(X, Y, 'gothic', 'Rankings Scene', 20); + this.add.bitmapText(X, Y + HEIGHT * 0.1, 'gothic', 'some other stuff here', 20); } cleanUp() { diff --git a/client/src/scenes/home.shop.js b/client/src/scenes/home.shop.js index d25319df..34101791 100644 --- a/client/src/scenes/home.shop.js +++ b/client/src/scenes/home.shop.js @@ -11,8 +11,8 @@ class HomeShop extends Phaser.Scene { } create() { - this.add.text(X, Y, 'Shop Scene', TEXT.HEADER); - this.add.text(X, Y + HEIGHT * 0.1, 'rulul', TEXT.NORMAL); + this.add.bitmapText(X, Y, 'gothic', 'Shop Scene', 20); + this.add.bitmapText(X, Y + HEIGHT * 0.1, 'gothic', 'some other stuff here', 20); } cleanUp() {