Melting molds (#347)

* temp tweak * add metall bars * melting molds * add sawing molds table * sawing sounds * fix
2024-07-23 10:29:41 +03:00
parent fee5cc25ce
commit 9f1b4fc51c
64 changed files with 583 additions and 66 deletions
--- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml
@@ -0,0 +1,134 @@
+- type: entity
+  id: CP14CopperBar1
+  parent: BaseItem
+  name: copper bar
+  suffix: 1
+  description: A heavy, slightly green, piece of refined copper
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    sprite: _CP14/Objects/Materials/copper_bar.rsi
+    layers:
+      - state: bar
+        map: ["base"]
+  - type: Appearance
+  - type: Stack
+    stackType: CP14CopperBar
+    count: 1
+    baseLayer: base
+    layerStates:
+    - bar
+    - bar_2
+    - bar_3
+  - type: Material
+  - type: PhysicalComposition # точно ли это нужно?
+    materialComposition:
+      CP14Copper: 100
+
+- type: entity
+  id: CP14CopperBar5
+  parent: CP14CopperBar1
+  suffix: 5
+  components:
+  - type: Stack
+    count: 5
+
+- type: entity
+  id: CP14CopperBar10
+  parent: CP14CopperBar1
+  suffix: 10
+  components:
+  - type: Stack
+    count: 10
+
+
+
+- type: entity
+  id: CP14IronBar1
+  parent: BaseItem
+  name: iron bar
+  suffix: 1
+  description: A heavy piece of refined iron
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    sprite: _CP14/Objects/Materials/iron_bar.rsi
+    layers:
+      - state: bar
+        map: ["base"]
+  - type: Appearance
+  - type: Stack
+    stackType: CP14IronBar
+    count: 1
+    baseLayer: base
+    layerStates:
+    - bar
+    - bar_2
+    - bar_3
+  - type: Material
+  - type: PhysicalComposition # точно ли это нужно?
+    materialComposition:
+      CP14Iron: 100
+
+- type: entity
+  id: CP14IronBar5
+  parent: CP14IronBar1
+  suffix: 5
+  components:
+  - type: Stack
+    count: 5
+
+- type: entity
+  id: CP14IronBar10
+  parent: CP14IronBar1
+  suffix: 10
+  components:
+  - type: Stack
+    count: 10
+
+
+
+- type: entity
+  id: CP14GoldBar1
+  parent: BaseItem
+  name: gold bar
+  description: A warm to the touch, soft piece of refined gold.
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    sprite: _CP14/Objects/Materials/gold_bar.rsi
+    layers:
+      - state: bar
+        map: ["base"]
+  - type: Appearance
+  - type: Stack
+    stackType: CP14GoldBar
+    count: 1
+    baseLayer: base
+    layerStates:
+    - bar
+    - bar_2
+    - bar_3
+  - type: Material
+  - type: PhysicalComposition # точно ли это нужно?
+    materialComposition:
+      CP14Gold: 100
+
+- type: entity
+  id: CP14GoldBar5
+  parent: CP14GoldBar1
+  suffix: 5
+  components:
+  - type: Stack
+    count: 5
+
+- type: entity
+  id: CP14GoldBar10
+  parent: CP14GoldBar1
+  suffix: 10
+  components:
+  - type: Stack
+    count: 10
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Blacksmith/melting_molds.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Blacksmith/melting_molds.yml
@@ -0,0 +1,101 @@
+- type: entity
+  id: CP14MeltingMoldBase
+  abstract: true
+  parent: BaseItem
+  name: melting mold
+  description: Wooden board for casting the metal into the required molds.
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    sprite: _CP14/Objects/Specific/Blacksmith/melting_molds.rsi
+
+- type: entity
+  id: CP14MeltingMoldBlank
+  parent: CP14MeltingMoldBase
+  name: black melting mold
+  description: An empty mold for casting metal. You can cut any shape you need in it on the pattern cutting table.
+  components:
+  - type: Sprite
+    layers:
+    - state: blank
+
+- type: entity
+  id: CP14MeltingMoldDaggers
+  parent: CP14MeltingMoldBase
+  name: dagger blade mold
+  components:
+  - type: Sprite
+    layers:
+    - state: blank
+    - state: dagger
+
+- type: entity
+  id: CP14MeltingMoldNails
+  parent: CP14MeltingMoldBase
+  name: mails mold
+  components:
+  - type: Sprite
+    layers:
+    - state: blank
+    - state: nails
+
+- type: entity
+  id: CP14MeltingMoldPickaxe
+  parent: CP14MeltingMoldBase
+  name: pickaxe head mold
+  components:
+  - type: Sprite
+    layers:
+    - state: blank
+    - state: pickaxe
+
+- type: entity
+  id: CP14MeltingMoldShovel
+  parent: CP14MeltingMoldBase
+  name: shovel head mold
+  components:
+  - type: Sprite
+    layers:
+    - state: blank
+    - state: shovel
+
+- type: entity
+  id: CP14MeltingMoldSickle
+  parent: CP14MeltingMoldBase
+  name: sickle blade mold
+  components:
+  - type: Sprite
+    layers:
+    - state: blank
+    - state: sickle
+
+- type: entity
+  id: CP14MeltingMoldSword
+  parent: CP14MeltingMoldBase
+  name: sword blade mold
+  components:
+  - type: Sprite
+    layers:
+    - state: blank
+    - state: sword
+
+- type: entity
+  id: CP14MeltingMoldThrowableSpear
+  parent: CP14MeltingMoldBase
+  name: throwable spearhead mold
+  components:
+  - type: Sprite
+    layers:
+    - state: blank
+    - state: throwable_spear
+
+- type: entity
+  id: CP14MeltingMoldTwoHandedSword
+  parent: CP14MeltingMoldBase
+  name: two-handed sword blade mold
+  components:
+  - type: Sprite
+    layers:
+    - state: blank
+    - state: two_handed_sword
--- a/Resources/Prototypes/_CP14/Entities/Objects/ores.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/ores.yml
@@ -19,7 +19,7 @@
  description: A piece of pale, heavy copper. 
  components:
  - type: Sprite
-    sprite: _CP14/Objects/Materials/ore_copper.rsi
+    sprite: _CP14/Objects/Materials/copper_ore.rsi
    layers:
      - state: ore1
        map: ["random"]
@@ -31,7 +31,7 @@
  description: A piece of cold, heavy iron. 
  components:
  - type: Sprite
-    sprite: _CP14/Objects/Materials/ore_iron.rsi
+    sprite: _CP14/Objects/Materials/iron_ore.rsi
    layers:
      - state: ore1
        map: ["random"]
@@ -43,7 +43,7 @@
  description: A piece of soft, pure gold.
  components:
  - type: Sprite
-    sprite: _CP14/Objects/Materials/ore_gold.rsi
+    sprite: _CP14/Objects/Materials/gold_ore.rsi
    layers:
      - state: ore1
        map: ["random"]
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml
@@ -4,32 +4,10 @@
  id: CP14BaseWorkbench
  abstract: true
  components:
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.45"
-        density: 55
-        mask:
-        - TabletopMachineMask
-        layer:
-        - Impassable
-        - MidImpassable
-        - LowImpassable
-        hard: false
-      fix2:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.45,-0.45,0.45,0.45"
-        density: 55
-        mask:
-        - TableMask
-        layer:
-        - TableLayer
  - type: Climbable
  - type: Clickable
  - type: PlaceableSurface
+  - type: InteractionOutline
  - type: CP14Workbench
    craftSpeed: 1

@@ -44,10 +22,10 @@
  - type: Sprite
    snapCardinals: true
    sprite: _CP14/Structures/Furniture/workbench.rsi
-    state: icon
+    state: workbench
  - type: Icon
    sprite: _CP14/Structures/Furniture/workbench.rsi
-    state: icon
+    state: workbench
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: Wood
@@ -76,7 +54,7 @@
        spawn:
          CP14WoodenPlanks1:
            min: 1
-            max: 1
+            max: 2
  - type: FootstepModifier
    footstepSoundCollection:
      collection: FootstepWood
@@ -89,4 +67,68 @@
  - type: CP14Workbench
    recipes:
    - CP14Bucket
-    - CP14BaseBarrel
+    - CP14BaseBarrel
+
+- type: entity
+  id: CP14WorkbenchMeltingMolds
+  parent:
+  - CP14BaseWorkbench
+  - CP14BaseWooden
+  name: sawing melting molds table
+  description: Specialized table that allows you to cut out molds for metal smelting.
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: _CP14/Structures/Furniture/workbench.rsi
+    state: melting_crafter
+  - type: Icon
+    sprite: _CP14/Structures/Furniture/workbench.rsi
+    state: melting_crafter
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Heat
+        damage: 40
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+    - trigger:
+        !type:DamageTrigger
+        damage: 60
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          CP14WoodenPlanks1:
+            min: 1
+            max: 2
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepWood
+  - type: FireVisuals
+    sprite: _CP14/Effects/fire.rsi
+    normalState: full
+  - type: CP14Workbench
+    craftSound:
+      collection: CP14Sawing
+    recipes:
+    - CP14MeltingMoldBlank
+    - CP14MeltingMoldDaggers
+    - CP14MeltingMoldNails
+    - CP14MeltingMoldPickaxe
+    - CP14MeltingMoldShovel
+    - CP14MeltingMoldSickle
+    - CP14MeltingMoldSword
+    - CP14MeltingMoldThrowableSpear
+    - CP14MeltingMoldTwoHandedSword
--- a/Resources/Prototypes/_CP14/Materials/simple.yml
+++ b/Resources/Prototypes/_CP14/Materials/simple.yml
@@ -32,4 +32,31 @@
  unit: materials-unit-piece
  icon: { sprite: _CP14/Objects/Materials/nails.rsi, state: nail_2 }
  color: "#555963"
+  price: 0 #?
+
+- type: material
+  id: CP14Copper
+  stackEntity: CP14CopperBar1
+  name: cp14-material-copper
+  unit: materials-unit-bar
+  icon: { sprite: _CP14/Objects/Materials/copper_bar.rsi, state: bar_2 }
+  color: "#9a5e22"
+  price: 0 #?
+
+- type: material
+  id: CP14Iron
+  stackEntity: CP14IronBar1
+  name: cp14-material-iron
+  unit: materials-unit-bar
+  icon: { sprite: _CP14/Objects/Materials/iron_bar.rsi, state: bar_2 }
+  color: "#9093a1"
+  price: 0 #?
+
+- type: material
+  id: CP14Gold
+  stackEntity: CP14GoldBar1
+  name: cp14-material-gold
+  unit: materials-unit-bar
+  icon: { sprite: _CP14/Objects/Materials/gold_bar.rsi, state: bar_2 }
+  color: "#FFD700"
  price: 0 #?
--- a/Resources/Prototypes/_CP14/Objectives/steal_target_groups.yml
+++ b/Resources/Prototypes/_CP14/Objectives/steal_target_groups.yml
@@ -2,5 +2,5 @@
  id: CP14Gold
  name: gold ore
  sprite:
-    sprite: _CP14/Objects/Materials/ore_gold.rsi
+    sprite: _CP14/Objects/Materials/gold_ore.rsi
    state: ore1
--- a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml
@@ -101,7 +101,7 @@
  category: construction-category-furniture
  icon:
    sprite: _CP14/Structures/Furniture/workbench.rsi
-    state: icon
+    state: workbench
  objectType: Structure
  placementMode: SnapgridCenter
  canBuildInImpassable: false
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/melds_crafter.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/melds_crafter.yml
@@ -0,0 +1,62 @@
+- type: CP14Recipe
+  id: CP14MeltingMoldBlank
+  craftTime: 2
+  stacks:
+    CP14WoodenPlanks: 2
+  result: CP14MeltingMoldBlank
+
+- type: CP14Recipe
+  id: CP14MeltingMoldDaggers
+  craftTime: 2
+  entities:
+    CP14MeltingMoldBlank: 1
+  result: CP14MeltingMoldDaggers
+
+- type: CP14Recipe
+  id: CP14MeltingMoldNails
+  craftTime: 2
+  entities:
+    CP14MeltingMoldBlank: 1
+  result: CP14MeltingMoldNails
+
+- type: CP14Recipe
+  id: CP14MeltingMoldPickaxe
+  craftTime: 2
+  entities:
+    CP14MeltingMoldBlank: 1
+  result: CP14MeltingMoldPickaxe
+
+- type: CP14Recipe
+  id: CP14MeltingMoldShovel
+  craftTime: 2
+  entities:
+    CP14MeltingMoldBlank: 1
+  result: CP14MeltingMoldShovel
+
+- type: CP14Recipe
+  id: CP14MeltingMoldSickle
+  craftTime: 2
+  entities:
+    CP14MeltingMoldBlank: 1
+  result: CP14MeltingMoldSickle
+
+- type: CP14Recipe
+  id: CP14MeltingMoldSword
+  craftTime: 2
+  entities:
+    CP14MeltingMoldBlank: 1
+  result: CP14MeltingMoldSword
+
+- type: CP14Recipe
+  id: CP14MeltingMoldThrowableSpear
+  craftTime: 2
+  entities:
+    CP14MeltingMoldBlank: 1
+  result: CP14MeltingMoldThrowableSpear
+
+- type: CP14Recipe
+  id: CP14MeltingMoldTwoHandedSword
+  craftTime: 2
+  entities:
+    CP14MeltingMoldBlank: 1
+  result: CP14MeltingMoldTwoHandedSword
--- a/Resources/Prototypes/_CP14/SoundCollections/misc.yml
+++ b/Resources/Prototypes/_CP14/SoundCollections/misc.yml
@@ -19,4 +19,13 @@
  - /Audio/_CP14/Items/nailing1.ogg
  - /Audio/_CP14/Items/nailing2.ogg
  - /Audio/_CP14/Items/nailing3.ogg
-  - /Audio/_CP14/Items/nailing4.ogg
+  - /Audio/_CP14/Items/nailing4.ogg
+  
+- type: soundCollection
+  id: CP14Sawing
+  files:
+  - /Audio/_CP14/Items/sawing1.ogg
+  - /Audio/_CP14/Items/sawing2.ogg
+  - /Audio/_CP14/Items/sawing3.ogg
+  - /Audio/_CP14/Items/sawing4.ogg
+  - /Audio/_CP14/Items/sawing5.ogg
--- a/Resources/Prototypes/_CP14/Stacks/materials.yml
+++ b/Resources/Prototypes/_CP14/Stacks/materials.yml
@@ -24,4 +24,25 @@
  name: nails
  spawn: CP14Nail1
  icon: { sprite: _CP14/Objects/Materials/nails.rsi, state: nail_2 }
+  maxCount: 10
+
+- type: stack
+  id: CP14CopperBar
+  name: copper bars
+  spawn: CP14CopperBar1
+  icon: { sprite: _CP14/Objects/Materials/copper_bar.rsi, state: bar_2 }
+  maxCount: 10
+
+- type: stack
+  id: CP14IronBar
+  name: iron bars
+  spawn: CP14IronBar1
+  icon: { sprite: _CP14/Objects/Materials/iron_bar.rsi, state: bar_2 }
+  maxCount: 10
+
+- type: stack
+  id: CP14GoldBar
+  name: gold bars
+  spawn: CP14GoldBar1
+  icon: { sprite: _CP14/Objects/Materials/gold_bar.rsi, state: bar_2 }
  maxCount: 10