-
Notifications
You must be signed in to change notification settings - Fork 122
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
161 additions
and
143 deletions.
There are no files selected for viewing
21 changes: 0 additions & 21 deletions
21
Content.Server/Vehicles/Systems/VehicleDestructionSystem.cs
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| using Robust.Shared.GameObjects; | ||
|
|
||
| namespace Content.Shared.Vehicle | ||
| { | ||
| [RegisterComponent] | ||
| public partial class KeyComponent : Component | ||
| { | ||
| [DataField("keyType")] | ||
| public string KeyType = string.Empty; | ||
|
|
||
| [ViewVariables] | ||
| public bool IsInserted = false; | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| using Content.Server.Vehicles.Components; | ||
| using Content.Shared.Buckle; | ||
| using Content.Shared.Buckle.Components; | ||
| using Content.Shared.Interaction; | ||
| using Content.Shared.Popups; | ||
| using Content.Shared.Vehicle; | ||
| using Content.Shared.Verbs; | ||
| using Content.Shared.Movement.Events; | ||
| using Robust.Shared.GameObjects; | ||
| using Robust.Shared.IoC; | ||
| using Robust.Shared.Map; | ||
| using Robust.Shared.Physics; | ||
| using Robust.Shared.Player; | ||
| using Robust.Shared.Timing; | ||
|
|
||
| namespace Content.Server.Vehicles.Systems | ||
| { | ||
| public sealed class VehicleSystem : EntitySystem | ||
| { | ||
| [Dependency] private readonly IGameTiming _gameTiming = default!; | ||
| [Dependency] private readonly IMapManager _mapManager = default!; | ||
| [Dependency] private readonly IEntityManager _entityManager = default!; | ||
| [Dependency] private readonly SharedBuckleSystem _buckleSystem = default!; | ||
| [Dependency] private readonly SharedPopupSystem _popupSystem = default!; | ||
|
|
||
| public override void Initialize() | ||
| { | ||
| base.Initialize(); | ||
| SubscribeLocalEvent<VehicleComponent, GetVerbsEvent<AlternativeVerb>>(AddEnterVehicleVerb); | ||
| SubscribeLocalEvent<VehicleComponent, MoveInputEvent>(OnMoveInput); | ||
| SubscribeLocalEvent<VehicleComponent, InteractHandEvent>(OnInteractHand); | ||
| SubscribeLocalEvent<VehicleComponent, BuckleChangeEvent>(OnBuckleChange); | ||
| } | ||
|
|
||
| private void AddEnterVehicleVerb(EntityUid uid, VehicleComponent component, GetVerbsEvent<AlternativeVerb> args) | ||
| { | ||
| if (!args.CanInteract || !args.CanAccess) | ||
| return; | ||
|
|
||
| if (component.Occupants.Count >= component.MaxOccupants) | ||
| return; | ||
|
|
||
| AlternativeVerb verb = new() | ||
| { | ||
| Act = () => EnterVehicle(args.User, uid, component), | ||
| Text = Loc.GetString("enter-vehicle-verb"), | ||
| Priority = 2 | ||
| }; | ||
| args.Verbs.Add(verb); | ||
| } | ||
|
|
||
| private void EnterVehicle(EntityUid user, EntityUid vehicle, VehicleComponent component) | ||
| { | ||
| if (component.Occupants.Count >= component.MaxOccupants) | ||
| { | ||
| _popupSystem.PopupEntity("The vehicle is full.", vehicle, Filter.Entities(user)); | ||
| return; | ||
| } | ||
|
|
||
| if (_buckleSystem.TryBuckle(user, user, vehicle)) | ||
| { | ||
| component.Occupants.Add(user); | ||
| if (component.Driver == null) | ||
| { | ||
| component.Driver = user; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void OnMoveInput(EntityUid uid, VehicleComponent component, ref MoveInputEvent args) | ||
| { | ||
| if (component.Driver == null || component.Driver != args.User) | ||
| return; | ||
|
|
||
| var transform = EntityManager.GetComponent<TransformComponent>(uid); | ||
| var direction = args.Component.HeldMoveButtons.ToVec(); | ||
| transform.Coordinates += direction * component.Speed * (float) _gameTiming.FrameTime.TotalSeconds; | ||
| } | ||
|
|
||
| private void OnInteractHand(EntityUid uid, VehicleComponent component, InteractHandEvent args) | ||
| { | ||
| if (args.Handled) | ||
| return; | ||
|
|
||
| if (component.Occupants.Contains(args.User)) | ||
| { | ||
| _buckleSystem.TryUnbuckle(args.User, args.User, false); | ||
| } | ||
| else | ||
| { | ||
| EnterVehicle(args.User, uid, component); | ||
| } | ||
|
|
||
| args.Handled = true; | ||
| } | ||
|
|
||
| private void OnBuckleChange(EntityUid uid, VehicleComponent component, BuckleChangeEvent args) | ||
| { | ||
| if (args.Buckling) | ||
| { | ||
| component.Occupants.Add(args.BuckledEntity); | ||
| } | ||
| else | ||
| { | ||
| component.Occupants.Remove(args.BuckledEntity); | ||
| if (component.Driver == args.BuckledEntity) | ||
| { | ||
| component.Driver = component.Occupants.Count > 0 ? component.Occupants[0] : null; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |