Skip to content

Commit

Permalink
Replace the materials crate (#2652)
Browse files Browse the repository at this point in the history
* Yeet

* Update dungeon_items_general.yml

* Update migration.yml

* New locker look
  • Loading branch information
dvir001 authored Jan 10, 2025
1 parent ca9fff9 commit 7848475
Show file tree
Hide file tree
Showing 16 changed files with 67 additions and 29 deletions.
11 changes: 0 additions & 11 deletions Resources/Prototypes/_NF/Catalog/Cargo/cargo_materials.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
- type: cargoProduct
id: Materials
abstract: true
icon:
sprite: Objects/Materials/Sheets/metal.rsi
state: steel_3
product: CrateMaterials
cost: 8400 # TODO: Lower the cost back when possible
category: cargoproduct-category-name-materials
group: market

- type: cargoProduct
id: MaterialUranium
abstract: true
Expand Down
14 changes: 0 additions & 14 deletions Resources/Prototypes/_NF/Catalog/Fills/Crates/materials.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
- type: entity
id: CrateMaterials
parent: CrateGenericSteel
name: materials crate
description: 1 stack of glass, plastic, steel, plasma and plasteel.
components:
- type: StorageFill
contents:
- id: SheetGlass
- id: SheetPlastic
- id: SheetSteel
- id: SheetPlasma
- id: SheetPlasteel

- type: entity
id: CrateMaterialMetalRods
parent: CrateGenericSteel
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Fills/Lockers/misc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# region Materials
- type: entity
parent: [ LockerMaterials, StorageFillMaterialsBasic ]
id: LockerMaterialsBasicFilled
suffix: Filled, Basic Materials (full)

- type: entity
parent: [ LockerMaterials, StorageFillMaterialsBasic10 ]
id: LockerMaterialsBasic10Filled
suffix: Filled, Basic Materials (10)
# endregion Materials
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
state: icon
- type: RandomSpawner
prototypes:
- CrateMaterials
- CrateMaterialGlass
- CrateMaterialPlastic
- CrateMaterialPlasteel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@
- CrateMaterialPlasma
- CrateMaterialUranium
- CrateMaterialTextiles
- CrateMaterials
- CrateMaterialBrass
- WeldingFuelTankFull
# Filled crates
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,6 @@
- CrateMaterialPlasma
- CrateMaterialUranium
- CrateMaterialTextiles
- CrateMaterials
- CrateMaterialBrass
- CrateMaterialMetalRods
- CrateMaterialPaper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@
- CrateMaterialPlasma
- CrateMaterialUranium
- CrateMaterialTextiles
- CrateMaterials
- CrateMaterialBrass
- CrateMaterialMetalRods
- CrateMaterialPaper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,41 @@
stateDoorOpen: pilot_open
stateDoorClosed: pilot_door

# Materials
- type: entity
id: LockerMaterials
parent: NFLockerBaseSecure
name: materials locker
components:
- type: Appearance
- type: EntityStorageVisuals
stateBaseClosed: secure
stateDoorOpen: secure_open
stateDoorClosed: secure_door
- type: GenericVisualizer
visuals:
enum.StorageVisuals.Open:
decal1:
True: { visible: false }
False: { visible: true }
decal2:
True: { visible: false }
False: { visible: true }
- type: Sprite
layers:
- state: secure
map: ["enum.StorageVisualLayers.Base"]
- state: secure_door
map: ["enum.StorageVisualLayers.Door"]
- state: door-decal-engi-01
map: [ decal1 ]
color: "#ad8c27"
- state: welded
visible: false
map: ["enum.WeldableLayers.BaseWelded"]
- state: locked
map: ["enum.LockVisualLayers.Lock"]

# Wooden Cabinet
- type: entity
id: LockerWoodenGeneric
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions Resources/Textures/_NF/Structures/Storage/closet.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,21 @@
{
"name": "generic"
},
{
"name": "secure_door"
},
{
"name": "secure_open"
},
{
"name": "secure"
},
{
"name": "generic_door"
},
{
"name": "generic_open"
},
{
"name": "locked"
},
Expand Down Expand Up @@ -135,6 +147,12 @@
},
{
"name": "o2n2_door"
},
{
"name": "door-decal-engi-01"
},
{
"name": "door-decal-null"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Resources/_NF/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@ ScienceTechFab: UnfinishedMachineFrame
ScienceTechFabCircuitboard: ProtolatheMachineCircuitboard
ScienceTechFabFlatpack: ProtolatheFlatpack

# 2024-12-27 Materials crate
CrateMaterials: LockerMaterialsBasicFilled

# 2025-01-05 Lights
ColoredLightTubeRed: LightTubeCrystalRed
ColoredBlueLightTube: LightTubeCrystalBlue
Expand Down

0 comments on commit 7848475

Please sign in to comment.