mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-20 23:17:43 +03:00
* Automatic changelog update * Make NPC names proper nouns & fix some genders (#20534) * Proper names & genders * Uppercase proper names * Make Smile female * fix bingus wrinkly head (#20531) * rouny meat and steak (#20526) * lost friendship flavor * add rouny steak * rouny special meat * rouny meat textures --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311) * Explosive wet floor sign & janitorial suicide vest * fix attributions * Remove name & desc from explosive wet floor sign * Make wet floor sign chameleonable * Automatic changelog update * Minor slippery stuff (#20535) * Update submodule to 162.2.0 (#20570) * Predicted armor (#20560) * clean up some lines in smile the slime prototype (#20552) * Revert "Use full file path for temp replays (#19002)" (#20545) * Add EyesGlasses into ClothesMate (#20523) * Automatic changelog update * Fix Punpun crew monitor sensor (#20484) * Automatic changelog update * EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394) Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Make arcades hackable again (#20555) * Automatic changelog update * Health alert tweaks (#20557) * Automatic changelog update * Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564) * Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent * Nukeops todo and cleanup * Remove Active field * Add EndedGameRuleComponent * bartender suit (#20521) * give me a drink bartender * guh * aARG * Necropolis and mine walls (#20578) * Automatic changelog update * archaic accent tweaks (#20567) * Automatic changelog update * Add confirmation to kick and respawn in the admin player actions panel (#20542) * Remove windows-latest CI runs, remove unused build-test-release.yml (#20540) * Change .editorconfig to keep existing attribute arrangement (#20538) * Automatic changelog update * Catch replay start and end errors on round restarts (#20565) * Update trivial components to use auto comp states (#20539) * Fix role unbans not applying in real time (#20547) * Disable AHelp buttons when no player is selected, update button styling (#20568) * Automatic changelog update * Added a toggle fullscreen button (default F11) (#20272) * Added a toggle fullscreen button (default F11) * Removed un-needed comments * Review Requested Changes * Fixed Acidental Spacing Change * bwoink, removed extraneous code * nothing, litterally * Automatic changelog update * Fix not networking markings (#20588) * Automatic changelog update * Update RobustToolbox to v162.2.1 (#20590) * Automatic changelog update * Glorfcode (force say on damage/stun/crit) (#20562) * Automatic changelog update * Fix AHelp progressively showing more AHelp panels (#20591) * Automatic changelog update * caninsert entitystorage tweaks (#20589) * Automatic changelog update * Fix mapping actions crashing on load (#20592) * Fix loading a map with a ThirstComponent crashing the game (#20594) * Fix electrocution displaying real name of disguised players (#20603) * Organ fixes (#20488) * Automatic changelog update * Kettle medical rework (#20435) * Initial try at medical rework for kettle * Re-add decal decorations to Kettle's medical * Add more lockers to kettle's med * Actually upload kettle's map, not its proto * Automatic changelog update * Added blocked visuals to volumetric pump (#20610) * Automatic changelog update * Move TimedDespawn to engine (#20515) * Update submodule to 163.0.0 (#20616) * Remove v0.1 version number from local main menu screen (#20617) * Remove cloneData parameter from AutoNetworkedField (#20596) * Update submodule to 164.0.0 (#20618) * fix cognizine ghost role (#20632) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Move ID layer one pixel to correct alignment (#20630) * Update nukie hardsuit descriptions (#20529) * Make holofans destructable (#20445) * Automatic changelog update * bowl is open (#20453) Co-authored-by: deltanedas <@deltanedas:kde.org> * Add TestPair.WaitCommand() (#20615) * Rename ThreatPrototype and mark fields as required (#20611) * Adjust hard bomb shape (#20608) * dragon refactor, objectives and use GenericAntag (#20201) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Added generic empty liquids tank (#20563) * Move view variables verb to the top of the list with no category and localize it (#20546) * saltern update (#20325) Co-authored-by: deltanedas <@deltanedas:kde.org> * Fix followers leaking (#20643) * Add Winter Boots (#20622) * add * fix prototype * Add QM mantle (#20621) * add * fix prototype * Automatic changelog update * Slime mobs breathe nitrogen and resprite their organs (#20577) * Slimes breathe nitrogen and resprite their organs * ups * mmm * Automatic changelog update * Fix the new lizard horn's consistency + issue (#20620) * fix * add * Revert "add" This reverts commit a054a3204a8f185a94ceb80b1bd3bc9f30423711. * Add RandomHumanoidAppearance component to for space ninjas (#20605) * Automatic changelog update * Space cat breathes space (#20550) * Space cat breathes space Made Space Cat lungs ROBUST * Made Space Cat's lungs ROBUST 2.0 * Automatic changelog update * Wide anomaly locator (#20581) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * add textures * fix encoding * fix 2 * Automatic changelog update * Fixed Telescopic Shield Lighting (#20650) * Fixed Telescopic Shield Lighting Bug fix #20199 * no need for these at all --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Automatic changelog update * Add a special hardsuit for nukie medic (#20471) * Automatic changelog update * Carry over other mutations when doing species mutation (#20551) * Automatic changelog update * Add Spanish accent to poncho and sombrero (#20377) --------- Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: LEVELcat <68501903+LEVELcat@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Doru991 <75124791+Doru991@users.noreply.github.com> Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: Skarletto <122584947+Skarletto@users.noreply.github.com> Co-authored-by: NULL882 <104377798+NULL882@users.noreply.github.com> Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com> Co-authored-by: Miro Kavaliou <miraslauk@gmail.com> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Kacper Urbańczyk <kacperjaroslawurbanczyk@gmail.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: daerSeebaer <61566539+daerSeebaer@users.noreply.github.com> Co-authored-by: Fluffiest Floofers <thebluewulf@gmail.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Kevin Zheng <kevinz5000@gmail.com> Co-authored-by: drteaspoon420 <87363733+drteaspoon420@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com> Co-authored-by: Kacper Urbańczyk <mikrel071204@gmail.com> Co-authored-by: Tox Cruize <141375638+TexCruize@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Michael Cu <43478115+michaelcu@users.noreply.github.com>
355 lines
12 KiB
C#
355 lines
12 KiB
C#
using System.Numerics;
|
|
using Content.Client.Items;
|
|
using Content.Client.Weapons.Ranged.Components;
|
|
using Content.Shared.Camera;
|
|
using Content.Shared.CombatMode;
|
|
using Robust.Shared.Spawners;
|
|
using Content.Shared.Weapons.Ranged;
|
|
using Content.Shared.Weapons.Ranged.Components;
|
|
using Content.Shared.Weapons.Ranged.Events;
|
|
using Content.Shared.Weapons.Ranged.Systems;
|
|
using Robust.Client.Animations;
|
|
using Robust.Client.GameObjects;
|
|
using Robust.Client.Graphics;
|
|
using Robust.Client.Input;
|
|
using Robust.Client.Player;
|
|
using Robust.Shared.Animations;
|
|
using Robust.Shared.Input;
|
|
using Robust.Shared.Map;
|
|
using Robust.Shared.Prototypes;
|
|
using Robust.Shared.Utility;
|
|
using SharedGunSystem = Content.Shared.Weapons.Ranged.Systems.SharedGunSystem;
|
|
using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
|
|
|
|
namespace Content.Client.Weapons.Ranged.Systems;
|
|
|
|
public sealed partial class GunSystem : SharedGunSystem
|
|
{
|
|
[Dependency] private readonly IEyeManager _eyeManager = default!;
|
|
[Dependency] private readonly IInputManager _inputManager = default!;
|
|
[Dependency] private readonly IPlayerManager _player = default!;
|
|
[Dependency] private readonly AnimationPlayerSystem _animPlayer = default!;
|
|
[Dependency] private readonly InputSystem _inputSystem = default!;
|
|
[Dependency] private readonly SharedCameraRecoilSystem _recoil = default!;
|
|
|
|
[ValidatePrototypeId<EntityPrototype>]
|
|
public const string HitscanProto = "HitscanEffect";
|
|
|
|
public bool SpreadOverlay
|
|
{
|
|
get => _spreadOverlay;
|
|
set
|
|
{
|
|
if (_spreadOverlay == value)
|
|
return;
|
|
|
|
_spreadOverlay = value;
|
|
var overlayManager = IoCManager.Resolve<IOverlayManager>();
|
|
|
|
if (_spreadOverlay)
|
|
{
|
|
overlayManager.AddOverlay(new GunSpreadOverlay(
|
|
EntityManager,
|
|
_eyeManager,
|
|
Timing,
|
|
_inputManager,
|
|
_player,
|
|
this));
|
|
}
|
|
else
|
|
{
|
|
overlayManager.RemoveOverlay<GunSpreadOverlay>();
|
|
}
|
|
}
|
|
}
|
|
|
|
private bool _spreadOverlay;
|
|
|
|
public override void Initialize()
|
|
{
|
|
base.Initialize();
|
|
UpdatesOutsidePrediction = true;
|
|
SubscribeLocalEvent<AmmoCounterComponent, ItemStatusCollectMessage>(OnAmmoCounterCollect);
|
|
SubscribeAllEvent<MuzzleFlashEvent>(OnMuzzleFlash);
|
|
|
|
// Plays animated effects on the client.
|
|
SubscribeNetworkEvent<HitscanEvent>(OnHitscan);
|
|
|
|
InitializeMagazineVisuals();
|
|
InitializeSpentAmmo();
|
|
}
|
|
|
|
private void OnMuzzleFlash(MuzzleFlashEvent args)
|
|
{
|
|
CreateEffect(GetEntity(args.Uid), args);
|
|
}
|
|
|
|
private void OnHitscan(HitscanEvent ev)
|
|
{
|
|
// ALL I WANT IS AN ANIMATED EFFECT
|
|
foreach (var a in ev.Sprites)
|
|
{
|
|
if (a.Sprite is not SpriteSpecifier.Rsi rsi)
|
|
continue;
|
|
|
|
var coords = GetCoordinates(a.coordinates);
|
|
|
|
if (Deleted(coords.EntityId))
|
|
continue;
|
|
|
|
var ent = Spawn(HitscanProto, coords);
|
|
var sprite = Comp<SpriteComponent>(ent);
|
|
var xform = Transform(ent);
|
|
xform.LocalRotation = a.angle;
|
|
sprite[EffectLayers.Unshaded].AutoAnimated = false;
|
|
sprite.LayerSetSprite(EffectLayers.Unshaded, rsi);
|
|
sprite.LayerSetState(EffectLayers.Unshaded, rsi.RsiState);
|
|
sprite.Scale = new Vector2(a.Distance, 1f);
|
|
sprite[EffectLayers.Unshaded].Visible = true;
|
|
|
|
var anim = new Animation()
|
|
{
|
|
Length = TimeSpan.FromSeconds(0.48f),
|
|
AnimationTracks =
|
|
{
|
|
new AnimationTrackSpriteFlick()
|
|
{
|
|
LayerKey = EffectLayers.Unshaded,
|
|
KeyFrames =
|
|
{
|
|
new AnimationTrackSpriteFlick.KeyFrame(rsi.RsiState, 0f),
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
_animPlayer.Play(ent, null, anim, "hitscan-effect");
|
|
}
|
|
}
|
|
|
|
public override void Update(float frameTime)
|
|
{
|
|
if (!Timing.IsFirstTimePredicted)
|
|
return;
|
|
|
|
var entityNull = _player.LocalPlayer?.ControlledEntity;
|
|
|
|
if (entityNull == null || !TryComp<CombatModeComponent>(entityNull, out var combat) || !combat.IsInCombatMode)
|
|
{
|
|
return;
|
|
}
|
|
|
|
var entity = entityNull.Value;
|
|
|
|
if (!TryGetGun(entity, out var gunUid, out var gun))
|
|
{
|
|
return;
|
|
}
|
|
|
|
var useKey = gun.UseKey ? EngineKeyFunctions.Use : EngineKeyFunctions.UseSecondary;
|
|
|
|
if (_inputSystem.CmdStates.GetState(useKey) != BoundKeyState.Down)
|
|
{
|
|
if (gun.ShotCounter != 0)
|
|
EntityManager.RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gunUid) });
|
|
return;
|
|
}
|
|
|
|
if (gun.NextFire > Timing.CurTime)
|
|
return;
|
|
|
|
var mousePos = _eyeManager.PixelToMap(_inputManager.MouseScreenPosition);
|
|
|
|
if (mousePos.MapId == MapId.Nullspace)
|
|
{
|
|
if (gun.ShotCounter != 0)
|
|
EntityManager.RaisePredictiveEvent(new RequestStopShootEvent { Gun = GetNetEntity(gunUid) });
|
|
|
|
return;
|
|
}
|
|
|
|
// Define target coordinates relative to gun entity, so that network latency on moving grids doesn't fuck up the target location.
|
|
var coordinates = EntityCoordinates.FromMap(entity, mousePos, TransformSystem, EntityManager);
|
|
|
|
Log.Debug($"Sending shoot request tick {Timing.CurTick} / {Timing.CurTime}");
|
|
|
|
EntityManager.RaisePredictiveEvent(new RequestShootEvent
|
|
{
|
|
Coordinates = GetNetCoordinates(coordinates),
|
|
Gun = GetNetEntity(gunUid),
|
|
});
|
|
}
|
|
|
|
public override void Shoot(EntityUid gunUid, GunComponent gun, List<(EntityUid? Entity, IShootable Shootable)> ammo,
|
|
EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, out bool userImpulse, EntityUid? user = null, bool throwItems = false)
|
|
{
|
|
userImpulse = true;
|
|
|
|
// Rather than splitting client / server for every ammo provider it's easier
|
|
// to just delete the spawned entities. This is for programmer sanity despite the wasted perf.
|
|
// This also means any ammo specific stuff can be grabbed as necessary.
|
|
var direction = fromCoordinates.ToMapPos(EntityManager, TransformSystem) - toCoordinates.ToMapPos(EntityManager, TransformSystem);
|
|
|
|
foreach (var (ent, shootable) in ammo)
|
|
{
|
|
if (throwItems)
|
|
{
|
|
Recoil(user, direction, gun.CameraRecoilScalar);
|
|
if (IsClientSide(ent!.Value))
|
|
Del(ent.Value);
|
|
else
|
|
RemoveShootable(ent.Value);
|
|
continue;
|
|
}
|
|
|
|
switch (shootable)
|
|
{
|
|
case CartridgeAmmoComponent cartridge:
|
|
if (!cartridge.Spent)
|
|
{
|
|
SetCartridgeSpent(ent!.Value, cartridge, true);
|
|
MuzzleFlash(gunUid, cartridge, user);
|
|
Audio.PlayPredicted(gun.SoundGunshot, gunUid, user);
|
|
Recoil(user, direction, gun.CameraRecoilScalar);
|
|
// TODO: Can't predict entity deletions.
|
|
//if (cartridge.DeleteOnSpawn)
|
|
// Del(cartridge.Owner);
|
|
}
|
|
else
|
|
{
|
|
userImpulse = false;
|
|
Audio.PlayPredicted(gun.SoundEmpty, gunUid, user);
|
|
}
|
|
|
|
if (IsClientSide(ent!.Value))
|
|
Del(ent.Value);
|
|
|
|
break;
|
|
case AmmoComponent newAmmo:
|
|
MuzzleFlash(gunUid, newAmmo, user);
|
|
Audio.PlayPredicted(gun.SoundGunshot, gunUid, user);
|
|
Recoil(user, direction, gun.CameraRecoilScalar);
|
|
if (IsClientSide(ent!.Value))
|
|
Del(ent.Value);
|
|
else
|
|
RemoveShootable(ent.Value);
|
|
break;
|
|
case HitscanPrototype:
|
|
Audio.PlayPredicted(gun.SoundGunshot, gunUid, user);
|
|
Recoil(user, direction, gun.CameraRecoilScalar);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
private void Recoil(EntityUid? user, Vector2 recoil, float recoilScalar)
|
|
{
|
|
if (!Timing.IsFirstTimePredicted || user == null || recoil == Vector2.Zero || recoilScalar == 0)
|
|
return;
|
|
|
|
_recoil.KickCamera(user.Value, recoil.Normalized() * 0.5f * recoilScalar);
|
|
}
|
|
|
|
protected override void Popup(string message, EntityUid? uid, EntityUid? user)
|
|
{
|
|
if (uid == null || user == null || !Timing.IsFirstTimePredicted)
|
|
return;
|
|
|
|
PopupSystem.PopupEntity(message, uid.Value, user.Value);
|
|
}
|
|
|
|
protected override void CreateEffect(EntityUid uid, MuzzleFlashEvent message, EntityUid? user = null)
|
|
{
|
|
if (!Timing.IsFirstTimePredicted)
|
|
return;
|
|
|
|
EntityCoordinates coordinates;
|
|
|
|
if (message.MatchRotation)
|
|
coordinates = new EntityCoordinates(uid, Vector2.Zero);
|
|
else if (TryComp<TransformComponent>(uid, out var xform))
|
|
coordinates = xform.Coordinates;
|
|
else
|
|
return;
|
|
|
|
if (!coordinates.IsValid(EntityManager))
|
|
return;
|
|
|
|
var ent = Spawn(message.Prototype, coordinates);
|
|
|
|
var effectXform = Transform(ent);
|
|
TransformSystem.SetLocalPositionRotation(effectXform,
|
|
effectXform.LocalPosition + new Vector2(0f, -0.5f),
|
|
effectXform.LocalRotation - MathF.PI / 2);
|
|
|
|
var lifetime = 0.4f;
|
|
|
|
if (TryComp<TimedDespawnComponent>(uid, out var despawn))
|
|
{
|
|
lifetime = despawn.Lifetime;
|
|
}
|
|
|
|
var anim = new Animation()
|
|
{
|
|
Length = TimeSpan.FromSeconds(lifetime),
|
|
AnimationTracks =
|
|
{
|
|
new AnimationTrackComponentProperty
|
|
{
|
|
ComponentType = typeof(SpriteComponent),
|
|
Property = nameof(SpriteComponent.Color),
|
|
InterpolationMode = AnimationInterpolationMode.Linear,
|
|
KeyFrames =
|
|
{
|
|
new AnimationTrackProperty.KeyFrame(Color.White.WithAlpha(1f), 0),
|
|
new AnimationTrackProperty.KeyFrame(Color.White.WithAlpha(0f), lifetime)
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
_animPlayer.Play(ent, anim, "muzzle-flash");
|
|
var light = EnsureComp<PointLightComponent>(uid);
|
|
light.NetSyncEnabled = false;
|
|
Lights.SetEnabled(uid, true, light);
|
|
Lights.SetRadius(uid, 2f, light);
|
|
Lights.SetColor(uid, Color.FromHex("#cc8e2b"), light);
|
|
Lights.SetEnergy(uid, 5f, light);
|
|
|
|
var animTwo = new Animation()
|
|
{
|
|
Length = TimeSpan.FromSeconds(lifetime),
|
|
AnimationTracks =
|
|
{
|
|
new AnimationTrackComponentProperty
|
|
{
|
|
ComponentType = typeof(PointLightComponent),
|
|
Property = nameof(PointLightComponent.Energy),
|
|
InterpolationMode = AnimationInterpolationMode.Linear,
|
|
KeyFrames =
|
|
{
|
|
new AnimationTrackProperty.KeyFrame(5f, 0),
|
|
new AnimationTrackProperty.KeyFrame(0f, lifetime)
|
|
}
|
|
},
|
|
new AnimationTrackComponentProperty
|
|
{
|
|
ComponentType = typeof(PointLightComponent),
|
|
Property = nameof(PointLightComponent.AnimatedEnable),
|
|
InterpolationMode = AnimationInterpolationMode.Linear,
|
|
KeyFrames =
|
|
{
|
|
new AnimationTrackProperty.KeyFrame(true, 0),
|
|
new AnimationTrackProperty.KeyFrame(false, lifetime)
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
var uidPlayer = EnsureComp<AnimationPlayerComponent>(uid);
|
|
|
|
_animPlayer.Stop(uid, uidPlayer, "muzzle-flash-light");
|
|
_animPlayer.Play(uid, uidPlayer, animTwo,"muzzle-flash-light");
|
|
}
|
|
}
|