Shards damage barefoot users + steptrigger-related general cleanup (#9585)

This commit is contained in:
Kara
2022-07-10 02:28:37 -07:00
committed by GitHub
parent 37bf333674
commit 459f8d23eb
22 changed files with 220 additions and 92 deletions

View File

@@ -2,6 +2,7 @@
name: mousetrap
parent: BaseItem
id: Mousetrap
description: Useful for catching rodents sneaking into your kitchen.
components:
- type: Sprite
sprite: Objects/Devices/mousetrap.rsi
@@ -13,9 +14,9 @@
intersectRatio: 0.2
requiredTriggeredSpeed: 0
- type: Mousetrap
ignoreDamageIfInventorySlotsFilled:
- shoes # shoes
- type: DamageOnTrigger
- type: TriggerOnStepTrigger
- type: ShoesRequiredStepTrigger
- type: DamageUserOnTrigger
damage:
types:
Blunt: 2 # base damage, scales based on mass

View File

@@ -92,3 +92,33 @@
sides: 4
- type: Sprite
state: d44
- type: CollisionWake
enabled: false
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.2,-0.2,0.2,0.2"
id: "slips"
hard: false
layer:
- LowImpassable
- shape:
!type:PhysShapeAabb
bounds: "-0.2,-0.2,0.2,0.2"
mass: 5
mask:
- ItemMask
- type: StepTrigger
intersectRatio: 0.2
requiredTriggeredSpeed: 0
- type: TriggerOnStepTrigger
- type: ShoesRequiredStepTrigger
- type: Slippery
slipSound:
path: /Audio/Effects/glass_step.ogg
launchForwardsMultiplier: 0
- type: DamageUserOnTrigger
damage:
types:
Piercing: 5

View File

@@ -19,6 +19,23 @@
Slash: 5
- type: Item
sprite: Objects/Materials/Shards/shard.rsi
- type: CollisionWake
enabled: false
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.2,-0.2,0.2,0.2"
id: "slips"
hard: false
layer:
- LowImpassable
- shape:
!type:PhysShapeAabb
bounds: "-0.2,-0.2,0.2,0.2"
mass: 5
mask:
- ItemMask
- type: DamageOtherOnHit
damage:
types:
@@ -39,12 +56,25 @@
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: StepTrigger
intersectRatio: 0.2
requiredTriggeredSpeed: 0
- type: ShoesRequiredStepTrigger
- type: Slippery
slipSound:
path: /Audio/Effects/glass_step.ogg
launchForwardsMultiplier: 0
- type: TriggerOnStepTrigger
- type: DamageUserOnTrigger
damage:
types:
Piercing: 5
- type: entity
parent: ShardBase
id: ShardGlass
name: glass shard
description: A small piece of glass. It looks sharp, you wouldn't want to step on it barefoot.
description: A small piece of glass.
components:
- type: Sprite
color: "#bbeeff"
@@ -53,12 +83,16 @@
- type: WelderRefinable
refineResult:
- SheetGlass1
- type: DamageUserOnTrigger
damage:
types:
Piercing: 5
- type: entity
parent: ShardBase
id: ShardGlassReinforced
name: reinforced glass shard
description: A small piece of reinforced glass. It looks sharp, you wouldn't want to step on it barefoot.
description: A small piece of reinforced glass.
components:
- type: Sprite
color: "#96cdef"
@@ -68,12 +102,16 @@
refineResult:
- SheetGlass1
- SheetSteel1
- type: DamageUserOnTrigger
damage:
types:
Piercing: 10
- type: entity
parent: ShardBase
id: ShardGlassPlasma
name: plasma glass shard
description: A small piece of plasma glass. It looks sharp, you wouldn't want to step on it barefoot.
description: A small piece of plasma glass.
components:
- type: Sprite
color: "#f3b489"
@@ -83,3 +121,7 @@
refineResult:
- SheetGlass1
- SheetPlasma1
- type: DamageUserOnTrigger
damage:
types:
Piercing: 15

View File

@@ -35,6 +35,7 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: LandMine
- type: TriggerOnStepTrigger
- type: StepTrigger
requiredTriggeredSpeed: 0
@@ -44,6 +45,7 @@
id: LandMineKick
components:
- type: GhostKickUserOnTrigger
- type: DeleteOnTrigger
- type: entity
name: modular mine
@@ -56,7 +58,6 @@
graph: ModularMineGraph
node: emptyCase
- type: LandMine
deleteOnActivate: false
- type: entity
name: explosive mine
@@ -70,3 +71,4 @@
intensitySlope: 3
totalIntensity: 120 # about a ~4 tile radius
canCreateVacuum: false
- type: DeleteOnTrigger