Shitty combat mode & animations. (#367)

* Combat mode UI & targeting zones.

* Fix inventory hud positioning.

* Crappy attack animations.

* Import TG combat sounds

* More work on arcs.

* Implement hit sounds.

* Lunging, hit effects, some more stuff.
This commit is contained in:
Pieter-Jan Briers
2019-09-26 22:32:32 +02:00
committed by GitHub
parent ac55ccf46e
commit 02d509fc5f
47 changed files with 1231 additions and 35 deletions

View File

@@ -0,0 +1,10 @@
- type: entity
id: WeaponArc
save: false
components:
- type: Sprite
sprite: Effects/weapons/arcs.rsi
directional: false
offset: 0.85, 0
drawdepth: Overlays
- type: MeleeWeaponArcAnimation

View File

@@ -1,6 +1,17 @@
- type: entity
id: ToolboxBase
parent: BaseItem
components:
- type: Storage
Capacity: 60
- type: Item
Size: 9999
- type: MeleeWeapon
hitSound: "/Audio/weapons/smash.ogg"
- type: entity
name: Emergency Toolbox
parent: BaseItem
parent: ToolboxBase
id: RedToolboxItem
description: A bright red toolbox, stocked with emergency tools
components:
@@ -8,14 +19,10 @@
texture: Objects/Tools/toolbox_r.png
- type: Icon
texture: Objects/Tools/toolbox_r.png
- type: Storage
Capacity: 60
- type: Item
Size: 9999
- type: entity
name: Mechanical Toolbox
parent: BaseItem
parent: ToolboxBase
id: BlueToolboxItem
description: A blue box, stocked with mechanical tools
components:
@@ -23,14 +30,10 @@
texture: Objects/Tools/Toolbox_b.png
- type: Icon
texture: Objects/Tools/Toolbox_b.png
- type: Storage
Capacity: 60
- type: Item
Size: 9999
- type: entity
name: Electrical Toolbox
parent: BaseItem
parent: ToolboxBase
id: YellowToolboxItem
description: A toolbox typically stocked with electrical gear
components:
@@ -38,10 +41,6 @@
texture: Objects/Tools/Toolbox_y.png
- type: Icon
texture: Objects/Tools/Toolbox_y.png
- type: Storage
Capacity: 60
- type: Item
Size: 9999
- type: entity
id: YellowToolboxItemFilled

View File

@@ -12,7 +12,18 @@
state: spear
- type: MeleeWeapon
range: 1.5
arcwidth: 10
arc: spear
- type: Item
Size: 24
sprite: Objects/Melee/spear.rsi
prefix: inhand
- type: MeleeWeaponAnimation
id: spear
state: spear
length: 0.10
speed: 6
arcType: Poke

View File

@@ -0,0 +1,7 @@
- type: MeleeWeaponAnimation
id: default
state: slash
arcType: Slash
length: 0.1
color: 255,255,255,1020
colorDelta: 0,0,0,-5100