diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs index 85d2e4675f..2027c2d2c6 100644 --- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs +++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs @@ -113,6 +113,11 @@ public sealed partial class MeleeWeaponComponent : Component [ViewVariables(VVAccess.ReadWrite), DataField] public bool SwingLeft; + /// + /// CrystallPunk Melee improvment. Allows each attack to take turns being either left or right + /// + [DataField] + public bool CPSwingBeverage = true; // Sounds diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index e59b4a13fe..8fe0dc6e59 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -428,6 +428,11 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem var attackEv = new MeleeAttackEvent(weaponUid); RaiseLocalEvent(user, ref attackEv); + //CrystallPun melee improvment + if (weapon.CPSwingBeverage) + weapon.SwingLeft = !weapon.SwingLeft; + //CrystallPun melee improvment end + weapon.Attacking = true; return true; } diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml new file mode 100644 index 0000000000..01e9806cef --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml @@ -0,0 +1,57 @@ +# Simple melee weapons + +# Battle Staff +# Mace +# Stick +# Dagger +# Spear +# Light Hammer +# Throwing spear +# Hand axe +# Sickle + +# Military melee weapons + +# Halberd +# Battle pick +# Warhammer +# Battle axe +# Glaive + +- type: entity + name: двуручный меч + abstract: true + parent: BaseItem + id: CPBaseTwoHandedSword + description: Мощное оружие, требующее огромной силы и умения для эффективного использования. + components: + - type: Sharp + - type: MeleeWeapon + attackRate: 0.75 + damage: + types: + Slash: 10 + Structural: 5 + soundHit: + collection: MetalThud + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Slash: 30 + Structural: 5 + - type: Item + size: Ginormous + +# Long spear +# Long sword +# Whip +# Short sword +# Hammer +# Morgenstern +# Pika +# Rapier +# Axe +# Scimitar +# Trident +# Chain \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml new file mode 100644 index 0000000000..4d50550d63 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml @@ -0,0 +1,17 @@ + +- type: entity + name: цвайхендер + parent: CPBaseTwoHandedSword + id: CPZweichender + components: + - type: MeleeWeapon + wideAnimationRotation: 225 + - type: Sprite + sprite: CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi + state: icon + - type: Clothing + sprite: CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi + quickEquip: false + slots: + - back + #TODO двуручный хват требует перчаток чтобы не получать урона самому \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/base.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/base.yml new file mode 100644 index 0000000000..fd817a5aa7 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/base.yml @@ -0,0 +1,14 @@ +# Simple ranged weapon + +# Crossbow +# Dart +# Short bow +# Slingshot + +# Military ranged weapon + +# Handheld crossbow +# Heavy Crossbow +# Longbow +# Blowpipe +# Net \ No newline at end of file diff --git a/Resources/Textures/CrystallPunk/Mobs/Species/Human/parts.rsi/full.png b/Resources/Textures/CrystallPunk/Mobs/Species/Human/parts.rsi/full.png index 27ed487178..a0e572d045 100644 Binary files a/Resources/Textures/CrystallPunk/Mobs/Species/Human/parts.rsi/full.png and b/Resources/Textures/CrystallPunk/Mobs/Species/Human/parts.rsi/full.png differ diff --git a/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/equipped-BACKPACK.png b/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..73e424ea65 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/icon.png b/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/icon.png new file mode 100644 index 0000000000..6cf6bcc1a2 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/icon.png differ diff --git a/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/inhand-left.png b/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/inhand-left.png new file mode 100644 index 0000000000..65a012c1e1 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/inhand-left.png differ diff --git a/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/inhand-right.png b/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/inhand-right.png new file mode 100644 index 0000000000..0699395a33 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/inhand-right.png differ diff --git a/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/meta.json b/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/meta.json new file mode 100644 index 0000000000..5b9a69edac --- /dev/null +++ b/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Created by Hemo (Discord) for CrystallPunk", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/wielded-inhand-left.png b/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..3047bb47cc Binary files /dev/null and b/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/wielded-inhand-right.png b/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..91c02785e5 Binary files /dev/null and b/Resources/Textures/CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi/wielded-inhand-right.png differ