From acc8093f9a0b1329b906dbb21f22dc7de70cdaca Mon Sep 17 00:00:00 2001 From: Red <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 2 Jun 2025 18:06:56 +0300 Subject: [PATCH] More economy fixes (#1356) * fic * Update base_instruments.yml * fix * Update chests.yml --- .../Entities/Objects/Fun/Instruments/base_instruments.yml | 4 ++-- .../Prototypes/_CP14/Entities/Objects/Materials/simple.yml | 6 ++++++ .../_CP14/Entities/Structures/Storage/Crates/base_chest.yml | 2 +- .../_CP14/Entities/Structures/Storage/Crates/coffin.yml | 6 ++++++ .../_CP14/Recipes/Construction/Graphs/Storage/coffins.yml | 4 ++-- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml index d6bd2e949a..9e37dcd57b 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml @@ -18,8 +18,8 @@ type: InstrumentBoundUserInterface - type: Item size: Normal - - type: StaticPrice - price: 200 + #- type: StaticPrice + # price: 200 #These are for instruments that are larger, can't be picked up, or have collision - type: entity diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml index d06372a927..03a2fad0d1 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml @@ -10,6 +10,9 @@ - type: Sprite sprite: _CP14/Objects/Materials/string.rsi state: icon + - type: PhysicalComposition + materialComposition: + CP14Cloth: 5 - type: entity id: CP14Web @@ -34,6 +37,9 @@ icon2: "" icon3: "" icon4: "" + - type: PhysicalComposition + materialComposition: + CP14Cloth: 2 - type: entity id: CP14Cloth1 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml index 856c2da767..fe65ae7370 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml @@ -52,7 +52,7 @@ paper_label: !type:ContainerSlot - type: ItemSlots - type: StaticPrice - price: 50 + price: 5 - type: CP14Lock #Empty, for installing new locks - type: Lock locked: false diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml index 4690ca2bd7..2f2ecc1717 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml @@ -41,3 +41,9 @@ node: CP14CrateCoffin containers: - entity_storage + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 30 + CP14Cloth: 20 + - type: EntityStorage + capacity: 1 diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml index f980e2f899..e3a04cdedc 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml @@ -11,7 +11,7 @@ - !type:SnapToGrid steps: - material: CP14WoodenPlanks - amount: 2 + amount: 3 doAfter: 2 - material: CP14Cloth amount: 2 @@ -26,7 +26,7 @@ completed: - !type:SpawnPrototype prototype: CP14WoodenPlanks1 - amount: 2 + amount: 3 - !type:SpawnPrototype prototype: CP14Cloth1 amount: 2