Merge remote-tracking branch 'upstream/master' into remove_obsolete_e…

…rror_uses # Conflicts: # DMCompiler/DM/Builders/DMProcBuilder.cs
OpenDreamProject · Feb 14, 2024 · e12116b · e12116b
2 parents c0b9b51 + 1627499
commit e12116b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/DMCompiler/DM/Builders/DMProcBuilder.cs b/DMCompiler/DM/Builders/DMProcBuilder.cs
@@ -186,18 +186,13 @@ public void ProcessStatementSet(DMASTProcStatementSet statementSet) {
                 switch (statementSet.Value) {
                     case DMASTIdentifier {Identifier: "usr"}:
                         proc.VerbSrc = statementSet.WasInKeyword ? VerbSrc.InUsr : VerbSrc.Usr;
-                        if (statementSet.WasInKeyword)
-                            DMCompiler.UnimplementedWarning(statementSet.Location,
-                                "'set src = usr.contents' is unimplemented");
                         break;
                     case DMASTDereference {Expression: DMASTIdentifier{Identifier: "usr"}, Operations: var operations}:
                         if (operations is not [DMASTDereference.FieldOperation {Identifier: var deref}])
                             goto default;
 
                         if (deref == "contents") {
                             proc.VerbSrc = VerbSrc.InUsr;
-                            DMCompiler.UnimplementedWarning(statementSet.Location,
-                                "'set src = usr.contents' is unimplemented");
                         }  else if (deref == "loc") {
                             proc.VerbSrc = VerbSrc.UsrLoc;
                             DMCompiler.UnimplementedWarning(statementSet.Location,

diff --git a/OpenDreamClient/ClientVerbSystem.cs b/OpenDreamClient/ClientVerbSystem.cs
@@ -3,6 +3,7 @@
 using OpenDreamClient.Rendering;
 using OpenDreamShared.Dream;
 using OpenDreamShared.Rendering;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Asynchronous;
@@ -17,6 +18,7 @@ public sealed class ClientVerbSystem : VerbSystem {
     [Dependency] private readonly ITaskManager _taskManager = default!;
     [Dependency] private readonly ITimerManager _timerManager = default!;
     [Dependency] private readonly IOverlayManager _overlayManager = default!;
+    [Dependency] private readonly TransformSystem _transformSystem = default!;
 
     private EntityQuery<DMISpriteComponent> _spriteQuery;
     private EntityQuery<DreamMobSightComponent> _sightQuery;
@@ -72,12 +74,10 @@ public IEnumerable<VerbInfo> GetAllVerbs() {
     /// <param name="ignoreHiddenAttr">Whether to ignore "set hidden = TRUE"</param>
     /// <returns>The ID, src, and information of every executable verb</returns>
     public IEnumerable<(int Id, ClientObjectReference Src, VerbInfo VerbInfo)> GetExecutableVerbs(bool ignoreHiddenAttr = false) {
-        ClientObjectReference? ourMob = null;
         sbyte? seeInvisibility = null;
         if (_playerManager.LocalEntity != null) {
             _sightQuery.TryGetComponent(_playerManager.LocalEntity.Value, out var mobSight);
 
-            ourMob = new ClientObjectReference(_entityManager.GetNetEntity(_playerManager.LocalEntity.Value));
             seeInvisibility = mobSight?.SeeInvisibility;
         }
 
@@ -112,7 +112,12 @@ public IEnumerable<VerbInfo> GetAllVerbs() {
                 // Check the verb's "set src" allows us to execute this
                 switch (verb.Accessibility) {
                     case VerbAccessibility.Usr:
-                        if (!src.Equals(ourMob))
+                        if (entity != _playerManager.LocalEntity)
+                            continue;
+
+                        break;
+                    case VerbAccessibility.InUsr:
+                        if (_transformSystem.GetParentUid(entity) != _playerManager.LocalEntity)
                             continue;
 
                         break;

diff --git a/OpenDreamRuntime/EntryPoint.cs b/OpenDreamRuntime/EntryPoint.cs
@@ -43,6 +43,7 @@ public override void Init() {
 
             _configManager.OverrideDefault(CVars.NetLogLateMsg, false); // Disable since disabling prediction causes timing errors otherwise.
             _configManager.OverrideDefault(CVars.GameAutoPauseEmpty, false); // TODO: world.sleep_offline can control this
+            _configManager.OverrideDefault(CVars.DiscordRichPresenceSecondIconId, "opendream");
             _configManager.SetCVar(CVars.GridSplitting, false); // Grid splitting should never be used
             if(String.IsNullOrEmpty(_configManager.GetCVar<string>(OpenDreamCVars.JsonPath))) //if you haven't set the jsonpath cvar, set it to the first valid file path passed as an arg
                 foreach (string arg in Environment.GetCommandLineArgs().Skip(1)) //skip the first element, because it's just the server's exe path

diff --git a/OpenDreamRuntime/Objects/Types/DreamObjectMovable.cs b/OpenDreamRuntime/Objects/Types/DreamObjectMovable.cs
@@ -9,6 +9,7 @@ namespace OpenDreamRuntime.Objects.Types;
 public class DreamObjectMovable : DreamObjectAtom {
     public EntityUid Entity;
     public readonly DMISpriteComponent SpriteComponent;
+    public DreamObjectAtom? Loc;
 
     // TODO: Cache this shit. GetWorldPosition is slow.
     public Vector2i Position => (Vector2i?)TransformSystem?.GetWorldPosition(_transformComponent) ?? (0, 0);
@@ -18,7 +19,6 @@ public class DreamObjectMovable : DreamObjectAtom {
 
     private readonly TransformComponent _transformComponent;
 
-    private DreamObjectAtom? _loc;
 
     private string? ScreenLoc {
         get => _screenLoc;
@@ -75,7 +75,7 @@ protected override bool TryGetVar(string varName, out DreamValue value) {
                 value = new(Z);
                 return true;
             case "loc":
-                value = new(_loc);
+                value = new(Loc);
                 return true;
             case "screen_loc":
                 value = (ScreenLoc != null) ? new(ScreenLoc) : DreamValue.Null;
@@ -97,7 +97,7 @@ protected override bool TryGetVar(string varName, out DreamValue value) {
             case "locs":
                 // Unimplemented; just return a list containing src.loc
                 DreamList locs = ObjectTree.CreateList();
-                locs.AddValue(new(_loc));
+                locs.AddValue(new(Loc));
 
                 value = new DreamValue(locs);
                 return true;
@@ -152,7 +152,7 @@ protected override void SetVar(string varName, DreamValue value) {
     }
 
     private void SetLoc(DreamObjectAtom? loc) {
-        _loc = loc;
+        Loc = loc;
         if (TransformSystem == null)
             return;
 

diff --git a/OpenDreamRuntime/ServerVerbSystem.cs b/OpenDreamRuntime/ServerVerbSystem.cs
@@ -188,6 +188,11 @@ private bool CanExecute(DreamConnection connection, DreamObject src, DreamProc v
         switch (verbInfo.Accessibility) {
             case VerbAccessibility.Usr:
                 return src == connection.Mob;
+            case VerbAccessibility.InUsr:
+                if (src is not DreamObjectMovable srcMovable)
+                    return false;
+
+                return srcMovable.Loc == connection.Mob;
             default:
                 // TODO: All the other kinds
                 return true;