fix(?) double journal spawns

polish up some descriptions
Alexejhero · Dec 11, 2023 · b1a5e9d · b1a5e9d
1 parent 8feaacb
commit b1a5e9d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 27 deletions.
diff --git a/SCHIZO/Items/PDAJournal.cs b/SCHIZO/Items/PDAJournal.cs
@@ -24,20 +24,20 @@ private sealed class PDAJournalPrefab
         internal static Dictionary<string, PDAJournalPrefab> Prefabs = [];
 
         public CustomPrefab NautilusPrefab { get; }
-        public CloneTemplate CloneTemplate { get; }
-        public PrefabInfo Info { get; }
         private PDAJournalPrefab(PDAJournal journal)
         {
             string prefabName = $"{nameof(PDAJournal)}_{journal.key}";
-            Info = new PrefabInfo
+
+            NautilusPrefab = new CustomPrefab(prefabName, null, null);
+
+            bool doSpawn = RetargetHelpers.Pick(journal.spawnInSN, journal.spawnInBZ);
+            if (doSpawn)
             {
-                ClassID = prefabName,
-                PrefabFileName = prefabName,
-                // nautilus complains if we don't have a techtype
-                // even though prefabs like this are *not* supposed to have one
-                TechType = EnumHandler.AddEntry<TechType>(prefabName)
-            };
-            CloneTemplate = new CloneTemplate(Info, CloneTargetClassId)
+                Spawns.SpawnLocation ourLoc = RetargetHelpers.Pick(journal.spawnLocationSN, journal.spawnLocationBZ);
+                SpawnLocation loc = new(ourLoc.position, ourLoc.rotation);
+                NautilusPrefab.SetSpawns(loc);
+            }
+            NautilusPrefab.SetGameObject(new CloneTemplate(NautilusPrefab.Info, CloneTargetClassId)
             {
                 ModifyPrefab = prefab =>
                 {
@@ -48,18 +48,7 @@ private PDAJournalPrefab(PDAJournal journal)
                         handTarget.secondaryTooltip = journal.pdaHandTargetSubtext;
                     handTarget.goal.key = journal.key;
                 }
-            };
-
-            NautilusPrefab = new CustomPrefab() { Info = Info };
-
-            bool doSpawn = RetargetHelpers.Pick(journal.spawnInSN, journal.spawnInBZ);
-            if (doSpawn)
-            {
-                Spawns.SpawnLocation ourLoc = RetargetHelpers.Pick(journal.spawnLocationSN, journal.spawnLocationBZ);
-                SpawnLocation loc = new(ourLoc.position, ourLoc.rotation);
-                NautilusPrefab.SetSpawns(loc);
-            }
-            NautilusPrefab.SetGameObject(CloneTemplate);
+            });
             NautilusPrefab.Register();
         }
 

diff --git a/SCHIZO/Subtitles/ActorData.BelowZero.cs b/SCHIZO/Subtitles/ActorData.BelowZero.cs
@@ -25,7 +25,7 @@ public static implicit operator Actor(ActorData data)
 
     [HarmonyPatch(typeof(uGUI_TalkingHead), nameof(uGUI_TalkingHead.GetSkin))]
     [HarmonyPrefix]
-    private static bool GetCustomSkin(uGUI_TalkingHead __instance, Actor actor, out TalkingHeadSkin __result)
+    private static bool GetCustomSkin(Actor actor, out TalkingHeadSkin __result)
     {
         __result = default;
 

diff --git a/Unity/Assets/Mod/Evil Fumo/Evil Fumo item data.asset b/Unity/Assets/Mod/Evil Fumo/Evil Fumo item data.asset
@@ -19,7 +19,11 @@ MonoBehaviour:
   displayName: Evil fumo
   tooltip: 'Don''t poke her, or she might bite you.
 
-    Keep away from sharp objects.'
+    Keep away from sharp objects.
+
+
+    <size=75%>(Model
+    by w1n7er)</size>'
   icon: {fileID: 21300000, guid: 60e94acee40f84d4896c5a5004c2c6a7, type: 3}
   itemSize: {x: 1, y: 1}
   isCraftable: 1

diff --git a/Unity/Assets/Mod/Gymbag/Gymbag BZ.asset b/Unity/Assets/Mod/Gymbag/Gymbag BZ.asset
@@ -17,7 +17,7 @@ MonoBehaviour:
     id: 0
   classId: quantumgymbag
   displayName: Quantum Gymbag
-  tooltip: 'Provides portable access to the quantum storage network... provided you
+  tooltip: 'Offers portable access to the quantum storage network... provided you
     don''t mind the smell.
 
     <size=75%>(Model by Vaalmyr)</size>'
@@ -36,7 +36,7 @@ MonoBehaviour:
   craftTreeTypeSN: 0
   craftTreePathSN: 
   techGroupSN: 14
-  techCategorySN: 0
+  techCategorySN: -1
   requiredForUnlockSN:
     isCustom: 0
     techType: 0

diff --git a/Unity/Assets/Mod/Neurofumo/Neurofumo item data.asset b/Unity/Assets/Mod/Neurofumo/Neurofumo item data.asset
@@ -17,7 +17,11 @@ MonoBehaviour:
     id: 0
   classId: neurofumoitem
   displayName: Neuro fumo
-  tooltip: Very huggable. Sure to keep your heart warm in any environment.
+  tooltip: 'Very huggable. Sure to keep your heart warm in any environment.
+
+
+    <size=75%>(Model
+    by Kat)</size>'
   icon: {fileID: 21300000, guid: 45820c772f47f814d88babbafe7caa46, type: 3}
   itemSize: {x: 1, y: 1}
   isCraftable: 1