Version update

rudderbucky · Feb 2, 2021 · c37c13d · c37c13d
1 parent e96d8d0
commit c37c13d
Show file tree

Hide file tree

Showing 335 changed files with 24,060 additions and 44 deletions.
diff --git a/Assets/Scripts/Functional Definitions/Abilities/Control.cs b/Assets/Scripts/Functional Definitions/Abilities/Control.cs
@@ -7,7 +7,7 @@ public class Control : PassiveAbility
 
     const float healthAddition = 200;
     const float damageAddition = 200;
-
+    private bool activated;
     List<Entity> boosted = new List<Entity>();
 
     protected override void Awake()
@@ -17,18 +17,24 @@ protected override void Awake()
     }
     public override void SetDestroyed(bool input)
     {
-        for (int i = 0; i < boosted.Count; i++)
+        if(activated && input)
         {
-            var entity = boosted[i];
-            var maxHealths = entity.GetMaxHealth();
-            maxHealths[0] -= healthAddition * abilityTier;
-
-            // Remove a percentage of health from the ship, based on what max health the core had before destruction
-            var healths = entity.GetHealth();
-            healths[0] -= (healths[0] / maxHealths[0]) * healthAddition * abilityTier;
-            entity.damageAddition -= damageAddition;
+            for (int i = 0; i < boosted.Count; i++)
+            {
+                var entity = boosted[i];
+                if (!entity)
+                    continue;
+                var maxHealths = entity.GetMaxHealth();
+                maxHealths[0] -= healthAddition * abilityTier;
+
+                // Remove a percentage of health from the ship, based on what max health the core had before destruction
+                var healths = entity.GetHealth();
+                healths[0] -= (healths[0] / maxHealths[0]) * healthAddition * abilityTier;
+                entity.damageAddition -= damageAddition;
+            }
+            Entity.OnEntitySpawn -= EntitySpawn;
         }
-        Entity.OnEntitySpawn -= EntitySpawn;
+
         base.SetDestroyed(input);
     }
 
@@ -39,6 +45,9 @@ protected override void Execute()
             if (!(AIData.entities[i] is Turret) && AIData.entities[i].faction == Core.faction && AIData.entities[i] != Core) // All drones or only ones owned by the player?
             {
                 var entity = AIData.entities[i];
+                if(!entity)
+                    continue;
+
                 var maxHealths = entity.GetMaxHealth();
                 maxHealths[0] += healthAddition * abilityTier;
                 var healths = entity.GetHealth();
@@ -47,6 +56,7 @@ protected override void Execute()
                 boosted.Add(entity);
             }
         }
+        activated = true;
         Entity.OnEntitySpawn += EntitySpawn;
     }
 
@@ -59,29 +69,14 @@ void EntitySpawn(Entity entity)
             var healths = entity.GetHealth();
             healths[0] += healthAddition * abilityTier;
             entity.damageAddition += damageAddition;
-            boosted.Add(entity);
+            if(!boosted.Contains(entity))
+                boosted.Add(entity);
         }
     }
 
-    private void OnDestroy()
+    void OnDestroy()
     {
-        if (!isDestroyed)
-        {
-            for (int i = 0; i < boosted.Count; i++)
-            {
-                var entity = boosted[i];
-                if (!entity)
-                    continue;
-                var maxHealths = entity.GetMaxHealth();
-                maxHealths[0] -= healthAddition * abilityTier;
-
-                // Remove a percentage of health from the ship, based on what max health the core had before destruction
-                var healths = entity.GetHealth();
-                healths[0] -= (healths[0] / maxHealths[0]) * healthAddition * abilityTier;
-                entity.damageAddition -= damageAddition;
-            }
-
-            Entity.OnEntitySpawn -= EntitySpawn;
-        }
+        if(!isDestroyed)
+            SetDestroyed(true);
     }
 }
diff --git a/Assets/Scripts/Functional Definitions/Interaction Definitions/SectorManager.cs b/Assets/Scripts/Functional Definitions/Interaction Definitions/SectorManager.cs
@@ -441,6 +441,14 @@ public Entity SpawnEntity(EntityBlueprint blueprint, Sector.LevelEntity data)
 
                         if(current.type == Sector.SectorType.BattleZone)
                         {
+                            // add core arrow
+                            if(MinimapArrowScript.instance && !(shellcore is PlayerCore))
+                            {
+                                shellcore.faction = data.faction;
+                                MinimapArrowScript.instance.AddCoreArrow(shellcore);
+                            }   
+
+
                             // set the carrier of the shellcore to the associated faction's carrier
                             if(carriers.ContainsKey(data.faction))
                                 shellcore.SetCarrier(carriers[data.faction]);

diff --git a/Assets/Scripts/Functional Definitions/Saving Scripts/VersionNumberScript.cs b/Assets/Scripts/Functional Definitions/Saving Scripts/VersionNumberScript.cs
@@ -5,8 +5,8 @@
 
 public class VersionNumberScript : MonoBehaviour
 {
-    public static string version = "Alpha 5.2.0";
-    public static string mapVersion = "Alpha 5.2.0";
+    public static string version = "Alpha 5.3.0";
+    public static string mapVersion = "Alpha 5.3.0";
     static VersionNumberScript instance;
     public Text episodeText;
 

diff --git a/Assets/Scripts/Graphs/FinishTaskNode.cs b/Assets/Scripts/Graphs/FinishTaskNode.cs
@@ -67,6 +67,10 @@ void SetEntityID(string ID)
 
         public void OnDialogue()
         {
+            // draw objectives
+            TaskManager.objectiveLocations[(Canvas as QuestCanvas).missionName].Remove(objectiveLocation);
+            TaskManager.DrawObjectiveLocations();
+
             DialogueSystem.ShowPopup(rewardText, textColor, SectorManager.instance.GetEntity(rewardGiverID));
             DialogueSystem.OnDialogueEnd = (int _) =>
             {
@@ -120,25 +124,23 @@ public override int Traverse()
             }
 
             SectorManager.instance.player.alerter.showMessage("TASK COMPLETE", "clip_victory");
+
+
             TaskManager.speakerIDList.Add(rewardGiverID);
             if (TaskManager.interactionOverrides.ContainsKey(rewardGiverID))
             {
                 Debug.Log("Contains key");
                 TaskManager.interactionOverrides[rewardGiverID].Push(() => {
-                    Debug.Log(TaskManager.interactionOverrides[rewardGiverID].Count);
                     TaskManager.interactionOverrides[rewardGiverID].Pop();
                     OnDialogue();
-                    Debug.Log(TaskManager.interactionOverrides[rewardGiverID].Count);
                 });
             }
             else
             {
                 var stack = new Stack<UnityEngine.Events.UnityAction>();
                 stack.Push(() => {
-                        Debug.Log(TaskManager.interactionOverrides[rewardGiverID].Count);
                         TaskManager.interactionOverrides[rewardGiverID].Pop();
                         OnDialogue();
-                        Debug.Log(TaskManager.interactionOverrides[rewardGiverID].Count);
                     });
                 TaskManager.interactionOverrides.Add(rewardGiverID, stack);
                 Debug.Log("ADDED " + rewardGiverID);
@@ -148,6 +150,7 @@ public override int Traverse()
             return -1;
         }
 
+        TaskManager.ObjectiveLocation objectiveLocation;
         void TryAddObjective()
 		{
             foreach(var ent in AIData.entities)
@@ -156,12 +159,13 @@ void TryAddObjective()
                 if(ent.ID == rewardGiverID)
                 {
                     TaskManager.objectiveLocations[(Canvas as QuestCanvas).missionName].Clear();
-                    TaskManager.objectiveLocations[(Canvas as QuestCanvas).missionName].Add(new TaskManager.ObjectiveLocation(
+                    objectiveLocation = new TaskManager.ObjectiveLocation(
                         ent.transform.position,
                         true,
                         (Canvas as QuestCanvas).missionName,
                         ent
-                    ));
+                    );
+                    TaskManager.objectiveLocations[(Canvas as QuestCanvas).missionName].Add(objectiveLocation);
                     TaskManager.DrawObjectiveLocations();
                     break;
                 }

diff --git a/Assets/Scripts/Graphs/UsePartCondition.cs b/Assets/Scripts/Graphs/UsePartCondition.cs
@@ -41,7 +41,7 @@ public void Init(int index)
         {
             OnPlayerReconstruct.AddListener(CheckParts);
             State = ConditionState.Listening;
-            TryAddObjective(false);
+            TryAddObjective(true);
         }
 
         public void DeInit()
@@ -80,7 +80,7 @@ void TryAddObjective(bool clear)
                 // TODO: Disambiguate name and entityName
                 if(ent.name == "Yard" || ent.entityName == "Yard")
                 {
-                    if(clear) TaskManager.objectiveLocations.Clear();
+                    if(clear) TaskManager.objectiveLocations[(Canvas as QuestCanvas).missionName].Clear();
                     objectiveLocation = new TaskManager.ObjectiveLocation(
                         ent.transform.position,
                         true,

diff --git a/Assets/Scripts/HUD Scripts/MinimapArrowScript.cs b/Assets/Scripts/HUD Scripts/MinimapArrowScript.cs
@@ -146,6 +146,9 @@ public void ClearCoreArrows()
 
 	public void AddCoreArrow(ShellCore core)
 	{
+		if(coreArrows.ContainsKey(core)) 
+			return;
+
 		coreArrows.Add(core, Instantiate(arrowPrefab, transform, false).transform);
 		coreArrows[core].GetComponent<SpriteRenderer>().color = FactionColors.colors[core.faction];
 		UpdatePosition(coreArrows[core], core.transform.position, core.faction != PlayerCore.Instance.faction);

diff --git a/Assets/Scripts/HUD Scripts/SaveMenuHandler.cs b/Assets/Scripts/HUD Scripts/SaveMenuHandler.cs
@@ -114,7 +114,7 @@ void InitializeSaves()
 				else icon.transform.SetSiblingIndex(1);
 			}
 			else icon.transform.SetSiblingIndex(0);
-			if((resourcePath == "" && saves[i].resourcePath != null && !saves[i].resourcePath.Contains("main")) 
+			if((resourcePath == "" && saves[i].resourcePath != null && !saves[i].resourcePath.Contains("main") && saves[i].resourcePath != "") 
 				|| (resourcePath != "" && saves[i].resourcePath != resourcePath)) icon.gameObject.SetActive(false);
 		}
 	}

diff --git a/Assets/StreamingAssets/Sectors/main - Alpha 5.2.0/.Danger Zone 0-2070.json b/Assets/StreamingAssets/Sectors/main - Alpha 5.2.0/.Danger Zone 0-2070.json
@@ -0,0 +1 @@
+{"sectorjson":"{\"sectorName\":\"Danger Zone 0-2070\",\"bounds\":{\"x\":-120,\"y\":-1740,\"w\":380,\"h\":660},\"type\":3,\"backgroundColor\":{\"r\":0.6499999761581421,\"g\":0.0,\"b\":0.0,\"a\":1.0},\"entities\":[],\"platformData\":[],\"platform\":{\"instanceID\":0},\"targets\":[],\"hasMusic\":true,\"musicID\":\"music_overworld\",\"partDropsDisabled\":false,\"backgroundSpawns\":[],\"waveSetPath\":\"\",\"rectangleEffectSkin\":1,\"backgroundTileSkin\":1,\"shardCountSet\":[0,0,0]}","platformjson":""}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"sectorjson":"{\"sectorName\":\"Danger Zone 0-2070\",\"bounds\":{\"x\":-120,\"y\":-1740,\"w\":380,\"h\":660},\"type\":3,\"backgroundColor\":{\"r\":0.6499999761581421,\"g\":0.0,\"b\":0.0,\"a\":1.0},\"entities\":[],\"platformData\":[],\"platform\":{\"instanceID\":0},\"targets\":[],\"hasMusic\":true,\"musicID\":\"music_overworld\",\"partDropsDisabled\":false,\"backgroundSpawns\":[],\"waveSetPath\":\"\",\"rectangleEffectSkin\":1,\"backgroundTileSkin\":1,\"shardCountSet\":[0,0,0]}","platformjson":""}