tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add lava (#13438)

Browse Source
This commit is contained in:
metalgearsloth
2023-01-18 05:25:32 +11:00
committed by GitHub
parent 4456229836
commit 6c9ce79387
27 changed files with 405 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Climbing/ClimbSystem.cs
View File

@@ -10,6 +10,7 @@ using Content.Shared.Body.Part;
using Content.Shared.Buckle.Components;
using Content.Shared.CCVar;
using Content.Shared.Climbing;
using Content.Shared.Climbing.Events;
using Content.Shared.Damage;
using Content.Shared.DragDrop;
using Content.Shared.GameTicking;
@@ -280,6 +281,8 @@ public sealed class ClimbSystem : SharedClimbSystem
climbing.IsClimbing = false;
climbing.OwnerIsTransitioning = false;
var ev = new EndClimbEvent();
RaiseLocalEvent(uid, ref ev);
Dirty(climbing);
}

2
Content.Server/Damage/Systems/DamageOnLandSystem.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Server.Damage.Systems
SubscribeLocalEvent<DamageOnLandComponent, LandEvent>(DamageOnLand);
}
private void DamageOnLand(EntityUid uid, DamageOnLandComponent component, LandEvent args)
private void DamageOnLand(EntityUid uid, DamageOnLandComponent component, ref LandEvent args)
{
_damageableSystem.TryChangeDamage(uid, component.Damage, component.IgnoreResistances);
}

2
Content.Server/Dice/DiceSystem.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Server.Dice
Roll(uid, component);
}
private void OnLand(EntityUid uid, DiceComponent component, LandEvent args)
private void OnLand(EntityUid uid, DiceComponent component, ref LandEvent args)
{
Roll(uid, component);
}

2
Content.Server/Fluids/EntitySystems/SpillableSystem.cs
View File

@@ -95,7 +95,7 @@ public sealed class SpillableSystem : EntitySystem
: SpillAt(solution, transformComponent.Coordinates, prototype, sound: sound, combine: combine);
}
private void SpillOnLand(EntityUid uid, SpillableComponent component, LandEvent args)
private void SpillOnLand(EntityUid uid, SpillableComponent component, ref LandEvent args)
{
if (!_solutionContainerSystem.TryGetSolution(uid, component.SolutionName, out var solution)) return;

2
Content.Server/Light/EntitySystems/LightBulbSystem.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Server.Light.EntitySystems
SetState(uid, bulb.State, bulb);
}
private void HandleLand(EntityUid uid, LightBulbComponent bulb, LandEvent args)
private void HandleLand(EntityUid uid, LightBulbComponent bulb, ref LandEvent args)
{
PlayBreakSound(uid, bulb);
SetState(uid, LightBulbState.Broken, bulb);

2
Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
View File

@@ -154,7 +154,7 @@ namespace Content.Server.Nutrition.EntitySystems
args.Handled = TryDrink(args.User, args.User, component);
}
private void HandleLand(EntityUid uid, DrinkComponent component, LandEvent args)
private void HandleLand(EntityUid uid, DrinkComponent component, ref LandEvent args)
{
if (component.Pressurized &&
!component.Opened &&

23
Content.Server/Tiles/LavaComponent.cs Normal file
View File

@@ -0,0 +1,23 @@
using Robust.Shared.Audio;
using Robust.Shared.GameStates;
namespace Content.Server.Tiles;
/// <summary>
/// Applies flammable and damage while vaulting.
/// </summary>
[RegisterComponent, Access(typeof(LavaSystem))]
public sealed class LavaComponent : Component
{
/// <summary>
/// Sound played if something disintegrates in lava.
/// </summary>
[ViewVariables(VVAccess.ReadWrite), DataField("soundDisintegration")]
public SoundSpecifier DisintegrationSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg");
/// <summary>
/// How many fire stacks are applied per second.
/// </summary>
[ViewVariables(VVAccess.ReadWrite), DataField("fireStacks")]
public float FireStacks = 2f;
}

39
Content.Server/Tiles/LavaSystem.cs Normal file
View File

@@ -0,0 +1,39 @@
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Shared.StepTrigger.Systems;
namespace Content.Server.Tiles;
public sealed class LavaSystem : EntitySystem
{
[Dependency] private readonly FlammableSystem _flammable = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<LavaComponent, StepTriggeredEvent>(OnLavaStepTriggered);
SubscribeLocalEvent<LavaComponent, StepTriggerAttemptEvent>(OnLavaStepTriggerAttempt);
}
private void OnLavaStepTriggerAttempt(EntityUid uid, LavaComponent component, ref StepTriggerAttemptEvent args)
{
if (!HasComp<FlammableComponent>(args.Tripper))
return;
args.Continue = true;
}
private void OnLavaStepTriggered(EntityUid uid, LavaComponent component, ref StepTriggeredEvent args)
{
var otherUid = args.Tripper;
if (TryComp<FlammableComponent>(otherUid, out var flammable))
{
// Apply the fury of a thousand suns
var multiplier = flammable.FireStacks == 0f ? 5f : 1f;
_flammable.AdjustFireStacks(otherUid, component.FireStacks * multiplier, flammable);
_flammable.Ignite(otherUid, flammable);
}
}
}

2
Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactLandSystem.cs
View File

@@ -14,7 +14,7 @@ public sealed class ArtifactLandSystem : EntitySystem
SubscribeLocalEvent<ArtifactLandTriggerComponent, LandEvent>(OnLand);
}
private void OnLand(EntityUid uid, ArtifactLandTriggerComponent component, LandEvent args)
private void OnLand(EntityUid uid, ArtifactLandTriggerComponent component, ref LandEvent args)
{
_artifact.TryActivateArtifact(uid, args.User);
}

10
Content.Shared/Climbing/Events/EndClimbEvent.cs Normal file
View File

@@ -0,0 +1,10 @@
namespace Content.Shared.Climbing.Events;
/// <summary>
/// Raised on an entity when it ends climbing.
/// </summary>
[ByRefEvent]
public readonly record struct EndClimbEvent
{
}

2
Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
View File

@@ -45,7 +45,7 @@ namespace Content.Shared.Nutrition.EntitySystems
}
}
private void OnCreamPieLand(EntityUid uid, CreamPieComponent component, LandEvent args)
private void OnCreamPieLand(EntityUid uid, CreamPieComponent component, ref LandEvent args)
{
SplatCreamPie(uid, component);
}

4
Content.Shared/Sound/SharedEmitSoundSystem.cs
View File

@@ -29,7 +29,7 @@ namespace Content.Shared.Sound
{
base.Initialize();
SubscribeLocalEvent<EmitSoundOnSpawnComponent, ComponentInit>(HandleEmitSpawnOnInit);
SubscribeLocalEvent<EmitSoundOnLandComponent, LandEvent>(HandleEmitSoundOnLand);
SubscribeLocalEvent<EmitSoundOnLandComponent, LandEvent>(OnEmitSoundOnLand);
SubscribeLocalEvent<EmitSoundOnUseComponent, UseInHandEvent>(HandleEmitSoundOnUseInHand);
SubscribeLocalEvent<EmitSoundOnThrowComponent, ThrownEvent>(HandleEmitSoundOnThrown);
SubscribeLocalEvent<EmitSoundOnActivateComponent, ActivateInWorldEvent>(HandleEmitSoundOnActivateInWorld);
@@ -42,7 +42,7 @@ namespace Content.Shared.Sound
TryEmitSound(component, predict: false);
}
private void HandleEmitSoundOnLand(EntityUid uid, BaseEmitSoundComponent component, LandEvent args)
private void OnEmitSoundOnLand(EntityUid uid, BaseEmitSoundComponent component, ref LandEvent args)
{
if (!TryComp<TransformComponent>(uid, out var xform) ||
!_mapManager.TryGetGrid(xform.GridUid, out var grid))

7
Content.Shared/Throwing/LandEvent.cs
View File

@@ -5,11 +5,8 @@ namespace Content.Shared.Throwing
/// <summary>
/// Raised when an entity that was thrown lands. This occurs before they stop moving and is when their tile-friction is reapplied.
/// </summary>
[PublicAPI]
public sealed class LandEvent : EntityEventArgs
{
public EntityUid? User;
}
[ByRefEvent]
public readonly record struct LandEvent(EntityUid? User);
/// <summary>
/// Raised when a thrown entity is no longer moving.

6
Content.Shared/Throwing/ThrowingSystem.cs
View File

@@ -82,8 +82,7 @@ public sealed class ThrowingSystem : EntitySystem
if (time < FlyTime)
{
_physics.SetBodyStatus(physics, BodyStatus.OnGround);
_thrownSystem.LandComponent(comp);
_thrownSystem.LandComponent(comp, physics);
}
else
{
@@ -94,8 +93,7 @@ public sealed class ThrowingSystem : EntitySystem
if (physics.Deleted)
return;
_physics.SetBodyStatus(physics, BodyStatus.OnGround);
_thrownSystem.LandComponent(comp);
_thrownSystem.LandComponent(comp, physics);
});
}

13
Content.Shared/Throwing/ThrownItemSystem.cs
View File

@@ -19,9 +19,11 @@ namespace Content.Shared.Throwing
/// </summary>
public sealed class ThrownItemSystem : EntitySystem
{
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly SharedBroadphaseSystem _broadphase = default!;
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
[Dependency] private readonly FixtureSystem _fixtures = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
private const string ThrowingFixture = "throw-fixture";
@@ -115,8 +117,10 @@ namespace Content.Shared.Throwing
EntityManager.RemoveComponent<ThrownItemComponent>(uid);
}
public void LandComponent(ThrownItemComponent thrownItem)
public void LandComponent(ThrownItemComponent thrownItem, PhysicsComponent physics)
{
_physics.SetBodyStatus(physics, BodyStatus.OnGround);
if (thrownItem.Deleted || Deleted(thrownItem.Owner) || _containerSystem.IsEntityInContainer(thrownItem.Owner)) return;
var landing = thrownItem.Owner;
@@ -133,8 +137,9 @@ namespace Content.Shared.Throwing
if (thrownItem.Thrower is not null)
_adminLogger.Add(LogType.Landed, LogImpact.Low, $"{ToPrettyString(landing):entity} thrown by {ToPrettyString(thrownItem.Thrower.Value):thrower} landed.");
var landMsg = new LandEvent {User = thrownItem.Thrower};
RaiseLocalEvent(landing, landMsg, false);
_broadphase.RegenerateContacts(physics);
var landEvent = new LandEvent(thrownItem.Thrower);
RaiseLocalEvent(landing, ref landEvent);
}
/// <summary>

43
Resources/Prototypes/Entities/Tiles/lava.yml Normal file
View File

@@ -0,0 +1,43 @@
- type: entity
id: FloorLavaEntity
name: lava floor
placement:
mode: SnapgridCenter
snap:
- Wall
components:
- type: StepTrigger
requiredTriggeredSpeed: 0
intersectRatio: 0.1
- type: Lava
- type: Transform
anchored: true
- type: Sprite
sprite: Tiles/Planet/lava.rsi
netsync: false
drawdepth: BelowFloor
layers:
- state: lava
shader: unshaded
- type: Icon
sprite: Tiles/Planet/lava.rsi
state: full
- type: IconSmooth
key: floor
base: lava
- type: Physics
bodyType: Static
- type: Fixtures
fixtures:
- shape:
!type:PhysShapeAabb
bounds: "-0.5,-0.5,0.5,0.5"
layer:
- SlipLayer
mask:
- ItemMask
density: 1000
hard: false
- type: Tag
tags:
- HideContextMenu

BIN
Resources/Textures/Tiles/Planet/lava.rsi/full.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Resources/Textures/Tiles/Planet/lava.rsi/lava.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
Resources/Textures/Tiles/Planet/lava.rsi/lava0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
Resources/Textures/Tiles/Planet/lava.rsi/lava1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
Resources/Textures/Tiles/Planet/lava.rsi/lava2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
Resources/Textures/Tiles/Planet/lava.rsi/lava3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
Resources/Textures/Tiles/Planet/lava.rsi/lava4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
Resources/Textures/Tiles/Planet/lava.rsi/lava5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
Resources/Textures/Tiles/Planet/lava.rsi/lava6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
Resources/Textures/Tiles/Planet/lava.rsi/lava7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

265
Resources/Textures/Tiles/Planet/lava.rsi/meta.json Normal file
View File

@@ -0,0 +1,265 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/tree/f116442e34fe3e941a1df474bb57bb410dd177a3/icons/turf and modified",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "full"
},
{
"name": "lava0",
"directions": 4,
"delays": [
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
]
]
},
{
"name": "lava1",
"directions": 4,
"delays": [
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
]
]
},
{
"name": "lava2",
"directions": 4,
"delays": [
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
]
]
},
{
"name": "lava3",
"directions": 4,
"delays": [
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
]
]
},
{
"name": "lava4",
"directions": 4,
"delays": [
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
]
]
},
{
"name": "lava5",
"directions": 4,
"delays": [
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
]
]
},
{
"name": "lava6",
"directions": 4,
"delays": [
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
]
]
},
{
"name": "lava7",
"directions": 4,
"delays": [
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
],
[
2,
2,
2,
2
]
]
},
{
"name": "lava",
"delays": [
[
2,
2,
2,
2
]
]
}
]
}