Апдейт ближнего боя (#37)

* Dagger update * Light weapons * HandheldAxe update * Update handheldAxe.yml * +sickle +dart * two handed update * add Link LightHammer sprite * pipi * . Add Weapons prototypes * fixes
2024-04-05 20:19:33 +03:00
parent bdfb5a72b9
commit 492176a8c3
51 changed files with 489 additions and 66 deletions
--- a/Resources/Prototypes/_CP14/Entities/Effects/weapon_arc.yml
+++ b/Resources/Prototypes/_CP14/Entities/Effects/weapon_arc.yml
@@ -0,0 +1,7 @@
+- type: entity
+  id: CPWeaponArcSlashLight
+  parent: WeaponArcStatic
+  noSpawn: true
+  components:
+    - type: WeaponArcVisuals
+      animation: CPSlashLight
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml
@@ -1,57 +1,62 @@
-# 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
+  id: CPBaseWeaponChemical
+  abstract: true
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      melee:
+        maxVol: 4
+  - type: MeleeChemicalInjector
+    solution: melee
+  - type: RefillableSolution
+    solution: melee
+  - type: InjectableSolution
+    solution: melee
+  - type: SolutionInjectOnEmbed
+    transferAmount: 2
+    solution: melee
+  - type: SolutionTransfer
+    maxTransferAmount: 2

 - type: entity
-  name: двуручный меч
+  id: CPBaseWeaponThrowable
  abstract: true
-  parent: BaseItem
-  id: CPBaseTwoHandedSword
-  description: Мощное оружие, требующее огромной силы и умения для эффективного использования.
-  components:
-  - type: Sharp
-  - type: MeleeWeapon
-    attackRate: 0.75
+  components: 
+  - type: DamageOtherOnHit
    damage:
      types:
-        Slash: 10
-        Structural: 5
-    soundHit:
-      collection: MetalThud
-  - type: Wieldable
-  - type: IncreaseDamageOnWield
+        Piercing: 10
+  - type: DamageOnLand
    damage:
      types:
-        Slash: 30
-        Structural: 5
-  - type: Item
-    size: Ginormous
+        Piercing: 10
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PolygonShape
+          vertices:
+            - -0.40,-0.30
+            - -0.30,-0.40
+            - 0.40,0.30
+            - 0.30,0.40
+        density: 10
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+
+- type: entity
+  id: CPBaseWeaponLight
+  abstract: true
+  components:
+  - type: MeleeWeapon
+    resetOnHandSelected: false
+
+- type: entity
+  id: CPBaseWeaponShort
+  abstract: true
+  components: 
+  - type: MeleeWeapon
+    range: 1.0 # 1.5 standart
+    cPAnimationOffset: -0.75

-# Long spear
-# Long sword
-# Whip
-# Short sword
-# Hammer
-# Morgenstern
-# Pika
-# Rapier
-# Axe
-# Scimitar
-# Trident
-# Chain
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml
@@ -0,0 +1,34 @@
+- type: entity
+  name: кинжал
+  parent: 
+  - BaseItem
+  - CPBaseWeaponChemical
+  - CPBaseWeaponThrowable
+  - CPBaseWeaponLight
+  - CPBaseWeaponShort
+  id: CPBaseDagger
+  description: Небольшое острое лезвие, сгодится и для ближнего боя, и как метательное оружие.
+  components:
+  - type: Item
+    storedRotation: -45 
+  - type: Sprite
+    sprite: CrystallPunk/Objects/Weapons/Melee/Dagger/dagger.rsi
+    layers:
+    - state: icon
+  - type: Sharp
+  - type: MeleeWeapon
+    attackRate: 1.8
+    wideAnimationRotation: 225
+    wideAnimation: CPWeaponArcSlashLight
+    damage:
+      types:
+        Slash: 5
+        Piercing: 5
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.15
+  - type: EmbeddableProjectile
+    offset: 0.15,0.15
+    removalTime: 1
+  - type: ThrowingAngle
+    angle: 225
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/handheldAxe.yml
@@ -0,0 +1,42 @@
+- type: entity
+  name: ручной топор
+  parent: 
+  - BaseItem
+  - CPBaseWeaponChemical
+  - CPBaseWeaponThrowable
+  - CPBaseWeaponLight
+  id: CPBaseHandheldAxe
+  description: Небольшой, надежный топорик.
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    sprite: CrystallPunk/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi
+    layers:
+    - state: icon
+  - type: Sharp
+  - type: MeleeWeapon
+    attackRate: 1.4
+    range: 1.2
+    wideAnimationRotation: 225
+    wideAnimation: CPWeaponArcSlashLight
+    damage:
+      types:
+        Slash: 10
+        Piercing: 5
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.25
+  - type: EmbeddableProjectile
+    offset: 0.15,0.15
+    removalTime: 1.5
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 5
+        Piercing: 5
+  - type: DamageOnLand
+    damage:
+      types:
+        Slash: 5
+        Piercing: 5
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/lightHammer.yml
@@ -0,0 +1,35 @@
+- type: entity
+  name: легкий молот
+  parent: 
+  - BaseItem
+  - CPBaseWeaponChemical
+  - CPBaseWeaponThrowable
+  - CPBaseWeaponLight
+  - CPBaseWeaponShort
+  id: CPBaseLightHammer
+  description: Небольшое молоток. Хорош как для плотнических работ, так и для проламывания черепов.
+  components:
+  - type: Item
+    storedRotation: -45 
+  - type: Sprite
+    sprite: CrystallPunk/Objects/Weapons/Melee/LightHammer/lightHammer.rsi
+    layers:
+    - state: icon
+  - type: MeleeWeapon
+    attackRate: 1.5
+    wideAnimationRotation: 225
+    wideAnimation: CPWeaponArcSlashLight
+    cPAnimationLength: 0.18
+    damage:
+      types:
+        Blunt: 10
+    soundHit:
+      collection: MetalThud
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 10
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 10
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml
@@ -0,0 +1,27 @@
+- type: entity
+  name: серп
+  parent: 
+  - BaseItem
+  - CPBaseWeaponChemical
+  - CPBaseWeaponLight
+  - CPBaseWeaponShort
+  id: CPBaseSickle
+  description: Изначально разработанное как оружие против травы, серп внезапно показал себя хорош и в более кровавой жатве.
+  components:
+  - type: Item
+    storedRotation: -45 
+  - type: Sprite
+    sprite: CrystallPunk/Objects/Weapons/Melee/Sickle/sickle.rsi
+    layers:
+    - state: icon
+  - type: MeleeWeapon
+    attackRate: 1.5
+    wideAnimationRotation: 225
+    wideAnimation: CPWeaponArcSlashLight
+    cPAnimationLength: 0.18
+    damage:
+      types:
+        Slash: 8
+        Piercing: 4
+    soundHit:
+      collection: MetalThud
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml
@@ -1,17 +1,45 @@
-
 - type: entity
-  name: цвайхендер
-  parent: CPBaseTwoHandedSword
-  id: CPZweichender
+  name: двуручный меч #ToDo - сделать базовый двуручник
+  parent: 
+  - BaseItem
+  - CPBaseWeaponChemical
+  id: CPBaseTwoHandedSword
+  description: Мощное оружие, требующее огромной силы и умения для эффективного использования.
  components:
-  - type: MeleeWeapon
-    wideAnimationRotation: 225
  - type: Sprite
-    sprite: CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi
+    sprite: CrystallPunk/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi
    state: icon
  - type: Clothing
-    sprite: CrystallPunk/Objects/Weapons/Melee/zweichhender.rsi
+    sprite: CrystallPunk/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi
    quickEquip: false
    slots:
    - back
-    #TODO двуручный хват требует перчаток чтобы не получать урона самому
+  - type: Icon
+    sprite: CrystallPunk/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword32.rsi
+    state: icon
+  - type: Sharp
+  - type: MeleeWeapon
+    attackRate: 0.5
+    wideAnimationRotation: 205
+    wideAnimation: CPWeaponArcSlashLight
+    damage:
+      types:
+        Slash: 5
+        Blunt: 3
+        Structural: 5
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.8
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Slash: 20
+        Blunt: 10
+        Structural: 5
+  - type: Item
+    size: Ginormous
+  - type: ClothingSpeedModifier
+    walkModifier: 0.9
+    sprintModifier: 0.8
+  - type: HeldSpeedModifier