Melee Executions (#30104)
* melee executions * fix damage bug * cleanup * address reviews hopefully * resistance bypass mechanic * component changes * self executions (not finished yet) * self execs part two * ok i fixed things (still not finished) * finish everything * review stuff * nuke if (kind = special) * more review stuffs * Make suicide system much less hardcoded and make much more use of events * Fix a dumb bug I introduced * self execution popups * Integration tests * Why did they even take 0.5 blunt damage? * More consistent integration tests * Destructive equals true * Allow it to dirty-dispose * IS THIS WHAT YOU WANT? * FRESH AND CLEAN * modifier to multiplier * don't jinx the integration tests * no file-scoped namespace * Move the rest of execution to shared, create SuicideGhostEvent * handled * Get rid of unused code and add a comment * ghost before suicide * stop cat suicides * popup fix + small suicide change * make it a bit better --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
This commit is contained in:
@@ -6,6 +6,8 @@
|
||||
description: A small piece of crystal.
|
||||
components:
|
||||
- type: Sharp
|
||||
- type: Execution
|
||||
doAfterDuration: 4.0
|
||||
- type: Sprite
|
||||
layers:
|
||||
- sprite: Objects/Materials/Shards/crystal.rsi
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
description: It's a shard of some unknown material.
|
||||
components:
|
||||
- type: Sharp
|
||||
- type: Execution
|
||||
doAfterDuration: 4.0
|
||||
- type: Sprite
|
||||
layers:
|
||||
- sprite: Objects/Materials/Shards/shard.rsi
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
description: In Space Glasgow this is called a conversation starter.
|
||||
components:
|
||||
- type: Sharp
|
||||
- type: Execution
|
||||
doAfterDuration: 4.0
|
||||
- type: MeleeWeapon
|
||||
attackRate: 1.5
|
||||
damage:
|
||||
|
||||
@@ -5,6 +5,8 @@
|
||||
description: A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter.
|
||||
components:
|
||||
- type: Sharp
|
||||
- type: Execution
|
||||
doAfterDuration: 4.0
|
||||
- type: Sprite
|
||||
sprite: Objects/Weapons/Melee/armblade.rsi
|
||||
state: icon
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
tags:
|
||||
- FireAxe
|
||||
- type: Sharp
|
||||
- type: Execution
|
||||
doAfterDuration: 4.0
|
||||
- type: Sprite
|
||||
sprite: Objects/Weapons/Melee/fireaxe.rsi
|
||||
state: icon
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
tags:
|
||||
- Knife
|
||||
- type: Sharp
|
||||
- type: Execution
|
||||
doAfterDuration: 4.0
|
||||
- type: Utensil
|
||||
types:
|
||||
- Knife
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
abstract: true
|
||||
components:
|
||||
- type: Sharp
|
||||
- type: Execution
|
||||
doAfterDuration: 4.0
|
||||
- type: MeleeWeapon
|
||||
wideAnimationRotation: -135
|
||||
- type: Sprite
|
||||
|
||||
Reference in New Issue
Block a user