v2.5.20241101.05 Update

Author: Baledin

Assets/Scripts/Global/CloudServices.cs

@@ -20,16 +20,26 @@ private void Start()
         AnalyticsService.Instance.StartDataCollection();
     }
 
-    async void Awake()
+    private async void Awake()
     {
+        await InitializeUnityServices();
         await InitializeRemoteConfigAsync();
-        await RemoteConfigService.Instance.FetchConfigsAsync(new UserAttributes(), new AppAttributes());
+    }
+
+    async Task InitializeUnityServices()
+    {
+        if (UnityServices.State == ServicesInitializationState.Uninitialized)
+        {
+            await UnityServices.InitializeAsync();
+        }
     }
 
     async Task InitializeRemoteConfigAsync()
     {
-        // initialize handlers for unity game services / remote config
-        await UnityServices.InitializeAsync();
+        if (RemoteConfigService.Instance.requestStatus == ConfigRequestStatus.None)
+        {
+            await RemoteConfigService.Instance.FetchConfigsAsync(new UserAttributes(), new AppAttributes());
+        }
     }
 }
 

Assets/Scripts/Global/Global.cs

@@ -12,8 +12,8 @@ public class Global : MonoBehaviour {
 
     private static bool isAlreadyInitialized;
 
-    public static string CurrentVersion = "v2.5.20241101.04";
-    public static int CurrentVersionInt = 102504004;  // literal(10) XwingVersion(25) Update#(increments) Patch#(increments)
+    public static string CurrentVersion = "v2.5.20241101.05";
+    public static int CurrentVersionInt = 102504005;  // literal(10) XwingVersion(25) Update#(increments) Patch#(increments)
     public static int LatestVersionInt  = 0;
 
     public static SquadBuilder SquadBuilder { get; set;}

Assets/Scripts/Model/Content/SecondEdition/Pilots/FO/XiClassLightShuttle/AgentTierny.cs

@@ -126,15 +126,14 @@ public override void WhenAssigned()
             Host.OnAttackStartAsAttacker += CheckAlliedStress;
             GenericShip.OnFaceupCritCardReadyToBeDealtGlobal += CheckRemoveBrokenTrust;
             Host.OnAttackFinish += CheckRemoveBrokenTrust;
-            Host.OnAttackFinishAsAttacker += CheckRemoveBrokenTrust;
         }
-
+        
         public override void WhenRemoved()
         {
             Host.OnCheckIsFriendly -= TreatAsAllied;
             Host.OnAttackStartAsAttacker -= CheckAlliedStress;
             GenericShip.OnFaceupCritCardReadyToBeDealtGlobal -= CheckRemoveBrokenTrust;
-            Host.OnAttackFinishAsAttacker -= CheckRemoveBrokenTrust;
+            Host.OnAttackFinish -= CheckRemoveBrokenTrust;
         }
 
         public void CheckRemoveBrokenTrust(GenericShip ship)

Assets/Scripts/Model/Content/SecondEdition/Pilots/Scum/YV666LightFreighter/MoraloEval.cs

@@ -70,7 +70,7 @@ private void CheckAbility(ref bool shouldBeDestroyed, Direction direction)
                 HostShip.SpendCharge();
                 shouldBeDestroyed = false;
 
-                Messages.ShowInfo(HostShip.PilotInfo.PilotName + " has been moved to the Reserve");
+                Messages.ShowInfo($"{HostShip.PilotInfo.PilotName} has been moved to Reserve");
 
                 Roster.MoveToReserve(HostShip);
 
@@ -92,7 +92,7 @@ private void SetupShip(object sender, System.EventArgs e)
             var subphase = Phases.StartTemporarySubPhaseNew<SetupShipMidgameSubPhase>(
                 "Setup",
                 delegate {
-                    Messages.ShowInfo(HostShip.PilotInfo.PilotName + " has returned to the play area");
+                    Messages.ShowInfo($"{HostShip.PilotInfo.PilotName} has returned to the play area");
                     Triggers.FinishTrigger();
                 }
             );

Assets/Scripts/Model/Roster/ShipRoster.cs

@@ -1,14 +1,16 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
+using GameCommands;
+using Obstacles;
 using Players;
+using Remote;
 using Ship;
 using SquadBuilderNS;
 using System;
-using GameCommands;
-using Obstacles;
-using Remote;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using Upgrade;
+using UpgradesList.SecondEdition;
 
 public static partial class Roster
 {
@@ -410,6 +412,8 @@ public static void MoveToReserve(GenericShip ship)
         AllUnits.Remove("ShipId:" + ship.ShipId);
         ship.Owner.Units.Remove("ShipId:" + ship.ShipId);
 
+        DisableUpgrades(ship);
+
         Reserve.Add(ship);
     }
 
@@ -422,6 +426,8 @@ public static void ReturnFromReserve(GenericShip ship)
         AllUnits.Add("ShipId:" + ship.ShipId, ship);
         ship.Owner.Units.Add("ShipId:" + ship.ShipId, ship);
 
+        EnableUpgrades(ship);
+
         Reserve.Remove(ship);
     }
 
@@ -432,4 +438,26 @@ public static void ToggleCalculatingStatus(PlayerNo playerNo, bool isActive)
         Roster.GetPlayer(playerNo).PlayerInfoPanel.transform.Find("StatusPanel").gameObject.SetActive(isActive);
     }
 
+    public static void DisableUpgrades(GenericShip ship)
+    {
+        foreach (GenericUpgrade upgrade in ship.UpgradeBar.GetUpgradesOnlyFaceup()) {
+            if(!ReserveUpgrades(upgrade))    
+                upgrade.DeactivateAbility();
+        }
+    }
+
+    public static void EnableUpgrades(GenericShip ship)
+    {
+        foreach (GenericUpgrade upgrade in ship.UpgradeBar.GetUpgradesOnlyFaceup())
+        {
+            if (!ReserveUpgrades(upgrade))
+                upgrade.ActivateAbility();
+        }
+    }
+
+    // Return true if upgrade allows moving to Reserve, this is to prevent deactivating the ability to return from reserve
+    public static bool ReserveUpgrades(GenericUpgrade upgrade)
+    {
+        return upgrade is BobaFett;
+    }
 }

Assets/Scripts/Model/Rules/RulesList/IonizationRule.cs

@@ -35,6 +35,8 @@ private static void RegisterRemoveIonization(GenericShip ship)
         {
             if (BoardTools.Board.IsOffTheBoard(ship)) return;
 
+            ship.AssignedManeuver.IsIonManeuver = true;
+
             ship.OnMovementExecuted -= RegisterRemoveIonization;
 
             Triggers.RegisterTrigger(new Trigger