2.3.0 Merge

Author: Nebby1999

Editor/Code/VarianceAPI.Editor.asmdef

@@ -19,7 +19,21 @@
         "Assembly-CSharp.dll"
     ],
     "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
+    "defineConstraints": [
+        "VAPI_GAME_IMPORTED",
+        "VAPI_MSU_IN_PROJECT"
+    ],
+    "versionDefines": [
+        {
+            "name": "riskofrain2",
+            "expression": "0.0.1",
+            "define": "VAPI_GAME_IMPORTED"
+        },
+        {
+            "name": "teammoonstorm-moonstormsharedutils",
+            "expression": "2.3.0",
+            "define": "VAPI_MSU_IN_PROJECT"
+        }
+    ],
     "noEngineReferences": false
 }

Runtime/CHANGELOG.md

@@ -1,3 +1,8 @@
+# '2.3.0' - Memory Optimization
+
+* Updated to game version 1.3.9
+* AssemblyDef for Runtime and Editor will no longer load if no game or MSU is installed in the project
+
 # '2.2.0' - Variants of the Storm
 
 * Updated to unity 2021.3.33

Runtime/Code/Components/BodyVariantManager.cs

@@ -48,6 +48,7 @@ public class BodyVariantManager : NetworkBehaviour
         private bool hasApplied = false;
         private EquipmentIndex storedEquip;
         private ItemDisplayRuleSet storedIDRS;
+        private bool modelSkinControllerFinished;
 
         #region Networking Related
         /// <summary>
@@ -76,13 +77,26 @@ private void OnListChanged(SyncList<int>.Operation op, int index)
 
         private void Awake()
         {
-            variantIndices.Callback = OnListChanged;
-
             characterBody = GetComponent<CharacterBody>();
             characterDeathBehavior = GetComponent<CharacterDeathBehavior>();
 
             if (characterBody.modelLocator && characterBody.modelLocator.modelTransform)
                 characterModel = characterBody.modelLocator.modelTransform.GetComponent<CharacterModel>();
+
+            if(characterModel.TryGetComponent<ModelSkinController>(out var mdlSkinController))
+            {
+                mdlSkinController.onSkinApplied += onSkinApplied;
+            }
+            else
+            {
+                modelSkinControllerFinished = true;
+            }
+            variantIndices.Callback = OnListChanged;
+        }
+
+        private void onSkinApplied(int obj)
+        {
+            modelSkinControllerFinished = true;
         }
 
         private void Start()
@@ -194,6 +208,9 @@ public void Apply()
         private IEnumerator ApplyVisuals()
         {
             yield return new WaitForEndOfFrame();
+            while (!modelSkinControllerFinished)
+                yield return new WaitForEndOfFrame();
+
             foreach (VariantVisuals visuals in visualsForCoroutine)
             {
                 visuals.ApplyMaterials(characterModel);

Runtime/Code/VAPIMain.cs

@@ -31,7 +31,7 @@ public class VAPIMain : BaseUnityPlugin
         /// <summary>
         /// VAPI's Version
         /// </summary>
-        public const string VERSION = "2.2.0";
+        public const string VERSION = "2.3.0";
 
         /// <summary>
         /// The instancee class of the Main class

Runtime/Code/VarianceAPI.asmdef

@@ -45,7 +45,21 @@
         "R2API.Addressables.dll"
     ],
     "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
+    "defineConstraints": [
+        "VAPI_GAME_IMPORTED",
+        "VAPI_MSU_IN_PROJECT"
+    ],
+    "versionDefines": [
+        {
+            "name": "riskofrain2",
+            "expression": "0.0.1",
+            "define": "VAPI_GAME_IMPORTED"
+        },
+        {
+            "name": "teammoonstorm-moonstormsharedutils",
+            "expression": "2.3.0",
+            "define": "VAPI_MSU_IN_PROJECT"
+        }
+    ],
     "noEngineReferences": false
 }

Runtime/VAPI-Manifest.asset

@@ -93,7 +93,7 @@ MonoBehaviour:
   Name: VarianceAPI
   Description: VarianceAPI allows you to create Variants for CharacterBodies, Variants
     can have different textures, lights, skills, and more.
-  Version: 2.2.0
+  Version: 2.3.0
   Dependencies:
   - {fileID: 11400000, guid: 5ceb1d8ed3af40d4d806e9756b403649, type: 2}
   - {fileID: 11400000, guid: 613d4ca030e90a832defdb35afe5393b, type: 2}

package.json

@@ -6,7 +6,7 @@
     "url": ""
   },
   "displayName": "VarianceAPI",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "unity": "2021.3",
   "description": "An API for Risk of Rain 2 that allows the creation of \"Variants\" for CharacterBodies, variants can have different skills, skins, models and more."
 }