Players are propelled forward when slipping (#7886)

* Slippery System checks if players are already down before slipping them again. Prevents chains of banana peels accelerating players to supersonic speeds.

* Slippery items and puddles now propel people, some more than others.

* a white space
This commit is contained in:
hubismal
2022-05-01 01:02:29 -05:00
committed by GitHub
parent 2881cd4020
commit 6ec1572dd6
5 changed files with 11 additions and 1 deletions

View File

@@ -91,6 +91,11 @@ namespace Content.Shared.Slippery
return false; return false;
} }
if (EntityManager.HasComponent<KnockedDownComponent>(otherBody.Owner))
{
return false;
}
var ev = new SlipAttemptEvent(); var ev = new SlipAttemptEvent();
RaiseLocalEvent(otherBody.Owner, ev, false); RaiseLocalEvent(otherBody.Owner, ev, false);
if (ev.Cancelled) if (ev.Cancelled)

View File

@@ -15,6 +15,7 @@
- type: Clickable - type: Clickable
- type: Evaporation - type: Evaporation
- type: Slippery - type: Slippery
launchForwardsMultiplier: 2.0
- type: Physics - type: Physics
- type: Fixtures - type: Fixtures
fixtures: fixtures:

View File

@@ -178,6 +178,7 @@
HeldPrefix: peel HeldPrefix: peel
- type: Slippery - type: Slippery
intersectPercentage: 0.2 intersectPercentage: 0.2
launchForwardsMultiplier: 6.0
- type: CollisionWake - type: CollisionWake
enabled: false enabled: false
- type: Physics - type: Physics

View File

@@ -132,6 +132,7 @@
state: pda-clown state: pda-clown
- type: Slippery - type: Slippery
paralyzeTime: 4 paralyzeTime: 4
launchForwardsMultiplier: 9.0
- type: CollisionWake - type: CollisionWake
enabled: false enabled: false
- type: Physics - type: Physics
@@ -520,4 +521,3 @@
state: pda-atmos state: pda-atmos
- type: Icon - type: Icon
state: pda-atmos state: pda-atmos

View File

@@ -15,6 +15,7 @@
- type: Slippery - type: Slippery
paralyzeTime: 2 paralyzeTime: 2
intersectPercentage: 0.2 intersectPercentage: 0.2
launchForwardsMultiplier: 6.0
- type: CollisionWake - type: CollisionWake
enabled: false enabled: false
- type: Physics - type: Physics
@@ -67,6 +68,7 @@
state: syndie state: syndie
- type: Slippery - type: Slippery
paralyzeTime: 5 paralyzeTime: 5
launchForwardsMultiplier: 9.0
- type: Item - type: Item
HeldPrefix: syndie HeldPrefix: syndie
@@ -93,5 +95,6 @@
state: omega state: omega
- type: Slippery - type: Slippery
paralyzeTime: 7 paralyzeTime: 7
launchForwardsMultiplier: 9.0
- type: Item - type: Item
HeldPrefix: omega HeldPrefix: omega