From b0ee653bff19ed52f9af061a2cf251a228acbb5d Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Sat, 9 Dec 2023 15:51:16 +0100 Subject: [PATCH] Fixed unabled to copy humans --- client/src/context/context.ts | 23 +++++++++++------------ client/src/context/contextmanager.ts | 25 +++++++++++-------------- client/src/unit/unitsmanager.ts | 2 +- scripts/python/addMissingUnits.py | 6 +++--- 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/client/src/context/context.ts b/client/src/context/context.ts index 9b96341b..a75cbb8e 100644 --- a/client/src/context/context.ts +++ b/client/src/context/context.ts @@ -7,19 +7,18 @@ export interface ContextInterface { } export class Context { + #allowUnitCopying: boolean; + #allowUnitPasting: boolean; + #useSpawnMenu: boolean; + #useUnitControlPanel: boolean; + #useUnitInfoPanel: boolean; - #allowUnitCopying:boolean; - #allowUnitPasting:boolean; - #useSpawnMenu:boolean; - #useUnitControlPanel:boolean; - #useUnitInfoPanel:boolean; - - constructor( config:ContextInterface ) { - this.#allowUnitCopying = ( config.allowUnitCopying !== false ); - this.#allowUnitPasting = ( config.allowUnitPasting !== false ); - this.#useSpawnMenu = ( config.useSpawnMenu !== false ); - this.#useUnitControlPanel = ( config.useUnitControlPanel !== false ); - this.#useUnitInfoPanel = ( config.useUnitInfoPanel !== false ); + constructor(config: ContextInterface) { + this.#allowUnitCopying = (config.allowUnitCopying !== false); + this.#allowUnitPasting = (config.allowUnitPasting !== false); + this.#useSpawnMenu = (config.useSpawnMenu !== false); + this.#useUnitControlPanel = (config.useUnitControlPanel !== false); + this.#useUnitInfoPanel = (config.useUnitInfoPanel !== false); } getAllowUnitCopying() { diff --git a/client/src/context/contextmanager.ts b/client/src/context/contextmanager.ts index 46bcb7dd..55b701c6 100644 --- a/client/src/context/contextmanager.ts +++ b/client/src/context/contextmanager.ts @@ -2,42 +2,39 @@ import { Manager } from "../other/manager"; import { Context, ContextInterface } from "./context"; export class ContextManager extends Manager { - - #currentContext!:string; + #currentContext!: string; constructor() { super(); } - add( name:string, contextConfig:ContextInterface ) { - super.add( name, new Context( contextConfig ) ); - - if ( Object.values( this.getAll() ).length === 1 ) { + add(name: string, contextConfig: ContextInterface) { + super.add(name, new Context(contextConfig)); + + if (Object.values(this.getAll()).length === 1) { this.#currentContext = name; } return this; } - currentContextIs( contextName:string ) { + currentContextIs(contextName: string) { return contextName === this.#currentContext; } getCurrentContext() { const contexts = this.getAll(); - return ( contexts.hasOwnProperty( this.#currentContext ) ) ? contexts[this.#currentContext] : false; + return (contexts.hasOwnProperty(this.#currentContext)) ? contexts[this.#currentContext] : false; } - setContext( contextName:string ) { - - if ( !this.get( contextName ) ) { - console.error( `setContext(): context name "${contextName}" does not exist.` ); + setContext(contextName: string) { + if (!this.get(contextName)) { + console.error(`setContext(): context name "${contextName}" does not exist.`); return false; } this.#currentContext = contextName; - console.log( `Setting context to "${this.#currentContext}".` ); + console.log(`Setting context to "${this.#currentContext}".`); } - } \ No newline at end of file diff --git a/client/src/unit/unitsmanager.ts b/client/src/unit/unitsmanager.ts index 2f65986f..c74e7c27 100644 --- a/client/src/unit/unitsmanager.ts +++ b/client/src/unit/unitsmanager.ts @@ -1196,7 +1196,7 @@ export class UnitsManager { return; if (units === null) - units = this.getSelectedUnits({ excludeHumans: true }); + units = this.getSelectedUnits(); if (units.length === 0) return; diff --git a/scripts/python/addMissingUnits.py b/scripts/python/addMissingUnits.py index 091d5ad3..2310ec49 100644 --- a/scripts/python/addMissingUnits.py +++ b/scripts/python/addMissingUnits.py @@ -6,7 +6,7 @@ from slpp import slpp as lua SEARCH_FOLDER = "D:\\Eagle Dynamics\\DCS World OpenBeta" -sys.path.append("D:\\Documents\\dcs") +sys.path.append("..\\..\\..\\dcs-master\\dcs-master") from dcs.vehicles import * from dcs.ships import * @@ -29,7 +29,7 @@ if len(sys.argv) > 1: units_map = ship_map # Loads the database - with open(filename) as f: + with open(filename, encoding="utf-8") as f: database = json.load(f) for unit in units_map.values(): @@ -41,7 +41,7 @@ if len(sys.argv) > 1: "label": unit.name, "shortLabel": unit.name, "type": unit.__qualname__.split(".")[0], - "enabled": True, + "enabled": False, "liveries": {} } print("Added missing unit " + unit.id)