From 19d0b618691262de34617db56c25db57dfe71518 Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 11 Feb 2025 14:08:04 -0800 Subject: [PATCH 1/4] have events display show outgoing & incoming attacks --- src/client/Utils.ts | 5 +- src/client/graphics/layers/EventsDisplay.ts | 91 +++++++++++++++++++-- 2 files changed, 87 insertions(+), 9 deletions(-) diff --git a/src/client/Utils.ts b/src/client/Utils.ts index 7954126f9..744921aa8 100644 --- a/src/client/Utils.ts +++ b/src/client/Utils.ts @@ -3,6 +3,7 @@ export function renderTroops(troops: number): string { } export function renderNumber(num: number) { + num = Math.max(num, 0); let numStr = ""; if (num >= 10_000_000) { numStr = (num / 1000000).toFixed(1) + "M"; @@ -51,7 +52,7 @@ export function generateCryptoRandomUUID(): string { ( c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4))) - ).toString(16), + ).toString(16) ); } @@ -63,6 +64,6 @@ export function generateCryptoRandomUUID(): string { const r: number = (Math.random() * 16) | 0; const v: number = c === "x" ? r : (r & 0x3) | 0x8; return v.toString(16); - }, + } ); } diff --git a/src/client/graphics/layers/EventsDisplay.ts b/src/client/graphics/layers/EventsDisplay.ts index 407658016..9621185f8 100644 --- a/src/client/graphics/layers/EventsDisplay.ts +++ b/src/client/graphics/layers/EventsDisplay.ts @@ -1,8 +1,11 @@ import { LitElement, html } from "lit"; import { customElement, property, state } from "lit/decorators.js"; import { EventBus } from "../../../core/EventBus"; -import { AllPlayers, MessageType } from "../../../core/game/Game"; -import { DisplayMessageUpdate } from "../../../core/game/GameUpdates"; +import { AllPlayers, MessageType, PlayerType } from "../../../core/game/Game"; +import { + AttackUpdate, + DisplayMessageUpdate, +} from "../../../core/game/GameUpdates"; import { EmojiUpdate } from "../../../core/game/GameUpdates"; import { TargetPlayerUpdate } from "../../../core/game/GameUpdates"; import { AllianceExpiredUpdate } from "../../../core/game/GameUpdates"; @@ -16,6 +19,7 @@ import { SendAllianceReplyIntentEvent } from "../../Transport"; import { unsafeHTML } from "lit/directives/unsafe-html.js"; import { onlyImages, sanitize } from "../../../core/Util"; import { GameView, PlayerView } from "../../../core/game/GameView"; +import { renderTroops } from "../../Utils"; interface Event { description: string; @@ -38,6 +42,8 @@ export class EventsDisplay extends LitElement implements Layer { public clientID: ClientID; private events: Event[] = []; + @state() private incomingAttacks: AttackUpdate[] = []; + @state() private outgoingAttacks: AttackUpdate[] = []; private updateMap = new Map([ [GameUpdateType.DisplayEvent, (u) => this.onDisplayMessageEvent(u)], @@ -54,6 +60,8 @@ export class EventsDisplay extends LitElement implements Layer { constructor() { super(); this.events = []; + this.incomingAttacks = []; + this.outgoingAttacks = []; } init() {} @@ -85,12 +93,26 @@ export class EventsDisplay extends LitElement implements Layer { if (!myPlayer) { return; } + myPlayer.incomingAttacks().forEach((a) => { - // console.log(`got incoming attack: ${JSON.stringify(a)}`); + console.log( + `got type: ${( + this.game.playerBySmallID(a.attackerID) as PlayerView + ).type()}` + ); }); - myPlayer.outgoingAttacks().forEach((a) => { - // console.log(`got outgoing attack: ${JSON.stringify(a)}`); + + // Update attacks + this.incomingAttacks = myPlayer.incomingAttacks().filter((a) => { + const t = (this.game.playerBySmallID(a.attackerID) as PlayerView).type(); + return t != PlayerType.Bot; }); + + this.outgoingAttacks = myPlayer + .outgoingAttacks() + .filter((a) => a.targetID != 0); + + this.requestUpdate(); } private addEvent(event: Event) { @@ -300,8 +322,62 @@ export class EventsDisplay extends LitElement implements Layer { } } + private renderAttacks() { + if ( + this.incomingAttacks.length === 0 && + this.outgoingAttacks.length === 0 + ) { + return html``; + } + + return html` + ${this.incomingAttacks.length > 0 + ? html` + + + ${this.incomingAttacks.map( + (attack) => html` +
+ ${renderTroops(attack.troops)} + ${( + this.game.playerBySmallID( + attack.attackerID + ) as PlayerView + )?.name()} +
+ ` + )} + + + ` + : ""} + ${this.outgoingAttacks.length > 0 + ? html` + + + ${this.outgoingAttacks.map( + (attack) => html` +
+ ${renderTroops(attack.troops)} + ${( + this.game.playerBySmallID(attack.targetID) as PlayerView + )?.name()} +
+ ` + )} + + + ` + : ""} + `; + } + render() { - if (this.events.length === 0) { + if ( + this.events.length === 0 && + this.incomingAttacks.length === 0 && + this.outgoingAttacks.length === 0 + ) { return html``; } @@ -351,6 +427,7 @@ export class EventsDisplay extends LitElement implements Layer { ` )} + ${this.renderAttacks()} @@ -358,6 +435,6 @@ export class EventsDisplay extends LitElement implements Layer { } createRenderRoot() { - return this; // Required for Tailwind classes to work with Lit + return this; } } From 4c76eafd9718aa362b2a960a33af07051062cdea Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 11 Feb 2025 14:25:51 -0800 Subject: [PATCH 2/4] update NPCs to use country svgs instead of emojies --- resources/maps/Europe.json | 384 +++++++++++----------- resources/maps/Mena.json | 502 +++++++++++++--------------- resources/maps/NorthAmerica.json | 236 ++++++-------- resources/maps/Oceania.json | 474 ++++++++++++--------------- resources/maps/WorldMap.json | 540 +++++++++++++++---------------- 5 files changed, 984 insertions(+), 1152 deletions(-) diff --git a/resources/maps/Europe.json b/resources/maps/Europe.json index 7f1de6115..f7df916c4 100644 --- a/resources/maps/Europe.json +++ b/resources/maps/Europe.json @@ -1,193 +1,193 @@ { - "name": "Europe", - "width": 2000, - "height": 1000, - "nations": [ - { - "coordinates": [171, 171], - "name": "Iceland 🇮🇸", - "strength": 1, - "flag": "IS" - }, - { - "coordinates": [477, 473], - "name": "Ireland 🇮🇪", - "strength": 1, - "flag": "IE" - }, - { - "coordinates": [650, 500], - "name": "England 🇬🇧", - "strength": 3, - "flag": "GB" - }, - { - "coordinates": [560, 800], - "name": "Spain 🇪🇸", - "strength": 2, - "flag": "ES" - }, - { - "coordinates": [726, 616], - "name": "France 🇫🇷", - "strength": 2, - "flag": "FR" - }, - { - "coordinates": [1050, 745], - "name": "Italy 🇮🇹", - "strength": 1, - "flag": "IT" - }, - { - "coordinates": [872, 634], - "name": "Switzerland 🇨🇭", - "strength": 1, - "flag": "CH" - }, - { - "coordinates": [960, 271], - "name": "Norway 🇳🇴", - "strength": 1, - "flag": "NO" - }, - { - "coordinates": [1095, 336], - "name": "Sweden 🇸🇪", - "strength": 1, - "flag": "SE" - }, - { - "coordinates": [1403, 235], - "name": "Finland 🇫🇮", - "strength": 1, - "flag": "FI" - }, - { - "coordinates": [775, 541], - "name": "Belgium 🇧🇪", - "strength": 1, - "flag": "BE" - }, - { - "coordinates": [868, 487], - "name": "Netherlands 🇳🇱", - "strength": 1, - "flag": "NL" - }, - { - "coordinates": [1000, 480], - "name": "Germany 🇩🇪", - "strength": 1, - "flag": "DE" - }, - { - "coordinates": [1017, 628], - "name": "Austria 🇦🇹", - "strength": 1, - "flag": "AT" - }, - { - "coordinates": [1120, 477], - "name": "Poland 🇵🇱", - "strength": 1, - "flag": "PL" - }, - { - "coordinates": [1060, 530], - "name": "Czechia 🇨🇿", - "strength": 1, - "flag": "CZ" - }, - { - "coordinates": [1540, 602], - "name": "Ukraine 🇺🇦", - "strength": 1, - "flag": "UA" - }, - { - "coordinates": [1500, 440], - "name": "Belarus 🇧🇾", - "strength": 1, - "flag": "BY" - }, - { - "coordinates": [1400, 670], - "name": "Romania 🇷🇴", - "strength": 1, - "flag": "RO" - }, - { - "coordinates": [1580, 834], - "name": "Turkiye 🇹🇷", - "strength": 1, - "flag": "TR" - }, - { - "coordinates": [525, 955], - "name": "Morocco 🇲🇦", - "strength": 1, - "flag": "MA" - }, - { - "coordinates": [1674, 449], - "name": "Russia 🇷🇺", - "strength": 3, - "flag": "RU" - }, - { - "coordinates": [1750, 950], - "name": "Syria 🇸🇾", - "strength": 1, - "flag": "SY" - }, - { - "coordinates": [1930, 950], - "name": "Iraq 🇮🇶", - "strength": 1, - "flag": "IQ" - }, - { - "coordinates": [1900, 720], - "name": "Georgia 🇬🇪", - "strength": 1, - "flag": "GE" - }, - { - "coordinates": [950, 930], - "name": "Tunisia 🇹🇳", - "strength": 1, - "flag": "TN" - }, - { - "coordinates": [740, 940], - "name": "Algeria 🇩🇿", - "strength": 1, - "flag": "DZ" - }, - { - "coordinates": [460, 830], - "name": "Portugal 🇵🇹", - "strength": 1, - "flag": "PT" - }, - { - "coordinates": [1300, 830], - "name": "Greece 🇬🇷", - "strength": 1, - "flag": "GR" - }, - { - "coordinates": [1270, 700], - "name": "Serbia 🇷🇸", - "strength": 1, - "flag": "RS" - }, - { - "coordinates": [1200, 630], - "name": "Hungary 🇭🇺", - "strength": 1, - "flag": "HU" - } - ] -} \ No newline at end of file + "name": "Europe", + "width": 2000, + "height": 1000, + "nations": [ + { + "coordinates": [171, 171], + "name": "Iceland", + "strength": 1, + "flag": "IS" + }, + { + "coordinates": [477, 473], + "name": "Ireland", + "strength": 1, + "flag": "IE" + }, + { + "coordinates": [650, 500], + "name": "United Kingdom", + "strength": 3, + "flag": "GB" + }, + { + "coordinates": [560, 800], + "name": "Spain", + "strength": 2, + "flag": "ES" + }, + { + "coordinates": [726, 616], + "name": "France", + "strength": 2, + "flag": "FR" + }, + { + "coordinates": [1050, 745], + "name": "Italy", + "strength": 1, + "flag": "IT" + }, + { + "coordinates": [872, 634], + "name": "Switzerland", + "strength": 1, + "flag": "CH" + }, + { + "coordinates": [960, 271], + "name": "Norway", + "strength": 1, + "flag": "NO" + }, + { + "coordinates": [1095, 336], + "name": "Sweden", + "strength": 1, + "flag": "SE" + }, + { + "coordinates": [1403, 235], + "name": "Finland", + "strength": 1, + "flag": "FI" + }, + { + "coordinates": [775, 541], + "name": "Belgium", + "strength": 1, + "flag": "BE" + }, + { + "coordinates": [868, 487], + "name": "Netherlands", + "strength": 1, + "flag": "NL" + }, + { + "coordinates": [1000, 480], + "name": "Germany", + "strength": 1, + "flag": "DE" + }, + { + "coordinates": [1017, 628], + "name": "Austria", + "strength": 1, + "flag": "AT" + }, + { + "coordinates": [1120, 477], + "name": "Poland", + "strength": 1, + "flag": "PL" + }, + { + "coordinates": [1060, 530], + "name": "Czech Republic", + "strength": 1, + "flag": "CZ" + }, + { + "coordinates": [1540, 602], + "name": "Ukraine", + "strength": 1, + "flag": "UA" + }, + { + "coordinates": [1500, 440], + "name": "Belarus", + "strength": 1, + "flag": "BY" + }, + { + "coordinates": [1400, 670], + "name": "Romania", + "strength": 1, + "flag": "RO" + }, + { + "coordinates": [1580, 834], + "name": "Turkey", + "strength": 1, + "flag": "TR" + }, + { + "coordinates": [525, 955], + "name": "Morocco", + "strength": 1, + "flag": "MA" + }, + { + "coordinates": [1674, 449], + "name": "Russian Federation", + "strength": 3, + "flag": "RU" + }, + { + "coordinates": [1750, 950], + "name": "Syrian Arab Republic", + "strength": 1, + "flag": "SY" + }, + { + "coordinates": [1930, 950], + "name": "Iraq", + "strength": 1, + "flag": "IQ" + }, + { + "coordinates": [1900, 720], + "name": "Georgia", + "strength": 1, + "flag": "GE" + }, + { + "coordinates": [950, 930], + "name": "Tunisia", + "strength": 1, + "flag": "TN" + }, + { + "coordinates": [740, 940], + "name": "Algeria", + "strength": 1, + "flag": "DZ" + }, + { + "coordinates": [460, 830], + "name": "Portugal", + "strength": 1, + "flag": "PT" + }, + { + "coordinates": [1300, 830], + "name": "Greece", + "strength": 1, + "flag": "GR" + }, + { + "coordinates": [1270, 700], + "name": "Serbia", + "strength": 1, + "flag": "RS" + }, + { + "coordinates": [1200, 630], + "name": "Hungary", + "strength": 1, + "flag": "HU" + } + ] +} diff --git a/resources/maps/Mena.json b/resources/maps/Mena.json index 72c9a2ac6..30a4937e6 100644 --- a/resources/maps/Mena.json +++ b/resources/maps/Mena.json @@ -1,287 +1,217 @@ { - "name": "MENA", - "width": 2000, - "height": 1000, - "nations": [ - { - "coordinates": [ - 200, - 100 - ], - "name": "Spain 🇪🇸", - "strength": 1 - }, - { - "coordinates": [ - 50, - 135 - ], - "name": "Portugal 🇵🇹", - "strength": 1 - }, - { - "coordinates": [ - 125, - 375 - ], - "name": "Morocco 🇲🇦", - "strength": 1 - }, - { - "coordinates": [ - 425, - 300 - ], - "name": "Algeria 🇩🇿", - "strength": 1 - }, - { - "coordinates": [ - 600, - 275 - ], - "name": "Tunisia 🇹🇳", - "strength": 1 - }, - { - "coordinates": [ - 750, - 450 - ], - "name": "Libya 🇱🇾", - "strength": 1 - }, - { - "coordinates": [ - 1100, - 450 - ], - "name": "Egypt 🇪🇬", - "strength": 1 - }, - { - "coordinates": [ - 1333, - 333 - ], - "name": "Israel 🇮🇱", - "strength": 1 - }, - { - "coordinates": [ - 1338, - 388 - ], - "name": "Palestine 🇵🇸", - "strength": 1 - }, - { - "coordinates": [ - 1370, - 325 - ], - "name": "Lebanon 🇱🇧", - "strength": 1 - }, - { - "coordinates": [ - 1228, - 728 - ], - "name": "Sudan 🇸🇩", - "strength": 1 - }, - { - "coordinates": [ - 1450, - 275 - ], - "name": "Syria 🇸🇾", - "strength": 1 - }, - { - "coordinates": [ - 1600, - 300 - ], - "name": "Iraq 🇮🇶", - "strength": 1 - }, - { - "coordinates": [ - 1550, - 600 - ], - "name": "Saudi Arabia 🇸🇦", - "strength": 1 - }, - { - "coordinates": [ - 1700, - 850 - ], - "name": "Yemen 🇾🇪", - "strength": 1 - }, - { - "coordinates": [ - 1950, - 725 - ], - "name": "Oman 🇴🇲", - "strength": 1 - }, - { - "coordinates": [ - 1860, - 620 - ], - "name": "UAE 🇦🇪", - "strength": 1 - }, - { - "coordinates": [ - 1730, - 580 - ], - "name": "Qatar 🇶🇦", - "strength": 1 - }, - { - "coordinates": [ - 1900, - 350 - ], - "name": "Iran 🇮🇷", - "strength": 1 - }, - { - "coordinates": [ - 1300, - 150 - ], - "name": "Turkey 🇹🇷", - "strength": 1 - }, - { - "coordinates": [ - 675, - 50 - ], - "name": "Italy 🇮🇹", - "strength": 1 - }, - { - "coordinates": [ - 950, - 125 - ], - "name": "Greece 🇬🇷", - "strength": 1 - }, - { - "coordinates": [ - 1000, - 25 - ], - "name": "Bulgaria 🇧🇬", - "strength": 1 - }, - { - "coordinates": [ - 1980, - 45 - ], - "name": "Uzbekistan 🇺🇿", - "strength": 1 - }, - { - "coordinates": [ - 1400, - 400 - ], - "name": "Jordan 🇯🇴", - "strength": 1 - }, - { - "coordinates": [ - 750, - 930 - ], - "name": "Chad 🇹🇩", - "strength": 1 - }, - { - "coordinates": [ - 500, - 900 - ], - "name": "Niger 🇳🇪", - "strength": 1 - }, - { - "coordinates": [ - 230, - 940 - ], - "name": "Mali 🇲🇱", - "strength": 1 - }, - { - "coordinates": [ - 40, - 830 - ], - "name": "Mauritania 🇲🇷", - "strength": 1 - }, - { - "coordinates": [ - 1490, - 980 - ], - "name": "Eritrea 🇪🇷", - "strength": 1 - }, - { - "coordinates": [ - 1630, - 460 - ], - "name": "Kuwait 🇰🇼", - "strength": 1 - }, - { - "coordinates": [ - 1550, - 25 - ], - "name": "Georgia 🇬🇪", - "strength": 1 - }, - { - "coordinates": [ - 1640, - 100 - ], - "name": "Azerbaijan 🇦🇿", - "strength": 1 - }, - { - "coordinates": [ - 1226, - 280 - ], - "name": "Cyprus 🇨🇾", - "strength": 1 - }, - { - "coordinates": [ - 1800, - 40 - ], - "name": "Kazakhstan 🇰🇿", - "strength": 1 - } - ] -} \ No newline at end of file + "name": "MENA", + "width": 2000, + "height": 1000, + "nations": [ + { + "coordinates": [200, 100], + "name": "Spain", + "strength": 1, + "flag": "ES" + }, + { + "coordinates": [50, 135], + "name": "Portugal", + "strength": 1, + "flag": "PT" + }, + { + "coordinates": [125, 375], + "name": "Morocco", + "strength": 1, + "flag": "MA" + }, + { + "coordinates": [425, 300], + "name": "Algeria", + "strength": 1, + "flag": "DZ" + }, + { + "coordinates": [600, 275], + "name": "Tunisia", + "strength": 1, + "flag": "TN" + }, + { + "coordinates": [750, 450], + "name": "Libyan Arab Jamahiriya", + "strength": 1, + "flag": "LY" + }, + { + "coordinates": [1100, 450], + "name": "Egypt", + "strength": 1, + "flag": "EG" + }, + { + "coordinates": [1333, 333], + "name": "Israel", + "strength": 1, + "flag": "IL" + }, + { + "coordinates": [1338, 388], + "name": "Palestinian Territory, Occupied", + "strength": 1, + "flag": "PS" + }, + { + "coordinates": [1370, 325], + "name": "Lebanon", + "strength": 1, + "flag": "LB" + }, + { + "coordinates": [1228, 728], + "name": "Sudan", + "strength": 1, + "flag": "SD" + }, + { + "coordinates": [1450, 275], + "name": "Syrian Arab Republic", + "strength": 1, + "flag": "SY" + }, + { + "coordinates": [1600, 300], + "name": "Iraq", + "strength": 1, + "flag": "IQ" + }, + { + "coordinates": [1550, 600], + "name": "Saudi Arabia", + "strength": 1, + "flag": "SA" + }, + { + "coordinates": [1700, 850], + "name": "Yemen", + "strength": 1, + "flag": "YE" + }, + { + "coordinates": [1950, 725], + "name": "Oman", + "strength": 1, + "flag": "OM" + }, + { + "coordinates": [1860, 620], + "name": "United Arab Emirates", + "strength": 1, + "flag": "AE" + }, + { + "coordinates": [1730, 580], + "name": "Qatar", + "strength": 1, + "flag": "QA" + }, + { + "coordinates": [1900, 350], + "name": "Iran, Islamic Republic Of", + "strength": 1, + "flag": "IR" + }, + { + "coordinates": [1300, 150], + "name": "Turkey", + "strength": 1, + "flag": "TR" + }, + { + "coordinates": [675, 50], + "name": "Italy", + "strength": 1, + "flag": "IT" + }, + { + "coordinates": [950, 125], + "name": "Greece", + "strength": 1, + "flag": "GR" + }, + { + "coordinates": [1000, 25], + "name": "Bulgaria", + "strength": 1, + "flag": "BG" + }, + { + "coordinates": [1980, 45], + "name": "Uzbekistan", + "strength": 1, + "flag": "UZ" + }, + { + "coordinates": [1400, 400], + "name": "Jordan", + "strength": 1, + "flag": "JO" + }, + { + "coordinates": [750, 930], + "name": "Chad", + "strength": 1, + "flag": "TD" + }, + { + "coordinates": [500, 900], + "name": "Niger", + "strength": 1, + "flag": "NE" + }, + { + "coordinates": [230, 940], + "name": "Mali", + "strength": 1, + "flag": "ML" + }, + { + "coordinates": [40, 830], + "name": "Mauritania", + "strength": 1, + "flag": "MR" + }, + { + "coordinates": [1490, 980], + "name": "Eritrea", + "strength": 1, + "flag": "ER" + }, + { + "coordinates": [1630, 460], + "name": "Kuwait", + "strength": 1, + "flag": "KW" + }, + { + "coordinates": [1550, 25], + "name": "Georgia", + "strength": 1, + "flag": "GE" + }, + { + "coordinates": [1640, 100], + "name": "Azerbaijan", + "strength": 1, + "flag": "AZ" + }, + { + "coordinates": [1226, 280], + "name": "Cyprus", + "strength": 1, + "flag": "CY" + }, + { + "coordinates": [1800, 40], + "name": "Kazakhstan", + "strength": 1, + "flag": "KZ" + } + ] +} diff --git a/resources/maps/NorthAmerica.json b/resources/maps/NorthAmerica.json index 9bd9325b0..a93917d43 100644 --- a/resources/maps/NorthAmerica.json +++ b/resources/maps/NorthAmerica.json @@ -1,135 +1,103 @@ { - "name": "NorthAmerica", - "width": 2000, - "height": 1000, - "nations": [ - { - "coordinates": [ - 1280, - 582 - ], - "name": "USA 🇺🇸", - "strength": 3 - }, - { - "coordinates": [ - 1235, - 509 - ], - "name": "Canada 🇨🇦", - "strength": 2 - }, - { - "coordinates": [ - 983, - 832 - ], - "name": "Mexico 🇲🇽", - "strength": 2 - }, - { - "coordinates": [ - 1126, - 871 - ], - "name": "Belize 🇧🇿", - "strength": 1 - }, - { - "coordinates": [ - 1096, - 893 - ], - "name": "Guatemala 🇬🇹", - "strength": 1 - }, - { - "coordinates": [ - 1124, - 916 - ], - "name": "El Salvador 🇸🇻", - "strength": 1 - }, - { - "coordinates": [ - 1143, - 906 - ], - "name": "Honduras 🇭🇳", - "strength": 1 - }, - { - "coordinates": [ - 1157, - 937 - ], - "name": "Nicaragua 🇳🇮", - "strength": 1 - }, - { - "coordinates": [ - 1184, - 963 - ], - "name": "Costa Rica 🇨🇷", - "strength": 1 - }, - { - "coordinates": [ - 1235, - 974 - ], - "name": "Panama 🇵🇦", - "strength": 1 - }, - { - "coordinates": [ - 1304, - 997 - ], - "name": "Colombia 🇨🇴", - "strength": 1 - }, - { - "coordinates": [ - 1392, - 955 - ], - "name": "Venezuela 🇻🇪", - "strength": 1 - }, - { - "coordinates": [ - 1228, - 802 - ], - "name": "Cuba 🇨🇺", - "strength": 1 - }, - { - "coordinates": [ - 1263, - 857 - ], - "name": "Jamaica 🇯🇲", - "strength": 1 - }, - { - "coordinates": [ - 1326, - 849 - ], - "name": "Haiti 🇭🇹", - "strength": 1 - }, - { - "coordinates": [ - 1358, - 852 - ], - "name": "Dominican Republic 🇩🇴", - "strength": 1 - } - ] -} \ No newline at end of file + "name": "NorthAmerica", + "width": 2000, + "height": 1000, + "nations": [ + { + "coordinates": [1280, 582], + "name": "United States", + "strength": 3, + "flag": "US" + }, + { + "coordinates": [1235, 509], + "name": "Canada", + "strength": 2, + "flag": "CA" + }, + { + "coordinates": [983, 832], + "name": "Mexico", + "strength": 2, + "flag": "MX" + }, + { + "coordinates": [1126, 871], + "name": "Belize", + "strength": 1, + "flag": "BZ" + }, + { + "coordinates": [1096, 893], + "name": "Guatemala", + "strength": 1, + "flag": "GT" + }, + { + "coordinates": [1124, 916], + "name": "El Salvador", + "strength": 1, + "flag": "SV" + }, + { + "coordinates": [1143, 906], + "name": "Honduras", + "strength": 1, + "flag": "HN" + }, + { + "coordinates": [1157, 937], + "name": "Nicaragua", + "strength": 1, + "flag": "NI" + }, + { + "coordinates": [1184, 963], + "name": "Costa Rica", + "strength": 1, + "flag": "CR" + }, + { + "coordinates": [1235, 974], + "name": "Panama", + "strength": 1, + "flag": "PA" + }, + { + "coordinates": [1304, 997], + "name": "Colombia", + "strength": 1, + "flag": "CO" + }, + { + "coordinates": [1392, 955], + "name": "Venezuela", + "strength": 1, + "flag": "VE" + }, + { + "coordinates": [1228, 802], + "name": "Cuba", + "strength": 1, + "flag": "CU" + }, + { + "coordinates": [1263, 857], + "name": "Jamaica", + "strength": 1, + "flag": "JM" + }, + { + "coordinates": [1326, 849], + "name": "Haiti", + "strength": 1, + "flag": "HT" + }, + { + "coordinates": [1358, 852], + "name": "Dominican Republic", + "strength": 1, + "flag": "DO" + } + ] +} diff --git a/resources/maps/Oceania.json b/resources/maps/Oceania.json index 61b391550..4d492a8af 100644 --- a/resources/maps/Oceania.json +++ b/resources/maps/Oceania.json @@ -1,271 +1,205 @@ { - "name": "Oceania", - "width": 2000, - "height": 1000, - "nations": [ - { - "coordinates": [ - 718, - 738 - ], - "name": "Australia 🇦🇺", - "strength": 1 - }, - { - "coordinates": [ - 1050, - 809 - ], - "name": "New Zealand 🇳🇿", - "strength": 1 - }, - { - "coordinates": [ - 686, - 407 - ], - "name": "Papua New Guinea 🇵🇬", - "strength": 1 - }, - { - "coordinates": [ - 436, - 407 - ], - "name": "East Timor 🇹🇱", - "strength": 1 - }, - { - "coordinates": [ - 182, - 378 - ], - "name": "Indonesia 🇮🇩", - "strength": 1 - }, - { - "coordinates": [ - 292, - 243 - ], - "name": "Brunei 🇧🇳", - "strength": 1 - }, - { - "coordinates": [ - 152, - 282 - ], - "name": "Singapore 🇸🇬", - "strength": 1 - }, - { - "coordinates": [ - 120, - 261 - ], - "name": "Malaysia 🇲🇾", - "strength": 1 - }, - { - "coordinates": [ - 106, - 129 - ], - "name": "Thailand 🇹🇭", - "strength": 1 - }, - { - "coordinates": [ - 51, - 42 - ], - "name": "Myanmar 🇲🇲", - "strength": 1 - }, - { - "coordinates": [ - 158, - 162 - ], - "name": "Cambodia 🇰🇭", - "strength": 1 - }, - { - "coordinates": [ - 182, - 43 - ], - "name": "Vietnam 🇻🇳", - "strength": 1 - }, - { - "coordinates": [ - 143, - 37 - ], - "name": "Laos 🇱🇦", - "strength": 1 - }, - { - "coordinates": [ - 278, - 18 - ], - "name": "Hong Kong 🇭🇰", - "strength": 1 - }, - { - "coordinates": [ - 359, - 1 - ], - "name": "Taiwan 🇹🇼", - "strength": 1 - }, - { - "coordinates": [ - 366, - 119 - ], - "name": "Philippines 🇵🇭", - "strength": 1 - }, - { - "coordinates": [ - 536, - 207 - ], - "name": "Palau 🇵🇼", - "strength": 1 - }, - { - "coordinates": [ - 834, - 215 - ], - "name": "Micronesia 🇫🇲", - "strength": 1 - }, - { - "coordinates": [ - 664, - 113 - ], - "name": "Guam 🇬🇺", - "strength": 1 - }, - { - "coordinates": [ - 1042, - 317 - ], - "name": "Marshall Islands 🇲🇭", - "strength": 1 - }, - { - "coordinates": [ - 799, - 385 - ], - "name": "Bougainville 🇵🇬", - "strength": 1 - }, - { - "coordinates": [ - 862, - 442 - ], - "name": "Solomon Islands 🇸🇧", - "strength": 1 - }, - { - "coordinates": [ - 945, - 497 - ], - "name": "Vanuatu 🇻🇺", - "strength": 1 - }, - { - "coordinates": [ - 930, - 574 - ], - "name": "New Caledonia 🇳🇨", - "strength": 1 - }, - { - "coordinates": [ - 1085, - 526 - ], - "name": "Fiji 🇫🇯", - "strength": 1 - }, - { - "coordinates": [ - 1169, - 568 - ], - "name": "Tonga 🇹🇴", - "strength": 1 - }, - { - "coordinates": [ - 1236, - 541 - ], - "name": "Niue 🇳🇺", - "strength": 1 - }, - { - "coordinates": [ - 1204, - 473 - ], - "name": "Samoa 🇼🇸", - "strength": 1 - }, - { - "coordinates": [ - 1491, - 523 - ], - "name": "Cook Islands 🇨🇰", - "strength": 1 - }, - { - "coordinates": [ - 1623, - 424 - ], - "name": "Polynesia 🇵🇫", - "strength": 1 - }, - { - "coordinates": [ - 1393, - 278 - ], - "name": "Kiribati 🇰🇮", - "strength": 1 - }, - { - "coordinates": [ - 1420, - 56 - ], - "name": "Hawaii 🇺🇸", - "strength": 1 - }, - { - "coordinates": [ - 1996, - 644 - ], - "name": "Easter Island 🇨🇱", - "strength": 1 - } - ] -} \ No newline at end of file + "name": "Oceania", + "width": 2000, + "height": 1000, + "nations": [ + { + "coordinates": [718, 738], + "name": "Australia", + "strength": 1, + "flag": "AU" + }, + { + "coordinates": [1050, 809], + "name": "New Zealand", + "strength": 1, + "flag": "NZ" + }, + { + "coordinates": [686, 407], + "name": "Papua New Guinea", + "strength": 1, + "flag": "PG" + }, + { + "coordinates": [436, 407], + "name": "Timor-Leste", + "strength": 1, + "flag": "TL" + }, + { + "coordinates": [182, 378], + "name": "Indonesia", + "strength": 1, + "flag": "ID" + }, + { + "coordinates": [292, 243], + "name": "Brunei Darussalam", + "strength": 1, + "flag": "BN" + }, + { + "coordinates": [152, 282], + "name": "Singapore", + "strength": 1, + "flag": "SG" + }, + { + "coordinates": [120, 261], + "name": "Malaysia", + "strength": 1, + "flag": "MY" + }, + { + "coordinates": [106, 129], + "name": "Thailand", + "strength": 1, + "flag": "TH" + }, + { + "coordinates": [51, 42], + "name": "Myanmar", + "strength": 1, + "flag": "MM" + }, + { + "coordinates": [158, 162], + "name": "Cambodia", + "strength": 1, + "flag": "KH" + }, + { + "coordinates": [182, 43], + "name": "Viet Nam", + "strength": 1, + "flag": "VN" + }, + { + "coordinates": [143, 37], + "name": "Lao People's Democratic Republic", + "strength": 1, + "flag": "LA" + }, + { + "coordinates": [278, 18], + "name": "Hong Kong", + "strength": 1, + "flag": "HK" + }, + { + "coordinates": [359, 1], + "name": "Taiwan, Province of China", + "strength": 1, + "flag": "TW" + }, + { + "coordinates": [366, 119], + "name": "Philippines", + "strength": 1, + "flag": "PH" + }, + { + "coordinates": [536, 207], + "name": "Palau", + "strength": 1, + "flag": "PW" + }, + { + "coordinates": [834, 215], + "name": "Micronesia, Federated States of", + "strength": 1, + "flag": "FM" + }, + { + "coordinates": [664, 113], + "name": "Guam", + "strength": 1, + "flag": "GU" + }, + { + "coordinates": [1042, 317], + "name": "Marshall Islands", + "strength": 1, + "flag": "MH" + }, + { + "coordinates": [799, 385], + "name": "Papua New Guinea", + "strength": 1, + "flag": "PG" + }, + { + "coordinates": [862, 442], + "name": "Solomon Islands", + "strength": 1, + "flag": "SB" + }, + { + "coordinates": [945, 497], + "name": "Vanuatu", + "strength": 1, + "flag": "VU" + }, + { + "coordinates": [930, 574], + "name": "New Caledonia", + "strength": 1, + "flag": "NC" + }, + { + "coordinates": [1085, 526], + "name": "Fiji", + "strength": 1, + "flag": "FJ" + }, + { + "coordinates": [1169, 568], + "name": "Tonga", + "strength": 1, + "flag": "TO" + }, + { + "coordinates": [1236, 541], + "name": "Niue", + "strength": 1, + "flag": "NU" + }, + { + "coordinates": [1204, 473], + "name": "Samoa", + "strength": 1, + "flag": "WS" + }, + { + "coordinates": [1491, 523], + "name": "Cook Islands", + "strength": 1, + "flag": "CK" + }, + { + "coordinates": [1623, 424], + "name": "French Polynesia", + "strength": 1, + "flag": "PF" + }, + { + "coordinates": [1393, 278], + "name": "Kiribati", + "strength": 1, + "flag": "KI" + }, + { + "coordinates": [1420, 56], + "name": "United States", + "strength": 1, + "flag": "US" + }, + { + "coordinates": [1996, 644], + "name": "Chile", + "strength": 1, + "flag": "CL" + } + ] +} diff --git a/resources/maps/WorldMap.json b/resources/maps/WorldMap.json index 4bfd542b8..b7288180b 100644 --- a/resources/maps/WorldMap.json +++ b/resources/maps/WorldMap.json @@ -1,271 +1,271 @@ { - "name": "World", - "width": 2000, - "height": 1000, - "nations": [ - { - "coordinates": [375, 272], - "flag": "US", - "name": "USA 🇺🇸", - "strength": 3 - }, - { - "coordinates": [372, 136], - "flag": "CA", - "name": "Canada 🇨🇦", - "strength": 2 - }, - { - "coordinates": [375, 374], - "flag": "MX", - "name": "Mexico 🇲🇽", - "strength": 1 - }, - { - "coordinates": [500, 378], - "flag": "CU", - "name": "Cuba 🇨🇺", - "strength": 1 - }, - { - "coordinates": [524, 474], - "flag": "CO", - "name": "Colombia 🇨🇴", - "strength": 1 - }, - { - "coordinates": [593, 473], - "flag": "VE", - "name": "Venezuela 🇻🇪", - "strength": 1 - }, - { - "coordinates": [596, 705], - "flag": "AR", - "name": "Argentina 🇦🇷", - "strength": 1 - }, - { - "coordinates": [637, 567], - "flag": "BR", - "name": "Brazil 🇧🇷", - "strength": 1 - }, - { - "coordinates": [1280, 975], - "flag": "AQ", - "name": "Antartica 🇦🇶", - "strength": 3 - }, - { - "coordinates": [709, 57], - "flag": "GL", - "name": "Greenland 🇬🇱", - "strength": 2 - }, - { - "coordinates": [831, 112], - "flag": "IS", - "name": "Iceland 🇮🇸", - "strength": 1 - }, - { - "coordinates": [925, 186], - "flag": "GB", - "name": "England 🇬🇧", - "strength": 3 - }, - { - "coordinates": [887, 183], - "flag": "IE", - "name": "Ireland 🇮🇪", - "strength": 1 - }, - { - "coordinates": [908, 264], - "flag": "ES", - "name": "Spain 🇪🇸", - "strength": 1 - }, - { - "coordinates": [1004, 250], - "flag": "IT", - "name": "Italy 🇮🇹", - "strength": 1 - }, - { - "coordinates": [958, 220], - "flag": "FR", - "name": "France 🇫🇷", - "strength": 2 - }, - { - "coordinates": [997, 205], - "flag": "DE", - "name": "Germany 🇩🇪", - "strength": 1 - }, - { - "coordinates": [1064, 101], - "flag": "SE", - "name": "Sweden 🇸🇪", - "strength": 1 - }, - { - "coordinates": [1046, 193], - "flag": "PL", - "name": "Poland 🇵🇱", - "strength": 1 - }, - { - "coordinates": [1061, 188], - "flag": "BY", - "name": "Belarus 🇧🇾", - "strength": 1 - }, - { - "coordinates": [1073, 243], - "flag": "RO", - "name": "Romania 🇷🇴", - "strength": 1 - }, - { - "coordinates": [1161, 274], - "flag": "TR", - "name": "Turkiye 🇹🇷", - "strength": 1 - }, - { - "coordinates": [969, 133], - "flag": "NO", - "name": "Norway 🇳🇴", - "strength": 1 - }, - { - "coordinates": [1062, 133], - "flag": "FI", - "name": "Finland 🇫🇮", - "strength": 1 - }, - { - "coordinates": [1099, 211], - "flag": "UA", - "name": "Ukraine 🇺🇦", - "strength": 1 - }, - { - "coordinates": [1344, 136], - "flag": "RU", - "name": "Russia 🇷🇺", - "strength": 3 - }, - { - "coordinates": [1537, 186], - "flag": "MN", - "name": "Mongolia 🇲🇳", - "strength": 1 - }, - { - "coordinates": [1524, 328], - "flag": "CN", - "name": "China 🇨🇳", - "strength": 3 - }, - { - "coordinates": [1368, 373], - "flag": "IN", - "name": "India 🇮🇳", - "strength": 2 - }, - { - "coordinates": [1276, 239], - "flag": "KZ", - "name": "Kazakhstan 🇰🇿", - "strength": 1 - }, - { - "coordinates": [1238, 309], - "flag": "IR", - "name": "Iran 🇮🇷", - "strength": 1 - }, - { - "coordinates": [1178, 351], - "flag": "SA", - "name": "Saudi Arabia 🇸🇦", - "strength": 1 - }, - { - "coordinates": [1679, 657], - "flag": "AU", - "name": "Australia 🇦🇺", - "strength": 2 - }, - { - "coordinates": [1890, 775], - "flag": "NZ", - "name": "New Zealand 🇳🇿", - "strength": 0.5 - }, - { - "coordinates": [918, 342], - "flag": "DZ", - "name": "Algeria 🇩🇿", - "strength": 1 - }, - { - "coordinates": [1030, 332], - "flag": "LY", - "name": "Libya 🇱🇾", - "strength": 1 - }, - { - "coordinates": [1092, 335], - "flag": "EG", - "name": "Egypt 🇪🇬", - "strength": 1 - }, - { - "coordinates": [963, 410], - "flag": "NE", - "name": "Niger 🇳🇪", - "strength": 1 - }, - { - "coordinates": [1112, 406], - "flag": "SD", - "name": "Sudan 🇸🇩", - "strength": 1 - }, - { - "coordinates": [1074, 508], - "flag": "CD", - "name": "DRC 🇨🇩", - "strength": 1 - }, - { - "coordinates": [1154, 443], - "flag": "ET", - "name": "Ethiopia 🇪🇹", - "strength": 1 - }, - { - "coordinates": [1075, 707], - "flag": "ZA", - "name": "South Africa 🇿🇦", - "strength": 1 - }, - { - "coordinates": [1194, 627], - "flag": "MG", - "name": "Madagascar 🇲🇬", - "strength": 0.5 - }, - { - "coordinates": [1052, 420], - "flag": "TD", - "name": "Chad 🇹🇩", - "strength": 1 - } - ] -} \ No newline at end of file + "name": "World", + "width": 2000, + "height": 1000, + "nations": [ + { + "coordinates": [375, 272], + "name": "United States", + "strength": 3, + "flag": "US" + }, + { + "coordinates": [372, 136], + "name": "Canada", + "strength": 2, + "flag": "CA" + }, + { + "coordinates": [375, 374], + "name": "Mexico", + "strength": 1, + "flag": "MX" + }, + { + "coordinates": [500, 378], + "name": "Cuba", + "strength": 1, + "flag": "CU" + }, + { + "coordinates": [524, 474], + "name": "Colombia", + "strength": 1, + "flag": "CO" + }, + { + "coordinates": [593, 473], + "name": "Venezuela", + "strength": 1, + "flag": "VE" + }, + { + "coordinates": [596, 705], + "name": "Argentina", + "strength": 1, + "flag": "AR" + }, + { + "coordinates": [637, 567], + "name": "Brazil", + "strength": 1, + "flag": "BR" + }, + { + "coordinates": [1280, 975], + "name": "Antarctica", + "strength": 3, + "flag": "AQ" + }, + { + "coordinates": [709, 57], + "name": "Greenland", + "strength": 2, + "flag": "GL" + }, + { + "coordinates": [831, 112], + "name": "Iceland", + "strength": 1, + "flag": "IS" + }, + { + "coordinates": [925, 186], + "name": "United Kingdom", + "strength": 3, + "flag": "GB" + }, + { + "coordinates": [887, 183], + "name": "Ireland", + "strength": 1, + "flag": "IE" + }, + { + "coordinates": [908, 264], + "name": "Spain", + "strength": 1, + "flag": "ES" + }, + { + "coordinates": [1004, 250], + "name": "Italy", + "strength": 1, + "flag": "IT" + }, + { + "coordinates": [958, 220], + "name": "France", + "strength": 2, + "flag": "FR" + }, + { + "coordinates": [997, 205], + "name": "Germany", + "strength": 1, + "flag": "DE" + }, + { + "coordinates": [1064, 101], + "name": "Sweden", + "strength": 1, + "flag": "SE" + }, + { + "coordinates": [1046, 193], + "name": "Poland", + "strength": 1, + "flag": "PL" + }, + { + "coordinates": [1061, 188], + "name": "Belarus", + "strength": 1, + "flag": "BY" + }, + { + "coordinates": [1073, 243], + "name": "Romania", + "strength": 1, + "flag": "RO" + }, + { + "coordinates": [1161, 274], + "name": "Turkey", + "strength": 1, + "flag": "TR" + }, + { + "coordinates": [969, 133], + "name": "Norway", + "strength": 1, + "flag": "NO" + }, + { + "coordinates": [1062, 133], + "name": "Finland", + "strength": 1, + "flag": "FI" + }, + { + "coordinates": [1099, 211], + "name": "Ukraine", + "strength": 1, + "flag": "UA" + }, + { + "coordinates": [1344, 136], + "name": "Russian Federation", + "strength": 3, + "flag": "RU" + }, + { + "coordinates": [1537, 186], + "name": "Mongolia", + "strength": 1, + "flag": "MN" + }, + { + "coordinates": [1524, 328], + "name": "China", + "strength": 3, + "flag": "CN" + }, + { + "coordinates": [1368, 373], + "name": "India", + "strength": 2, + "flag": "IN" + }, + { + "coordinates": [1276, 239], + "name": "Kazakhstan", + "strength": 1, + "flag": "KZ" + }, + { + "coordinates": [1238, 309], + "name": "Iran, Islamic Republic Of", + "strength": 1, + "flag": "IR" + }, + { + "coordinates": [1178, 351], + "name": "Saudi Arabia", + "strength": 1, + "flag": "SA" + }, + { + "coordinates": [1679, 657], + "name": "Australia", + "strength": 2, + "flag": "AU" + }, + { + "coordinates": [1890, 775], + "name": "New Zealand", + "strength": 0.5, + "flag": "NZ" + }, + { + "coordinates": [918, 342], + "name": "Algeria", + "strength": 1, + "flag": "DZ" + }, + { + "coordinates": [1030, 332], + "name": "Libyan Arab Jamahiriya", + "strength": 1, + "flag": "LY" + }, + { + "coordinates": [1092, 335], + "name": "Egypt", + "strength": 1, + "flag": "EG" + }, + { + "coordinates": [963, 410], + "name": "Niger", + "strength": 1, + "flag": "NE" + }, + { + "coordinates": [1112, 406], + "name": "Sudan", + "strength": 1, + "flag": "SD" + }, + { + "coordinates": [1074, 508], + "name": "Congo, The Democratic Republic of the", + "strength": 1, + "flag": "CD" + }, + { + "coordinates": [1154, 443], + "name": "Ethiopia", + "strength": 1, + "flag": "ET" + }, + { + "coordinates": [1075, 707], + "name": "South Africa", + "strength": 1, + "flag": "ZA" + }, + { + "coordinates": [1194, 627], + "name": "Madagascar", + "strength": 0.5, + "flag": "MG" + }, + { + "coordinates": [1052, 420], + "name": "Chad", + "strength": 1, + "flag": "TD" + } + ] +} From 69debaca77dfbe8046de8f44ca460309fb1d2d29 Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 11 Feb 2025 16:21:06 -0800 Subject: [PATCH 3/4] make BlackSea flag codes lowercase --- resources/maps/BlackSea.json | 132 ++++++++++++++--------------------- 1 file changed, 54 insertions(+), 78 deletions(-) diff --git a/resources/maps/BlackSea.json b/resources/maps/BlackSea.json index b63603c68..ae90b80cb 100644 --- a/resources/maps/BlackSea.json +++ b/resources/maps/BlackSea.json @@ -1,79 +1,55 @@ { - "name": "BlackSea", - "width": 1500, - "height": 1100, - "nations": [ - { - "coordinates": [ - 122, - 647 - ], - "name": "Bulgaria", - "strength": 1, - "flag": "BG" - }, - { - "coordinates": [ - 513, - 929 - ], - "name": "Turkiye", - "strength": 2, - "flag": "TR" - }, - { - "coordinates": [ - 123, - 237 - ], - "name": "Romania", - "strength": 1, - "flag": "RO" - }, - { - "coordinates": [ - 300, - 188 - ], - "name": "Maldova", - "strength": 1, - "flag": "MD" - }, - { - "coordinates": [ - 737, - 120 - ], - "name": "Ukraine", - "strength": 1, - "flag": "UA" - }, - { - "coordinates": [ - 1180, - 354 - ], - "name": "Russia", - "strength": 3, - "flag": "RU" - }, - { - "coordinates": [ - 1362, - 722 - ], - "name": "Georgia", - "strength": 1, - "flag": "GE" - }, - { - "coordinates": [ - 1382, - 943 - ], - "name": "Armenia", - "strength": 1, - "flag": "AM" - } - ] -} \ No newline at end of file + "name": "BlackSea", + "width": 1500, + "height": 1100, + "nations": [ + { + "coordinates": [122, 647], + "name": "Bulgaria", + "strength": 1, + "flag": "bg" + }, + { + "coordinates": [513, 929], + "name": "Turkiye", + "strength": 2, + "flag": "tr" + }, + { + "coordinates": [123, 237], + "name": "Romania", + "strength": 1, + "flag": "ro" + }, + { + "coordinates": [300, 188], + "name": "Maldova", + "strength": 1, + "flag": "md" + }, + { + "coordinates": [737, 120], + "name": "Ukraine", + "strength": 1, + "flag": "ua" + }, + { + "coordinates": [1180, 354], + "name": "Russia", + "strength": 3, + "flag": "ru" + }, + { + "coordinates": [1362, 722], + "name": "Georgia", + "strength": 1, + "flag": "ge" + }, + { + "coordinates": [1382, 943], + "name": "Armenia", + "strength": 1, + "flag": "am" + } + ] +} From 91ca03aff8d878b912bf591fbab0d982ca19e859 Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 11 Feb 2025 16:28:13 -0800 Subject: [PATCH 4/4] style top bar --- src/client/graphics/layers/TopBar.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/client/graphics/layers/TopBar.ts b/src/client/graphics/layers/TopBar.ts index c513d7b68..fdf8f32b5 100644 --- a/src/client/graphics/layers/TopBar.ts +++ b/src/client/graphics/layers/TopBar.ts @@ -26,16 +26,19 @@ export class TopBar extends LitElement implements Layer { if (!this.isVisible) { return html``; } + const myPlayer = this.game?.myPlayer(); if (!myPlayer?.isAlive() || this.game?.inSpawnPhase()) { return html``; } + const popRate = this.game.config().populationIncreaseRate(myPlayer) * 10; const maxPop = this.game.config().maxPopulation(myPlayer); const goldPerSecond = this.game.config().goldAdditionRate(myPlayer) * 10; + return html`
(+${renderTroops(popRate)})
-