Merge branch 'development' of https://github.com/Sandrem/FlyCasual in…

…to development
Sandrem · Mar 30, 2019 · 5ae19a5 · 5ae19a5
2 parents a988120 + 35405c3
commit 5ae19a5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/Assets/Scripts/Model/Content/SecondEdition/Upgrades/Crew/BobaFett.cs b/Assets/Scripts/Model/Content/SecondEdition/Upgrades/Crew/BobaFett.cs
@@ -87,7 +87,7 @@ private bool SetupFilter()
                 DistanceInfo distInfo = new DistanceInfo(HostShip, enemyShip);
                 if (distInfo.Range < 4)
                 {
-                    Messages.ShowErrorToHuman("Boba Fett's Ability: Invalid location for this ship:\nThe range to " + enemyShip.PilotInfo.PilotName + " is " + distInfo.Range + ".  It must be beyond range 3.");
+                    Messages.ShowErrorToHuman("Boba Fett's Ability: The range to the closest enemy is " + distInfo.Range + ".  It must be beyond range 3.");
                     return false;
                 }
             }

diff --git a/Assets/Scripts/Model/Phases/SubPhases/ActivationSubPhase.cs b/Assets/Scripts/Model/Phases/SubPhases/ActivationSubPhase.cs
@@ -142,7 +142,7 @@ public override bool ThisShipCanBeSelected(GenericShip ship, int mouseKeyIsPress
             }
             else
             {
-                Messages.ShowErrorToHuman(ship.PilotInfo.PilotName + " cannot be selected.\n The ship must be owned by " + RequiredPlayer + " and have a pilot skill of " + RequiredPilotSkill);
+                Messages.ShowErrorToHuman("This ship cannot be selected. The ship must be owned by " + RequiredPlayer + " and have a pilot skill of " + RequiredPilotSkill + ".");
             }
             return result;
         }

diff --git a/Assets/Scripts/Model/Phases/SubPhases/CombatSubPhase.cs b/Assets/Scripts/Model/Phases/SubPhases/CombatSubPhase.cs
@@ -172,7 +172,7 @@ public override bool ThisShipCanBeSelected(GenericShip ship, int mouseKeyIsPress
             }
             else
             {
-                Messages.ShowErrorToHuman(ship.PilotInfo.PilotName + " cannot be selected.  \nThe ship must be owned by " + Tools.PlayerToInt(RequiredPlayer) + " and have an initiative of " + RequiredPilotSkill);
+                Messages.ShowErrorToHuman("This ship cannot be selected.  The ship must be owned by " + Tools.PlayerToInt(RequiredPlayer) + " and have an initiative of " + RequiredPilotSkill + ".");
             }
 
             return result;

diff --git a/Assets/Scripts/Model/Phases/SubPhases/GenericSubPhase.cs b/Assets/Scripts/Model/Phases/SubPhases/GenericSubPhase.cs
@@ -82,7 +82,7 @@ public virtual bool ThisShipCanBeSelected(GenericShip ship, int mouseKeyIsPresse
             }
             else
             {
-                Messages.ShowErrorToHuman(ship.PilotName + " cannot be selected.\n The ship must be owned by " + Phases.CurrentSubPhase.RequiredPlayer + " and have a pilot skill of " + Phases.CurrentSubPhase.RequiredPilotSkill);
+                Messages.ShowErrorToHuman("This ship cannot be selected. The ship must be owned by " + Phases.CurrentSubPhase.RequiredPlayer + " and have a pilot skill of " + Phases.CurrentSubPhase.RequiredPilotSkill + ".");
             }
             return result;
         }

diff --git a/Assets/Scripts/Model/Phases/SubPhases/SetupSubPhase.cs b/Assets/Scripts/Model/Phases/SubPhases/SetupSubPhase.cs
@@ -145,7 +145,7 @@ public override bool ThisShipCanBeSelected(GenericShip ship, int mouseKeyIsPress
             }
             else
             {
-                Messages.ShowErrorToHuman(ship.PilotInfo.PilotName + " cannot be selected:\n The ship must be owned by " + Phases.CurrentSubPhase.RequiredPlayer + " and have a pilot skill of " + Phases.CurrentSubPhase.RequiredPilotSkill);
+                Messages.ShowErrorToHuman("This ship cannot be selected. The ship must be owned by " + Phases.CurrentSubPhase.RequiredPlayer + " and have a pilot skill of " + Phases.CurrentSubPhase.RequiredPilotSkill + ".");
             }
             return result;
         }

diff --git a/Assets/_TerrainAutoUpgrade.meta b/Assets/_TerrainAutoUpgrade.meta
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 else
                 {
-                    Messages.ShowErrorToHuman(ship.PilotInfo.PilotName + " cannot be selected.\n The ship must be owned by " + RequiredPlayer + " and have a pilot skill of " + RequiredPilotSkill);
+                    Messages.ShowErrorToHuman("This ship cannot be selected. The ship must be owned by " + RequiredPlayer + " and have a pilot skill of " + RequiredPilotSkill + ".");
                 }
                 return result;
             }
@@ Expand Down @@