From a12c09eba518300957fe407481cac7d21c6b0666 Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Mon, 20 Nov 2023 09:44:59 +0100 Subject: [PATCH] Minor refactoring --- client/demo.js | 1 + client/src/unit/contextaction.ts | 10 +++++----- client/src/unit/contextactionset.ts | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/client/demo.js b/client/demo.js index ca65e0c8..5589ac23 100644 --- a/client/demo.js +++ b/client/demo.js @@ -138,6 +138,7 @@ class DemoDataGenerator { DEMO_UNIT_DATA[idx].position.lat += idx / 100; DEMO_UNIT_DATA[idx].category = "GroundUnit"; DEMO_UNIT_DATA[idx].isLeader = true; + DEMO_UNIT_DATA[idx].coalition = 0; idx += 1; DEMO_UNIT_DATA[idx] = JSON.parse(JSON.stringify(baseData)); diff --git a/client/src/unit/contextaction.ts b/client/src/unit/contextaction.ts index 5d935143..dd3a4b6b 100644 --- a/client/src/unit/contextaction.ts +++ b/client/src/unit/contextaction.ts @@ -1,7 +1,7 @@ import { Unit } from "./unit"; -export interface ContextActionOptionsInterface { - isScenic?:boolean +export interface ContextActionOptions { + isScenic?: boolean } export class ContextAction { @@ -11,10 +11,10 @@ export class ContextAction { #callback: CallableFunction | null = null; #units: Unit[] = []; #hideContextAfterExecution: boolean = true - #options: ContextActionOptionsInterface; + #options: ContextActionOptions; - constructor(id: string, label: string, description: string, callback: CallableFunction, hideContextAfterExecution: boolean = true, options:ContextActionOptionsInterface) { - this.#id = id; + constructor(id: string, label: string, description: string, callback: CallableFunction, hideContextAfterExecution: boolean = true, options: ContextActionOptions) { + this.#id = id; this.#label = label; this.#description = description; this.#callback = callback; diff --git a/client/src/unit/contextactionset.ts b/client/src/unit/contextactionset.ts index 60e1e88d..d061cd1d 100644 --- a/client/src/unit/contextactionset.ts +++ b/client/src/unit/contextactionset.ts @@ -1,4 +1,4 @@ -import { ContextAction, ContextActionOptionsInterface } from "./contextaction"; +import { ContextAction, ContextActionOptions } from "./contextaction"; import { Unit } from "./unit"; export class ContextActionSet { @@ -8,7 +8,7 @@ export class ContextActionSet { } - addContextAction(unit: Unit, id: string, label: string, description: string, callback: CallableFunction, hideContextAfterExecution: boolean = true, options?:ContextActionOptionsInterface) { + addContextAction(unit: Unit, id: string, label: string, description: string, callback: CallableFunction, hideContextAfterExecution: boolean = true, options?:ContextActionOptions) { options = options || {}; if (!(id in this.#contextActions)) {