From c553ee16328e3f5d28be6ecbe8173b99a89ec982 Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@googlemail.com>
Date: Sun, 16 Jan 2022 18:02:40 +0100
Subject: [PATCH] Support for rotation variants in mods (was broken previously)

---
 src/js/mods/mod_interface.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/js/mods/mod_interface.js b/src/js/mods/mod_interface.js
index 784e3d9d..e1043cb1 100644
--- a/src/js/mods/mod_interface.js
+++ b/src/js/mods/mod_interface.js
@@ -208,19 +208,21 @@ export class ModInterface {
         T.buildings[id] = {};
 
         metaClass.getAllVariantCombinations().forEach(combination => {
-            const actualVariant = combination.variant || defaultBuildingVariant;
-            registerBuildingVariant(id, metaClass, actualVariant, combination.rotationVariant || 0);
+            const variant = combination.variant || defaultBuildingVariant;
+            const rotationVariant = combination.rotationVariant || 0;
+
+            const buildingIdentifier = id + (variant === defaultBuildingVariant ? "" : "-" + variant);
+
+            const uniqueTypeId = buildingIdentifier + (rotationVariant === 0 ? "" : "-" + rotationVariant);
+            registerBuildingVariant(uniqueTypeId, metaClass, variant, rotationVariant);
 
             gBuildingVariants[id].metaInstance = metaInstance;
 
-            T.buildings[id][actualVariant] = {
+            T.buildings[id][variant] = {
                 name: combination.name || "Name",
                 description: combination.description || "Description",
             };
 
-            const buildingIdentifier =
-                id + (actualVariant === defaultBuildingVariant ? "" : "-" + actualVariant);
-
             if (combination.regularImageBase64) {
                 this.registerSprite(
                     "sprites/buildings/" + buildingIdentifier + ".png",
@@ -235,7 +237,7 @@ export class ModInterface {
                 );
             }
             if (combination.tutorialImageBase64) {
-                this.setBuildingTutorialImage(id, actualVariant, combination.tutorialImageBase64);
+                this.setBuildingTutorialImage(id, variant, combination.tutorialImageBase64);
             }
         });