more mat arbitrage fixes (#2294)

new-frontiers-14 · Oct 20, 2024 · a063ee4 · a063ee4
1 parent 3035edc
commit a063ee4
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 48 deletions.
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -181,7 +181,7 @@
       Steel: 50
       Plastic: 100
   - type: StaticPrice
-    price: 12.5 # increases in price after decomposed into raw materials # Frontier: 30<12.5 - TODO: material value rework
+    price: 15 # increases in price after decomposed into raw materials # Frontier: 30<12.5, 12.5<15 - TODO: material value rework
 
 - type: entity
   parent: ClothingMaskBase

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml
@@ -36,7 +36,7 @@
   - type: TrashOnSolutionEmpty
     solution: drink
   - type: StaticPrice
-    price: 12.5
+    price: 20 # Frontier: 12.5<20
 
 - type: entity
   parent: FlaskBase

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
@@ -79,7 +79,7 @@
       Glass: 50
   - type: SpaceGarbage
   - type: StaticPrice
-    price: 1
+    price: 4 # Frontier: 1<4, it's BIG, mkay
 
 - type: entity
   name: bowl

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
@@ -113,7 +113,7 @@
     materialComposition:
       Glass: 30
   - type: StaticPrice # Frontier
-    price: 2 # Frontier
+    price: 3 # Frontier
 
 - type: entity
   parent: FoodPlateTrash

diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -118,7 +118,7 @@
     materialComposition:
       Plastic: 25
   - type: StaticPrice
-    price: 1
+    price: 3 # Frontier: 1<3
 
 - type: entity
   name: broken zipties

diff --git a/Resources/Prototypes/Entities/Objects/Tools/gps.yml b/Resources/Prototypes/Entities/Objects/Tools/gps.yml
@@ -20,4 +20,4 @@
     tags:
     - GPS
   - type: StaticPrice
-    price: 25
+    price: 35 # Frontier: 25<35
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml
@@ -116,7 +116,7 @@
     stackRequirements:
       Steel: 5
   - type: StaticPrice
-    price: 12.5
+    price: 18 # 12.5<18
   - type: Tag # Frontier
     tags: # Frontier
     - SmallThrusterMachineCircuitboard # Frontier
@@ -176,7 +176,7 @@
     stackRequirements:
       Glass: 2
   - type: StaticPrice
-    price: 12.5
+    price: 18 # 12.5<18
 
 - type: entity
   id: SmallGyroscopeMachineCircuitboard

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/brassknuckles.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/brassknuckles.yml
@@ -31,9 +31,9 @@
     - WhitelistChameleon
   - type: PhysicalComposition
     materialComposition:
-      Brass: 1000
+      Brass: 300 # 1000<300
   - type: StaticPrice
-    price: 30 # Ensures these can be sold and have a reasonable vending value.
+    price: 30 # Ensures these can be sold and have a reasonable vending value
 
 - type: entity
   name: crass knuckles

diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/clothes.yml b/Resources/Prototypes/_NF/Recipes/Lathes/clothes.yml
@@ -1,95 +1,70 @@
 # Jumpsuits
 - type: latheRecipe
   id: ClothingUniformRandomPunkTanktop
+  parent: BaseJumpsuitRecipe
   result: ClothingUniformRandomPunkTanktop
-  completetime: 3
   category: ClothesNF
-  materials:
-    Cloth: 300
+  applyMaterialDiscount: false
 
 - type: latheRecipe
   id: ClothingUniformRandomPunkTanktopShorts
+  parent: ClothingUniformRandomPunkTanktop
   result: ClothingUniformRandomPunkTanktopShorts
-  completetime: 3
-  category: ClothesNF
-  materials:
-    Cloth: 300
 
 - type: latheRecipe
   id: ClothingUniformRandomPunkCroptop
+  parent: ClothingUniformRandomPunkTanktop
   result: ClothingUniformRandomPunkCroptop
-  completetime: 3
-  category: ClothesNF
-  materials:
-    Cloth: 300
 
 - type: latheRecipe
   id: ClothingUniformRandomPunkCroptopShorts
+  parent: ClothingUniformRandomPunkTanktop
   result: ClothingUniformRandomPunkCroptopShorts
-  completetime: 3
-  category: ClothesNF
-  materials:
-    Cloth: 300
 
 # Coats
 - type: latheRecipe
   id: ClothingOuterCoatBomberRandomized
+  parent: BaseCoatRecipe
   result: ClothingOuterCoatBomberRandomized
-  completetime: 3
   category: ClothesNF
-  materials:
-    Cloth: 300
-    Durathread: 400
+  applyMaterialDiscount: false
 
 - type: latheRecipe
   id: ClothingOuterCoatLettermanRandomized
+  parent: ClothingOuterCoatBomberRandomized
   result: ClothingOuterCoatLettermanRandomized
   completetime: 3
   category: ClothesNF
-  materials:
-    Cloth: 300
-    Durathread: 400
 
 # Belts / Webbings
 - type: latheRecipe
   id: ClothingBeltSalvageWebbing
   result: ClothingBeltSalvageWebbing
   completetime: 1
   category: ClothesNF
+  applyMaterialDiscount: false
   materials:
     Cloth: 400
 
 - type: latheRecipe
   id: ClothingBeltMercenaryWebbing
+  parent: ClothingBeltSalvageWebbing
   result: ClothingBeltMercenaryWebbing
-  completetime: 4
-  category: ClothesNF
-  materials:
-    Cloth: 400
 
 - type: latheRecipe
   id: ClothingBeltMilitaryWebbing
+  parent: ClothingBeltSalvageWebbing
   result: ClothingBeltMilitaryWebbing
-  completetime: 4
-  category: ClothesNF
-  materials:
-    Cloth: 400
 
 - type: latheRecipe
   id: ClothingBeltBandolier
+  parent: ClothingBeltSalvageWebbing
   result: ClothingBeltBandolier
-  completetime: 4
-  category: ClothesNF
-  materials:
-    Cloth: 400
 
 - type: latheRecipe
   id: ClothingBeltPunkRandomized
+  parent: ClothingBeltSalvageWebbing
   result: ClothingBeltPunkRandomized
-  completetime: 4
-  category: ClothesNF
-  materials:
-    Cloth: 400
 
 # Gloves
 - type: latheRecipe

diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml
@@ -67,6 +67,7 @@
   result: SmallThrusterMachineCircuitboard
   category: Circuitry
   completetime: 4
+  applyMaterialDiscount: false
   materials:
     Steel: 140
     Glass: 300