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

Replace VerbTypes with verb classes (#6525)

Browse Source
This commit is contained in:
Leon Friedrich
2022-02-10 15:30:59 +13:00
committed by GitHub
parent 0cd2c2fa9d
commit 1c9ffdc78c
60 changed files with 409 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Medical/MedicalScannerSystem.cs
View File

@@ -22,11 +22,11 @@ namespace Content.Server.Medical
base.Initialize();
SubscribeLocalEvent<MedicalScannerComponent, RelayMovementEntityEvent>(OnRelayMovement);
SubscribeLocalEvent<MedicalScannerComponent, GetInteractionVerbsEvent>(AddInsertOtherVerb);
SubscribeLocalEvent<MedicalScannerComponent, GetAlternativeVerbsEvent>(AddAlternativeVerbs);
SubscribeLocalEvent<MedicalScannerComponent, GetVerbsEvent<InteractionVerb>>(AddInsertOtherVerb);
SubscribeLocalEvent<MedicalScannerComponent, GetVerbsEvent<AlternativeVerb>>(AddAlternativeVerbs);
}
private void AddInsertOtherVerb(EntityUid uid, MedicalScannerComponent component, GetInteractionVerbsEvent args)
private void AddInsertOtherVerb(EntityUid uid, MedicalScannerComponent component, GetVerbsEvent<InteractionVerb> args)
{
if (args.Using == null ||
!args.CanAccess ||
@@ -35,14 +35,14 @@ namespace Content.Server.Medical
!component.CanInsert(args.Using.Value))
return;
Verb verb = new();
InteractionVerb verb = new();
verb.Act = () => component.InsertBody(args.Using.Value);
verb.Category = VerbCategory.Insert;
verb.Text = EntityManager.GetComponent<MetaDataComponent>(args.Using.Value).EntityName;
args.Verbs.Add(verb);
}
private void AddAlternativeVerbs(EntityUid uid, MedicalScannerComponent component, GetAlternativeVerbsEvent args)
private void AddAlternativeVerbs(EntityUid uid, MedicalScannerComponent component, GetVerbsEvent<AlternativeVerb> args)
{
if (!args.CanAccess || !args.CanInteract)
return;
@@ -50,7 +50,7 @@ namespace Content.Server.Medical
// Eject verb
if (component.IsOccupied)
{
Verb verb = new();
AlternativeVerb verb = new();
verb.Act = () => component.EjectBody();
verb.Category = VerbCategory.Eject;
verb.Text = Loc.GetString("medical-scanner-verb-noun-occupant");
@@ -62,7 +62,7 @@ namespace Content.Server.Medical
component.CanInsert(args.User) &&
_actionBlockerSystem.CanMove(args.User))
{
Verb verb = new();
AlternativeVerb verb = new();
verb.Act = () => component.InsertBody(args.User);
verb.Text = Loc.GetString("medical-scanner-verb-enter");
// TODO VERN ICON