]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
add construction for carp statue (#31261)
authordeltanedas <39013340+deltanedas@users.noreply.github.com>
Wed, 28 Aug 2024 13:08:55 +0000 (13:08 +0000)
committerGitHub <noreply@github.com>
Wed, 28 Aug 2024 13:08:55 +0000 (15:08 +0200)
* separate eyes and teeth

* make it buildable and make fixture less abusable

* norot

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Resources/Prototypes/Entities/Structures/Specific/xeno.yml
Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml
Resources/Prototypes/Recipes/Construction/structures.yml
Resources/Textures/Structures/Specific/carp_statue.rsi/eyes.png [new file with mode: 0644]
Resources/Textures/Structures/Specific/carp_statue.rsi/eyes_unshaded.png [new file with mode: 0644]
Resources/Textures/Structures/Specific/carp_statue.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Structures/Specific/carp_statue.rsi/meta.json
Resources/Textures/Structures/Specific/carp_statue.rsi/statue.png
Resources/Textures/Structures/Specific/carp_statue.rsi/teeth_unshaded.png [new file with mode: 0644]
Resources/Textures/Structures/Specific/carp_statue.rsi/unshaded.png [deleted file]

index 2f58e5caea91575e8a319cffb4292d1b64fe4e73..17920565ef310850d511ed51c123da44090e9eda 100644 (file)
   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
index 5c67d3936e4ba00781451c7fe220d5ccfefc2ee9..4810a34e042080897fb47c4e69b7287d2a8acb97 100644 (file)
               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
index a273f6674057bab49e89ffc45a79afee87831b85..5278c1b45e05228d92babfc1ca699a8d49d2bcc8 100644 (file)
   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 (file)
index 0000000..7cc6ffc
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 (file)
index 0000000..83f8029
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 (file)
index 0000000..c5d6bd2
Binary files /dev/null and b/Resources/Textures/Structures/Specific/carp_statue.rsi/icon.png differ
index 5c8d12c6c62aa47e2471b4f5926e69f05a30a8a1..fb1ed6a3ef3d8a5f54cbde77f03f5e8ba5a9b2ea 100644 (file)
       "name": "statue"
     },
     {
-      "name": "unshaded"
+      "name": "icon"
+    },
+    {
+      "name": "eyes"
+    },
+    {
+      "name": "eyes_unshaded"
+    },
+    {
+      "name": "teeth_unshaded"
     }
   ]
 }
index 203006754073fdbdcfecc65052a1e8b932839d2c..4dbbc1b6dbb7ec237f0e67d81bb2ffbd2c2c95d9 100644 (file)
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 (file)
index 0000000..73acc87
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 (file)
index a5ee7e8..0000000
Binary files a/Resources/Textures/Structures/Specific/carp_statue.rsi/unshaded.png and /dev/null differ