* Apply patch 1777eea9a4..6b32bb2b14
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* make red squiggly line go away
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Add todo list
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Add palette to `TextureButton`
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Rename `PalettedButtonSheetlet` to `NTButtonSheetlet` and move useful methods to `ButtonSheetlet`
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* migrate `ContextMenu` styles
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Update todo
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* tweak NT colors
* New stylesheet: `InterfaceStylesheet` & `InterfaceTooltipSheetlet`
* Move inheritance of `IButtonConfig` to `NanotransenStylesheet.Buttons`
* move `MenuButtonSheetlet` & actually implement `InterfaceStylesheet` correctly
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* tweak color & update todo
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* chat is this real (update chat palette)
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Update todo
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* `SmallButton` and remove some obsolete things from `StyleNano`
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* rename `StyleClasses` to `StyleClass` so `Stylesheets.Redux.StyleClasses` syntax is dead
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* replace `ButtonColorGreen` with `Positive`
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* `Placeholder`
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Examine popup buttons
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* move over more things & cleanup `StyleNano` more (under 1000 lines!!!!)
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Remove some more redundant stuff
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Undo style change for chat window
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* paper editing works now
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* `OptionButton` styles
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* `ListContainer`, move `DefaultWindow` styles (for now) & more cleanup
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* fix `ActionButton` not having highlighting
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* remove imports of `Robust.Client.UserInterface.StylesheetHelpers` & format
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* `ButtonBig` and more cleanup
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Move items inheriting from `ISheetletConfig` into their own directory
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Cleanup & move `Label` styles
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Action search box styles
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Moved, stuff is
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* rename `LabelSubtext` to `LabelSubText` & move more stuff (were almost there!!)
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* yap & move over MORE stuff (just like one thing left!!!)
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Change status classes to appropriate existing classes
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* remove remaining references to `StyleNano`
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Fix some hardcoding & broken code, `GetFromControl`
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Scrollbars!
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* chores
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* clean up `StyleClass.cs`
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* `ItemListSheetlet` refactor
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* more chores!
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Consistency w/ directory structure
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Move `MainMenuSheetlet`
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* `ColorPalette`
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* whoopsie
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Remove most sheet-specific sheetlets
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* fix warnings, cleanup, & fix scrollbar (this is why we fix warnings boys)
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* yap
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* MASSIVE resharper skill issue
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* actually use `ISheetletConfig`
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* have specific sheetlet be specific
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* `GetResourceOr`
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* cleanup & move / remove `IPalette`s
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* actually do specific stylesheets correctly & fix tooltips
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* cleanup & logging
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* Move `FontKind` and `FontKindExtensions` to their own files
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* rename `InterfaceStylesheet` to `SystemStylesheet`
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* change `ButtonHovered` etc to `PseudoHovered` etc
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* give the palettes fun names
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* `StyleSpace` is no more
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* It should compile now! I am now going to bed (fr) if it fails it fails
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* make squiggly red line go away
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
* add additional type restrictions to sheetlets
* `CommonStylesheet`
* minor cleanup
* Make `GetSheetletRules` not horrible
* wait this was duplicating style rules. oops!
* move some sheetlets to their associated xamls
* oh wait apparently that was important
* review pass 1
* review pass 2 (font & color stuff)
* review pass 3: remove unused stuff / filename fix
* fix warnings & "replace cast with explicit variable type"
* move `Palette` stuff to its own directory
* tweak colors (they're different now that I actually fixed the OKlab thing)
* review pass 4: little things
* make window close button grey before hovering
* refactor `HLine` to make it less terrible and allow it to be styled
* fix `NanoHeading` (it's been broken for a while whoops) and cleanup hardcoding
* band-aid missing references in `StyleNano`
* move `StyleBox` generating functions out of `IButtonSheetlet` into `StyleBoxHelper`
* remove dictionary field from `IStylesheetManager`
* Add check for unloaded sheetlets
* style tweaks to satisfy OCD
* I somehow missed this: `Caution` styleclass replaced with `negative`, refactor `PowerChargeWindow`
* tweak palettes for like the fourth time
* construct `StyleNano` / `StyleSpace` in `StylesheetManager` and mark them as obsolete
* rename `BackgroundPanel` classes for consistency
* tweak window / `ListContainer`
* oh right you use `///` not `/**`
* font system is bad, make it temporary
* acknowledge Divider funkyness
* remove use of class `Disabled`
* `ColorPalette` allow overriding colors with brace initialization
* review pass again
* tweak disabled button colors
* `StatusPalette` tweaks
* typo
* Make squiggly red line go away
* Delete `Redux`
* Remove all references to `Redux`
* make red less radioactive
* Store stylesheet name inside stylesheet class
* fix merge errors
* use RT's Oklab support instead
* shuffle around `StylesheetManager` fields
* apply stylesheets based off `StylesheetComponent`
* simplify `ColorPalette` construction
* add todo for `SheetletConfigType`
* `OptionButton` has a background color now
* fix disabled buttons
* sigh (red color palette fixed)
* make `ItemList` use primary palette
* Revert "apply stylesheets based off `StylesheetComponent`"
This reverts commit c05b147da845f6e04ff33d1cbd91a18a92c676d7.
* dead code removal
* buttons are green when pressed (we need togglebuttons)
---------
Signed-off-by: Brandon Li <sirbrandonthenerd@gmail.com>
Co-authored-by: Janet Blackquill <uhhadd@gmail.com>
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 = { StyleClass.ItemStatus },
|
|
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 = {StyleClass.ItemStatus}
|
|
})
|
|
}
|
|
},
|
|
new BoxContainer
|
|
{
|
|
Orientation = BoxContainer.LayoutOrientation.Vertical,
|
|
VerticalAlignment = VAlignment.Bottom,
|
|
Margin = new Thickness(0, 0, 0, 2),
|
|
Children =
|
|
{
|
|
(_ammoCount = new Label
|
|
{
|
|
StyleClasses = {StyleClass.ItemStatus},
|
|
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
|
|
}
|