Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Content.Tests/DMProject/Tests/Stdlib/List/remove.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@
L = list(1,2,3,2,1)
L.Remove(list(2))
ASSERT(L ~= list(1,2,3,1))

L = list(1,2,3,2,1)
L.Remove(L)
ASSERT(L ~= list())
9 changes: 2 additions & 7 deletions OpenDreamClient/ClientVerbSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ public override void Initialize() {
_spriteQuery = _entityManager.GetEntityQuery<DMISpriteComponent>();
_sightQuery = _entityManager.GetEntityQuery<DreamMobSightComponent>();

_playerManager.LocalPlayerAttached += OnLocalPlayerAttached;

SubscribeNetworkEvent<AllVerbsEvent>(OnAllVerbsEvent);
SubscribeNetworkEvent<RegisterVerbEvent>(OnRegisterVerbEvent);
SubscribeNetworkEvent<UpdateClientVerbsEvent>(OnUpdateClientVerbsEvent);
Expand Down Expand Up @@ -242,10 +240,7 @@ private void OnUpdateClientVerbsEvent(UpdateClientVerbsEvent e) {
_interfaceManager.DefaultInfo?.RefreshVerbs(this);
}

private void OnLocalPlayerAttached(EntityUid obj) {
// Our mob changed, update our verb panels
// A little hacky, but also wait half a second for verb information about our mob to arrive
// TODO: Remove this timer
_timerManager.AddTimer(new Timer(500, false, () => _interfaceManager.DefaultInfo?.RefreshVerbs(this)));
public void RefreshVerbs() {
_interfaceManager.DefaultInfo?.RefreshVerbs(this);
}
}
3 changes: 3 additions & 0 deletions OpenDreamClient/Rendering/ClientAppearanceSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public int GetAnimationFrame(IGameTiming gameTiming) {
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly MapSystem _mapSystem = default!;
[Dependency] private readonly IPrototypeManager _protoManager = default!;
[Dependency] private readonly ClientVerbSystem _verbSystem = default!;

public override void Initialize() {
UpdatesOutsidePrediction = true;
Expand Down Expand Up @@ -99,6 +100,8 @@ public override void Update(float frameTime) {
if (flick.GetAnimationFrame(_gameTiming) == -1)
_movableFlicks.Remove(flickKey);
}

_verbSystem.RefreshVerbs();
}

public void SetAllAppearances(Dictionary<uint, ImmutableAppearance> appearances) {
Expand Down
43 changes: 43 additions & 0 deletions OpenDreamRuntime/Objects/Types/DreamList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,13 @@ public override IEnumerable<DreamValue> EnumerateValues() {
yield return new(verb);
}

public override bool ContainsValue(DreamValue value) {
if (!value.TryGetValueAsProc(out var verb))
return false;

return Verbs.Contains(verb);
}

public override void SetValue(DreamValue key, DreamValue value, bool allowGrowth = false) {
throw new Exception("Cannot set the values of a verbs list");
}
Expand All @@ -673,6 +680,18 @@ public override void AddValue(DreamValue value) {
_verbSystem?.UpdateClientVerbs(_client);
}

public override void RemoveValue(DreamValue value) {
if (!value.TryGetValueAsProc(out var verb))
return;

var valueIndex = Verbs.LastIndexOf(verb);

if (valueIndex != -1) {
Verbs.RemoveAt(valueIndex);
_verbSystem?.UpdateClientVerbs(_client);
}
}

public override void Cut(int start = 1, int end = 0) {
int verbCount = Verbs.Count + 1;
if (end == 0 || end > verbCount) end = verbCount;
Expand Down Expand Up @@ -722,6 +741,15 @@ public override IEnumerable<DreamValue> EnumerateValues() {
}
}

public override bool ContainsValue(DreamValue value) {
if (!value.TryGetValueAsProc(out var verb))
return false;
if (verb.VerbId == null)
return false;

return GetVerbs().Contains(verb.VerbId.Value);
}

public override void SetValue(DreamValue key, DreamValue value, bool allowGrowth = false) {
throw new Exception("Cannot set the values of a verbs list");
}
Expand All @@ -740,6 +768,21 @@ public override void AddValue(DreamValue value) {
});
}

public override void RemoveValue(DreamValue value) {
if (!value.TryGetValueAsProc(out var verb))
return;
if (verb.VerbId == null) {
return;
}

atomManager.UpdateAppearance(atom, appearance => {
var valueIndex = appearance.Verbs.LastIndexOf(verb.VerbId.Value);

if (valueIndex != -1)
appearance.Verbs.RemoveAt(valueIndex);
});
}

public override void Cut(int start = 1, int end = 0) {
atomManager.UpdateAppearance(atom, appearance => {
int count = appearance.Verbs.Count + 1;
Expand Down
6 changes: 6 additions & 0 deletions OpenDreamRuntime/Procs/Native/DreamProcNativeList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,12 @@ private static int ListRemove(IDreamList list, ReadOnlySpan<DreamValue> args) {
var itemRemoved = 0;
foreach (var argument in args) {
if (argument.TryGetValueAsDreamList(out var argumentList)) {
if (argumentList == list) {
itemRemoved += list.GetLength();
list.Cut();
break;
}

foreach (DreamValue value in argumentList.EnumerateValues()) {
if (list.ContainsValue(value)) {
list.RemoveValue(value);
Expand Down
Loading