Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more mat arbitrage fixes #2294

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Clothing/Masks/masks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
- type: TrashOnSolutionEmpty
solution: drink
- type: StaticPrice
price: 12.5
price: 20 # Frontier: 12.5<20

- type: entity
parent: FlaskBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
materialComposition:
Glass: 30
- type: StaticPrice # Frontier
price: 2 # Frontier
price: 3 # Frontier

- type: entity
parent: FoodPlateTrash
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
materialComposition:
Plastic: 25
- type: StaticPrice
price: 1
price: 3 # Frontier: 1<3

- type: entity
name: broken zipties
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Tools/gps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
tags:
- GPS
- type: StaticPrice
price: 25
price: 35 # Frontier: 25<35
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
stackRequirements:
Steel: 5
- type: StaticPrice
price: 12.5
price: 18 # 12.5<18
- type: Tag # Frontier
tags: # Frontier
- SmallThrusterMachineCircuitboard # Frontier
Expand Down Expand Up @@ -176,7 +176,7 @@
stackRequirements:
Glass: 2
- type: StaticPrice
price: 12.5
price: 18 # 12.5<18

- type: entity
id: SmallGyroscopeMachineCircuitboard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
51 changes: 13 additions & 38 deletions Resources/Prototypes/_NF/Recipes/Lathes/clothes.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_NF/Recipes/Lathes/electronics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
result: SmallThrusterMachineCircuitboard
category: Circuitry
completetime: 4
applyMaterialDiscount: false
materials:
Steel: 140
Glass: 300
Expand Down
Loading