Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Rename and clean up interaction events (#4044)

Browse Source 
* Rename and clean up interaction events

* Fix hand equip events
This commit is contained in:
ShadowCommander
2021-05-22 21:06:40 -07:00
committed by GitHub
parent d97021d3a0
commit acb102f978
62 changed files with 273 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Chemistry/HyposprayComponent.cs
View File

@@ -42,7 +42,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
Dirty();
}
bool IAttack.ClickAttack(AttackEventArgs eventArgs)
bool IAttack.ClickAttack(AttackEvent eventArgs)
{
var target = eventArgs.TargetEntity;
var user = eventArgs.User;

4
Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs
View File

@@ -723,12 +723,12 @@ namespace Content.Server.GameObjects.Components.Disposal
return TryDrop(eventArgs.User, eventArgs.Using);
}
public override bool CanDragDropOn(DragDropEventArgs eventArgs)
public override bool CanDragDropOn(DragDropEvent eventArgs)
{
return CanInsert(eventArgs.Dragged);
}
public override bool DragDropOn(DragDropEventArgs eventArgs)
public override bool DragDropOn(DragDropEvent eventArgs)
{
_ = TryInsert(eventArgs.Dragged, eventArgs.User);
return true;

4
Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs
View File

@@ -616,14 +616,14 @@ namespace Content.Server.GameObjects.Components.Disposal
return TryDrop(eventArgs.User, eventArgs.Using);
}
public override bool CanDragDropOn(DragDropEventArgs eventArgs)
public override bool CanDragDropOn(DragDropEvent eventArgs)
{
// Base is redundant given this already calls the base CanInsert
// If that changes then update this
return CanInsert(eventArgs.Dragged);
}
public override bool DragDropOn(DragDropEventArgs eventArgs)
public override bool DragDropOn(DragDropEvent eventArgs)
{
_ = TryInsert(eventArgs.Dragged, eventArgs.User);
return true;

2
Content.Server/GameObjects/Components/GUI/StrippableComponent.cs
View File

@@ -74,7 +74,7 @@ namespace Content.Server.GameObjects.Components.GUI
UserInterface.SetState(new StrippingBoundUserInterfaceState(inventory, hands, cuffs));
}
public override bool Drop(DragDropEventArgs args)
public override bool Drop(DragDropEvent args)
{
if (!args.User.TryGetComponent(out ActorComponent? actor)) return false;

2
Content.Server/GameObjects/Components/Kitchen/KitchenSpikeComponent.cs
View File

@@ -67,7 +67,7 @@ namespace Content.Server.GameObjects.Components.Kitchen
}
public override bool DragDropOn(DragDropEventArgs eventArgs)
public override bool DragDropOn(DragDropEvent eventArgs)
{
TrySpike(eventArgs.Dragged, eventArgs.User);
return true;

2
Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs
View File

@@ -284,7 +284,7 @@ namespace Content.Server.GameObjects.Components.Medical
}
}
public override bool DragDropOn(DragDropEventArgs eventArgs)
public override bool DragDropOn(DragDropEvent eventArgs)
{
_bodyContainer.Insert(eventArgs.Dragged);
return true;

4
Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs
View File

@@ -39,7 +39,7 @@ namespace Content.Server.GameObjects.Components.Movement
}
}
public override bool CanDragDropOn(DragDropEventArgs eventArgs)
public override bool CanDragDropOn(DragDropEvent eventArgs)
{
if (!base.CanDragDropOn(eventArgs))
return false;
@@ -132,7 +132,7 @@ namespace Content.Server.GameObjects.Components.Movement
return true;
}
public override bool DragDropOn(DragDropEventArgs eventArgs)
public override bool DragDropOn(DragDropEvent eventArgs)
{
if (eventArgs.User == eventArgs.Dragged)
{

2
Content.Server/GameObjects/Components/Strap/StrapComponent.cs
View File

@@ -219,7 +219,7 @@ namespace Content.Server.GameObjects.Components.Strap
}
}
public override bool DragDropOn(DragDropEventArgs eventArgs)
public override bool DragDropOn(DragDropEvent eventArgs)
{
if (!eventArgs.Dragged.TryGetComponent(out BuckleComponent? buckleComponent)) return false;
return buckleComponent.TryBuckle(eventArgs.User, Owner);

2
Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs
View File

@@ -43,7 +43,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
private bool HasUses => _uses > 0;
protected override bool OnHitEntities(IReadOnlyList<IEntity> entities, AttackEventArgs eventArgs)
protected override bool OnHitEntities(IReadOnlyList<IEntity> entities, AttackEvent eventArgs)
{
if (entities.Count == 0)
{

6
Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs
View File

@@ -66,12 +66,12 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
[ViewVariables(VVAccess.ReadWrite)] [DataField("clickAttackEffect")] public bool ClickAttackEffect { get; set; } = true;
protected virtual bool OnHitEntities(IReadOnlyList<IEntity> entities, AttackEventArgs eventArgs)
protected virtual bool OnHitEntities(IReadOnlyList<IEntity> entities, AttackEvent eventArgs)
{
return true;
}
bool IAttack.WideAttack(AttackEventArgs eventArgs)
bool IAttack.WideAttack(AttackEvent eventArgs)
{
if (!eventArgs.WideAttack) return true;
@@ -126,7 +126,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
return true;
}
bool IAttack.ClickAttack(AttackEventArgs eventArgs)
bool IAttack.ClickAttack(AttackEvent eventArgs)
{
if (eventArgs.WideAttack) return false;

2
Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs
View File

@@ -80,7 +80,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
}
}
protected override bool OnHitEntities(IReadOnlyList<IEntity> entities, AttackEventArgs eventArgs)
protected override bool OnHitEntities(IReadOnlyList<IEntity> entities, AttackEvent eventArgs)
{
if (!Activated || entities.Count == 0 || Cell == null)
return true;