From 287cf2d9ab3814c3566b849c10351a5b23cf0b39 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Tue, 30 May 2023 22:42:14 -0500 Subject: [PATCH] Shiv balance pass (+ shards now weigh less) (#16952) * shiv balance pass * ill get the combat knife later * that's dode! * dode dollars --- .../Entities/Objects/Materials/shards.yml | 3 +- .../Entities/Objects/Weapons/Melee/knife.yml | 201 ++++++++---------- 2 files changed, 90 insertions(+), 114 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml index e9f88039ca..a1a068e54c 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml @@ -27,6 +27,7 @@ Slash: 3.5 - type: Item sprite: Objects/Materials/Shards/shard.rsi + size: 4 - type: CollisionWake enabled: false - type: Fixtures @@ -129,7 +130,7 @@ description: A small piece of plasma glass. components: - type: Sprite - color: "#f3b489" + color: "#FF72E7" - type: WelderRefinable refineResult: - SheetGlass1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index 38fcc918fc..91832bd698 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -26,119 +26,6 @@ useSound: path: /Audio/Items/Culinary/chop.ogg -- type: entity - name: shiv - parent: BaseKnife - id: Shiv - description: A crude weapon fashioned from a piece of cloth and a glass shard. - components: - - type: Tag - tags: - - CombatKnife - - Knife - - type: Construction - graph: Shiv - node: icon - - type: Sprite - sprite: Objects/Weapons/Melee/shiv.rsi - size: 2 - state: icon - - type: MeleeWeapon - attackRate: 1.5 - damage: - types: - Slash: 5 - - type: Item - size: 10 - sprite: Objects/Weapons/Melee/shiv.rsi - - type: DisarmMalus - malus: 0.225 - -- type: entity - name: reinforced shiv - parent: BaseKnife - id: ReinforcedShiv - description: A crude weapon fashioned from a piece of cloth and a reinforced glass shard. - components: - - type: Tag - tags: - - CombatKnife - - Knife - - type: Construction - graph: ReinforcedShiv - node: icon - - type: Sprite - sprite: Objects/Weapons/Melee/reinforced_shiv.rsi - size: 2 - state: icon - - type: MeleeWeapon - attackRate: 1.5 - damage: - types: - Slash: 10 - - type: Item - size: 10 - sprite: Objects/Weapons/Melee/reinforced_shiv.rsi - - type: DisarmMalus - malus: 0.225 - -- type: entity - name: plasma shiv - parent: BaseKnife - id: PlasmaShiv - description: A crude weapon fashioned from a piece of cloth and a plasma shard. - components: - - type: Tag - tags: - - CombatKnife - - Knife - - type: Construction - graph: PlasmaShiv - node: icon - - type: Sprite - sprite: Objects/Weapons/Melee/plasma_shiv.rsi - size: 2 - state: icon - - type: MeleeWeapon - attackRate: 1.5 - damage: - types: - Slash: 15 - - type: Item - size: 10 - sprite: Objects/Weapons/Melee/plasma_shiv.rsi - - type: DisarmMalus - malus: 0.225 - -- type: entity - name: uranium shiv - parent: BaseKnife - id: UraniumShiv - description: A crude weapon fashioned from a piece of cloth and a uranium shard. - components: - - type: Tag - tags: - - CombatKnife - - Knife - - type: Construction - graph: UraniumShiv - node: icon - - type: Sprite - sprite: Objects/Weapons/Melee/uranium_shiv.rsi - size: 2 - state: icon - - type: MeleeWeapon - attackRate: 1.5 - damage: - types: - Slash: 10 - Radiation: 5 - - type: Item - size: 10 - sprite: Objects/Weapons/Melee/uranium_shiv.rsi - - type: DisarmMalus - malus: 0.225 - - type: entity name: kitchen knife parent: BaseKnife @@ -235,3 +122,91 @@ - type: Item size: 10 sprite: Objects/Weapons/Melee/kukri_knife.rsi + +- type: entity + name: shiv + parent: BaseKnife + id: Shiv + description: A crude weapon fashioned from a piece of cloth and a glass shard. + components: + - type: Tag + tags: + - CombatKnife + - Knife + - type: Construction + graph: Shiv + node: icon + - type: Sprite + sprite: Objects/Weapons/Melee/shiv.rsi + size: 2 + state: icon + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 5.5 + - type: Item + size: 4 #as much as a regular glass shard + sprite: Objects/Weapons/Melee/shiv.rsi + - type: DisarmMalus + malus: 0.225 + +- type: entity + name: reinforced shiv + parent: Shiv + id: ReinforcedShiv + description: A crude weapon fashioned from a piece of cloth and a reinforced glass shard. + components: + - type: Construction + graph: ReinforcedShiv + node: icon + size: 2 + state: icon + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 7 #each "tier" grants an additional 2 damage + - type: Item + sprite: Objects/Weapons/Melee/reinforced_shiv.rsi + - type: Sprite + sprite: Objects/Weapons/Melee/reinforced_shiv.rsi + +- type: entity + name: plasma shiv + parent: Shiv + id: PlasmaShiv + description: A crude weapon fashioned from a piece of cloth and a plasma glass shard. + components: + - type: Construction + graph: PlasmaShiv + node: icon + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 9 + - type: Item + sprite: Objects/Weapons/Melee/plasma_shiv.rsi + - type: Sprite + sprite: Objects/Weapons/Melee/plasma_shiv.rsi + +- type: entity + name: uranium shiv + parent: Shiv + id: UraniumShiv + description: A crude weapon fashioned from a piece of cloth and a uranium glass shard. Violates the geneva convention! + components: + - type: Construction + graph: UraniumShiv + node: icon + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 7 + Radiation: 4 + - type: Item + sprite: Objects/Weapons/Melee/uranium_shiv.rsi + - type: Sprite + sprite: Objects/Weapons/Melee/uranium_shiv.rsi