Added some warnings in the ship designer.

Pulsar4xDevs · Dec 13, 2024 · 52899e8 · 52899e8
1 parent fa44de1
commit 52899e8
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 10 deletions.
diff --git a/Pulsar4X/GameEngine/Storage/StorageSpaceProcessor.cs b/Pulsar4X/GameEngine/Storage/StorageSpaceProcessor.cs
@@ -80,12 +80,12 @@ internal static (int rate, double range) CalcRateAndRange(ComponentInstancesDB i
                     }
                 }
             }
-            int finalRate = (int)(rate / i);
+            int finalRate = (int)rate;
             double finalRange = range / i;
             return (finalRate, finalRange);
         }
 
-        internal static Dictionary<string, double> CalculatedMaxStorage(ShipDesign shipDesign)
+        public static Dictionary<string, double> CalculatedMaxStorage(ShipDesign shipDesign)
         {         
             Dictionary<string, double> calculatedMaxStorage = new ();
             foreach (var component in shipDesign.Components)
@@ -102,7 +102,7 @@ internal static Dictionary<string, double> CalculatedMaxStorage(ShipDesign shipD
             return calculatedMaxStorage;
         }
 
-        internal static (int rate, double range) CalcRateAndRange(ShipDesign shipDesign)
+        public static (int rate, double range) CalcRateAndRange(ShipDesign shipDesign)
         {
             double rate = 0;
             double range = 0;
@@ -112,12 +112,12 @@ internal static (int rate, double range) CalcRateAndRange(ShipDesign shipDesign)
                 if (component.design.HasAttribute<CargoTransferAtb>())
                 {
                     var atbdata = component.design.GetAttribute<CargoTransferAtb>();
-                    rate += atbdata.TransferRate_kgs;
+                    rate += atbdata.TransferRate_kgs * component.count;
                     range += atbdata.TransferRange_ms;
                     i++;
                 }
             }
-            int finalRate = (int)(rate / i);
+            int finalRate = (int)rate;
             double finalRange = range / i;
             return (finalRate, finalRange);
         }

diff --git a/Pulsar4X/Pulsar4X.Client/Interface/Windows/ShipDesignWindow.cs b/Pulsar4X/Pulsar4X.Client/Interface/Windows/ShipDesignWindow.cs
@@ -17,6 +17,7 @@
 using Pulsar4X.Storage;
 using Pulsar4X.Movement;
 using Pulsar4X.Names;
+using SDL2;
 
 namespace Pulsar4X.SDL2UI
 {
@@ -703,6 +704,11 @@ internal void DisplayStats()
                 ImGui.PopStyleColor();
             }
 
+            foreach (var warning in Warnings())
+            {
+                ImGui.Text(warning);
+            }
+
             ImGui.NewLine();
             NewShipButton();
             ImGui.SameLine();
@@ -780,6 +786,7 @@ private void UpdateShipStats()
                     estor += atb.MaxStore * component.count;
                 }
 
+                /*
                 if (component.design.HasAttribute<CargoStorageAtb>())
                 {
                     var atb = component.design.GetAttribute<CargoStorageAtb>();
@@ -795,9 +802,20 @@ private void UpdateShipStats()
                 {
                     var atb = component.design.GetAttribute<CargoTransferAtb>();
                     //atb.TransferRange_ms
-                }
+                    
+                }*/
             }
 
+            cstore = StorageSpaceProcessor.CalculatedMaxStorage(_workingDesign);
+            var cargoTransfer = StorageSpaceProcessor.CalcRateAndRange(_workingDesign);
+            foreach (var store in cstore)
+            {
+                if (store.Key != thrusterFuel)
+                    _cvol += store.Value;
+            }
+
+
+
             _armorMass = ShipDesign.GetArmorMass(_profile, _uiState.Faction.GetDataBlob<FactionInfoDB>().Data.CargoGoods);
             mass += (long)Math.Round(_armorMass);
 
@@ -813,6 +831,8 @@ private void UpdateShipStats()
             _wspd = WarpMath.MaxSpeedCalc(wp, mass);
             _egen = egen;
             _estor = estor;
+            _trate = cargoTransfer.rate;
+            _trnge = cargoTransfer.range;
             //double fuelMass = 0;
             if (thrusterFuel.IsNotNullOrEmpty())
             {
@@ -883,11 +903,24 @@ internal void DisplayImage(float maxwidth, float maxheight)
                 ImGui.Image(_shipImgPtr, new System.Numerics.Vector2(rawimagewidth * scale, rawimageheight * scale));
             }
         }
-
-        private List<string> _warningString = new List<string>();
-        private void Warnings()
+
+        private List<string> Warnings()
         {
-            //if(_workingDesign.Components.)
+            List<string> warnings = new List<string>();
+            if (_cvol > 0 && _trate == 0 || _trnge == 0)
+            {
+                warnings.Add("This ship has cargo space but no way to transfer cargo by itself");
+            }
+            if (_wspd == 0)
+            {
+                warnings.Add("This ship has no warp ability");
+            }
+
+            if (_ttwr == 0)
+            {
+                warnings.Add("This ship has no newtonion thrust");
+            }
+            return warnings;
         }
     }
 }