Inventory - Ready for Merge #484

ogmage78 · 2017-08-02T00:15:42Z

2017-08-01

[Og II]

Refactored again on Mogwai's feedback

This is getting so large, I need to stop here - this is a good spot - adds significant functionality but with a few known bugs.

Inventory will save with the container and load again in the correct positions.
Character Description Event is now wired up for inventory.
removed containers copy of aceObject Inventory - just make the list accessible.
Updated Clone so it you pass a new guid, it resets all the associated child tables.
implemented placement IntProperty 65 used to track slot in Container
Created supporting methods to manage pack order
Enhanced the debug log message for DBDEBUG
Small temp fix to stutter when attempting to shift walk or shift jump. We still need to really understand autonomous
Created new view vw_ace_inventory_object to expose ability to pull by container.
general clean up comments and whitespace
Inventory loading - working
TODO.
1 Add in capacity checks
2 bug still in picking up items off the ground and saving to database.
3 bug with reloaded items saved in a secondary side pack.

…et, my shifitng logic does not want to save.

LtRipley36706

possible path worth exploring, it might need to pull in some of the changes from pr #482 to fully work like you might expect

LtRipley36706 · 2017-08-02T05:01:24Z

Source/ACE/Command/Handlers/AdminCommands.cs

@@ -1015,17 +1015,23 @@ public static void HandleCI(Session session, params string[] parameters)
            WorldObject testContainer = LootGenerationFactory.CreateTestWorldObject(session.Player, weenieId);


WorldObject newObj = WorldObjectFactory.CreateNewWorldObject(weenieId); newObj.ContainerId = session.Player.Guid.Full; newObj.Placement = 0; session.Player.AddToInventory(newObj); session.Player.TrackObject(newObj); session.Network.EnqueueSend(new GameMessagePutObjectInContainer(session, session.Player.Guid, newObj, 0), new GameMessageUpdateInstanceId(newObj.Guid, session.Player.Guid, PropertyInstanceId.Container)); } }

try this instead

LtRipley36706 · 2017-08-02T05:18:48Z

Source/ACE/Command/Handlers/DebugCommands.cs

@@ -825,8 +826,10 @@ public static void HandleWeapons(Session session, params string[] parameters)
            {
                foreach (uint weenieId in weaponsTest)
                {
-                    WorldObject loot = LootGenerationFactory.CreateTestWorldObject(session.Player, weenieId);
+                    AceObject lootAceObject = (AceObject)DatabaseManager.World.GetAceObjectByWeenie(weenieId).Clone(GuidManager.NewItemGuid().Full);
+                    WorldObject loot = new GenericObject(lootAceObject);


WorldObject loot = WorldObjectFactory.CreateNewWorldObject(weenieId);

instead of AceObject + WorldObject stuff

I tried that first - but it dies not look like it really works. If you try to persist it, you will see that what you are doing behind the scenes, is making a world object which is made from an aceObject. Then you do a clone and assign a new guid. It looks like a new object and it is, but the problem is that all of the aceObject contained in your new world object have the aceobjectid of the item you cloned from. It does not matter as long as you are just spawning something that will never be persisted. If you actually try to save that to the database, it blows up. This actually works as coded.

I think the solution here is to make CreateNewWorldObject work. CreateNewWorldObject is meant to be the primary tool for generating loot. It currently only takes a weenie, but should probably be modified to accept a Loot Tier (int) as well.

This functionality should be an easy one liner, not a complicated daisy-chain of methods like Og had to implement.

Ok, I will work on making the other method work and refactor my code to use that.

See this change in 482

Think it does what you're expecting, assuming your clone(guid) changes are also merged

It does part of it. The DB layer should be assigning the objectGuid of the child objects, but it doesn't hurt (and is probably better) to do a deep reassignment of the guid.

LtRipley36706 · 2017-08-02T05:18:59Z

Source/ACE/Command/Handlers/DebugCommands.cs

@@ -849,11 +852,13 @@ public static void HandleSplits(Session session, params string[] parameters)
            {
                foreach (uint weenieId in splitsTest)
                {
-                    WorldObject loot = LootGenerationFactory.CreateTestWorldObject(session.Player, weenieId);
+                    AceObject lootAceObject = (AceObject)DatabaseManager.World.GetAceObjectByWeenie(weenieId).Clone(GuidManager.NewItemGuid().Full);
+                    WorldObject loot = new GenericObject(lootAceObject);


WorldObject loot = WorldObjectFactory.CreateNewWorldObject(weenieId);

instead of AceObject + WorldObject stuff

…re a code base between world and shard so in this instance must stay in sync. More inventory loading work.

Mogwai-TheFurry · 2017-08-02T11:58:26Z

Source/ACE.Entity/AceObject.cs

@@ -1798,6 +1808,20 @@ public object Clone(uint guid)
        {
            AceObject ret = (AceObject)Clone();
            ret.AceObjectId = guid;
+            // We are cloning a new AceObject with a new AceObjectID - need to set this to false. Og II
+            ret.HasEverBeenSavedToDatabase = false;


also make it Dirty. ret.IsDirty = true;

Mogwai-TheFurry · 2017-08-02T13:02:55Z

Source/ACE/Command/Handlers/DebugCommands.cs

@@ -825,8 +826,10 @@ public static void HandleWeapons(Session session, params string[] parameters)
            {
                foreach (uint weenieId in weaponsTest)
                {
-                    WorldObject loot = LootGenerationFactory.CreateTestWorldObject(session.Player, weenieId);
+                    AceObject lootAceObject = (AceObject)DatabaseManager.World.GetAceObjectByWeenie(weenieId).Clone(GuidManager.NewItemGuid().Full);
+                    WorldObject loot = new GenericObject(lootAceObject);


I think the solution here is to make CreateNewWorldObject work. CreateNewWorldObject is meant to be the primary tool for generating loot. It currently only takes a weenie, but should probably be modified to accept a Loot Tier (int) as well.

This functionality should be an easy one liner, not a complicated daisy-chain of methods like Og had to implement.

Mogwai-TheFurry · 2017-08-02T13:06:10Z

Source/ACE/Entity/Container.cs

+            var invList = inventory.OrderBy(o => o.Value.Placement);
+            uint place = 0;
+            AceObject saveableCopy;
+            foreach (var keyValuePair in invList)


This loop doesn't make sense to me. Can you explain what it does?

When you either put something in your backpack or you just move it around to a new slot - everything in the pack with a placement >= the placement slot you are going in has to move. Put 4 things in your pack. They are in slots 0, 1, 2, 3 Now drag item in slot 3 to slot 0. 3 is now is set to 0, 0 is set to 1 and 1 is set to 2 and 2 is set to 3. Not every move ends up with a total inventory shift. Only drag to the first of the list does that. If you drag to the middle, only everything past that has to shift. If you drag to the last open slot, nothing moves. By default, when you pick something up off the ground if you do not drag it to a slot, it goes to position 0. There may be a better way to do that. This works correctly in all cases with the minimum number of moves. (updates). More than happy to refactor if there is a better way.

it's a mini towers of hanoi ;) Just kidding that is what it made me think of laying out what was happening on a piece of paper.

I figured that's what it was, but it's coded rather oddly. I don't think we need to be saving on every ordering alteration. We can let the periodic save handle this sort of stuff.

There are easier ways to do this:
invList.Where(i => i.Placement >= newItemPlacement).ForEach(i => i.Placement++);

Also, need to check for container limitations? Ie, holds 24, already at capacity, etc. Method should probably return a boolean indicator of success so the caller can act accordingly.

I knew there had to be a better way. Thanks Mogwai! I will also add in capacity checks as part of this work.

ddevec · 2017-08-02T18:18:56Z

Source/ACE/Entity/Container.cs

@@ -51,14 +52,54 @@ public Container(AceObject aceObject, ObjectGuid guid)
        {
        }

+        public virtual void ContainerPlacement(WorldObject inventoryItem)


I'm not a really big fan of this function name. What does ContainerPlacement mean? I would assume it returns the container placement of the item, but that's clearly not it, it removes an inventory item, then does some other stuff. Perhaps RemoveItemFromInventory? Or would that be improper for some reason?

I like: PlaceItemInContainer

ddevec · 2017-08-02T18:20:00Z

Source/ACE/Entity/Container.cs

+                    saveableCopy = keyValuePair.Value.SnapShotOfAceObject();
+                    saveableCopy.ClearDirtyFlags();
+                    saveableCopy.Placement = place;
+                    DatabaseManager.Shard.SaveObject(saveableCopy, null);


I'm still not 100% sure what this funciton does. But shouldn't saving these objects be piggy-backed on saving the player, not done on every inventory reshuffle?

Going to put this save in a #if directive it makes it easy to debug if it persists right away. I will hook this in with character save which is how it will work.

ddevec · 2017-08-02T18:20:10Z

Source/ACE/Entity/Container.cs

+            saveableCopy = inventoryItem.SnapShotOfAceObject();
+            saveableCopy.ClearDirtyFlags();
+            saveableCopy.Placement = inventoryItem.Placement;
+            DatabaseManager.Shard.SaveObject(saveableCopy, null);


… the world from spawning - have to find that bug.

…e of container.

…ved changes to vw_ace_object (can use that has to have position) created very simple view for inventory loading. Wired up inventory section of inventory and stubbed in wielded.

Mogwai-TheFurry

Now that this is shaping up and I can read it more easily, I'm not a fan that we maintain a duplicate list of inventory in Container (with the original/primary being AceObject). IMO, Container should act on the AceObject.Inventory collection, which removes a lot of the issues you have with clearing and duplicating lists.

LtRipley36706 · 2017-08-04T17:59:55Z

@Mogwai-TheFurry basically a function call, Container.AddToInventory(worldobject) would add it to the collection of inventory, recalc the burden of the container and send all the appropriate createobject and privateupdateints with the RemoveFromInventory doing the removeobject msg instead yeah?

…bject per Mogwai.

… world and pick them back up.

LtRipley36706

some object stuff I noticed which could pose issues later on

LtRipley36706 · 2017-08-05T00:18:07Z

Source/ACE/Entity/Container.cs

-               session.Network.EnqueueSend(new GameMessageCreateObject(invItem));
+            foreach (var invItem in Inventory.Values)
+            {
+                var inv = new GenericObject(invItem);


should switch to var inv = CreateWorldObject(invItem);

LtRipley36706 · 2017-08-05T00:19:11Z

Source/ACE/Entity/Container.cs


-            var containers = inventory.Where(wo => wo.Value.ItemCapacity > 0).ToList();
-            return containers.Any(cnt => ((Container)cnt.Value).inventory.ContainsKey(inventoryItemGuid));
+            var containers = Inventory.Where(wo => wo.Value.ItemsCapacity > 0).ToList();


instead of testing containers by ItemsCapacity, test by WeenieType or even object type (Container) if the objects in Inventory are WorldObjects?

That was legacy from when we did not have types set and everything was a debug object, I will fix. This was a lot more involved than I thought, so I just overlooked that. Thanks for catching it!

LtRipley36706 · 2017-08-05T00:22:13Z

Source/ACE/Entity/Container.cs

        }

        public virtual WorldObject GetInventoryItem(ObjectGuid objectGuid)
        {
-            var containers = inventory.Where(wo => wo.Value.ItemCapacity > 0).ToList();
+            if (Inventory.ContainsKey(objectGuid))
+                return new GenericObject(Inventory[objectGuid]);


not all objects are GenericObject, use CreateWorldObject to get proper object

Good catch. I will fix

LtRipley36706 · 2017-08-05T00:23:38Z

Source/ACE/Entity/Container.cs

+            if (Inventory.ContainsKey(objectGuid))
+                return new GenericObject(Inventory[objectGuid]);
+
+            var containers = Inventory.Where(wo => wo.Value.ItemsCapacity > 0).ToList();


wo.GetType == Container or wo.WeenieType == WeenieType.Container here maybe?

That was legacy from when we did not have types set and everything was a debug object, I will fix. This was a lot more involved than I thought, so I just overlooked that. Thanks for catching it!

ogmage78 · 2017-08-05T00:59:35Z

@LtRipley36706 Made those changes - updating now.

…g saving items in secondary packs to the db.

LtRipley36706 · 2017-08-06T20:54:53Z

Source/ACE.Entity/Enum/Properties/PropertyInt.cs

-        CreatureType = 2,
-        PaletteTemplate = 3,
-        ClothingPriority = 4,
-        EncumbranceVal = 5, // ENCUMB_VAL_INT,


Lost note in formatting, please restore so we can track what we changed from client/aclogview

We align the formatting on all of the other files - you want it unaligned? I am not sure I follow?

no issues with the alignment, it was the note // ENCUMB_VAL_INT that was lost.. ACE calls it EncumbranceVal, client and aclogview call it ENCUMB_VAL_INT

LtRipley36706 · 2017-08-06T20:54:58Z

Source/ACE.Entity/Enum/Properties/PropertyInt.cs

-        ItemsCapacity = 6,
-        ContainersCapacity = 7,
-        Mass = 8,
-        ValidLocations = 9, // LOCATIONS_INT,


Lost note in formatting, please restore so we can track what we changed from client/aclogview

We align the formatting on all of the other files - you want it unaligned? I am not sure I follow?

no issues with the alignment, it was the note // LOCATIONS_INT that was lost.. ACE calls it ValidLocations, client and aclogview call it LOCATIONS_INT

LtRipley36706 · 2017-08-06T20:57:34Z

Source/ACE.Entity/Enum/WeenieType.cs

@@ -75,6 +75,7 @@ public enum WeenieType : uint
        SocialManager,
        Pet,
        PetDevice,
-        CombatPet
+        CombatPet,
+        Foci


Foci did not have their own WeenieType. They were assigned to WeenieType.Generic

I know, I needed to add one

LtRipley36706 · 2017-08-06T21:00:12Z

Source/ACE/Entity/WorldObject.cs

@@ -1460,7 +1460,8 @@ protected WorldObject(AceObject aceObject)
                : this(new ObjectGuid(aceObject.AceObjectId))
        {
            AceObject = aceObject;
-
+            SetWeenieHeaderFlag();
+            SetWeenieHeaderFlag2();


these shouldn't be needed, the WeenieHeaderFlags are set when an object reads the field. If its not updating, its a bug for sure

It was needed it was not working.

maybe worth a todo/fixme.. we shouldn't have to think too much about these

LtRipley36706 · 2017-08-06T21:01:55Z

Source/ACE/Network/GameEvent/Events/GameEventPlayerDescription.cs

+                Writer.Write(inv.Value.AceObjectId);
+                if ((WeenieType)inv.Value.WeenieType == WeenieType.Container)
+                    Writer.Write((uint)ContainerType.Container);
+                if ((WeenieType)inv.Value.WeenieType == WeenieType.Foci)


technically foci weren't containers, as they were classified as WeenieType.Generic.. They do have RequireBackPackSlot flag on their ObjDesc however

They are passed as containers in the character description event.

LtRipley36706 · 2017-08-06T21:03:33Z

Source/ACE/Network/GameEvent/Events/GameEventViewContents.cs

+                    case WeenieType.Container:
+                        Writer.Write((uint)ContainerType.Container);
+                        break;
+                    case WeenieType.Foci:


see above comments, possible issue with categorization

LtRipley36706 · 2017-08-07T17:16:25Z

Source/ACE.Entity/AceObject.cs

@@ -1220,6 +1220,12 @@ public string DisplayName
            set { SetBoolProperty(PropertyBool.RequiresBackpackSlot, value); }
        }

+        public bool UseBackpackSlot


Feels like this shouldn't be in AceObject and instead in WorldObject. I follow why you put it here though. GameEventPlayerDescription reads things as AceObject and not WorldObject.

Maybe slap a few fixme/todos to correct the anomalous property/object usage so when someone gets around to bringing GameEventPlayerDescription in line with expectations this oddity gets corrected?

It really has to be in both places because to do what Mogwai wanted, I don't make inventory a world object until it is used or wielded. It is only ready only and makes the code much simpler to follow.

Yeah, this is necessary.

LtRipley36706

notes added, only one real question regarding saving to db flag

LtRipley36706 · 2017-08-07T17:20:25Z

Source/ACE.Entity/AceObject.cs

            ret.GeneratorLinks.ForEach(c => c.AceObjectId = guid);
-
-            // No need to change Dictionary guids per DDEVEC


bad merge? some comment got axed, some things got duplicated

LtRipley36706 · 2017-08-07T17:22:37Z

Source/ACE.Entity/AceObject.cs

@@ -1817,8 +1841,7 @@ public object Clone(uint guid)
            AceObject ret = (AceObject)Clone();
            ret.AceObjectId = guid;
            // We are cloning a new AceObject with a new AceObjectID - need to set this to false. Og II
-            ret.HasEverBeenSavedToDatabase = false;
-            ret.IsDirty = true;
+            ret.SetDirtyFlags();


HasEverBeenSavedToDatabase possible issue in removing this..

is it possible for something to be HasEverBeenSavedToDatabase == true and IsDirty == true? I'd assume something could be dirty that already has been saved to the database, so I don't follow the change entirely.

it is not enough to set the flag on the top level. This looked like it was working because until this work, we never really saved items to the database. What I put in - I tested and it works - you have to do a deep set the setDirtyFlags that primes it to save to the database for the first time from a clone. The flags are maintained automatically after that first save as items are changed. It is a good system Mogwai put in, we just needed to debug the first real saves. This does that.

LtRipley36706 · 2017-08-07T17:25:30Z

Source/ACE.Entity/AceObject.cs

+       public void ClearDirtyFlags()
+        {
+            this.IsDirty = false;
+            this.HasEverBeenSavedToDatabase = true;


see above comment re HasEverBeenSavedToDatabase

this is correct. This call is only to be used on first save after clone.

LtRipley36706 · 2017-08-07T17:25:41Z

Source/ACE.Entity/AceObject.cs

+        public void SetDirtyFlags()
+        {
+            this.IsDirty = true;
+            this.HasEverBeenSavedToDatabase = false;


see above comment re HasEverBeenSavedToDatabase

this is correct. This call is only to be used on first save after clone.

LtRipley36706 · 2017-08-07T17:26:08Z

Source/ACE.Entity/BaseAceProperty.cs

+        public void SetDirtyFlags()
+        {
+            this.IsDirty = true;
+            this.HasEverBeenSavedToDatabase = false;


See above comment re HasEverBeenSavedToDatabase

this is correct. This call is only to be used on first save after clone.

LtRipley36706 · 2017-08-07T17:45:28Z

Source/ACE/Entity/Player.cs

@@ -1371,14 +1376,17 @@ public bool GetVirtualOnlineStatus()

        private void SendSelf()


just something I noticed in retail pcaps, but haven't investigated much...

following the CreatePlayer and Player Description Event there is often a DeleteObject which deletes yourself followed by a CreateObject which creates yourself. The DeleteObject message isn't fully handled by aclogview so there could some something else in that packet which puts this in to better context

Not sure I get why, but worthing noting and investigating.

LtRipley36706 · 2017-08-07T17:47:24Z

Source/ACE/Entity/WorldObject.cs

@@ -1460,7 +1460,8 @@ protected WorldObject(AceObject aceObject)
                : this(new ObjectGuid(aceObject.AceObjectId))
        {
            AceObject = aceObject;
-
+            SetWeenieHeaderFlag();
+            SetWeenieHeaderFlag2();


maybe worth a todo/fixme.. we shouldn't have to think too much about these

LtRipley36706 · 2017-08-07T17:49:48Z

Source/ACE/Factories/LootGenerationFactory.cs

-                WorldObject wo = CreateTestWorldObject(player, weenieList[i].WeenieClassId);
+                WorldObject wo = WorldObjectFactory.CreateNewWorldObject(weenieList[i].WeenieClassId);
+                if (wo.WeenieType == WeenieType.Container)
+                    player.Session.Network.EnqueueSend(new GameEventViewContents(player.Session, wo.SnapShotOfAceObject()));


any time a container is created in the world if you are in range you are shown the contents before opening?

it is only send to the player that has the container

LtRipley36706 · 2017-08-07T17:51:57Z

Source/ACE/Network/GameEvent/Events/GameEventViewContents.cs

    public class GameEventViewContents : GameEventMessage
    {
-        public GameEventViewContents(Session session, uint objectId)
+        public GameEventViewContents(Session session, AceObject container)


feels like this should be a WorldObject.. AceObject is behind the scenes usually

no, mogway made me change inventory to only make world objects when needed.

LtRipley36706 · 2017-08-07T17:52:26Z

changelog.md

@@ -1,5 +1,25 @@
 # ACEmulator Change Log

+


bad merge in here

ogmage78 · 2017-08-12T12:57:48Z

As I put in the change log, there are some known bugs, but I think this is a good start. I am sure there are some better ways to program this. I would love to learn them, but at this time, I will be taking a step back from the project. I thought this added value so I am reopening this. If you want to merge it so someone else can pick this up - great. If not, then just close it without merge. I had hoped I would be able to keep working on the project, but that does not seem likely at this time. A big thank you to @Mogwai-TheFurry for taking the time to help a very out of date programmer. I wish you guys the very best.

will re-review

Mogwai-TheFurry

Very minor stuff. Looks great, Og!

Mogwai-TheFurry · 2017-08-14T11:59:46Z

Source/ACE.Entity/AceObject.cs

@@ -1220,6 +1220,12 @@ public string DisplayName
            set { SetBoolProperty(PropertyBool.RequiresBackpackSlot, value); }
        }

+        public bool UseBackpackSlot


Yeah, this is necessary.

Mogwai-TheFurry · 2017-08-14T12:01:39Z

Source/ACE.Entity/AceObject.cs

@@ -1817,8 +1841,7 @@ public object Clone(uint guid)
            AceObject ret = (AceObject)Clone();
            ret.AceObjectId = guid;
            // We are cloning a new AceObject with a new AceObjectID - need to set this to false. Og II
-            ret.HasEverBeenSavedToDatabase = false;
-            ret.IsDirty = true;
+            ret.SetDirtyFlags();


Mogwai-TheFurry · 2017-08-14T12:07:18Z

Source/ACE/Entity/Landblock.cs

@@ -792,14 +794,14 @@ public void ScheduleItemTransferInContainer(ActionChain chain, ObjectGuid wo, Co
            }
        }

-        public void ScheduleItemTransfer(ActionChain chain, ObjectGuid wo, ObjectGuid container)
+        public void ScheduleItemTransfer(ActionChain chain, ObjectGuid wo, ObjectGuid container, uint placement = 0)


I think the terminology we've been using as a semi-standard is "QueueItemTransfer". No biggie.

Mogwai-TheFurry · 2017-08-14T12:08:08Z

Source/ACE/Entity/Landblock.cs

        }

        private void Log(string message)
        {
-            log.Debug($"LB {id.Landblock.ToString("X")}: {message}");
+            log.Debug($"LB {id.Landblock:X}: {message}");


The ToString was right - it would have printed the landblock Id in Hex. You're now only logging the "X" component.

Fixed - damn resharper lead me astray .... ;)

Mogwai-TheFurry · 2017-08-14T12:10:49Z

changelog.md

@@ -18,6 +39,7 @@
 ### 2017-08-06
 [Ripley]
 * Added Scroll weenie object.
+>>>>>>> 7d22ad27bd89e4462abb1f358c37f0891ea3d9a3


merge artifact

ogmage78 and others added 8 commits July 31, 2017 07:24

WIP - Inventory

3a4c503

Merge with latest

25d3314

Working on inventory saving. Not able to manage placement correctly y…

aad1384

…et, my shifitng logic does not want to save.

WIP broke saving now.

55c4d74

Got Placement working.

22e6e00

Update change log.

52fba76

Won't load character

ac57e4b

WIP

d4f9341

LtRipley36706 reviewed Aug 2, 2017

View reviewed changes

Modify vw_ace_object to expose ability to pull by container. They sha…

054d150

…re a code base between world and shard so in this instance must stay in sync. More inventory loading work.

Mogwai-TheFurry previously requested changes Aug 2, 2017

View reviewed changes

ddevec reviewed Aug 2, 2017

View reviewed changes

ogmage78 added 7 commits August 2, 2017 14:34

Merge

cb0ce89

Started work on requested changes. I have managed to keep anything in…

6c20cb1

… the world from spawning - have to find that bug.

WIP - Need to have container inventory backed by aceObject

e0f36cd

put in todo

126d4ad

curse you style cop !

5e0a858

Simplified and cleaned up inventory save. Now saves with periodic sav…

a06003d

…e of container.

Inventory saves and loads correctly. Items are created on login. Remo…

598d4b0

…ved changes to vw_ace_object (can use that has to have position) created very simple view for inventory loading. Wired up inventory section of inventory and stubbed in wielded.

ogmage78 changed the title ~~Doctor Strangelove or: How I Learned to Stop Worrying and Love Multithreading REVIEW ONLY~~ Doctor Strangelove or: How I Learned to Stop Worrying and Love Multithreading NEW REVIEW REQUESTED Aug 4, 2017

Mogwai-TheFurry reviewed Aug 4, 2017

View reviewed changes

ogmage78 added 2 commits August 4, 2017 16:30

Updated to removed duplicated dictioanry between worldObject and AceO…

6bb43ae

…bject per Mogwai.

Good Save point. You can move items, persist them, drop them onto the…

488e9c5

… world and pick them back up.

LtRipley36706 reviewed Aug 5, 2017

View reviewed changes

ogmage78 added 2 commits August 4, 2017 19:48

Starting to work on saving equipted items.

581e13e

Made Ripley's changes

e247df5

Fixed bug in container save. Fixed saving ace_object. Still have a bu…

bcfaab8

…g saving items in secondary packs to the db.

ogmage78 changed the title ~~Doctor Strangelove or: How I Learned to Stop Worrying and Love Multithreading NEW REVIEW REQUESTED~~ Doctor Strangelove or: How I Learned to Stop Worrying and Love Multi-threading READY FOR FINAL REVIEW & MERGE Aug 6, 2017

Added a few comments and deleted a large comment block.

a4c2948

LtRipley36706 reviewed Aug 6, 2017

View reviewed changes

ACEmulator deleted a comment from ogmage78 Aug 6, 2017

ogmage78 added 3 commits August 6, 2017 17:56

Merge changes

bd2957c

Merge Cleanup

99f2d98

Removed new weenie type per Ripley's request.

9f49567

ogmage78 changed the title ~~Doctor Strangelove or: How I Learned to Stop Worrying and Love Multi-threading READY FOR FINAL REVIEW & MERGE~~ Doctor Strangelove or: How I Learned to Stop Worrying and Love Multi-threading MERGE BROKE THIS - NOT READY FOR MERGE Aug 6, 2017

ogmage78 changed the title ~~Doctor Strangelove or: How I Learned to Stop Worrying and Love Multi-threading MERGE BROKE THIS - NOT READY FOR MERGE~~ Doctor Strangelove or: How I Learned to Stop Worrying and Love Multi-threading READY FOR FINAL REVIEW & MERGE Aug 7, 2017

Fixed bug introduced by merge with cow.

b8ab50d

LtRipley36706 reviewed Aug 7, 2017

View reviewed changes

ogmage78 closed this Aug 8, 2017

Merge Update

c7f513b

ogmage78 changed the title ~~Doctor Strangelove or: How I Learned to Stop Worrying and Love Multi-threading READY FOR FINAL REVIEW & MERGE~~ Inventory - Ready for Merge Aug 12, 2017

ogmage78 reopened this Aug 12, 2017

Mogwai-TheFurry suggested changes Aug 14, 2017

View reviewed changes

Fixed items in Mogwai's feedback.

1936d75

Mogwai-TheFurry approved these changes Aug 14, 2017

View reviewed changes

Mogwai-TheFurry merged commit d29bc3d into ACEmulator:master Aug 14, 2017

ogmage78 deleted the inventory branch August 15, 2017 01:20

		@@ -1015,17 +1015,23 @@ public static void HandleCI(Session session, params string[] parameters)
		WorldObject testContainer = LootGenerationFactory.CreateTestWorldObject(session.Player, weenieId);

		ret.GeneratorLinks.ForEach(c => c.AceObjectId = guid);

		// No need to change Dictionary guids per DDEVEC

		@@ -1371,14 +1376,17 @@ public bool GetVirtualOnlineStatus()

		private void SendSelf()

Inventory - Ready for Merge #484

Inventory - Ready for Merge #484

Conversation

ogmage78 commented Aug 2, 2017 • edited

2017-08-01

Refactored again on Mogwai's feedback

LtRipley36706 left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ogmage78 Aug 2, 2017 • edited

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 Aug 2, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Mogwai-TheFurry Aug 2, 2017 • edited

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

Mogwai-TheFurry left a comment

Choose a reason for hiding this comment

LtRipley36706 commented Aug 4, 2017

LtRipley36706 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

ogmage78 commented Aug 5, 2017

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

LtRipley36706 Aug 6, 2017 • edited

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

LtRipley36706 Aug 6, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LtRipley36706 Aug 6, 2017 • edited

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

LtRipley36706 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LtRipley36706 Aug 7, 2017 • edited

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 commented Aug 2, 2017 •

edited

LtRipley36706 left a comment •

edited

ogmage78 Aug 2, 2017 •

edited

ogmage78 Aug 2, 2017 •

edited

Mogwai-TheFurry Aug 2, 2017 •

edited

LtRipley36706 Aug 6, 2017 •

edited

LtRipley36706 Aug 6, 2017 •

edited

LtRipley36706 Aug 6, 2017 •

edited

LtRipley36706 Aug 7, 2017 •

edited