Status effect refactor (#4868)

* Oops! All Changes In One Commit

* try desperately to fix prediction issues and fail

* oops

* test

* actually fixes prediction issues

* port jittering to status effect

* default merge behavior + alert cooldown stuff

* silly test issue

* zabloing

* address reviews
This commit is contained in:
mirrorcult
2021-10-15 14:45:04 -07:00
committed by GitHub
parent 51578304f1
commit ae1ce0b31c
36 changed files with 811 additions and 511 deletions

View File

@@ -105,10 +105,10 @@
CarbonDioxide: 0.00015190972
damage:
types:
Asphyxiation: 1
Asphyxiation: 1
damageRecovery:
types:
Asphyxiation: -1
Asphyxiation: -1
- type: MobState
thresholds:
0: !type:NormalMobState {}
@@ -117,7 +117,11 @@
- type: HeatResistance
- type: CombatMode
- type: Internals
- type: Stunnable
- type: StatusEffects
allowed:
- Stun
- KnockedDown
- SlowedDown
- type: Examiner
- type: UnarmedCombat
range: 1.5

View File

@@ -62,8 +62,11 @@
solution: bloodstream
- type: Bloodstream
max_volume: 100
# StatusEffects
- type: Stunnable
- type: StatusEffects
allowed:
- Stun
- KnockedDown
- SlowedDown
# Other
- type: Inventory
- type: Clickable

View File

@@ -0,0 +1,17 @@
# Status effect prototypes.
# Holds no actual logic, just some basic data about the effect.
- type: statusEffect
id: Stun
alert: Stun
- type: statusEffect
id: KnockedDown
alert: Stun
- type: statusEffect
id: SlowedDown
- type: statusEffect
id: Jitter
alwaysAllowed: true