* Add nullable to some Content.Shared files. * Use [NotNullWhen(true)] * Undo adding now redundant !'s * Forgot one * Add a ton more nullable * You can guess * Fix some issues * It actually compiles now * Auto stash before merge of "null2" and "origin/master" * I lied * enable annotations -> enable * Revert ActionBlockerSystem.cs to original * Fix ActionBlockerSystem.cs * More nullable * Undo some added exclamation marks * Fix issues * Update Content.Shared/Maps/ContentTileDefinition.cs Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Resolve some issues * Remove unused method * Fix more issues * Fix more issues * Fix more issues * Fix more issues * Fix issue, rollback SharedGhostComponent.cs * Update submodule * Fix issue, invert some if-statements to reduce nesting * Revert RobustToolbox * FIx things broken by merge * Some fixes - Replaced with string.Empty - Remove some exclamation marks - Revert file * Some fixes * Trivial #nullable enable * Fix null ables Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
61 lines
2.1 KiB
C#
61 lines
2.1 KiB
C#
#nullable enable
|
|
using System;
|
|
using Robust.Shared.GameObjects;
|
|
using Robust.Shared.Map;
|
|
using Robust.Shared.Maths;
|
|
using Robust.Shared.Serialization;
|
|
|
|
namespace Content.Shared.GameObjects.Components.Weapons.Ranged
|
|
{
|
|
public abstract class SharedRangedWeaponComponent : Component
|
|
{
|
|
// Each RangedWeapon should have a RangedWeapon component +
|
|
// some kind of RangedBarrelComponent (this dictates what ammo is retrieved).
|
|
public override string Name => "RangedWeapon";
|
|
public override uint? NetID => ContentNetIDs.RANGED_WEAPON;
|
|
}
|
|
|
|
[Serializable, NetSerializable]
|
|
public sealed class RangedWeaponComponentState : ComponentState
|
|
{
|
|
public FireRateSelector FireRateSelector { get; }
|
|
|
|
public RangedWeaponComponentState(
|
|
FireRateSelector fireRateSelector
|
|
) : base(ContentNetIDs.RANGED_WEAPON)
|
|
{
|
|
FireRateSelector = fireRateSelector;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// A component message raised when the weapon is fired at a position on the map.
|
|
/// </summary>
|
|
[Serializable, NetSerializable]
|
|
public sealed class FirePosComponentMessage : ComponentMessage
|
|
{
|
|
/// <summary>
|
|
/// If this is not invalid, the target position is relative to the grid.
|
|
/// Otherwise, it is a map position.
|
|
/// </summary>
|
|
public GridId TargetGrid { get; }
|
|
|
|
/// <summary>
|
|
/// If Target Grid is not invalid, this is relative to the grid, otherwise
|
|
/// it is a map position.
|
|
/// </summary>
|
|
public Vector2 TargetPosition { get; }
|
|
|
|
/// <summary>
|
|
/// Constructs a new instance of <see cref="FirePosComponentMessage"/>.
|
|
/// </summary>
|
|
/// <param name="targetGrid">The grid that the target position is on, if any.</param>
|
|
/// <param name="targetPosition">Target position relative to the grid, or a map position if the grid is invalid.</param>
|
|
public FirePosComponentMessage(GridId targetGrid, Vector2 targetPosition)
|
|
{
|
|
TargetGrid = targetGrid;
|
|
TargetPosition = targetPosition;
|
|
}
|
|
}
|
|
}
|