alex

Alexejhero · Nov 29, 2023 · b0609fd · b0609fd
1 parent a5ff8e5
commit b0609fd
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 2 deletions.
diff --git a/SCHIZO/Items/ErmBed/ErmBed.cs b/SCHIZO/Items/ErmBed/ErmBed.cs
@@ -12,7 +12,7 @@ public sealed class ErmBed : ClonePrefab
         TechType.BedZeta;
 #endif
 
-    private Texture2D _replacementTexture;
+    private readonly Texture2D _replacementTexture;
 
     [SetsRequiredMembers]
     public ErmBed(ModItem modItem) : base(modItem, CLONE_TARGET)

diff --git a/Unity/Assets/Mod/ErmMoon.meta → Unity/Assets/Mod/Erm Moon.meta b/Unity/Assets/Mod/ErmMoon.meta → Unity/Assets/Mod/Erm Moon.meta
diff --git a/.../Assets/Mod/ErmMoon/ErmMoon Prefab.prefab → ...Assets/Mod/Erm Moon/ErmMoon Prefab.prefab b/.../Assets/Mod/ErmMoon/ErmMoon Prefab.prefab → ...Assets/Mod/Erm Moon/ErmMoon Prefab.prefab
diff --git a/...ts/Mod/ErmMoon/ErmMoon Prefab.prefab.meta → ...s/Mod/Erm Moon/ErmMoon Prefab.prefab.meta b/...ts/Mod/ErmMoon/ErmMoon Prefab.prefab.meta → ...s/Mod/Erm Moon/ErmMoon Prefab.prefab.meta
diff --git a/Unity/Assets/Mod/ErmMoon/ErmMoon.asset → Unity/Assets/Mod/Erm Moon/ErmMoon.asset b/Unity/Assets/Mod/ErmMoon/ErmMoon.asset → Unity/Assets/Mod/Erm Moon/ErmMoon.asset
diff --git a/Unity/Assets/Mod/ErmMoon/ErmMoon.asset.meta → Unity/Assets/Mod/Erm Moon/ErmMoon.asset.meta b/Unity/Assets/Mod/ErmMoon/ErmMoon.asset.meta → Unity/Assets/Mod/Erm Moon/ErmMoon.asset.meta
diff --git a/Unity/Assets/Mod/Green Screen/Green Screens.asset b/Unity/Assets/Mod/Green Screen/Green Screens.asset
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c08c4776b89c430d985e9557dc60112d, type: 3}
+  m_Name: Green Screens
+  m_EditorClassIdentifier: 
+  registryItems: []
diff --git a/Unity/Assets/Mod/Green Screen/Green Screens.asset.meta b/Unity/Assets/Mod/Green Screen/Green Screens.asset.meta
diff --git a/Unity/Assets/Scripts/SCHIZO/Items/ErmBed/ErmBedLoader.cs b/Unity/Assets/Scripts/SCHIZO/Items/ErmBed/ErmBedLoader.cs
@@ -13,7 +13,7 @@ public sealed partial class ErmBedLoader : ItemLoader
 
         public override TriValidationResult AcceptsItem(ItemData item)
         {
-            return item.classId == "ermbed" ? TriValidationResult.Valid
+            return item.classId.ToLower() == "ermbed" ? TriValidationResult.Valid
                 : TriValidationResult.Error("ErmBedLoader only accepts an ErmBed");
         }
     }

diff --git a/Unity/Assets/Scripts/SCHIZO/Items/Gymbag/GymbagLoader.cs b/Unity/Assets/Scripts/SCHIZO/Items/Gymbag/GymbagLoader.cs
@@ -1,9 +1,17 @@
 using JetBrains.Annotations;
+using SCHIZO.Items.Data;
+using TriInspector;
 
 namespace SCHIZO.Items.Gymbag
 {
     [UsedImplicitly]
     public sealed partial class GymbagLoader : ItemLoader
     {
+        public override TriValidationResult AcceptsItem(ItemData item)
+        {
+            string classId = item.classId.ToLower();
+            return classId == "gymbag" || classId == "quantumgymbag" ? TriValidationResult.Valid
+                : TriValidationResult.Error("GymbagLoader only accepts a Gymbag or a QuantumGymbag");
+        }
     }
 }