From 8ca1edf9a27c95111b53ea08d9e2870075c413fc Mon Sep 17 00:00:00 2001 From: evanpelle Date: Tue, 1 Oct 2024 08:01:44 -0700 Subject: [PATCH] fixed center button clicked immediately on creation, make fake humans less strong. --- src/client/graphics/layers/RadialMenu.ts | 28 +++++++++++++----------- src/core/configuration/DefaultConfig.ts | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/client/graphics/layers/RadialMenu.ts b/src/client/graphics/layers/RadialMenu.ts index e0d8d0fa3..445740377 100644 --- a/src/client/graphics/layers/RadialMenu.ts +++ b/src/client/graphics/layers/RadialMenu.ts @@ -191,7 +191,7 @@ export class RadialMenu implements Layer { this.showRadialMenu(event.x, event.y); } this.isCenterButtonEnabled = false - this.updateCenterButtonState() + this.enableCenterButton() for (const item of this.menuItems.values()) { item.disabled = true this.updateMenuItemState(item) @@ -206,8 +206,7 @@ export class RadialMenu implements Layer { if (this.game.inSpawnPhase()) { if (tile.isLand() && !tile.hasOwner()) { - this.isCenterButtonEnabled = true - this.updateCenterButtonState() + this.enableCenterButton() } return } @@ -220,8 +219,7 @@ export class RadialMenu implements Layer { if (tile.owner() != myPlayer && tile.isLand() && myPlayer.sharesBorderWith(other)) { if (!other.isPlayer() || !myPlayer.isAlliedWith(other)) { - this.isCenterButtonEnabled = true - this.updateCenterButtonState() + this.enableCenterButton() } } @@ -351,17 +349,21 @@ export class RadialMenu implements Layer { this.menuElement.select('.center-button-text').transition().duration(200).style('font-size', fontSize); } - private updateCenterButtonState() { - const centerButton = this.menuElement.select('.center-button'); + private enableCenterButton() { + // Add delay so center button is clicked immediately on creation. + setTimeout(() => { + this.isCenterButtonEnabled = true; + const centerButton = this.menuElement.select('.center-button'); - centerButton.select('.center-button-hitbox') - .style('cursor', this.isCenterButtonEnabled ? 'pointer' : 'not-allowed'); + centerButton.select('.center-button-hitbox') + .style('cursor', this.isCenterButtonEnabled ? 'pointer' : 'not-allowed'); - centerButton.select('.center-button-visible') - .attr('fill', this.isCenterButtonEnabled ? '#2c3e50' : '#999999'); + centerButton.select('.center-button-visible') + .attr('fill', this.isCenterButtonEnabled ? '#2c3e50' : '#999999'); - centerButton.select('.center-button-text') - .attr('fill', this.isCenterButtonEnabled ? 'white' : '#cccccc'); + centerButton.select('.center-button-text') + .attr('fill', this.isCenterButtonEnabled ? 'white' : '#cccccc'); + }, 25); } private getDisabledColor(color: string): string { diff --git a/src/core/configuration/DefaultConfig.ts b/src/core/configuration/DefaultConfig.ts index 2da9a93cf..97d28a3bb 100644 --- a/src/core/configuration/DefaultConfig.ts +++ b/src/core/configuration/DefaultConfig.ts @@ -118,7 +118,7 @@ export class DefaultConfig implements Config { return 10000 } if (playerInfo.playerType == PlayerType.FakeHuman) { - return 50000 + return 10000 } return 10000 }