Add rejuvenate command (#380)

* Add rejuvenate command

Takes one or more entity uids as input. Attempts to find a DamageableComponent on that mob and heal all damage on it.

* Add rejuvenate to right click menu

* Update engine submodule

* Make suggested changes

- Remove redundant error checks in rejuvenate console command, add in relevant ones along with shell messages so the user knows what's going on.
- Remove localization of group check on rejuvenate verb, since the translated version wouldn't be in groups.yml this would've broken the verb in other locales.
- Have the rejuvenate verb attempt to heal the user by default if no arguments were provided to it.

* More localization + help message formatting improvement

* Add more suggested changes
This commit is contained in:
moneyl
2019-10-13 09:30:44 -04:00
committed by Pieter-Jan Briers
parent d6e378c3bf
commit a5b19b10e0
3 changed files with 119 additions and 0 deletions

View File

@@ -0,0 +1,68 @@
using Content.Server.GameObjects;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
namespace Content.Server.Administration
{
class Rejuvenate : IClientCommand
{
public string Command => "rejuvenate";
public string Description
{
get
{
var localizationManager = IoCManager.Resolve<ILocalizationManager>();
return localizationManager.GetString("Fully heals a mob.");
}
}
public string Help
{
get
{
var localizationManager = IoCManager.Resolve<ILocalizationManager>();
return localizationManager.GetString("Usage: rejuvenate <mobUid_1> <mobUid_2> ... <mobUid_n>\nAttempts to heal the user's mob if no arguments are provided.");
}
}
public void Execute(IConsoleShell shell, IPlayerSession player, string[] args)
{
var localizationManager = IoCManager.Resolve<ILocalizationManager>();
if (args.Length < 1 && player != null) //Try to heal the users mob if applicable
{
shell.SendText(player, localizationManager.GetString("Healing the user's mob since no arguments were provided."));
if (player.AttachedEntity == null)
{
shell.SendText(player, localizationManager.GetString("There's no entity attached to the user."));
return;
}
if (!player.AttachedEntity.TryGetComponent(out DamageableComponent damage))
{
shell.SendText(player, localizationManager.GetString("The user's entity does not have a DamageableComponent."));
return;
}
damage.HealAllDamage();
return;
}
var entityManager = IoCManager.Resolve<IEntityManager>();
foreach (var arg in args)
{
if(!EntityUid.TryParse(arg, out var uid) || !entityManager.TryGetEntity(uid, out var entity))
{
shell.SendText(player, localizationManager.GetString("Could not find entity {0}", arg));
continue;
}
if (!entity.TryGetComponent(out DamageableComponent damage))
{
shell.SendText(player, localizationManager.GetString("Entity {0} does not have a DamageableComponent.", arg));
continue;
}
damage.HealAllDamage();
}
}
}
}

View File

@@ -1,11 +1,17 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using Content.Server.Interfaces; using Content.Server.Interfaces;
using Content.Server.Interfaces.GameObjects; using Content.Server.Interfaces.GameObjects;
using Content.Shared.GameObjects; using Content.Shared.GameObjects;
using Robust.Server.Interfaces.GameObjects;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
using Robust.Server.Console;
namespace Content.Server.GameObjects namespace Content.Server.GameObjects
{ {
@@ -105,6 +111,18 @@ namespace Content.Server.GameObjects
TakeDamage(damageType, -amount); TakeDamage(damageType, -amount);
} }
public void HealAllDamage()
{
var values = Enum.GetValues(typeof(DamageType)).Cast<DamageType>();
foreach (var damageType in values)
{
if (CurrentDamage.ContainsKey(damageType) && damageType != DamageType.Total)
{
TakeHealing(damageType, CurrentDamage[damageType]);
}
}
}
void UpdateForDamageType(DamageType damageType, int oldValue) void UpdateForDamageType(DamageType damageType, int oldValue)
{ {
int change = _currentDamage[damageType] - oldValue; int change = _currentDamage[damageType] - oldValue;
@@ -169,6 +187,38 @@ namespace Content.Server.GameObjects
Thresholds.Add(damageType, new List<DamageThreshold>()); Thresholds.Add(damageType, new List<DamageThreshold>());
} }
} }
/// <summary>
/// Completely removes all damage from the DamageableComponent (heals the mob).
/// </summary>
[Verb]
private sealed class RejuvenateVerb : Verb<DamageableComponent>
{
protected override string GetText(IEntity user, DamageableComponent component) => "Rejuvenate";
protected override VerbVisibility GetVisibility(IEntity user, DamageableComponent component)
{
var groupController = IoCManager.Resolve<IConGroupController>();
if (user.TryGetComponent<IActorComponent>(out var player))
{
if (groupController.CanCommand(player.playerSession, "rejuvenate"))
return VerbVisibility.Visible;
}
return VerbVisibility.Invisible;
}
protected override void Activate(IEntity user, DamageableComponent component)
{
var groupController = IoCManager.Resolve<IConGroupController>();
if (user.TryGetComponent<IActorComponent>(out var player))
{
if (groupController.CanCommand(player.playerSession, "rejuvenate"))
component.HealAllDamage();
}
}
}
} }
} }

View File

@@ -50,4 +50,5 @@
- endround - endround
- restartround - restartround
- respawn - respawn
- rejuvenate
CanViewVar: true CanViewVar: true