Bugfixes

Assets/Scripts/Functional Definitions/Interaction Definitions/BattleZoneManager.cs

@@ -6,6 +6,7 @@ public class BattleZoneManager : MonoBehaviour
     static List<Entity> targets;
     public string sectorName;
     public bool playing;
+    public bool opposingFactionAdded = false;
 
     float startTime = 0f;
     public int CreditsCollected = 0;
@@ -31,6 +32,7 @@ public Stats(int faction)
 
     void OnEnable()
     {
+        opposingFactionAdded = false;
         targets = new List<Entity>();
         Entity.OnEntityDeath += OnEntityDeath;
         ShellCore.OnPowerCollected += OnPowerCollected;
@@ -180,7 +182,7 @@ public void UpdateCounters()
                 }
             }
 
-            if (livingFactions.Count < 2 || allAllied)
+            if ((livingFactions.Count < 2 || allAllied))
             {
                 foreach (Entity playerEntity in targets)
                 {
@@ -225,7 +227,10 @@ public void AddTarget(Entity target)
 
         if (target)
         {
-            playing = true;
+            if (!opposingFactionAdded && targets.Exists(e => !FactionManager.IsAllied(e.GetFaction(), target.GetFaction())))
+                opposingFactionAdded = true;
+            if (opposingFactionAdded)
+                playing = true;
         }
 
         if (!targets.Contains(target))

Assets/Scripts/Functional Definitions/Interaction Definitions/SectorManager.cs

@@ -745,13 +745,11 @@ public Entity SpawnEntity(EntityBlueprint blueprint, Sector.LevelEntity data)
                     {
                         ok = false;
                     }
-
-                    if (blueprint.dialogue.traderInventory == null)
+                    else if (blueprint.dialogue.traderInventory == null)
                     {
                         ok = false;
                     }
-
-                    if (string.IsNullOrEmpty(data.blueprintJSON))
+                    else if (string.IsNullOrEmpty(data.blueprintJSON))
                     {
                         ok = false;
                     }
@@ -768,12 +766,13 @@ public Entity SpawnEntity(EntityBlueprint blueprint, Sector.LevelEntity data)
                     }
                     else
                     {
+                        blueprint.dialogue = ScriptableObject.CreateInstance<Dialogue>();
                         blueprint.dialogue.traderInventory = new List<EntityBlueprint.PartInfo>();
                     }
                 }
                 catch (System.Exception e)
                 {
-                    Debug.LogWarning(e);
+                    Debug.LogWarning(e + " " + data.ID);
                     blueprint.dialogue.traderInventory = new List<EntityBlueprint.PartInfo>();
                 }
 

Assets/Scripts/Game Object Definitions/AI/PartyManager.cs

@@ -2,6 +2,7 @@
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
+using System.Linq;
 
 public class PartyManager : MonoBehaviour
 {
@@ -189,29 +190,33 @@ public void Unassign(string charID)
         if (!PartyLocked)
         {
             var member = partyMembers.Find(c => c.ID == charID);
-            if (member && member.GetAI() != null)
-            {
-                member.GetAI().follow(null);
-            }
-
-            partyMembers.Remove(member);
-            partyResponses.Remove(charID);
-
-            if (partyIndicators.ContainsKey(member))
-            {
-                Destroy(partyIndicators[member]);
-                partyIndicators.Remove(member);
-            }
-            // sukratHealth.SetActive(false);
+            UnassignBackend(charID, member);
         }
         else
         {
             PlayerCore.Instance.alerter.showMessage("Cannot modify party currently!", "clip_alert");
         }
-
         UpdatePortraits();
     }
 
+
+    public void UnassignBackend(string charID, ShellCore member)
+    {
+        if (member && member.GetAI() != null)
+        {
+            member.GetAI().follow(null);
+        }
+
+        partyMembers.Remove(member);
+        if (charID != null) partyResponses.Remove(charID);
+
+        if (partyIndicators.ContainsKey(member))
+        {
+            Destroy(partyIndicators[member]);
+            partyIndicators.Remove(member);
+        }
+    }
+
     public GameObject partyIndicatorPrefab;
     public Dictionary<ShellCore, GameObject> partyIndicators = new Dictionary<ShellCore, GameObject>();
     public Transform indicatorTransform;
@@ -293,6 +298,11 @@ public void CharacterScrollSetup()
     void Update()
     {
         blocker.SetActive(false);
+        var deadMembers = partyMembers.FindAll(sc => !sc);
+        foreach (var member in deadMembers)
+        {
+            UnassignBackend(null, member);
+        }
 
         // distance maximum for party members - teleport them close to the player
         if (SectorManager.instance?.current?.type != Sector.SectorType.BattleZone && !DialogueSystem.isInCutscene)

Assets/Scripts/Game Object Definitions/Entity Definitions/Entity.cs

@@ -538,7 +538,7 @@ protected virtual void BuildEntity()
         int sortingOrder = 1;
         //For shellcores, create the tractor beam
         // Create shell parts
-        if (blueprint != null)
+        if (blueprint != null && blueprint.parts != null)
         {
             for (int i = 0; i < blueprint.parts.Count; i++)
             {

Assets/Scripts/HUD Scripts/MinimapArrowScript.cs

@@ -173,7 +173,7 @@ public void ClearCoreArrows()
 
     public void AddCoreArrow(ShellCore core)
     {
-        if (coreArrows.ContainsKey(core))
+        if (coreArrows.ContainsKey(core) || !core)
         {
             return;
         }