Merge pull request #70 from sTiKyt/trash-prices-reworked

Trash and some stuff prices implemented
new-frontiers-14 · Jul 23, 2023 · da38280 · da38280
2 parents 4ae534c + 3b4a268
commit da38280
Show file tree

Hide file tree

Showing 25 changed files with 84 additions and 7 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -11,6 +11,7 @@
                 "build",
                 "/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names.
                 "/consoleloggerparameters:NoSummary" // Do not generate summary otherwise it leads to duplicate errors in Problems panel
+
             ],
             "group": {
                 "kind": "build",
@@ -34,4 +35,4 @@
             "problemMatcher": "$msCompile"
         }
     ]
-}
+}
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
@@ -54,6 +54,8 @@
   - type: Tag
     tags:
     - Trash
+  - type: StaticPrice
+    price: 1
 
 - type: entity
   name: broken bowl
@@ -72,7 +74,7 @@
       Glass: 50
   - type: SpaceGarbage
   - type: StaticPrice
-    price: 0
+    price: 1
 
 - type: entity
   name: bowl
@@ -82,3 +84,5 @@
   components:
   - type: Sprite
     state: bowl2
+  - type: StaticPrice
+    price: 3
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/plate.yml
@@ -48,6 +48,8 @@
     materialComposition:
       Glass: 100
   - type: SpaceGarbage
+  - type: StaticPrice
+    price: 3
 
 - type: entity
   name: broken plate
@@ -62,6 +64,8 @@
     tags:
     - Trash
   - type: SpaceGarbage
+  - type: StaticPrice
+    price: 1
 
 # Small Plate
 
@@ -91,6 +95,8 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: StaticPrice
+    price: 2
 
 - type: entity
   parent: FoodPlateTrash
@@ -114,6 +120,8 @@
   - type: Tag
     tags:
     - Trash
+  - type: StaticPrice
+    price: 1
 
 - type: entity
   name: plastic plate
@@ -127,6 +135,8 @@
   - type: Tag
     tags:
     - Trash
+  - type: StaticPrice
+    price: 1
 
 # Pie Tin
 
@@ -146,3 +156,5 @@
     materialComposition:
       Steel: 100
   - type: SpaceGarbage
+  - type: StaticPrice
+    price: 1
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml
@@ -30,6 +30,8 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
+  - type: StaticPrice
+    price: 10
 
 - type: entity
   abstract: true
@@ -50,6 +52,8 @@
   - type: PhysicalComposition
     materialComposition:
       Steel: 100
+  - type: StaticPrice
+    price: 1
 # Tins
 
 # Need something that you can open these tins with. I suggest a prying or cutting tool.

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -395,7 +395,7 @@
       Steel: 100
   - type: SpaceGarbage
   - type: StaticPrice
-    price: 0
+    price: 1
 
 - type: entity
   noSpawn: true

diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml
@@ -22,3 +22,5 @@
   - type: Tag
     tags:
     - Radio
+  - type: StaticPrice
+    price: 25
diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -44,6 +44,8 @@
     - Honking
     useSound:
       collection: BikeHorn
+  - type: StaticPrice
+    price: 15
 
 - type: entity
   parent: BaseItem
@@ -84,6 +86,8 @@
     damage:
       types:
         Blunt: 5
+  - type: StaticPrice
+    price: 2
 
 
 - type: entity
@@ -130,3 +134,5 @@
   - type: Construction
     graph: BananiumHorn
     node: bananiumHorn
+  - type: StaticPrice
+    price: 20
diff --git a/Resources/Prototypes/Entities/Objects/Misc/books.yml b/Resources/Prototypes/Entities/Objects/Misc/books.yml
@@ -25,6 +25,8 @@
     backgroundImagePath: "/Textures/Interface/Paper/paper_background_book.svg.96dpi.png"
     backgroundPatchMargin: 23.0, 16.0, 14.0, 15.0
     contentMargin: 20.0, 20.0, 20.0, 20.0
+  - type: StaticPrice
+    price: 15
 
 - type: entity
   id: BookSpaceEncyclopedia
@@ -84,7 +86,7 @@
   id: BookChefGaming
   parent: BaseItem
   name: chef gaming
-  description: A book about cooking written by a gamer chef. 
+  description: A book about cooking written by a gamer chef.
   components:
   - type: Sprite
     sprite: Objects/Misc/books.rsi
@@ -156,7 +158,7 @@
   id: BookSecurity
   parent: BaseItem
   name: security 101
-  description: A book about security written by Nanotrasen. The book is stained with blood. It seems to have been used more as a weapon than reading material. 
+  description: A book about security written by Nanotrasen. The book is stained with blood. It seems to have been used more as a weapon than reading material.
   components:
   - type: Sprite
     sprite: Objects/Misc/books.rsi

diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -27,4 +27,6 @@
     materialComposition:
       Glass: 50
   - type: SpaceGarbage
+  - type: StaticPrice
+    price: 1
 
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -54,6 +54,8 @@
   - type: Appearance
   - type: Physics
     canCollide: false
+  - type: StaticPrice
+    price: 5
 
 - type: entity
   name: lamp
@@ -203,3 +205,5 @@
         - MachineMask
         layer:
         - MachineLayer
+  - type: StaticPrice
+    price: 3
diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml
@@ -21,6 +21,8 @@
     damage:
       types:
         Blunt: 0
+  - type: StaticPrice
+    price: 19
 
 - type: entity
   name: makeshift handcuffs
@@ -54,6 +56,8 @@
     sprite: Objects/Misc/cablecuffs.rsi
     state: cuff
     color: forestgreen
+  - type: StaticPrice
+    price: 6
 
 - type: entity
   name: zipties
@@ -82,6 +86,8 @@
   - type: Sprite
     sprite: Objects/Misc/zipties.rsi
     state: cuff
+  - type: StaticPrice
+    price: 9
 
 - type: entity
   id: BaseHandcuffsBroken
@@ -96,6 +102,8 @@
   - type: PhysicalComposition
     materialComposition:
       Plastic: 25
+  - type: StaticPrice
+    price: 1
 
 - type: entity
   name: broken zipties

diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml
@@ -30,6 +30,8 @@
     - Trash
   - type: Appearance
   - type: PaperVisuals
+  - type: StaticPrice
+    price: 1
 
 - type: entity
   name: office paper

diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -406,3 +406,5 @@
       sprite: Objects/Weapons/Melee/e_shield.rsi
       size: 5
       heldPrefix: eshield
+    - type: StaticPrice
+      price: 15
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -85,7 +85,7 @@
       Plastic: 50
   - type: SpaceGarbage
   - type: StaticPrice
-    price: 75 # These are limited supply items.
+    price: 35 # These are limited supply items.
   - type: TrashOnEmpty
     solution: pen
 

diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -74,3 +74,5 @@
         startValue: 10.0
         endValue: 1.0
         property: Radius
+  - type: StaticPrice
+    price: 35
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gps.yml b/Resources/Prototypes/Entities/Objects/Tools/gps.yml
@@ -12,3 +12,5 @@
   - type: Item
     sprite: Objects/Devices/gps.rsi
   - type: HandheldGPS
+  - type: StaticPrice
+    price: 25
diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml
@@ -74,6 +74,8 @@
     radius: 1.1 #smallest possible
     color: orange
   - type: Appearance
+  - type: StaticPrice
+    price: 15
 
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -7,6 +7,8 @@
     capacity: 10
   - type: Item
     size: 10
+  - type: StaticPrice
+    price: 10
 
 - type: entity
   name: match stick
@@ -40,6 +42,8 @@
     unlitIcon: match_unlit
     litIcon: match_lit
     burntIcon: match_burnt
+  - type: StaticPrice
+    price: 2
 
 - type: entity
   parent: Matchstick
@@ -51,6 +55,8 @@
       - state: match_burnt
   - type: Matchstick
     state: Burnt
+  - type: StaticPrice
+    price: 1
 
 - type: entity
   name: match box

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -44,6 +44,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/plant_rustle.ogg
+  - type: StaticPrice
+    price: 50
 
 - type: entity
   id: PottedPlant0

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
@@ -40,6 +40,8 @@
         node: monitorBroken
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: StaticPrice
+    price: 100
 
 - type: entity
   id: ComputerFrame
@@ -98,3 +100,5 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: StaticPrice
+    price: 25
diff --git a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   parent: BaseMachinePowered
   id: FaxMachineBase
   name: long range fax machine

diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -83,6 +83,8 @@
   - type: Construction
     graph: DisposalPipe
     node: broken
+  - type: StaticPrice
+    price: 1
 
 - type: entity
   id: DisposalPipe

diff --git a/Resources/Prototypes/Entities/Structures/Storage/paper_bin.yml b/Resources/Prototypes/Entities/Structures/Storage/paper_bin.yml
@@ -37,6 +37,8 @@
   - type: ContainerContainer
     containers:
       bin-container: !type:Container
+  - type: StaticPrice
+    price: 5
 
 - type: entity
   parent: PaperBin

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -26,6 +26,8 @@
             min: 1
             max: 1
         offset: 0
+  - type: StaticPrice
+    price: 30
 
 - type: entity
   parent: BaseSign
@@ -48,6 +50,8 @@
           path: /Audio/Effects/poster_broken.ogg
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: StaticPrice
+    price: 1
 
 # Contraband
 - type: entity

diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Books/hyperlinks.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Books/hyperlinks.yml
@@ -8,6 +8,8 @@
   - type: Tag
     tags:
     - Book
+  - type: StaticPrice
+    price: 35
 
 - type: entity
   parent: BaseHyperlinkBook