Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nerf & standardised slip times #27879

Merged
merged 11 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Content.Shared/Slippery/SlipperyComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ public sealed partial class SlipperyComponent : Component
/// </summary>
[DataField, AutoNetworkedField]
[Access(Other = AccessPermissions.ReadWrite)]
public float ParalyzeTime = 3f;
public float ParalyzeTime = 1.5f;

/// <summary>
/// The entity's speed will be multiplied by this to slip it forwards.
/// </summary>
[DataField, AutoNetworkedField]
[Access(Other = AccessPermissions.ReadWrite)]
public float LaunchForwardsMultiplier = 1f;
public float LaunchForwardsMultiplier = 1.5f;

/// <summary>
/// If this is true, any slipping entity loses its friction until
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@
description: uplink-slipocalypse-clustersoap-desc
productEntity: SlipocalypseClusterSoap
cost:
Telecrystal: 3
Telecrystal: 2
categories:
- UplinkDisruption

Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Entities/Effects/puddle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@
components:
- type: Clickable
- type: Slippery
launchForwardsMultiplier: 2.0
- type: Transform
noRot: true
anchored: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,6 @@
sprite: Objects/Specific/Hydroponics/banana.rsi
heldPrefix: peel
- type: Slippery
launchForwardsMultiplier: 1.5
- type: StepTrigger
intersectRatio: 0.2
- type: CollisionWake
Expand Down Expand Up @@ -388,7 +387,6 @@
path: /Audio/Effects/slip.ogg
params:
volume: -100
launchForwardsMultiplier: 1.6

- type: entity
name: bananium peel
Expand All @@ -402,8 +400,6 @@
sprite: Objects/Materials/materials.rsi
heldPrefix: peel
- type: Slippery
paralyzeTime: 4
launchForwardsMultiplier: 2

- type: entity
name: carrot
Expand Down
4 changes: 1 addition & 3 deletions Resources/Prototypes/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,7 @@
borderColor: "#C18199"
- type: Icon
state: pda-clown
- type: Slippery
paralyzeTime: 4
launchForwardsMultiplier: 1.5
- type: Slippery # secretly made of bananium
- type: StepTrigger
- type: CollisionWake
enabled: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,6 @@
sound:
path: /Audio/Items/bikehorn.ogg
- type: Slippery
paralyzeTime: 4
launchForwardsMultiplier: 1.5
- type: StepTrigger
- type: CollisionWake
enabled: false
Expand Down
7 changes: 4 additions & 3 deletions Resources/Prototypes/Entities/Objects/Fun/error.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
- ReagentId: Nutriment
Quantity: 5
- type: Slippery
launchForwardsMultiplier: 5
paralyzeTime: 3
launchForwardsMultiplier: 3
- type: StepTrigger
intersectRatio: 0.2
- type: CollisionWake
Expand All @@ -28,14 +29,14 @@
slips:
shape:
!type:PhysShapeAabb
bounds: "-0.2,-0.2,0.2,0.2"
bounds: "-0.4,-0.3,0.4,0.3"
hard: false
layer:
- SlipLayer
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.2,-0.2,0.2,0.2"
bounds: "-0.4,-0.3,0.4,0.3"
density: 30
mask:
- ItemMask
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@
- type: Transform
anchored: true
- type: Slippery
paralyzeTime: 2
launchForwardsMultiplier: 1.5
- type: StepTrigger
intersectRatio: 0.2
- type: Physics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
sprite: Objects/Specific/Janitorial/soap.rsi
storedRotation: -90
- type: Slippery
paralyzeTime: 2
launchForwardsMultiplier: 1.5
- type: StepTrigger
intersectRatio: 0.2
- type: CollisionWake
Expand Down Expand Up @@ -129,8 +127,8 @@
- type: SolutionContainerVisuals
fillBaseName: syndie-
- type: Slippery
paralyzeTime: 5
launchForwardsMultiplier: 2.5
paralyzeTime: 3
launchForwardsMultiplier: 3
- type: Item
heldPrefix: syndie
- type: FlavorProfile
Expand All @@ -154,8 +152,8 @@
layers:
- state: syndie-soaplet
- type: Slippery
paralyzeTime: 5
launchForwardsMultiplier: 2.5
paralyzeTime: 1.5 # these things are tiny
launchForwardsMultiplier: 1.5
- type: StepTrigger
intersectRatio: 0.04
- type: Item
Expand Down Expand Up @@ -196,7 +194,6 @@
- type: SolutionContainerVisuals
fillBaseName: gibs-
- type: Slippery
paralyzeTime: 2
- type: StepTrigger
- type: Item
heldPrefix: gibs
Expand All @@ -221,8 +218,8 @@
- type: SolutionContainerVisuals
fillBaseName: omega-
- type: Slippery
paralyzeTime: 7
launchForwardsMultiplier: 3
paralyzeTime: 5.0
launchForwardsMultiplier: 3.0
- type: Item
heldPrefix: omega
- type: SolutionContainerManager
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Entities/Tiles/bananium.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: Slippery
paralyzeTime: 2
launchForwardsMultiplier: 1.5
- type: StepTrigger
intersectRatio: 0.2
- type: Physics
Expand Down
2 changes: 0 additions & 2 deletions Resources/Prototypes/Reagents/cleaning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@
meltingPoint: 18.2
tileReactions:
- !type:SpillTileReaction
paralyzeTime: 3
launchForwardsMultiplier: 2
requiredSlipSpeed: 1
superSlippery: true

Expand Down
Loading