diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml index 730e6cf724..ce771e4b96 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml @@ -24,7 +24,7 @@ - type: IncreaseDamageOnWield damage: types: - Blunt: 4 + Blunt: 3 - type: MeleeWeapon angle: 100 attackRate: 1.3 @@ -33,12 +33,12 @@ wideAnimation: CP14WeaponArcSlash damage: types: - Blunt: 4 + Blunt: 3 soundHit: collection: MetalThud cPAnimationLength: 0.3 cPAnimationOffset: -1.3 - type: StaminaDamageOnHit - damage: 9 + damage: 4 - type: CP14Currency currency: 20 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml b/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml index 99df874049..d8377bb13c 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Fence/iron_grille.yml @@ -19,9 +19,9 @@ !type:DamageTrigger damage: 250 behaviors: - #- !type:PlaySoundBehavior - # sound: - # collection: WoodDestroy + - !type:PlaySoundBehavior + sound: + collection: MetalBreak - !type:DoActsBehavior acts: [ "Destruction" ] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml index 708c7db44a..98ca16399e 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml @@ -114,3 +114,35 @@ collection: CP14Sawing #TODO recipeTags: - CP14RecipeSewing + +- type: entity + id: CP14WorkbenchAnvil + parent: + - CP14BaseWorkbench + name: anvil + description: "An ultimatum anvil that doesn't even need a hammer or red-hot ingot temperatures to forge tools. (OOC: we just haven't done it yet)" + components: + - type: Sprite + snapCardinals: true + 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 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml new file mode 100644 index 0000000000..8ec2629b90 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml @@ -0,0 +1,116 @@ +- type: CP14Recipe + id: CP14BaseBattleHammer + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14WoodenPlanks: 1 + CP14IronBar: 3 + result: CP14BaseBattleHammer + +- type: CP14Recipe + id: CP14BaseDagger + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14WoodenPlanks: 1 + CP14IronBar: 1 + result: CP14BaseDagger + +- type: CP14Recipe + id: CP14BaseHandheldAxe + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14WoodenPlanks: 1 + CP14IronBar: 1 + result: CP14BaseHandheldAxe + +- type: CP14Recipe + id: CP14BaseLightHammer + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14WoodenPlanks: 1 + CP14IronBar: 1 + result: CP14BaseLightHammer + +- type: CP14Recipe + id: CP14BaseMace + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14WoodenPlanks: 1 + CP14IronBar: 2 + result: CP14BaseMace + +- type: CP14Recipe + id: CP14BaseShield + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14WoodenPlanks: 2 + CP14IronBar: 2 + result: CP14BaseShield + +- type: CP14Recipe + id: CP14BaseSickle + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14WoodenPlanks: 1 + CP14IronBar: 2 + result: CP14BaseSickle + +- type: CP14Recipe + id: CP14BaseThrowableSpear + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14WoodenPlanks: 2 + CP14IronBar: 1 + result: CP14BaseThrowableSpear + +- type: CP14Recipe + id: CP14BaseSword + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14WoodenPlanks: 1 + CP14IronBar: 3 + result: CP14BaseSword + +- type: CP14Recipe + id: CP14BaseTwoHandedSword + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14WoodenPlanks: 1 + CP14IronBar: 4 + result: CP14BaseTwoHandedSword + +- type: CP14Recipe + id: CP14BaseHoe + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14WoodenPlanks: 1 + CP14IronBar: 2 + result: CP14BaseHoe + +- type: CP14Recipe + id: CP14BasePickaxe + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14WoodenPlanks: 1 + CP14IronBar: 2 + result: CP14BasePickaxe + +- type: CP14Recipe + id: CP14BaseShovel + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14WoodenPlanks: 1 + CP14IronBar: 2 + result: CP14BaseShovel \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml index 4a1725f17c..efc2b3a803 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml @@ -51,4 +51,12 @@ CP14Wheat: 2 stacks: CP14WoodenPlanks: 2 - result: CP14BaseBroom \ No newline at end of file + result: CP14BaseBroom + +- type: CP14Recipe + id: CP14BaseBattleStaff + tag: CP14RecipeWorkbench + craftTime: 4 + stacks: + CP14WoodenPlanks: 3 + result: CP14BaseBattleStaff \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index eca6c68975..442a162530 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -42,3 +42,9 @@ - type: Tag id: CP14RecipeWorkbench + +- type: Tag + id: CP14RecipeAnvil + +- type: Tag + id: CP14RecipeMeltingFurnace diff --git a/Resources/Textures/_CP14/Structures/Furniture/mannequin.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/mannequin.rsi/meta.json index 68a4eeb0cd..56753a2bb8 100644 --- a/Resources/Textures/_CP14/Structures/Furniture/mannequin.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Furniture/mannequin.rsi/meta.json @@ -9,7 +9,7 @@ "states": [ { "name": "mannequin", - "directions": 4 + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/anvil.png b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/anvil.png new file mode 100644 index 0000000000..102a69fe65 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/anvil.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json index a8070577ac..a74677153d 100644 --- a/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Furniture/workbench.rsi/meta.json @@ -18,6 +18,10 @@ }, { "name": "sewing_table" + }, + { + "name": "anvil", + "directions": 4 } ] }