From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:08:55 +0000 (+0000) Subject: add construction for carp statue (#31261) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6808558df61f28930c31adfba028214e69fdaa7d;p=space-station-14.git add construction for carp statue (#31261) * separate eyes and teeth * make it buildable and make fixture less abusable * norot --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- diff --git a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml index 2f58e5caea..17920565ef 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml @@ -57,8 +57,54 @@ description: A statue of one of the brave carp that got us where we are today. Made with real teeth! components: - type: Sprite + noRot: true sprite: Structures/Specific/carp_statue.rsi layers: - state: statue - - state: unshaded + - state: eyes + - state: eyes_unshaded shader: unshaded + - state: teeth_unshaded + shader: unshaded + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.35,-0.35,0.35,0.35" + density: 60 + mask: + - MachineMask + layer: + - MidImpassable + - LowImpassable + - type: Construction + graph: CarpStatue + node: statue + +- type: entity + parent: CarpStatue + id: CarpStatueEmpty + suffix: Empty + description: A lump of precious metals, soon to be a brilliant carp statue. + components: + - type: Sprite + layers: + - state: statue + - type: Construction + node: empty + +- type: entity + parent: CarpStatue + id: CarpStatueEyes + suffix: Eyes + description: A statue of one of the brave carp that got us where we are today. This one needs a dentist... + components: + - type: Sprite + layers: + - state: statue + - state: eyes + - state: eyes_unshaded + shader: unshaded + - type: Construction + node: eyes diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml index 5c67d3936e..4810a34e04 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml @@ -27,3 +27,62 @@ doAfter: 5 - tool: Welding doAfter: 5 + +- type: constructionGraph + id: CarpStatue + start: start + graph: + - node: start + edges: + - to: empty + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Silver + amount: 15 + doAfter: 7 + - node: empty + entity: CarpStatueEmpty + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: IngotSilver1 + amount: 15 + - !type:DeleteEntity {} + steps: + - tool: Welding + doAfter: 5 + - to: eyes + steps: + - material: Diamond + amount: 2 + doAfter: 2 + - node: eyes + entity: CarpStatueEyes + edges: + - to: empty + completed: + - !type:SpawnPrototype + prototype: MaterialDiamond1 + amount: 2 + steps: + - tool: Prying + doAfter: 2 + - to: statue + steps: + - material: SpaceCarpTooth + amount: 5 + doAfter: 3 + - node: statue + entity: CarpStatue + edges: + - to: eyes + completed: + - !type:SpawnPrototype + prototype: MaterialToothSpaceCarp1 + amount: 5 + steps: + - tool: Prying + doAfter: 5 diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index a273f66740..5278c1b45e 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -1644,6 +1644,23 @@ conditions: - !type:TileNotBlocked +- type: construction + name: carp statue + id: CarpStatue + graph: CarpStatue + startNode: start + targetNode: statue + category: construction-category-structures + placementMode: SnapgridCenter + description: A statue of one of the brave carp that got us where we are today. Made with real teeth! + objectType: Structure + canBuildInImpassable: false + icon: + sprite: Structures/Specific/carp_statue.rsi + state: icon + conditions: + - !type:TileNotBlocked + - type: construction name: bananium clown statue id: BananiumClownStatue diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes.png new file mode 100644 index 0000000000..7cc6ffccf1 Binary files /dev/null and b/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes.png differ diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes_unshaded.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes_unshaded.png new file mode 100644 index 0000000000..83f80290eb Binary files /dev/null and b/Resources/Textures/Structures/Specific/carp_statue.rsi/eyes_unshaded.png differ diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/icon.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/icon.png new file mode 100644 index 0000000000..c5d6bd20e5 Binary files /dev/null and b/Resources/Textures/Structures/Specific/carp_statue.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json b/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json index 5c8d12c6c6..fb1ed6a3ef 100644 --- a/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json +++ b/Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json @@ -11,7 +11,16 @@ "name": "statue" }, { - "name": "unshaded" + "name": "icon" + }, + { + "name": "eyes" + }, + { + "name": "eyes_unshaded" + }, + { + "name": "teeth_unshaded" } ] } diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/statue.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/statue.png index 2030067540..4dbbc1b6db 100644 Binary files a/Resources/Textures/Structures/Specific/carp_statue.rsi/statue.png and b/Resources/Textures/Structures/Specific/carp_statue.rsi/statue.png differ diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/teeth_unshaded.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/teeth_unshaded.png new file mode 100644 index 0000000000..73acc87e0d Binary files /dev/null and b/Resources/Textures/Structures/Specific/carp_statue.rsi/teeth_unshaded.png differ diff --git a/Resources/Textures/Structures/Specific/carp_statue.rsi/unshaded.png b/Resources/Textures/Structures/Specific/carp_statue.rsi/unshaded.png deleted file mode 100644 index a5ee7e88a9..0000000000 Binary files a/Resources/Textures/Structures/Specific/carp_statue.rsi/unshaded.png and /dev/null differ