Merge branch 'dev'

DigiWorm0 · Nov 5, 2023 · 64df426 · 64df426
2 parents cc2295a + c45c2c9
commit 64df426
Show file tree

Hide file tree

Showing 64 changed files with 1,705 additions and 485 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-    "editor.codeLens": false
+    "editor.codeLens": false,
+    "dotnet.defaultSolution": "LevelImposter.sln"
 }
diff --git a/LevelImposter/Assets/SerializedAssetDB.json b/LevelImposter/Assets/SerializedAssetDB.json
@@ -25,6 +25,11 @@
       "Map": 2,
       "Path": "Office/panel_vitals"
     },
+    {
+      "ID": "util-spore",
+      "Map": 5,
+      "Path": "Outside/OutsideJungle/Mushrooms/Mushroom (1)"
+    },
     {
       "ID": "util-computer",
       "Map": 2,
@@ -40,6 +45,11 @@
       "Map": 2,
       "Path": "Office/OfficeVent"
     },
+    {
+      "ID": "util-vent3",
+      "Map": 5,
+      "Path": "Rooms/Kitchen/Vents/KitchenVent"
+    },
     {
       "ID": "util-cam",
       "Map": 2,
@@ -60,6 +70,11 @@
       "Map": 4,
       "Path": "Security/task_cams"
     },
+    {
+      "ID": "util-cams4",
+      "Map": 5,
+      "Path": "lookout_binoculars"
+    },
     {
       "ID": "util-ladder1",
       "Map": 4,
@@ -755,6 +770,106 @@
       "Map": 4,
       "Path": "Electrical/task_calibrate"
     },
+    {
+      "ID": "task-marshmallow1",
+      "Map": 5,
+      "Path": "Outside/OutsideBeach/TaskConsoles/RoastMarshmallow Stick (1)/RoastMarshmallowStickConsole"
+    },
+    {
+      "ID": "task-marshmallow2",
+      "Map": 5,
+      "Path": "Outside/OutsideBeach/TaskConsoles/RoastMarshmallow Fire/RoastMarshmallowFireConsole"
+    },
+    {
+      "ID": "task-sandcastle",
+      "Map": 5,
+      "Path": "Rooms/RecRoom/TaskConsoles/BuildSandcastle/BuildSandcastleConsole"
+    },
+    {
+      "ID": "task-weights",
+      "Map": 5,
+      "Path": "Rooms/RecRoom/TaskConsoles/LiftWeights/LiftWeightsConsole"
+    },
+    {
+      "ID": "task-frisbee",
+      "Map": 5,
+      "Path": "Rooms/RecRoom/TaskConsoles/TestFrisbee/TestFrisbeeConsole"
+    },
+    {
+      "ID": "task-generator",
+      "Map": 5,
+      "Path": "Rooms/Kitchen/TaskConsoles/CrankGenerator (1a)/CrankGeneratorConsole"
+    },
+    {
+      "ID": "task-fish1",
+      "Map": 5,
+      "Path": "Rooms/Dock/TaskConsoles/CatchFish (1)/CatchFishConsole"
+    },
+    {
+      "ID": "task-fish2",
+      "Map": 5,
+      "Path": "Rooms/Kitchen/TaskConsoles/CatchFish (2)/CatchFishConsole"
+    },
+    {
+      "ID": "task-seashells",
+      "Map": 5,
+      "Path": "Outside/OutsideBeach/TaskConsoles/CollectShells (1)/CollectShellsConsole"
+    },
+    {
+      "ID": "task-egg1",
+      "Map": 5,
+      "Path": "Outside/OutsideJungle/TaskConsoles/HelpCritter (1b)/HelpCritterConsole"
+    },
+    {
+      "ID": "task-egg2",
+      "Map": 5,
+      "Path": "Rooms/Laboratory/TaskConsoles/HelpCritter (2)/HelpCritterConsole"
+    },
+    {
+      "ID": "task-samples1",
+      "Map": 5,
+      "Path": "Outside/OutsideJungle/TaskConsoles/CollectSamples (1a)/CollectSamplesConsole"
+    },
+    {
+      "ID": "task-samples2",
+      "Map": 5,
+      "Path": "Rooms/Laboratory/TaskConsoles/CollectSamples (2)/CollectSamplesConsole"
+    },
+    {
+      "ID": "task-vegetables1",
+      "Map": 5,
+      "Path": "Rooms/Greenhouse/TaskConsoles/CollectVegetables (1)/CollectVegetablesConsole"
+    },
+    {
+      "ID": "task-vegetables2",
+      "Map": 5,
+      "Path": "Rooms/Kitchen/TaskConsoles/CollectVegetables (2)/CollectVegetablesConsole"
+    },
+    {
+      "ID": "task-radio",
+      "Map": 5,
+      "Path": "Rooms/Communications/TaskConsoles/TuneRadio/TuneRadioConsole"
+    },
+    {
+      "ID": "task-mineores",
+      "Map": 5,
+      "Path": "Rooms/MiningPit/TaskConsoles/MineOres/MineOresConsole"
+    },
+    {
+      "ID": "task-replaceparts1",
+      "Map": 5,
+      "Path": "Rooms/UpperEngine/TaskConsoles/ReplaceParts (1b)/ReplacePartsConsole"
+    },
+    {
+      "ID": "task-replaceparts2",
+      "Map": 5,
+      "Path": "Rooms/DropshipRuins/TaskConsoles/ReplaceParts (2b)/ReplacePartsConsole"
+    },
+    {
+      "ID": "task-hoist",
+      "Map": 5,
+      "Path": "Outside/OutsideJungle/TaskConsoles/HoistSupplies (1)/HoistSuppliesConsole"
+    },
     {
       "ID": "ss-skeld",
       "Map": 0,
@@ -775,6 +890,11 @@
       "Map": 4,
       "Path": ""
     },
+    {
+      "ID": "ss-fungle",
+      "Map": 5,
+      "Path": ""
+    },
     {
       "ID": "dec-barrier",
       "Map": 2,
@@ -1413,6 +1533,90 @@
       "Type": 2,
       "Name": "CalibrateDistributorTask"
     },
+    {
+      "ID": "task-marshmallow1",
+      "Map": 5,
+      "Type": 0,
+      "Name": "RoastMarshmallowTask"
+    },
+    {
+      "ID": "task-sandcastle",
+      "Map": 5,
+      "Type": 1,
+      "Name": "BuildSandcastleTask"
+    },
+    {
+      "ID": "task-weights",
+      "Map": 5,
+      "Type": 1,
+      "Name": "LiftWeightsTask"
+    },
+    {
+      "ID": "task-frisbee",
+      "Map": 5,
+      "Type": 1,
+      "Name": "TestFrisbeeTask"
+    },
+    {
+      "ID": "task-generator",
+      "Map": 5,
+      "Type": 1,
+      "Name": "CrankGeneratorTask"
+    },
+    {
+      "ID": "task-fish1",
+      "Map": 5,
+      "Type": 2,
+      "Name": "CatchFishTask"
+    },
+    {
+      "ID": "task-seashells",
+      "Map": 5,
+      "Type": 1,
+      "Name": "CollectShellsTask"
+    },
+    {
+      "ID": "task-egg1",
+      "Map": 5,
+      "Type": 2,
+      "Name": "HelpCritterTask"
+    },
+    {
+      "ID": "task-samples1",
+      "Map": 5,
+      "Type": 0,
+      "Name": "CollectSamplesTask"
+    },
+    {
+      "ID": "task-vegetables1",
+      "Map": 5,
+      "Type": 2,
+      "Name": "CollectVegetablesTask"
+    },
+    {
+      "ID": "task-radio",
+      "Map": 5,
+      "Type": 1,
+      "Name": "TuneRadioTask"
+    },
+    {
+      "ID": "task-mineores",
+      "Map": 5,
+      "Type": 2,
+      "Name": "MineOresTask"
+    },
+    {
+      "ID": "task-replaceparts1",
+      "Map": 5,
+      "Type": 0,
+      "Name": "ReplacePartsTask"
+    },
+    {
+      "ID": "task-hoist",
+      "Map": 5,
+      "Type": 2,
+      "Name": "HoistSuppliesTask"
+    },
     {
       "ID": "sab-electric",
       "Map": 2,
@@ -1448,6 +1652,12 @@
       "Map": 0,
       "Type": 3,
       "Name": "NoOxyTask"
+    },
+    {
+      "ID": "sab-btnmixup",
+      "Map": 5,
+      "Type": 3,
+      "Name": "MushroomMixupSabotageTask"
     }
   ],
   "SoundDB": [
@@ -2352,6 +2562,14 @@
       "ID": "task-id_walletmask",
       "Paths": [ "admin_sliderBottom/admin_Wallet/admin_walletFront" ]
     },
+    {
+      "ID": "task-id_greenlight",
+      "Paths": [ "admin_sliderTop/admin_lightGreen" ]
+    },
+    {
+      "ID": "task-id_redlight",
+      "Paths": [ "admin_sliderTop/admin_lightRed" ]
+    },
     {
       "ID": "task-keys_keychain",
       "Paths": [ "panel_key_keychain" ]
@@ -2493,6 +2711,22 @@
       "ID": "task-pass_scanner",
       "Paths": [ "Panel_scanner" ]
     },
+    {
+      "ID": "task-pass_pull",
+      "Paths": [ "Panel_boardingpull" ]
+    },
+    {
+      "ID": "task-pass_flip",
+      "Paths": [ "panel_boardingFront/panel_boardingFlip" ]
+    },
+    {
+      "ID": "task-pass_idwindow",
+      "Paths": [ "panel_boardingFront/panel_boardingpicBG/panel_boardingpicwindow" ]
+    },
+    {
+      "ID": "task-pass_idfront",
+      "Paths": [ "panel_boardingFront" ]
+    },
     {
       "ID": "task-photos_bg",
       "Paths": [ "photos_bucket" ]

diff --git a/LevelImposter/Builders/BuildRouter.cs b/LevelImposter/Builders/BuildRouter.cs
@@ -30,8 +30,10 @@ public class BuildRouter
             new SabotageOptionsBuilder(),
             new OneWayColliderBuilder(),
             new DecontaminationBuilder(),
+            new SporeBuilder(),
 
             new SabBuilder(),
+            new SabMixupBuilder(),
             new SabConsoleBuilder(),
             new SabMapBuilder(),
             new SabDoorBuilder(),

diff --git a/LevelImposter/Builders/Generic/SpriteBuilder.cs b/LevelImposter/Builders/Generic/SpriteBuilder.cs
@@ -11,7 +11,7 @@ public class SpriteBuilder : IElemBuilder
     {
         public void Build(LIElement elem, GameObject obj)
         {
-            if (elem.properties.spriteData == null)
+            if (elem.properties.spriteID == null)
                 return;
             if (SpriteLoader.Instance == null)
                 throw new Exception("SpriteLoader has not initialized");

diff --git a/LevelImposter/Builders/Sab/SabBuilder.cs b/LevelImposter/Builders/Sab/SabBuilder.cs
@@ -1,7 +1,7 @@
+using LevelImposter.Core;
+using LevelImposter.DB;
 using System.Collections.Generic;
 using UnityEngine;
-using LevelImposter.DB;
-using LevelImposter.Core;
 
 namespace LevelImposter.Builders
 {
@@ -27,7 +27,9 @@ public SabBuilder()
 
         public void Build(LIElement elem, GameObject obj)
         {
-            if (!elem.type.StartsWith("sab-") || elem.type.StartsWith("sab-btn") || elem.type.StartsWith("sab-door"))
+            if (!elem.type.StartsWith("sab-") ||
+                elem.type.StartsWith("sab-btn") ||
+                elem.type.StartsWith("sab-door"))
                 return;
 
             // ShipStatus
@@ -42,7 +44,7 @@ public void Build(LIElement elem, GameObject obj)
                 _sabContainer.transform.SetParent(shipStatus.transform);
                 _sabContainer.SetActive(false);
             }
-            
+
             // Prefab
             var prefabTask = AssetDB.GetTask<SabotageTask>(elem.type);
             if (prefabTask == null)
@@ -82,7 +84,7 @@ public void Build(LIElement elem, GameObject obj)
                 bool hasSabSystem = SAB_SYSTEMS.TryGetValue(elem.type, out SystemTypes sabSystemType);
                 if (!hasSabSystem)
                     return;
-                
+
                 // Remove Old System
                 var oldSystem = shipStatus.Systems[sabSystemType].Cast<IActivatable>();
                 var sabSystem = shipStatus.Systems[SystemTypes.Sabotage].Cast<SabotageSystemType>();