From 76a05a5776517deb05bd65566c64d3e331409b63 Mon Sep 17 00:00:00 2001
From: Exund <SylverProfessionnel@gmail.com>
Date: Wed, 9 Sep 2020 02:03:23 +0200
Subject: [PATCH] Changes to allow more flexibility

---
 src/js/game/building_codes.js               | 4 ++--
 src/js/game/components/static_map_entity.js | 4 ++--
 src/js/game/hud/parts/buildings_toolbar.js  | 6 +++++-
 src/js/game/key_action_mapper.js            | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/js/game/building_codes.js b/src/js/game/building_codes.js
index 65eff317..1530f218 100644
--- a/src/js/game/building_codes.js
+++ b/src/js/game/building_codes.js
@@ -19,7 +19,7 @@ import { Vector } from "../core/vector";
 
 /**
  * Stores a lookup table for all building variants (for better performance)
- * @type {Object<string | number, BuildingVariantIdentifier>}
+ * @type {{[x: string]: BuildingVariantIdentifier, [x: number]: BuildingVariantIdentifier}}
  */
 export const gBuildingVariants = {
     // Set later
@@ -79,5 +79,5 @@ export function getCodeFromBuildingData(metaBuilding, variant, rotationVariant)
         false,
         "Building not found by data: " + metaBuilding.getId() + " / " + variant + " / " + rotationVariant
     );
-    return 0;
+    return "0";
 }
diff --git a/src/js/game/components/static_map_entity.js b/src/js/game/components/static_map_entity.js
index 1ef9506e..9518092e 100644
--- a/src/js/game/components/static_map_entity.js
+++ b/src/js/game/components/static_map_entity.js
@@ -19,7 +19,7 @@ export class StaticMapEntityComponent extends Component {
             originalRotation: types.float,
 
             // See building_codes.js
-            code: types.uint,
+            code: types.string,
         };
     }
 
@@ -96,7 +96,7 @@ export class StaticMapEntityComponent extends Component {
 
         this.origin = origin;
         this.rotation = rotation;
-        this.code = code;
+        this.code = code.toString();
         this.originalRotation = originalRotation;
     }
 
diff --git a/src/js/game/hud/parts/buildings_toolbar.js b/src/js/game/hud/parts/buildings_toolbar.js
index f8953204..82562074 100644
--- a/src/js/game/hud/parts/buildings_toolbar.js
+++ b/src/js/game/hud/parts/buildings_toolbar.js
@@ -13,8 +13,12 @@ import { MetaLeverBuilding } from "../../buildings/lever";
 import { MetaFilterBuilding } from "../../buildings/filter";
 import { MetaDisplayBuilding } from "../../buildings/display";
 import { MetaReaderBuilding } from "../../buildings/reader";
+import { MetaBuilding } from "../../meta_building";
 
-const supportedBuildings = [
+/**
+ * @type {Array<typeof MetaBuilding>}
+ */
+export const supportedBuildings = [
     MetaBeltBaseBuilding,
     MetaSplitterBuilding,
     MetaUndergroundBeltBuilding,
diff --git a/src/js/game/key_action_mapper.js b/src/js/game/key_action_mapper.js
index d5a758a5..8f00a019 100644
--- a/src/js/game/key_action_mapper.js
+++ b/src/js/game/key_action_mapper.js
@@ -7,7 +7,7 @@ import { Application } from "../application";
 import { Signal, STOP_PROPAGATION } from "../core/signal";
 import { IS_MOBILE } from "../core/config";
 import { T } from "../translations";
-function key(str) {
+export function key(str) {
     return str.toUpperCase().charCodeAt(0);
 }