Skip to content

Commit

Permalink
Integrate changes
Browse files Browse the repository at this point in the history
  • Loading branch information
NouCake committed Feb 12, 2024
1 parent 298bfd8 commit b19cbd6
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/scene/board-scene.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default class BoardScene extends BaseScene<BoardSceneController> {
playerList.updatePlayerList(this.aznopoly.room.connectedPlayerIds.map(e => ({uuid: e, name: this.aznopoly.room.getPlayerName(e), host: false})))
playerList.updateTitle("");

this.rollButton = this.add.existing(new AzNopolyButton(this, "Roll Dice", WIDTH - 150, HEIGHT - 100, this.controller.onRollClick.bind(this.controller)));
this.rollButton = this.add.existing(new AzNopolyButton(this, "Roll Dice", WIDTH - 150, HEIGHT - 100, 0, 0, this.controller.onRollClick.bind(this.controller)));
this.rollButton.disable();

this.choiceWheel = this.add.existing(new RandomSelectionWheel(this, WIDTH /2, HEIGHT / 2, {width: 300, height: 40}));
Expand Down
2 changes: 1 addition & 1 deletion src/scene/lobby-scene.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default class LobbyScene extends BaseScene<LobbySceneController> {
private initButton() {
if (!this.aznopoly.isHost) return;

const button = new AzNopolyButton(this, "Start Game", WIDTH - 200, HEIGHT - 120, this.controller.onStartClick.bind(this.controller));
const button = new AzNopolyButton(this, "Start Game", WIDTH - 200, HEIGHT - 120, 0, 0, this.controller.onStartClick.bind(this.controller));
this.add.existing(button);
}

Expand Down
1 change: 1 addition & 0 deletions src/style.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export const COLOR_PRIMARY = 0x4690A9;
export const COLOR_PRIMARY_2 = 0x73c8e4;
export const COLOR_CONTRAST = 0x73c8e4;

type TextStyle = Phaser.Types.GameObjects.Text.TextStyle;
Expand Down
2 changes: 1 addition & 1 deletion src/ui/button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class AzNopolyButton extends Phaser.GameObjects.Container {

private onClick: () => void;

constructor(scene: Scene, title: string, x: number, y: number, widthOffset: number, heightOffset: number, onClick: () => void) {
constructor(scene: Phaser.Scene, title: string, x: number, y: number, widthOffset: number, heightOffset: number, onClick: () => void) {
super(scene);
this.onClick = onClick;

Expand Down
2 changes: 1 addition & 1 deletion src/ui/random-selection-wheel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default class RandomSelectionWheel extends Phaser.GameObjects.Container {
this.choiceTexts.forEach((text, i) => {
text.setStyle(FONT_STYLE_BODY);
if(i === index) {
text.setStyle({color: '#ffffff'});
text.setStyle({color: '#dddddd'});
}
});
}
Expand Down

0 comments on commit b19cbd6

Please sign in to comment.