Shiptest Fixups (#2158)

* ShipPrice Fucky * destroy all of the invalid entity refs * No redundant value in shipyard test, revalue ships --------- Co-authored-by: Whatstone <[email protected]>
new-frontiers-14 · Oct 6, 2024 · 52c3123 · 52c3123
1 parent 2664fe8
commit 52c3123
Show file tree

Hide file tree

Showing 49 changed files with 95 additions and 588 deletions.
diff --git a/Content.IntegrationTests/Tests/_NF/ShipyardTests.cs b/Content.IntegrationTests/Tests/_NF/ShipyardTests.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using Content.Server.Cargo.Systems;
 using Content.Shared.Shipyard.Prototypes;
 using Robust.Server.GameObjects;
@@ -75,20 +75,20 @@ await server.WaitAssertion(() =>
                 foreach (var vessel in protoManager.EnumeratePrototypes<VesselPrototype>())
                 {
                     var mapId = mapManager.CreateMap();
-                    double combinedPrice = 0;
+                    double appraisePrice = 0;
 
                     Assert.That(mapLoader.TryLoad(mapId, vessel.ShuttlePath.ToString(), out var roots));
                     var shuttle = roots.FirstOrDefault(uid => entManager.HasComponent<MapGridComponent>(uid));
 
                     pricing.AppraiseGrid(shuttle, null, (uid, price) =>
                     {
-                        combinedPrice += price;
+                        appraisePrice += price;
                     });
 
-                    Assert.That(combinedPrice, Is.AtMost(vessel.Price),
-                        $"Found arbitrage on {vessel.ID} shuttle! Cost is {vessel.Price} but sell is {combinedPrice}!");
-                    Assert.That(vessel.Price - combinedPrice, Is.GreaterThan(vessel.Price * 0.05),
-                        $"Arbitrage possible on {vessel.ID}. {vessel.Price} - {combinedPrice} = {vessel.Price - combinedPrice} > 5% of the buy price!");
+                    var idealMinPrice = appraisePrice * vessel.MinPriceMarkup;
+
+                    Assert.That(vessel.Price, Is.AtLeast(idealMinPrice),
+                        $"Arbitrage possible on {vessel.ID}. Minimal price should be {idealMinPrice}, {(vessel.MinPriceMarkup - 1.0f) * 100}% over the appraise price ({appraisePrice}).");
 
                     mapManager.DeleteMap(mapId);
                 }

diff --git a/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs b/Content.Shared/Shipyard/Prototypes/VesselPrototype.cs
@@ -76,6 +76,12 @@ public sealed class VesselPrototype : IPrototype
     /// </summary>
     [DataField]
     public ProtoId<GuideEntryPrototype>? GuidebookPage = default!;
+
+    /// <summary>
+    ///     The price markup of the vessel testing
+    /// </summary>
+    [DataField]
+    public float MinPriceMarkup = 1.05f;
 }
 
 public enum VesselSize : byte

diff --git a/Resources/Maps/_NF/POI/edison.yml b/Resources/Maps/_NF/POI/edison.yml
@@ -12887,8 +12887,6 @@ entities:
       pos: 16.5,19.5
       parent: 2
     - type: DeviceList
-      configurators:
-      - invalid
       devices:
       - 1588
       - 1587
@@ -13066,8 +13064,6 @@ entities:
       pos: -13.5,14.5
       parent: 2
     - type: DeviceList
-      configurators:
-      - invalid
       devices:
       - 1750
       - 1751
@@ -13114,8 +13110,6 @@ entities:
       pos: -11.5,1.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 3947
   - uid: 1566
@@ -13124,8 +13118,6 @@ entities:
       pos: 12.5,1.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 3948
   - uid: 1567
@@ -13698,8 +13690,6 @@ entities:
       pos: -13.5,9.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 3955
       - 3956
@@ -13710,8 +13700,6 @@ entities:
       pos: -13.5,10.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 3955
       - 3956
@@ -13722,8 +13710,6 @@ entities:
       pos: -5.5,16.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 3818
       - 3817
@@ -13735,8 +13721,6 @@ entities:
       pos: -5.5,17.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 3818
       - 3817
@@ -13748,8 +13732,6 @@ entities:
       pos: -5.5,18.5
       parent: 2
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 3818
       - 3817

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml b/Resources/Maps/_NF/Shuttles/Expedition/brigand.yml
@@ -2536,8 +2536,6 @@ entities:
       pos: -0.5,-0.5
       parent: 1
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 647
   - uid: 198
@@ -2547,8 +2545,6 @@ entities:
       pos: -0.5,-4.5
       parent: 1
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 647
   - uid: 204
@@ -2558,8 +2554,6 @@ entities:
       pos: -0.5,5.5
       parent: 1
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 647
   - uid: 220
@@ -2574,8 +2568,6 @@ entities:
       pos: 0.5,5.5
       parent: 1
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 647
   - uid: 433
@@ -2591,8 +2583,6 @@ entities:
       pos: -1.5,-4.5
       parent: 1
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 647
   - uid: 450
@@ -2602,8 +2592,6 @@ entities:
       pos: 0.5,-4.5
       parent: 1
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 647
   - uid: 459
@@ -2613,8 +2601,6 @@ entities:
       pos: 0.5,-0.5
       parent: 1
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 647
   - uid: 460

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml b/Resources/Maps/_NF/Shuttles/Expedition/decadedove.yml
@@ -3111,11 +3111,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-5.5
       parent: 1
-    - type: DeviceNetwork
-      configurators:
-      - invalid
-      deviceLists:
-      - 2
 - proto: FloorDrain
   entities:
   - uid: 729

diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml b/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml
@@ -4429,9 +4429,6 @@ entities:
     - type: Transform
       pos: 8.5,-12.5
       parent: 2
-    - type: DeviceNetwork
-      configurators:
-      - invalid
 - proto: SurveillanceCameraSecurity
   entities:
   - uid: 244
@@ -4557,9 +4554,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-18.5
       parent: 2
-    - type: DeviceNetwork
-      configurators:
-      - invalid
     - type: SurveillanceCamera
       setupAvailableNetworks:
       - SurveillanceCameraSecurity

diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml
@@ -1745,9 +1745,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,7.5
       parent: 1
-    - type: DeviceNetwork
-      configurators:
-      - invalid
 - proto: ConveyorBelt
   entities:
   - uid: 224
@@ -3200,9 +3197,6 @@ entities:
     - type: Transform
       pos: -1.5,8.5
       parent: 1
-    - type: DeviceNetwork
-      configurators:
-      - invalid
 - proto: SurveillanceCameraSecurity
   entities:
   - uid: 418

diff --git a/Resources/Maps/_NF/Shuttles/Scrap/point.yml b/Resources/Maps/_NF/Shuttles/Scrap/point.yml
@@ -1234,8 +1234,6 @@ entities:
       pos: 1.5,1.5
       parent: 1
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 58
 - proto: FirelockEdge
@@ -1520,8 +1518,6 @@ entities:
       pos: 4.5,0.5
       parent: 1
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 58
     - type: AtmosPipeColor
@@ -1546,8 +1542,6 @@ entities:
       pos: 2.5,0.5
       parent: 1
     - type: DeviceNetwork
-      configurators:
-      - invalid
       deviceLists:
       - 58
     - type: AtmosPipeColor

diff --git a/Resources/Maps/_NF/Shuttles/Sr/broom.yml b/Resources/Maps/_NF/Shuttles/Sr/broom.yml
@@ -509,9 +509,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,0.5
       parent: 1
-    - type: DeviceNetwork
-      configurators:
-      - invalid
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -521,9 +518,6 @@ entities:
     - type: Transform
       pos: 1.5,-0.5
       parent: 1
-    - type: DeviceNetwork
-      configurators:
-      - invalid
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GravityGeneratorMini