juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

You can now see paper on crates (with color!) (#26834)

Browse Source 
* Implement changes on not-cooked branch

* Made it work

* Fix update appearance calls

* Fix extra indents, clean-up code, fix tests hopefully

* Fix hammy cagecrate

* Fix messing up the yml, add artifact crate specific labels back in

* Visual Studio hates yml, sad

* Seperate the colors for cargonia

* sorry json

* make label move with artifact door

* Apply suggestion changes

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Fix remaining crate offsets, add a few for livestock and graves (why are you labeling graves) and coffin label sprites (why are you labeling coffins??)

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
This commit is contained in:
Verm
2024-04-13 22:39:02 -05:00
committed by GitHub
parent cb4561fe96
commit 96ad9002f1
33 changed files with 275 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Resources/Prototypes/Entities/Objects/Misc/paper.yml
View File

@@ -15,6 +15,7 @@
map: ["enum.PaperVisualLayers.Stamp"]
visible: false
- type: Paper
- type: PaperLabelType
- type: ActivatableUI
key: enum.PaperUiKey.Key
closeOnHandDeselect: false
@@ -143,6 +144,8 @@
- state: paper_stamp-generic
map: ["enum.PaperVisualLayers.Stamp"]
visible: false
- type: PaperLabelType
paperType: CaptainsPaper
- type: PaperVisuals
headerImagePath: "/Textures/Interface/Paper/paper_heading_captains_thoughts.svg.96dpi.png"
backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png"
@@ -160,19 +163,21 @@
sprite: Objects/Misc/bureaucracy.rsi
layers:
- state: paper
color: "#f7e574"
color: "#9ef5ff"
- state: paper_words
map: ["enum.PaperVisualLayers.Writing"]
color: "#f7e574"
color: "#9ef5ff"
visible: false
- state: paper_stamp-generic
map: ["enum.PaperVisualLayers.Stamp"]
visible: false
- type: PaperLabelType
paperType: Invoice
- type: PaperVisuals
backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png"
contentImagePath: "/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png"
backgroundModulate: "#f7e574"
contentImageModulate: "#f7e574"
backgroundModulate: "#9ef5ff"
contentImageModulate: "#9ef5ff"
backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0
contentMargin: 16.0, 16.0, 16.0, 16.0
headerImagePath: "/Textures/Interface/Paper/paper_heading_cargo_invoice.svg.96dpi.png"
@@ -184,6 +189,29 @@
name: bounty manifest
description: A paper label designating a crate as containing a bounty. Selling a crate with this label will fulfill the bounty.
components:
- type: Sprite
sprite: Objects/Misc/bureaucracy.rsi
layers:
- state: paper
color: "#f7e574"
- state: paper_words
map: ["enum.PaperVisualLayers.Writing"]
color: "#f7e574"
visible: false
- state: paper_stamp-generic
map: ["enum.PaperVisualLayers.Stamp"]
visible: false
- type: PaperLabelType
paperType: Bounty
- type: PaperVisuals
backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png"
contentImagePath: "/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png"
backgroundModulate: "#f7e574"
contentImageModulate: "#f7e574"
backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0
contentMargin: 16.0, 16.0, 16.0, 16.0
headerImagePath: "/Textures/Interface/Paper/paper_heading_cargo_invoice.svg.96dpi.png"
headerMargin: 0.0, 12.0, 0.0, 0.0
- type: CargoBountyLabel
- type: StaticPrice
price: 0

12
Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
View File

@@ -17,8 +17,8 @@
visible: false
- state: open_overlay
map: ["enum.StorageVisualLayers.Door"]
- state: label_overlay
map: ["enum.BodyBagVisualLayers.Label"]
- state: paper
map: ["enum.PaperLabelVisuals.Layer"]
- type: Icon
sprite: Objects/Specific/Medical/Morgue/bodybags.rsi
state: bag
@@ -62,9 +62,15 @@
- type: GenericVisualizer
visuals:
enum.PaperLabelVisuals.HasLabel:
enum.BodyBagVisualLayers.Label:
enum.PaperLabelVisuals.Layer:
True: {visible: true}
False: {visible: false}
enum.PaperLabelVisuals.LabelType:
enum.PaperLabelVisuals.Layer:
Paper: { state: paper }
Bounty: { state: bounty }
CaptainsPaper: { state: captains_paper }
Invoice: { state: invoice }
enum.FoldedVisuals.State:
foldedLayer:
True: {visible: true}

21
Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
View File

@@ -1,4 +1,4 @@
- type: entity
- type: entity
id: CrateArtifactContainer
parent: BaseStructureDynamic
name: artifact container
@@ -24,6 +24,8 @@
- state: locked
map: ["enum.LockVisualLayers.Lock"]
shader: unshaded
- state: paper
map: ["enum.PaperLabelVisuals.Layer"]
- type: InteractionOutline
- type: Physics
- type: Fixtures
@@ -73,6 +75,23 @@
- type: EntityStorageVisuals
stateDoorOpen: artifact_container_open
stateDoorClosed: artifact_container_door
- type: GenericVisualizer
visuals:
enum.PaperLabelVisuals.HasLabel:
enum.PaperLabelVisuals.Layer:
True: { visible: true }
False: { visible: false }
enum.PaperLabelVisuals.LabelType:
enum.PaperLabelVisuals.Layer:
Paper: { state: paper }
Bounty: { state: bounty }
CaptainsPaper: { state: captains_paper }
Invoice: { state: invoice }
enum.StorageVisuals.Open:
enum.PaperLabelVisuals.Layer:
True: { offset: "0.0,0.3125" }
False: { offset: "0.0,0.0" }
- type: LockVisuals
- type: ItemSlots
- type: ContainerContainer

18
Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
View File

@@ -21,6 +21,9 @@
- state: welded
visible: false
map: ["enum.WeldableLayers.BaseWelded"]
- state: paper
sprite: Structures/Storage/Crates/labels.rsi
map: ["enum.PaperLabelVisuals.Layer"]
- type: InteractionOutline
- type: Physics
- type: Fixtures
@@ -55,6 +58,18 @@
- type: EntityStorageVisuals
stateDoorOpen: open
stateDoorClosed: closed
- type: GenericVisualizer
visuals:
enum.PaperLabelVisuals.HasLabel:
enum.PaperLabelVisuals.Layer:
True: { visible: true }
False: { visible: false }
enum.PaperLabelVisuals.LabelType:
enum.PaperLabelVisuals.Layer:
Paper: { state: paper }
Bounty: { state: bounty }
CaptainsPaper: { state: captains_paper }
Invoice: { state: invoice }
- type: PaperLabel
labelSlot:
insertVerbText: Attach Label
@@ -106,6 +121,9 @@
- state: locked
map: ["enum.LockVisualLayers.Lock"]
shader: unshaded
- state: paper
sprite: Structures/Storage/Crates/labels.rsi
map: ["enum.PaperLabelVisuals.Layer"]
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: StructuralMetallic

52
Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
View File

@@ -138,6 +138,9 @@
map: ["enum.StorageVisualLayers.Base"]
- state: closed
map: ["enum.StorageVisualLayers.Door"]
- state: paper
sprite: Structures/Storage/Crates/labels.rsi
map: ["enum.PaperLabelVisuals.Layer"]
- type: Construction
graph: WebStructures
node: crate
@@ -320,6 +323,10 @@
- state: base
- state: closed
map: ["enum.StorageVisualLayers.Door"]
- state: paper
sprite: Structures/Storage/Crates/labels.rsi
offset: "-0.25,0.625"
map: ["enum.PaperLabelVisuals.Layer"]
- type: Icon
sprite: Structures/Storage/Crates/livestock.rsi
state: base
@@ -371,6 +378,10 @@
- state: base
- state: closed
map: ["enum.StorageVisualLayers.Door"]
- state: paper
sprite: Structures/Storage/Crates/labels.rsi
offset: "0.0,0.125"
map: ["enum.PaperLabelVisuals.Layer"]
- type: Icon
sprite: Structures/Storage/Crates/cage.rsi
- type: Destructible
@@ -424,6 +435,10 @@
- state: welded
visible: false
map: ["enum.WeldableLayers.BaseWelded"]
- state: paper
sprite: Structures/Storage/Crates/labels.rsi
offset: "0.0,-0.09375"
map: ["enum.PaperLabelVisuals.Layer"]
- type: Icon
sprite: Structures/Storage/Crates/piratechest.rsi
state: crate_icon
@@ -449,6 +464,8 @@
- state: welded
visible: false
map: ["enum.WeldableLayers.BaseWelded"]
- state: paper
map: ["enum.PaperLabelVisuals.Layer"]
- type: Icon
sprite: Structures/Storage/Crates/toybox.rsi
state: crate_icon
@@ -465,6 +482,8 @@
- state: base
- state: closed
map: ["enum.StorageVisualLayers.Door"]
- state: paper
map: ["enum.PaperLabelVisuals.Layer"]
- type: Icon
sprite: Structures/Storage/Crates/coffin.rsi
state: base
@@ -503,6 +522,10 @@
- state: base
- state: closed
map: ["enum.StorageVisualLayers.Door"]
- state: paper
sprite: Structures/Storage/Crates/labels.rsi
offset: "-0.28125,0.625"
map: ["enum.PaperLabelVisuals.Layer"]
- type: Icon
sprite: Structures/Storage/Crates/wooden_grave.rsi
state: base
@@ -547,6 +570,10 @@
- state: base
- state: closed
map: ["enum.StorageVisualLayers.Door"]
- state: paper
sprite: Structures/Storage/Crates/labels.rsi
offset: "-0.3125,0.5625"
map: ["enum.PaperLabelVisuals.Layer"]
- type: Icon
sprite: Structures/Storage/Crates/stone_grave.rsi
state: base
@@ -571,6 +598,17 @@
sprite: Structures/Storage/Crates/trashcart.rsi
- type: Sprite
sprite: Structures/Storage/Crates/trashcart.rsi
layers:
- state: base
- state: closed
map: ["enum.StorageVisualLayers.Door"]
- state: welded
visible: false
map: ["enum.WeldableLayers.BaseWelded"]
- state: paper
sprite: Structures/Storage/Crates/labels.rsi
offset: "0.0,0.03125"
map: ["enum.PaperLabelVisuals.Layer"]
- type: entity
parent: CrateBaseSecure
@@ -581,6 +619,20 @@
sprite: Structures/Storage/Crates/trashcart_jani.rsi
- type: Sprite
sprite: Structures/Storage/Crates/trashcart_jani.rsi
layers:
- state: base
- state: closed
map: ["enum.StorageVisualLayers.Door"]
- state: welded
visible: false
map: ["enum.WeldableLayers.BaseWelded"]
- state: locked
map: ["enum.LockVisualLayers.Lock"]
shader: unshaded
- state: paper
sprite: Structures/Storage/Crates/labels.rsi
offset: "0.0,0.03125"
map: ["enum.PaperLabelVisuals.Layer"]
- type: AccessReader
access: [["Janitor"]]