Inventory Phase 1 and Drop Item #189

ogmage78 · 2017-03-31T21:01:27Z

This is at a good place for code review and possible merge. Once approved, this will allow others to start on the numerous tasks around inventory management. You can spawn a Training wand in your backpack or on the ground. That is just throw away code to test with. It is in the debug handler.
usage:
@ctw me OR @ctw ground

Once the item is spawned, you can then drop it on the ground.

Included in this PR. Starts to address Issue #144

World object now has inventory dictionary. Added this here as anything that can be a container needs to have this ability. Not all world objects are containers - so also added property IsContainer

Added methods to:

Add to inventory
Remove from inventory
Lookup item in inventory
Handle Drop item:
1. Calls lookup
2. Update Container burden
3. Sets some properties in preparation for going 3D
4. GameMessageUpdatePosition.
5. Alerts Landblock to new arrival
6. Removes the item the player's inventory
  Added GameActionDropItem
  This handles the client's request to drop an item.
  Added GameMessagePutObjectIn3d

As usual - any coding faux pas are not by design. Feedback is wanted and welcome. If there is a better way to do what I did - please let me know.

…te an item in your backpack and drop the item into 3D space. Start of inventory management

ogmage78 · 2017-04-02T03:47:46Z

I will fix this first thing in the morning. I looked they are easy to resolve. Thanks for checking it over.

ogmage78 · 2017-04-02T13:12:04Z

I fixed the merge issues. When you get a chance to review this - if you look at:
public void HandleDropItem(ObjectGuid objectGuid, Session session) - I am not sure if it needs to be on world object or player. I cannot remember if any NPC's would drop anything as part of a quest. I put in in WO just in case. That might be a mistake. If it needs to go into player - I need to create a method on world object to update containerId. Anyway - any feedback is appreciated.

Mogwai-TheFurry

Fix the mutex and ReadOnlyCollection and I'll take it. The Objects coming out of the Landblock is a necessary evil until we have an action queue.

Mogwai-TheFurry · 2017-04-03T01:21:28Z

Source/ACE/Entity/WorldObject.cs

@@ -72,6 +85,10 @@ public ushort ForcePositionIndex

        public SequenceManager Sequences { get; }

+        public object InventoryMutex => this.inventoryMutex;


I'm really hesitant to think a mutex needs to be public. Red flag for other code being nosey into this class.

Fixed. I got confused there -

Mogwai-TheFurry · 2017-04-03T01:22:52Z

Source/ACE/Entity/WorldObject.cs

@@ -72,6 +85,10 @@ public ushort ForcePositionIndex

        public SequenceManager Sequences { get; }

+        public object InventoryMutex => this.inventoryMutex;
+
+        public Dictionary<ObjectGuid, WorldObject> Inventory => this.inventory;


this should be a ReadOnlyDictionary. You'll have to new it up in the constructor. The default for "inventory" may fire after this, rendering this default incorrect. I'm not exactly sure when the "=>" operator binds on the property, so it may work after all. If you feel this is correct as is, I'm open to discussion as always.

Mogwai-TheFurry · 2017-04-03T01:27:45Z

Source/ACE/Entity/WorldObject.cs

+            {
+                // Find the item we want to pick up
+                var obj = LandblockManager.GetWorldObject(session, itemGuid);
+                if (Object.ReferenceEquals(null, obj))


if (obj == null)

Mogwai-TheFurry · 2017-04-03T01:28:16Z

Source/ACE/Entity/WorldObject.cs

+                this.Position.positionZ = obj.Position.positionZ;
+                this.Position.rotationW = obj.Position.rotationW;
+                this.Position.rotationZ = obj.Position.rotationZ;
+


whoa, does this actually work?

Mogwai-TheFurry · 2017-04-03T01:29:25Z

Source/ACE/Entity/WorldObject.cs

+                this.Position.rotationZ = obj.Position.rotationZ;
+
+                session.Network.EnqueueSend(new GameMessageUpdatePosition(this));
+


remove large chunks of commented code. If you need to keep them, feel free to make a blog page on the acemulator wiki.

Fixed - I did not see I pushed that. Comments gone. Sorry about that.

Mogwai-TheFurry · 2017-04-03T01:36:12Z

Source/ACE/Managers/LandblockManager.cs

@@ -61,8 +61,17 @@ public static void HandleQueryHealth(Session source, ObjectGuid targetId)
        }

        /// <summary>
+        /// return wo in preparation to take it off the landblock and put it in a container.
+        /// </summary>
+        public static WorldObject GetWorldObject(Session source, ObjectGuid targetId)


ugh... we really need that action queue...

ogmage78

Fixed the issues you outlined.

ogmage78 · 2017-04-03T02:51:42Z

Source/ACE/Entity/WorldObject.cs

@@ -72,6 +85,10 @@ public ushort ForcePositionIndex

        public SequenceManager Sequences { get; }

+        public object InventoryMutex => this.inventoryMutex;


Fixed. I got confused there -

ogmage78 · 2017-04-03T02:52:17Z

Source/ACE/Entity/WorldObject.cs

@@ -72,6 +85,10 @@ public ushort ForcePositionIndex

        public SequenceManager Sequences { get; }

+        public object InventoryMutex => this.inventoryMutex;
+
+        public Dictionary<ObjectGuid, WorldObject> Inventory => this.inventory;


ogmage78 · 2017-04-03T02:52:25Z

Source/ACE/Entity/WorldObject.cs

+            {
+                // Find the item we want to pick up
+                var obj = LandblockManager.GetWorldObject(session, itemGuid);
+                if (Object.ReferenceEquals(null, obj))


ogmage78 · 2017-04-03T02:52:55Z

Source/ACE/Entity/WorldObject.cs

+                this.Position.rotationZ = obj.Position.rotationZ;
+
+                session.Network.EnqueueSend(new GameMessageUpdatePosition(this));
+


Fixed - I did not see I pushed that. Comments gone. Sorry about that.

At a good stopping point for a code review. Added the ability to crea…

08116c4

…te an item in your backpack and drop the item into 3D space. Start of inventory management

Mogwai-TheFurry added the blocked:Merge Conflict label Apr 2, 2017

ogmage78 added 2 commits April 1, 2017 23:00

Fixed merge conflicts

bdfcc58

Fixed merge issues.

2e979b7

Mogwai-TheFurry removed the blocked:Merge Conflict label Apr 2, 2017

Work in progress to PutItemInContainer

0924b02

Mogwai-TheFurry suggested changes Apr 3, 2017

View reviewed changes

Mogwai-TheFurry added the blocked:Needs rework label Apr 3, 2017

Fixed issues requested for PR

e7cf138

ogmage78 commented Apr 3, 2017

View reviewed changes

Mogwai-TheFurry merged commit cc7db4a into ACEmulator:master Apr 3, 2017

ogmage78 deleted the inventorypart1 branch April 14, 2017 19:37

LtRipley36706 removed the blocked:Needs rework label May 1, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Inventory Phase 1 and Drop Item #189

Inventory Phase 1 and Drop Item #189

ogmage78 commented Mar 31, 2017

ogmage78 commented Apr 2, 2017

ogmage78 commented Apr 2, 2017

Mogwai-TheFurry left a comment

Mogwai-TheFurry Apr 3, 2017

ogmage78 Apr 3, 2017

Mogwai-TheFurry Apr 3, 2017

ogmage78 Apr 3, 2017

Mogwai-TheFurry Apr 3, 2017

ogmage78 Apr 3, 2017

Mogwai-TheFurry Apr 3, 2017

Mogwai-TheFurry Apr 3, 2017

ogmage78 Apr 3, 2017

Mogwai-TheFurry Apr 3, 2017

ogmage78 left a comment

ogmage78 Apr 3, 2017

ogmage78 Apr 3, 2017

ogmage78 Apr 3, 2017

ogmage78 Apr 3, 2017

		@@ -72,6 +85,10 @@ public ushort ForcePositionIndex

		public SequenceManager Sequences { get; }

		public object InventoryMutex => this.inventoryMutex;

		this.Position.rotationZ = obj.Position.rotationZ;

		session.Network.EnqueueSend(new GameMessageUpdatePosition(this));

Inventory Phase 1 and Drop Item #189

Inventory Phase 1 and Drop Item #189

Conversation

ogmage78 commented Mar 31, 2017

ogmage78 commented Apr 2, 2017

ogmage78 commented Apr 2, 2017

Mogwai-TheFurry left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ogmage78 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment