diff --git a/SCHIZO/Items/ErmBed/ErmBed.cs b/SCHIZO/Items/ErmBed/ErmBed.cs index 736c7438..15edd4b8 100644 --- 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 b/Unity/Assets/Mod/Erm Moon.meta similarity index 100% rename from Unity/Assets/Mod/ErmMoon.meta rename to Unity/Assets/Mod/Erm Moon.meta diff --git a/Unity/Assets/Mod/ErmMoon/ErmMoon Prefab.prefab b/Unity/Assets/Mod/Erm Moon/ErmMoon Prefab.prefab similarity index 100% rename from Unity/Assets/Mod/ErmMoon/ErmMoon Prefab.prefab rename to Unity/Assets/Mod/Erm Moon/ErmMoon Prefab.prefab diff --git a/Unity/Assets/Mod/ErmMoon/ErmMoon Prefab.prefab.meta b/Unity/Assets/Mod/Erm Moon/ErmMoon Prefab.prefab.meta similarity index 100% rename from Unity/Assets/Mod/ErmMoon/ErmMoon Prefab.prefab.meta rename to Unity/Assets/Mod/Erm Moon/ErmMoon Prefab.prefab.meta diff --git a/Unity/Assets/Mod/ErmMoon/ErmMoon.asset b/Unity/Assets/Mod/Erm Moon/ErmMoon.asset similarity index 100% rename from Unity/Assets/Mod/ErmMoon/ErmMoon.asset rename to Unity/Assets/Mod/Erm Moon/ErmMoon.asset diff --git a/Unity/Assets/Mod/ErmMoon/ErmMoon.asset.meta b/Unity/Assets/Mod/Erm Moon/ErmMoon.asset.meta similarity index 100% rename from Unity/Assets/Mod/ErmMoon/ErmMoon.asset.meta rename to 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 new file mode 100644 index 00000000..3bf3fbd7 --- /dev/null +++ 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 new file mode 100644 index 00000000..ad493a06 --- /dev/null +++ b/Unity/Assets/Mod/Green Screen/Green Screens.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8015418bedfe6234d9823f8b8a51fbc3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Scripts/SCHIZO/Items/ErmBed/ErmBedLoader.cs b/Unity/Assets/Scripts/SCHIZO/Items/ErmBed/ErmBedLoader.cs index a05b7cfc..54f937c0 100644 --- 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 index c48352c1..91c7f66d 100644 --- 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"); + } } }