Merge pull request #1184 from ShadowCommander/UnarmedAttack

Implement unarmed combat
2020-06-23 08:17:32 -07:00
parent 2fb2cea29f 264d3d3942
commit 5a6417cadf
6 changed files with 49 additions and 12 deletions
--- a/Resources/Prototypes/Entities/Mobs/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/human.yml
@@ -134,6 +134,10 @@
  - type: HumanoidAppearance
  - type: Stunnable
  - type: AnimationPlayer
+  - type: UnarmedCombat
+    range: 0.8
+    arcwidth: 30
+    arc: fist

 - type: entity
  save: false
--- a/Resources/Prototypes/MeleeWeaponAnimations/default.yml
+++ b/Resources/Prototypes/MeleeWeaponAnimations/default.yml
@@ -5,3 +5,10 @@
  length: 0.1
  color: 255,255,255,1020
  colorDelta: 0,0,0,-5100
+
+- type: MeleeWeaponAnimation
+  id: fist
+  state: fist
+  arcType: Poke
+  length: 0.15
+  speed: 1
--- a/Resources/Textures/Effects/weapons/arcs.rsi/fist.png
+++ b/Resources/Textures/Effects/weapons/arcs.rsi/fist.png
--- a/Resources/Textures/Effects/weapons/arcs.rsi/meta.json
+++ b/Resources/Textures/Effects/weapons/arcs.rsi/meta.json
@@ -13,6 +13,10 @@
        {
            "name": "slash",
            "directions": 1
+        },
+        {
+            "name": "fist",
+            "directions": 1
        }
    ]
 }