Improved item consume behavior, scrolled text end clicks and item too…

…ltip interactions
Pyrdacor · Mar 10, 2021 · b4dcbcc · b4dcbcc
1 parent 8ca807a
commit b4dcbcc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/Ambermoon.Core/UI/Layout.cs b/Ambermoon.Core/UI/Layout.cs
@@ -1561,6 +1561,8 @@ bool ShowTextItem(uint index, uint subIndex)
 
         void UseItem(ItemGrid itemGrid, int slot, ItemSlot itemSlot)
         {
+            itemGrid.HideTooltip();
+
             if (itemSlot.Flags.HasFlag(ItemSlotFlags.Broken))
             {
                 SetInventoryMessage(game.DataNameProvider.CannotUseBrokenItems, true);
@@ -1592,11 +1594,6 @@ void UseItem(ItemGrid itemGrid, int slot, ItemSlot itemSlot)
                 return;
             }
 
-            void PlayConsume(Action finishAction)
-            {
-                ItemAnimation.Play(game, RenderView, ItemAnimation.Type.Consume, itemGrid.GetSlotPosition(slot), finishAction);
-            }
-
             if (item.Flags.HasFlag(ItemFlags.Readable) && item.TextIndex != 0)
             {
                 if (!ShowTextItem(item.TextIndex, item.TextSubIndex))
@@ -1611,8 +1608,10 @@ void PlayConsume(Action finishAction)
                 }
                 else
                 {
-                    PlayConsume(() =>
+                    game.StartSequence();
+                    DestroyItem(itemSlot, TimeSpan.FromMilliseconds(50), true, () =>
                     {
+                        game.EndSequence();
                         game.CurrentSavegame.ActivateSpecialItem(item.SpecialItemPurpose);
                         SetInventoryMessage(game.DataNameProvider.SpecialItemActivated, true);
                     });
@@ -2076,6 +2075,8 @@ internal void SetInventoryMessage(string message, bool waitForClick = false)
             {
                 if (waitForClick)
                 {
+                    foreach (var itemGrid in itemGrids)
+                        itemGrid.HideTooltip();
                     inventoryMessage?.Destroy();
                     game.CursorType = CursorType.Click;
                     inventoryMessage = AddScrollableText(new Rect(21, 51, 162, 14), game.ProcessText(message));
@@ -2351,6 +2352,9 @@ void ApplyItemRemoveEffects()
                 {
                     game.EquipmentRemoved(itemSlot.ItemIndex, itemSlot.Amount, itemSlot.Flags.HasFlag(ItemSlotFlags.Cursed));
                 }
+
+                if (game.CurrentWindow.Window == Window.Inventory)
+                    game.UpdateCharacterInfo();
             }
 
             if (consumed)

diff --git a/Ambermoon.Core/UI/Popup.cs b/Ambermoon.Core/UI/Popup.cs
@@ -164,7 +164,11 @@ public UIText AddText(Rect bounds, IText text, TextColor textColor, TextAlign te
             {
                 bool closeAfterScroll = CloseOnClick;
                 CloseOnClick = false;
-                uiText.Scrolled += scrolledToEnd => CloseOnClick = closeAfterScroll && scrolledToEnd;
+                uiText.Scrolled += scrolledToEnd =>
+                {
+                    if (closeAfterScroll && scrolledToEnd)
+                        game.ClosePopup();
+                };
             }
             return uiText;
         }