Another blacksmith minor update (#648)

* modular golden sickle

* anvil and furnace resprite

* Update comoss.yml

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/pickaxe.yml

@@ -14,7 +14,6 @@
 - type: entity
   parent: CP14ModularBladePickaxeBase
   id: CP14ModularBladeIronPickaxe
-  categories: [ ForkFiltered ]
   name: iron pickaxe head
   components:
   - type: Sprite
@@ -27,7 +26,6 @@
 - type: entity
   parent: CP14ModularBladePickaxeBase
   id: CP14ModularBladeGoldPickaxe
-  categories: [ ForkFiltered ]
   name: golden pickaxe head
   components:
   - type: Sprite
@@ -40,7 +38,6 @@
 - type: entity
   parent: CP14ModularBladePickaxeBase
   id: CP14ModularBladeCopperPickaxe
-  categories: [ ForkFiltered ]
   name: copper pickaxe head
   components:
   - type: Sprite

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/rapier.yml

@@ -14,7 +14,6 @@
 - type: entity
   parent: CP14ModularBladeRapierBase
   id: CP14ModularBladeIronRapier
-  categories: [ ForkFiltered ]
   name: iron rapier blade
   components:
   - type: Sprite
@@ -27,7 +26,6 @@
 - type: entity
   parent: CP14ModularBladeRapierBase
   id: CP14ModularBladeGoldRapier
-  categories: [ ForkFiltered ]
   name: golden rapier blade
   components:
   - type: Sprite
@@ -40,7 +38,6 @@
 - type: entity
   parent: CP14ModularBladeRapierBase
   id: CP14ModularBladeCopperRapier
-  categories: [ ForkFiltered ]
   name: copper rapier blade
   components:
   - type: Sprite

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sickle.yml

@@ -0,0 +1,36 @@
+- type: entity
+  parent: BaseItem
+  id: CP14ModularBladeSickleBase
+  categories: [ ForkFiltered ]
+  abstract: true
+  description: A sickle blade without a hilt. A blacksmith can use it as a spare part to create a weapon.
+  components:
+  - type: Item
+    storedRotation: 45
+    shape:
+    - 0,0,0,0
+    storedOffset: 0, 5
+
+- type: entity
+  parent: CP14ModularBladeSickleBase
+  id: CP14ModularBladeIronSickle
+  name: iron sickle blade
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi
+    state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeIronSickle
+
+- type: entity
+  parent: CP14ModularBladeSickleBase
+  id: CP14ModularBladeGoldSickle
+  name: golden sickle blade
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi
+    state: icon
+  - type: CP14ModularCraftPart
+    possibleParts:
+    - BladeGoldSickle

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/blade.yml

@@ -36,25 +36,6 @@
     possibleParts:
     - BladeIronMace
 
-- type: entity
-  parent: BaseItem
-  id: CP14ModularBladeIronSickle
-  categories: [ ForkFiltered ]
-  name: iron sickle blade
-  description: A sickle blade without a hilt. A blacksmith can use it as a spare part to create a weapon.
-  components:
-  - type: Item
-    storedRotation: 45
-    shape:
-    - 0,0,0,0
-    storedOffset: 0, 5
-  - type: Sprite
-    sprite: _CP14/Objects/ModularTools/iron_sickle.rsi
-    state: icon
-  - type: CP14ModularCraftPart
-    possibleParts:
-    - BladeIronSickle
-
 - type: entity
   parent: BaseItem
   id: CP14ModularBladeIronShovel

Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sickle.yml

@@ -7,7 +7,7 @@
   - type: Sprite
     layers:
     - state: icon
-    - sprite: _CP14/Objects/ModularTools/iron_sickle.rsi
+    - sprite: _CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi
       state: icon
   - type: CP14ModularCraftAutoAssemble
     details:

Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml

@@ -119,66 +119,4 @@
     craftSound:
       collection: CP14Sawing #TODO
     recipeTags:
-    - CP14RecipeSewing
-
-- type: entity
-  id: CP14WorkbenchAnvil
-  parent:
-  - CP14BaseWorkbench
-  name: anvil
-  description: I feel really bad, please someone fix this.
-  components:
-  - type: Sprite
-    state: anvil
-  - type: Icon
-    state: anvil
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 250
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: CP14Workbench
-    craftSound:
-      collection: CP14Sawing #TODO
-    recipeTags:
-    - CP14RecipeAnvil
-
-- type: entity
-  id: CP14WorkbenchFurnace
-  parent:
-  - CP14BaseWorkbench
-  name: melting furnace
-  description: I feel really bad, please someone fix this.
-  components:
-  - type: Sprite
-    state: furnace
-  - type: Icon
-    state: furnace
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 150
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: MetalBreak
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: CP14Workbench
-    craftSound:
-      collection: CP14Sawing #TODO
-    recipeTags:
-    - CP14RecipeMeltingFurnace
+    - CP14RecipeSewing

Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/anvil.yml

@@ -0,0 +1,33 @@
+- type: entity
+  id: CP14WorkbenchAnvil
+  parent:
+  - CP14BaseWorkbench
+  name: anvil
+  description: A big piece of metal that allows you to turn square pieces of metal into pieces of metal in other, more useful shapes.
+  components:
+  - type: Sprite
+    snapCardinals: false
+    sprite: _CP14/Structures/Specific/Blacksmith/anvil.rsi
+    state: icon
+  - type: Icon
+    sprite: _CP14/Structures/Specific/Blacksmith/anvil.rsi
+    state: icon
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 250
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: CP14Workbench
+    craftSound:
+      collection: CP14Sawing #TODO
+    recipeTags:
+    - CP14RecipeAnvil

Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/furnace.yml

@@ -0,0 +1,41 @@
+- type: entity
+  id: CP14WorkbenchFurnace
+  parent:
+  - CP14BaseWorkbench
+  name: melting furnace
+  description: A red-hot stone cosntruction that allows ores to be smelted into pure metal
+  components:
+  - type: Sprite
+    snapCardinals: false
+    drawdepth: Mobs
+    sprite: _CP14/Structures/Specific/Blacksmith/furnace.rsi
+    layers:
+    - state: base
+    - state: fire
+      shader: unshaded
+  - type: Icon
+    sprite: _CP14/Structures/Specific/Blacksmith/furnace.rsi
+    state: base
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: PointLight
+    color: "#99411f"
+    radius: 2
+    energy: 2
+  - type: CP14Workbench
+    craftSound:
+      collection: CP14Sawing #TODO
+    recipeTags:
+    - CP14RecipeMeltingFurnace 

Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/sharpening_stone.yml

@@ -9,7 +9,7 @@
   - type: UseDelay
   - type: InteractionOutline
   - type: Sprite
-    sprite: _CP14/Structures/Specific/sharpening_stone.rsi
+    sprite: _CP14/Structures/Specific/Blacksmith/sharpening_stone.rsi
     state: base
   - type: PlaceableSurface
   - type: ItemPlacer

Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml

@@ -0,0 +1,46 @@
+#Concept:
+# Copy of dagger with lesser damage 
+# But can gather grass from world
+- type: modularPart
+  id: BaseBladeSickle
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseWeaponChemical
+    - BaseWeaponSharp
+    #components: TODO Add gathering tag
+  - !type:EditMeleeWeapon
+    attackRateMultiplier: 1.4
+    bonusDamage:
+      types:
+        Slash: 4
+        Piercing: 1
+  - !type:EditItem
+    newSize: Normal
+    adjustShape: 0, 1
+    storedOffsetBonus: 0, 5
+  - !type:EditModularSlots
+    addSlots:
+    - Garde
+
+- type: modularPart
+  id: BladeIronSickle
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeIronSickle
+  rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladeSickle
+    - BaseWeaponIron
+
+- type: modularPart
+  id: BladeGoldSickle
+  targetSlot: Blade
+  sourcePart: CP14ModularBladeIronSickle
+  rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/gold_sickle.rsi
+  modifiers:
+  - !type:Inherit
+    copyFrom:
+    - BaseBladeSickle
+    - BaseWeaponGold

Resources/Prototypes/_CP14/ModularCraft/blade.yml

@@ -1,31 +1,3 @@
-#Concept:
-# Copy of dagger with lesser damage 
-# But can gather grass from world
-- type: modularPart
-  id: BladeIronSickle
-  targetSlot: Blade
-  sourcePart: CP14ModularBladeIronSickle
-  rsiPath: _CP14/Objects/ModularTools/iron_sickle.rsi
-  modifiers:
-  - !type:Inherit
-    copyFrom:
-    - BaseWeaponChemical
-    - BaseWeaponSharp
-    #components: TODO Add gathering tag
-  - !type:EditMeleeWeapon
-    attackRateMultiplier: 1.4
-    bonusDamage:
-      types:
-        Slash: 4
-        Piercing: 1
-  - !type:EditItem
-    newSize: Normal
-    adjustShape: 0, 1
-    storedOffsetBonus: 0, 5
-  - !type:EditModularSlots
-    addSlots:
-    - Garde
-
 #Concept:
 # + High Throwable damage
 #   Piercing animation

Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml

@@ -145,6 +145,14 @@
     CP14IronBar: 1
   result: CP14ModularBladeIronSickle
 
+- type: CP14Recipe
+  id: CP14ModularBladeGoldSickle
+  tag: CP14RecipeAnvil
+  craftTime: 2
+  stacks:
+    CP14GoldBar: 1
+  result: CP14ModularBladeGoldSickle
+
 - type: CP14Recipe
   id: CP14ModularBladeIronShovel
   tag: CP14RecipeAnvil

Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/iron_sickle.rsi/meta.json

@@ -0,0 +1,42 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CLA",
+  "copyright": "Created by TheShuEd (Github) ",
+  "states": [
+    {
+      "name": "equipped-BELT1",
+      "directions": 4
+    },
+    {
+      "name": "equipped-BELT2",
+      "directions": 4
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json

@@ -21,9 +21,6 @@
     },
     {
       "name": "furnace"
-    },
-    {
-      "name": "anvil"
     }
   ]
 }

Resources/Textures/_CP14/Structures/Specific/Blacksmith/anvil.rsi/meta.json

@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "Created by vladimir.s for CrystallEdge",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/_CP14/Structures/Specific/Blacksmith/furnace.rsi/meta.json

@@ -0,0 +1,45 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "Created by vladimir.s for CrystallEdge",
+  "size": {
+    "x": 48,
+    "y": 80
+  },
+  "states": [
+    {
+      "name": "base",
+      "directions": 4
+    },
+    {
+      "name": "fire",
+      "directions": 4,
+      "delays": [
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ],
+        [
+          0.3,
+          0.3,
+          0.3,
+          0.3
+        ]
+      ]
+    }
+  ]
+}