Merge pull request #103 from new-frontiers-14/salvage_tweaks

salvage_tweaks
new-frontiers-14 · Jul 29, 2023 · 5544b82 · 5544b82
2 parents 6fe0adb + b679bb0
commit 5544b82
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 98 deletions.
diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
@@ -60,7 +60,7 @@ public override void Update(float frameTime)
                 if (lathe.CurrentRecipe == null)
                     continue;
 
-                if (_timing.CurTime - comp.StartTime >= comp.ProductionLength)
+                if (_timing.CurTime - comp.StartTime >= (comp.ProductionLength * 3))
                     FinishProducing(uid, lathe);
             }
         }

diff --git a/Resources/Prototypes/Procedural/salvage_loot.yml b/Resources/Prototypes/Procedural/salvage_loot.yml
@@ -1,99 +1,99 @@
 # Ores
 # - Low value
-- type: salvageLoot
-  id: OreTin
-  desc: Veins of steel
-  guaranteed: true
-  loots:
-    - !type:BiomeMarkerLoot
-      proto:
-        Caves: OreTin
-        Grasslands: OreTin
-        Lava: BasaltOreTin
-        Snow: SnowOreTin
+# - type: salvageLoot
+  # id: OreTin
+  # desc: Veins of steel
+  # guaranteed: true
+  # loots:
+    # - !type:BiomeMarkerLoot
+      # proto:
+        # Caves: OreTin
+        # Grasslands: OreTin
+        # Lava: BasaltOreTin
+        # Snow: SnowOreTin
 
-- type: salvageLoot
-  id: OreQuartz
-  desc: Veins of quartz
-  guaranteed: true
-  loots:
-    - !type:BiomeMarkerLoot
-      proto:
-        Caves: OreQuartz
-        Grasslands: OreQuartz
-        Lava: BasaltOreQuartz
-        Snow: SnowOreQuartz
+# - type: salvageLoot
+  # id: OreQuartz
+  # desc: Veins of quartz
+  # guaranteed: true
+  # loots:
+    # - !type:BiomeMarkerLoot
+      # proto:
+        # Caves: OreQuartz
+        # Grasslands: OreQuartz
+        # Lava: BasaltOreQuartz
+        # Snow: SnowOreQuartz
 
 # - Medium value
-- type: salvageLoot
-  id: OreGold
-  desc: Veins of gold ore
-  guaranteed: true
-  loots:
-    - !type:BiomeMarkerLoot
-      proto:
-        Caves: OreGold
-        Grasslands: OreGold
-        Lava: BasaltOreGold
-        Snow: SnowOreGold
+# - type: salvageLoot
+  # id: OreGold
+  # desc: Veins of gold ore
+  # guaranteed: true
+  # loots:
+    # - !type:BiomeMarkerLoot
+      # proto:
+        # Caves: OreGold
+        # Grasslands: OreGold
+        # Lava: BasaltOreGold
+        # Snow: SnowOreGold
 
-- type: salvageLoot
-  id: OreSilver
-  desc: Veins of silver ore
-  guaranteed: true
-  loots:
-    - !type:BiomeMarkerLoot
-      proto:
-        Caves: OreSilver
-        Grasslands: OreSilver
-        Lava: BasaltOreSilver
-        Snow: SnowOreSilver
+# - type: salvageLoot
+  # id: OreSilver
+  # desc: Veins of silver ore
+  # guaranteed: true
+  # loots:
+    # - !type:BiomeMarkerLoot
+      # proto:
+        # Caves: OreSilver
+        # Grasslands: OreSilver
+        # Lava: BasaltOreSilver
+        # Snow: SnowOreSilver
 
 # - High value
-- type: salvageLoot
-  id: OrePlasma
-  desc: Veins of plasma ore
-  guaranteed: true
-  loots:
-    - !type:BiomeMarkerLoot
-      proto:
-        Caves: OrePlasma
-        Grasslands: OrePlasma
-        Lava: BasaltOrePlasma
-        Snow: SnowOrePlasma
+# - type: salvageLoot
+  # id: OrePlasma
+  # desc: Veins of plasma ore
+  # guaranteed: true
+  # loots:
+    # - !type:BiomeMarkerLoot
+      # proto:
+        # Caves: OrePlasma
+        # Grasslands: OrePlasma
+        # Lava: BasaltOrePlasma
+        # Snow: SnowOrePlasma
 
-- type: salvageLoot
-  id: OreUranium
-  desc: Veins of uranium ore
-  guaranteed: true
-  loots:
-    - !type:BiomeMarkerLoot
-      proto:
-        Caves: OreUranium
-        Grasslands: OreUranium
-        Lava: BasaltOreUranium
-        Snow: SnowOreUranium
+# - type: salvageLoot
+  # id: OreUranium
+  # desc: Veins of uranium ore
+  # guaranteed: true
+  # loots:
+    # - !type:BiomeMarkerLoot
+      # proto:
+        # Caves: OreUranium
+        # Grasslands: OreUranium
+        # Lava: BasaltOreUranium
+        # Snow: SnowOreUranium
 
-- type: salvageLoot
-  id: OreBananium
-  desc: Veins of bananium ore
-  guaranteed: true
-  loots:
-    - !type:BiomeMarkerLoot
-      proto:
-        Caves: OreBananium
-        Grasslands: OreBananium
-        Lava: BasaltOreBananium
-        Snow: SnowOreBananium
+# - type: salvageLoot
+  # id: OreBananium
+  # desc: Veins of bananium ore
+  # guaranteed: true
+  # loots:
+    # - !type:BiomeMarkerLoot
+      # proto:
+        # Caves: OreBananium
+        # Grasslands: OreBananium
+        # Lava: BasaltOreBananium
+        # Snow: SnowOreBananium
 
-- type: salvageLoot
-  id: OreArtifactFragment
-  desc: artifact fragment-embedded rock
-  guaranteed: true
-  loots:
-    - !type:BiomeMarkerLoot
-      proto:
-        Caves: OreArtifactFragment
-        Grasslands: OreArtifactFragment
-        Lava: BasaltOreArtifactFragment
-        Snow: SnowOreArtifactFragment
+# - type: salvageLoot
+  # id: OreArtifactFragment
+  # desc: artifact fragment-embedded rock
+  # guaranteed: true
+  # loots:
+    # - !type:BiomeMarkerLoot
+      # proto:
+        # Caves: OreArtifactFragment
+        # Grasslands: OreArtifactFragment
+        # Lava: BasaltOreArtifactFragment
+        # Snow: SnowOreArtifactFragment
diff --git a/Resources/Prototypes/Procedural/salvage_rewards.yml b/Resources/Prototypes/Procedural/salvage_rewards.yml
@@ -53,9 +53,7 @@
     SpaceCash5000: 0.5
     # custom NF14
     WeaponTetherGun: 0.5
-    WeaponForceGun: 0.5
     WeaponGrapplingGun: 0.5
-    WeaponStaffHealing: 0.25
     EnergyShield: 0.5
     TelecomServerCircuitboard: 1.0
     ComputerIFFCircuitboard: 1.0
@@ -65,6 +63,9 @@
     ScienceTechFabCircuitboard: 1.0
     SecurityTechFabCircuitboard: 0.25
     MaterialReclaimerMachineCircuitboard: 1.0
+    CratePirateChest: 0.5
+    ClothingOuterArmorReflective: 0.5
+
 
 - type: weightedRandom
   id: SalvageRewardEpic
@@ -90,5 +91,6 @@
     # Custom NF
     EnergySword: 0.5
     EnergyDagger: 0.5
-    EnergySwordDouble: 0.25
-    WeaponLauncherRocket: 1.0
+    EnergyCutlass: 0.5
+    Claymore: 0.5
+    WeaponLauncherRocket: 0.5
diff --git a/Resources/Prototypes/_NF/Shipyard/anchor.yml b/Resources/Prototypes/_NF/Shipyard/anchor.yml
@@ -14,7 +14,7 @@
   minPlayers: 0
   stations: 
     Anchor:
-      stationProto: StandardFrontierVessel
+      stationProto: StandardFrontierExpeditionVessel
       components:
         - type: StationNameSetup
           mapNameTemplate: '{0} Anchor {1}'

diff --git a/Resources/Prototypes/_NF/Shipyard/dartx.yml b/Resources/Prototypes/_NF/Shipyard/dartx.yml
@@ -14,7 +14,7 @@
   minPlayers: 0
   stations:
     DartX:
-      stationProto: StandardFrontierVessel
+      stationProto: StandardFrontierExpeditionVessel
       components:
         - type: StationNameSetup
           mapNameTemplate: '{0} Dart-X {1}'

diff --git a/Resources/Prototypes/_NF/Shipyard/default_shipyard_catalog.yml b/Resources/Prototypes/_NF/Shipyard/default_shipyard_catalog.yml
@@ -14,7 +14,7 @@
     - type: Transform
 
 - type: entity
-  id: StandardFrontierVessel
+  id: StandardFrontierExpeditionVessel
   parent:
     - BaseStation
     - BaseStationJobsSpawning
@@ -26,6 +26,18 @@
   components:
     - type: Transform
 
+- type: entity
+  id: StandardFrontierVessel
+  parent:
+    - BaseStation
+    - BaseStationJobsSpawning
+    - BaseStationRecords
+    - BaseStationAlertLevels
+    - BaseStationAllEventsEligible
+  noSpawn: true
+  components:
+    - type: Transform
+
 - type: vessel
   id: PTS
   name: NC Personal Transport
@@ -70,7 +82,7 @@
   minPlayers: 0
   stations:
     Courser:
-      stationProto: StandardFrontierVessel
+      stationProto: StandardFrontierExpeditionVessel
       components:
         - type: StationNameSetup
           mapNameTemplate: '{0} Courser-X {1}'

diff --git a/Resources/Prototypes/_NF/Shipyard/sprinter.yml b/Resources/Prototypes/_NF/Shipyard/sprinter.yml
@@ -14,7 +14,7 @@
   minPlayers: 0
   stations: 
     Sprinter:
-      stationProto: StandardFrontierVessel
+      stationProto: StandardFrontierExpeditionVessel
       components:
         - type: StationNameSetup
           mapNameTemplate: '{0} Sprinter {1}'