Display design combat speed with two decimal places instead of zero (#…

…262)
ekolis · Jan 21, 2023 · b86808c · b86808c
1 parent 1c1bac6
commit b86808c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/FrEee.WinForms/Controls/DesignReport.cs b/FrEee.WinForms/Controls/DesignReport.cs
@@ -67,7 +67,7 @@ public void Bind()
  resMaintMin.Amount = Design.MaintenanceCost[Resource.Minerals];
  resMaintOrg.Amount = Design.MaintenanceCost[Resource.Organics];
  resMaintRad.Amount = Design.MaintenanceCost[Resource.Radioactives];
- txtSpeed.Text = Design.StrategicSpeed.ToString() + " sec/turn; " + Design.CombatSpeed.ToString() + "km/s";
+ txtSpeed.Text = Design.StrategicSpeed.ToString() + " sec/turn; " + Design.CombatSpeed.ToString("f2") + "km/s";
  var genPerTurn = Design.GetAbilityValue("Supply Generation Per Turn").ToInt();
  var genPerStar = Design.GetAbilityValue("Solar Supply Generation").ToInt();
  txtSupplyStorage.Text = "Cap. " + Design.SupplyStorage.ToUnitString(true) + ", " + genPerTurn.ToUnitString(true) + "/turn, " + genPerStar.ToUnitString(true) + "/star, -" + Design.SupplyUsagePerSector + "/sector";
@@ -137,4 +137,4 @@ private void picPortrait_Click(object sender, System.EventArgs e)
  picPortrait.ShowFullSize(Design.Name);
  }
  }
-}
+}
diff --git a/FrEee.WinForms/Forms/VehicleDesignForm.cs b/FrEee.WinForms/Forms/VehicleDesignForm.cs
@@ -1,4 +1,4 @@
-using FrEee.Game.Interfaces;
+using FrEee.Game.Interfaces;
 using FrEee.Game.Objects.Civilization;
 using FrEee.Game.Objects.Space;
 using FrEee.Game.Objects.Technology;
@@ -177,7 +177,7 @@ private void BindDesignData()
  resCostMin.Amount = Design.Cost[Resource.Minerals];
  resCostOrg.Amount = Design.Cost[Resource.Organics];
  resCostRad.Amount = Design.Cost[Resource.Radioactives];
- txtSpeed.Text = Design.StrategicSpeed.ToString() + " sec/turn; " + Design.CombatSpeed;
+ txtSpeed.Text = Design.StrategicSpeed.ToString() + " sec/turn; " + Design.CombatSpeed.ToString("f2");
 
  var genPerTurn = Design.GetAbilityValue("Supply Generation Per Turn").ToInt();
  var genPerStar = Design.GetAbilityValue("Solar Supply Generation").ToInt();
@@ -563,4 +563,4 @@ public MountInfo(Mount mount)
  public string ShortName { get { return Mount == null ? "(No Mount)" : Mount.ShortName.Value; } }
  }
  }
-}
+}
diff --git a/FrEee/Game/Interfaces/IDesign.cs b/FrEee/Game/Interfaces/IDesign.cs
@@ -28,7 +28,7 @@ public interface IDesign : INamed, IPictorial, IOwnableAbilityObject, IConstruct
  /// <summary>
  /// The movement speed of the design in combat.
  /// </summary>
- int CombatSpeed { get; }
+ double CombatSpeed { get; }
 
  /// <summary>
  /// The vehicle's components.

diff --git a/FrEee/Game/Objects/Vehicles/Design.cs b/FrEee/Game/Objects/Vehicles/Design.cs
@@ -1,4 +1,4 @@
-using FrEee.Game.Enumerations;
+using FrEee.Game.Enumerations;
 using FrEee.Game.Interfaces;
 using FrEee.Game.Objects.Abilities;
 using FrEee.Game.Objects.Civilization;
@@ -178,7 +178,9 @@ public IEnumerable<IAbilityObject> Children
  get { return new IAbilityObject[] { Hull }.Concat(Components); }
  }
 
- public int CombatSpeed => Mod.Current.Settings.CombatSpeedPercentPerStrategicSpeed.PercentOfRounded(StrategicSpeed) + this.GetAbilityValue("Combat Movement").ToInt();
+ public double CombatSpeed
+ => Mod.Current.Settings.CombatSpeedPercentPerStrategicSpeed.PercentOf(StrategicSpeed)
+ + this.GetAbilityValue("Combat Movement").ToDouble();
 
  /// <summary>
  /// The components used in this design.