mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-18 14:07:53 +03:00
# Description Picked 400 commits (and skipped many, many more) from WizDen since #540. Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor). --- # TODO - [x] Pick - [x] Compile - [x] Fix runtime errors - [ ] Fix up humanoid profile editor - [ ] Test everything --- # Changelog 🆑 - add: Merged 400 WizDen PRs. Happy testing! --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com> Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com> Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com> Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com> Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@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: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com> Co-authored-by: ShadowCommander <shadowjjt@gmail.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Jezithyr <jezithyr@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Ciac32 <aknoxlor@gmail.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: nao fujiwara <awkwarddryad@gmail.com> Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com> Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com> Co-authored-by: exincore <me@exin.xyz> Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com> Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com> Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com> Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com> Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com> Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com> Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com> Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com> Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com> Co-authored-by: ike709 <ike709@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> # Conflicts: # Content.Client/Input/ContentContexts.cs # Content.Client/Lobby/LobbyState.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml # Content.Client/Lobby/UI/LobbyGui.xaml # Content.Client/Lobby/UI/LobbyGui.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml # Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Shared/Alert/AlertType.cs # Content.Shared/Input/ContentKeyFunctions.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs # Resources/ConfigPresets/EinsteinEngines/default.toml # Resources/Prototypes/Alerts/alerts.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/keybinds.yml
357 lines
12 KiB
C#
357 lines
12 KiB
C#
using System.Numerics;
|
|
using Content.Client.IoC;
|
|
using Content.Client.Items;
|
|
using Content.Client.Resources;
|
|
using Content.Client.Stylesheets;
|
|
using Content.Client.Weapons.Ranged.Components;
|
|
using Content.Client.Weapons.Ranged.ItemStatus;
|
|
using Robust.Client.Animations;
|
|
using Robust.Client.Graphics;
|
|
using Robust.Client.UserInterface;
|
|
using Robust.Client.UserInterface.Controls;
|
|
|
|
namespace Content.Client.Weapons.Ranged.Systems;
|
|
|
|
public sealed partial class GunSystem
|
|
{
|
|
private void OnAmmoCounterCollect(EntityUid uid, AmmoCounterComponent component, ItemStatusCollectMessage args)
|
|
{
|
|
RefreshControl(uid, component);
|
|
|
|
if (component.Control != null)
|
|
args.Controls.Add(component.Control);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Refreshes the control being used to show ammo. Useful if you change the AmmoProvider.
|
|
/// </summary>
|
|
/// <param name="uid"></param>
|
|
/// <param name="component"></param>
|
|
private void RefreshControl(EntityUid uid, AmmoCounterComponent? component = null)
|
|
{
|
|
if (!Resolve(uid, ref component, false))
|
|
return;
|
|
|
|
component.Control?.Dispose();
|
|
component.Control = null;
|
|
|
|
var ev = new AmmoCounterControlEvent();
|
|
RaiseLocalEvent(uid, ev, false);
|
|
|
|
// Fallback to default if none specified
|
|
ev.Control ??= new DefaultStatusControl();
|
|
|
|
component.Control = ev.Control;
|
|
UpdateAmmoCount(uid, component);
|
|
}
|
|
|
|
private void UpdateAmmoCount(EntityUid uid, AmmoCounterComponent component)
|
|
{
|
|
if (component.Control == null)
|
|
return;
|
|
|
|
var ev = new UpdateAmmoCounterEvent()
|
|
{
|
|
Control = component.Control
|
|
};
|
|
|
|
RaiseLocalEvent(uid, ev, false);
|
|
}
|
|
|
|
protected override void UpdateAmmoCount(EntityUid uid, bool prediction = true)
|
|
{
|
|
// Don't use resolves because the method is shared and there's no compref and I'm trying to
|
|
// share as much code as possible
|
|
if (prediction && !Timing.IsFirstTimePredicted ||
|
|
!TryComp<AmmoCounterComponent>(uid, out var clientComp))
|
|
{
|
|
return;
|
|
}
|
|
|
|
UpdateAmmoCount(uid, clientComp);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Raised when an ammocounter is requesting a control.
|
|
/// </summary>
|
|
public sealed class AmmoCounterControlEvent : EntityEventArgs
|
|
{
|
|
public Control? Control;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Raised whenever the ammo count / magazine for a control needs updating.
|
|
/// </summary>
|
|
public sealed class UpdateAmmoCounterEvent : HandledEntityEventArgs
|
|
{
|
|
public Control Control = default!;
|
|
}
|
|
|
|
#region Controls
|
|
|
|
private sealed class DefaultStatusControl : Control
|
|
{
|
|
private readonly BulletRender _bulletRender;
|
|
|
|
public DefaultStatusControl()
|
|
{
|
|
MinHeight = 15;
|
|
HorizontalExpand = true;
|
|
VerticalAlignment = VAlignment.Center;
|
|
AddChild(_bulletRender = new BulletRender
|
|
{
|
|
HorizontalAlignment = HAlignment.Right,
|
|
VerticalAlignment = VAlignment.Bottom
|
|
});
|
|
}
|
|
|
|
public void Update(int count, int capacity)
|
|
{
|
|
_bulletRender.Count = count;
|
|
_bulletRender.Capacity = capacity;
|
|
|
|
_bulletRender.Type = capacity > 50 ? BulletRender.BulletType.Tiny : BulletRender.BulletType.Normal;
|
|
}
|
|
}
|
|
|
|
public sealed class BoxesStatusControl : Control
|
|
{
|
|
private readonly BatteryBulletRenderer _bullets;
|
|
private readonly Label _ammoCount;
|
|
|
|
public BoxesStatusControl()
|
|
{
|
|
MinHeight = 15;
|
|
HorizontalExpand = true;
|
|
VerticalAlignment = Control.VAlignment.Center;
|
|
|
|
AddChild(new BoxContainer
|
|
{
|
|
Orientation = BoxContainer.LayoutOrientation.Horizontal,
|
|
Children =
|
|
{
|
|
(_bullets = new BatteryBulletRenderer
|
|
{
|
|
Margin = new Thickness(0, 0, 5, 0),
|
|
HorizontalExpand = true
|
|
}),
|
|
(_ammoCount = new Label
|
|
{
|
|
StyleClasses = { StyleNano.StyleClassItemStatus },
|
|
HorizontalAlignment = HAlignment.Right,
|
|
VerticalAlignment = VAlignment.Bottom
|
|
}),
|
|
}
|
|
});
|
|
}
|
|
|
|
public void Update(int count, int max)
|
|
{
|
|
_ammoCount.Visible = true;
|
|
|
|
_ammoCount.Text = $"x{count:00}";
|
|
|
|
_bullets.Capacity = max;
|
|
_bullets.Count = count;
|
|
}
|
|
}
|
|
|
|
private sealed class ChamberMagazineStatusControl : Control
|
|
{
|
|
private readonly BulletRender _bulletRender;
|
|
private readonly TextureRect _chamberedBullet;
|
|
private readonly Label _noMagazineLabel;
|
|
private readonly Label _ammoCount;
|
|
|
|
public ChamberMagazineStatusControl()
|
|
{
|
|
MinHeight = 15;
|
|
HorizontalExpand = true;
|
|
VerticalAlignment = Control.VAlignment.Center;
|
|
|
|
AddChild(new BoxContainer
|
|
{
|
|
Orientation = BoxContainer.LayoutOrientation.Horizontal,
|
|
HorizontalExpand = true,
|
|
Children =
|
|
{
|
|
new Control
|
|
{
|
|
HorizontalExpand = true,
|
|
Margin = new Thickness(0, 0, 5, 0),
|
|
Children =
|
|
{
|
|
(_bulletRender = new BulletRender
|
|
{
|
|
HorizontalAlignment = HAlignment.Right,
|
|
VerticalAlignment = VAlignment.Bottom
|
|
}),
|
|
(_noMagazineLabel = new Label
|
|
{
|
|
Text = "No Magazine!",
|
|
StyleClasses = {StyleNano.StyleClassItemStatus}
|
|
})
|
|
}
|
|
},
|
|
new BoxContainer
|
|
{
|
|
Orientation = BoxContainer.LayoutOrientation.Vertical,
|
|
VerticalAlignment = VAlignment.Bottom,
|
|
Margin = new Thickness(0, 0, 0, 2),
|
|
Children =
|
|
{
|
|
(_ammoCount = new Label
|
|
{
|
|
StyleClasses = {StyleNano.StyleClassItemStatus},
|
|
HorizontalAlignment = HAlignment.Right,
|
|
}),
|
|
(_chamberedBullet = new TextureRect
|
|
{
|
|
Texture = StaticIoC.ResC.GetTexture("/Textures/Interface/ItemStatus/Bullets/chambered.png"),
|
|
HorizontalAlignment = HAlignment.Left,
|
|
}),
|
|
}
|
|
}
|
|
}
|
|
});
|
|
}
|
|
|
|
public void Update(bool chambered, bool magazine, int count, int capacity)
|
|
{
|
|
_chamberedBullet.ModulateSelfOverride =
|
|
chambered ? Color.FromHex("#d7df60") : Color.Black;
|
|
|
|
if (!magazine)
|
|
{
|
|
_bulletRender.Visible = false;
|
|
_noMagazineLabel.Visible = true;
|
|
_ammoCount.Visible = false;
|
|
return;
|
|
}
|
|
|
|
_bulletRender.Visible = true;
|
|
_noMagazineLabel.Visible = false;
|
|
_ammoCount.Visible = true;
|
|
|
|
_bulletRender.Count = count;
|
|
_bulletRender.Capacity = capacity;
|
|
|
|
_bulletRender.Type = capacity > 50 ? BulletRender.BulletType.Tiny : BulletRender.BulletType.Normal;
|
|
|
|
_ammoCount.Text = $"x{count:00}";
|
|
}
|
|
|
|
public void PlayAlarmAnimation(Animation animation)
|
|
{
|
|
_noMagazineLabel.PlayAnimation(animation, "alarm");
|
|
}
|
|
}
|
|
|
|
private sealed class RevolverStatusControl : Control
|
|
{
|
|
private readonly BoxContainer _bulletsList;
|
|
|
|
public RevolverStatusControl()
|
|
{
|
|
MinHeight = 15;
|
|
HorizontalExpand = true;
|
|
VerticalAlignment = Control.VAlignment.Center;
|
|
AddChild((_bulletsList = new BoxContainer
|
|
{
|
|
Orientation = BoxContainer.LayoutOrientation.Horizontal,
|
|
HorizontalExpand = true,
|
|
VerticalAlignment = VAlignment.Center,
|
|
SeparationOverride = 0
|
|
}));
|
|
}
|
|
|
|
public void Update(int currentIndex, bool?[] bullets)
|
|
{
|
|
_bulletsList.RemoveAllChildren();
|
|
var capacity = bullets.Length;
|
|
|
|
string texturePath;
|
|
if (capacity <= 20)
|
|
{
|
|
texturePath = "/Textures/Interface/ItemStatus/Bullets/normal.png";
|
|
}
|
|
else if (capacity <= 30)
|
|
{
|
|
texturePath = "/Textures/Interface/ItemStatus/Bullets/small.png";
|
|
}
|
|
else
|
|
{
|
|
texturePath = "/Textures/Interface/ItemStatus/Bullets/tiny.png";
|
|
}
|
|
|
|
var texture = StaticIoC.ResC.GetTexture(texturePath);
|
|
var spentTexture = StaticIoC.ResC.GetTexture("/Textures/Interface/ItemStatus/Bullets/empty.png");
|
|
|
|
FillBulletRow(currentIndex, bullets, _bulletsList, texture, spentTexture);
|
|
}
|
|
|
|
private void FillBulletRow(int currentIndex, bool?[] bullets, Control container, Texture texture, Texture emptyTexture)
|
|
{
|
|
var capacity = bullets.Length;
|
|
var colorA = Color.FromHex("#b68f0e");
|
|
var colorB = Color.FromHex("#d7df60");
|
|
var colorSpentA = Color.FromHex("#b50e25");
|
|
var colorSpentB = Color.FromHex("#d3745f");
|
|
var colorGoneA = Color.FromHex("#000000");
|
|
var colorGoneB = Color.FromHex("#222222");
|
|
|
|
var altColor = false;
|
|
var scale = 1.3f;
|
|
|
|
for (var i = 0; i < capacity; i++)
|
|
{
|
|
var bulletFree = bullets[i];
|
|
// Add a outline
|
|
var box = new Control()
|
|
{
|
|
MinSize = texture.Size * scale,
|
|
};
|
|
if (i == currentIndex)
|
|
{
|
|
box.AddChild(new TextureRect
|
|
{
|
|
Texture = texture,
|
|
TextureScale = new Vector2(scale, scale),
|
|
ModulateSelfOverride = Color.LimeGreen,
|
|
});
|
|
}
|
|
Color color;
|
|
Texture bulletTexture = texture;
|
|
|
|
if (bulletFree.HasValue)
|
|
{
|
|
if (bulletFree.Value)
|
|
{
|
|
color = altColor ? colorA : colorB;
|
|
}
|
|
else
|
|
{
|
|
color = altColor ? colorSpentA : colorSpentB;
|
|
bulletTexture = emptyTexture;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
color = altColor ? colorGoneA : colorGoneB;
|
|
}
|
|
|
|
box.AddChild(new TextureRect
|
|
{
|
|
Stretch = TextureRect.StretchMode.KeepCentered,
|
|
Texture = bulletTexture,
|
|
ModulateSelfOverride = color,
|
|
});
|
|
altColor ^= true;
|
|
container.AddChild(box);
|
|
}
|
|
}
|
|
}
|
|
|
|
#endregion
|
|
}
|