zzre: Complete ScrDeck

zzio/InventoryCard.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 
 namespace zzio;
 
@@ -155,6 +156,26 @@ public IEnumerator<ZZClass> GetEnumerator()
         if (class2 != ZZClass.None) yield return class2;
     }
     IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+    public bool IsCompatible(zzio.db.SpellRow spell)
+    {
+        var zzclasses = Enum.GetValues<ZZClass>().Where(s => s != ZZClass.None);
+        List<ZZClass> skills = [class0, class1, class2];
+        List<ZZClass> reqs = [spell.PriceA, spell.PriceB, spell.PriceC];
+
+        var neutralsNeeded = 0;
+        foreach (var zzclass in zzclasses)
+        {
+            var skillHad = skills.Where(s => s == zzclass).Count();
+            var skillNeeded = reqs.Where(s => s == zzclass).Count();
+            var skillDeficit = skillNeeded - skillHad;
+            if (skillDeficit > 0)
+                neutralsNeeded += skillDeficit;
+        }
+        if (skills.Where(s => s == ZZClass.Neutral).Count() - neutralsNeeded < 0)
+            return false;
+        return true;
+    }
 }
 
 public enum ZZPermSpellStatus

zzre.core/math/WorldCollider.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Collections.Generic;
 using System.Linq;
 using zzio.rwbs;
@@ -94,7 +94,7 @@ public static WorldCollider Create(RWWorld world)
             sectorType = RWPlaneSectionType.XPlane,
             leftValue = float.PositiveInfinity,
             rightValue = float.PositiveInfinity,
-            children = [rootAtomic, new RWString()]
+            children = [rootAtomic!, new RWString()]
         };
 
         var splits = new CollisionSplit[splitCount];

zzre/game/Game.cs

@@ -128,6 +128,7 @@ protected void LoadScene(string sceneName)
         clearColor = (scene.misc.clearColor.ToFColor() with { a = 1f }).ToVeldrid();
 
         ecsWorld.Publish(new messages.SceneLoaded(scene, GetTag<Savegame>()));
+        ui.World.Publish(new messages.SceneLoaded(scene, GetTag<Savegame>()));
     }
 
     private void DisposeUnusedAssets(in messages.SceneLoaded _)

zzre/game/UI.cs

@@ -81,6 +81,7 @@ public UI(ITagContainer diContainer)
             new systems.ui.Tooltip(this),
             new systems.ui.CorrectRenderOrder(this),
             new systems.ui.Fade(this),
+            new systems.ui.UIScript(this),
 
             new systems.Reaper(this),
             new systems.ParentReaper(this));

zzre/game/Zanzarah.cs

@@ -24,6 +24,7 @@ public interface IZanzarahContainer
     event Action<MouseButton, Vector2> OnMouseDown;
     event Action<MouseButton, Vector2> OnMouseUp;
     event Action<Vector2> OnMouseMove;
+    event Action<float> OnScroll;
 }
 
 public class Zanzarah : ITagContainer

zzre/game/components/ui/DraggedCard.cs

@@ -0,0 +1,5 @@
+using zzio;
+
+namespace zzre.game.components.ui;
+
+public record struct DraggedCard(InventoryCard card);

zzre/game/components/ui/ScrBookMenu.cs

@@ -1,13 +1,10 @@
-using System.Collections.Generic;
 using zzio.db;
 
 namespace zzre.game.components.ui;
 
 public struct ScrBookMenu
 {
-    public Inventory Inventory;
     public FairyRow[] Fairies;
-    public Dictionary<components.ui.ElementId, FairyRow> FairyButtons;
     public DefaultEcs.Entity Sidebar;
     public DefaultEcs.Entity Crosshair;
 }

zzre/game/components/ui/ScrDeck.cs

@@ -1,4 +1,6 @@
-namespace zzre.game.components.ui;
+using zzio;
+
+namespace zzre.game.components.ui;
 
 public struct ScrDeck
 {
@@ -14,14 +16,23 @@ public enum Tab
     public Tab ActiveTab;
     public bool IsGridMode;
     public int Scroll;
-    public Inventory Inventory;
     public DefaultEcs.Entity SummaryBackground;
     public DefaultEcs.Entity SpellBackground;
+
+    public DefaultEcs.Entity[] TabButtons;
     public DefaultEcs.Entity ListSlider;
-    public DefaultEcs.Entity FairyHoverSummary;
-    public DefaultEcs.Entity[] ListTabs;
-    public DefaultEcs.Entity[] ListButtons;
-    public DefaultEcs.Entity[] ListUsedMarkers;
-    public DefaultEcs.Entity[] ListSummaries;
-    public DefaultEcs.Entity[] DeckSlotParents;
+
+    public DefaultEcs.Entity[] DeckSlots;
+    public DefaultEcs.Entity[] ListSlots;
+
+    public DefaultEcs.Entity LastHovered;
+    public DefaultEcs.Entity StatsTitle;
+    public DefaultEcs.Entity StatsDescriptions;
+    public DefaultEcs.Entity StatsLights;
+    public DefaultEcs.Entity StatsLevel;
+
+    public int VacatedDeckSlot;
+    public InventoryCard? DraggedCard;
+    public DefaultEcs.Entity DraggedCardImage;
+    public DefaultEcs.Entity DraggedOverlay;
 }

zzre/game/components/ui/Slot.cs

@@ -0,0 +1,18 @@
+using zzio;
+
+namespace zzre.game.components.ui;
+
+public record struct Slot
+{
+    public enum Type { None, DeckSlot, ListSlot, SpellSlot }
+    public Type type;
+    public int index;
+    public InventoryCard? card;
+    public DefaultEcs.Entity button;
+    public DefaultEcs.Entity usedMarker; // ListSlot only
+    public DefaultEcs.Entity[] spellImages; // ListSlot only
+    public bool showSpells; // ListSlot only
+    public DefaultEcs.Entity summary;
+    public DefaultEcs.Entity req; // SpellSlot only
+    public DefaultEcs.Entity[] spellSlots; // DeckSlot only
+};

zzre/game/components/ui/SlotButton.cs

@@ -0,0 +1,3 @@
+namespace zzre.game.components.ui;
+
+public record struct SlotButton;

zzre/game/components/ui/UIScript.cs

@@ -0,0 +1,6 @@
+namespace zzre.game.components.ui;
+
+public record struct UIScript(
+    DefaultEcs.Entity DeckSlotEntity,
+    bool ItemConsumed
+);

zzre/game/messages/ui/ExecuteUIScript.cs

@@ -0,0 +1,6 @@
+namespace zzre.game.messages.ui;
+
+public readonly record struct ExecuteUIScript(
+    zzio.InventoryItem Item,
+    DefaultEcs.Entity DeckSlotEntity
+);

zzre/game/messages/ui/UIScriptFinished.cs

@@ -0,0 +1,6 @@
+namespace zzre.game.messages.ui;
+
+public readonly record struct UIScriptFinished(
+    DefaultEcs.Entity DeckSlotEntity,
+    bool ItemConsumed
+);

zzre/game/systems/player/OpenMenuKeys.cs

@@ -18,10 +18,12 @@ public class OpenMenuKeys : ISystem<float>
     private readonly IZanzarahContainer zzContainer;
     private readonly PlayerControls playerControls;
     private readonly UI ui;
+    private readonly Zanzarah zanzarah;
 
     public OpenMenuKeys(ITagContainer diContainer)
     {
         ui = diContainer.GetTag<UI>();
+        zanzarah = diContainer.GetTag<Zanzarah>();
         playerControls = diContainer.GetTag<PlayerControls>();
         zzContainer = diContainer.GetTag<IZanzarahContainer>();
         zzContainer.OnKeyDown += HandleKeyDown;
@@ -34,15 +36,28 @@ public void Dispose()
 
     private void HandleKeyDown(KeyCode code)
     {
+        var inventory = zanzarah.CurrentGame!.PlayerEntity.Get<Inventory>();
         if (!IsEnabled || playerControls.IsLocked)
             return;
         switch (code)
         {
-            case MenuKey: ui.Publish<messages.ui.OpenDeck>(); break;
-            case RuneMenuKey: ui.Publish<messages.ui.OpenRuneMenu>(); break;
-            case BookMenuKey: ui.Publish<messages.ui.OpenBookMenu>(); break;
-            case MapMenuKey: ui.Publish<messages.ui.OpenMapMenu>(); break;
-            case DeckMenuKey: ui.Publish<messages.ui.OpenDeck>(); break;
+            case RuneMenuKey:
+                if (inventory.Contains(StdItemId.RuneFairyGarden))
+                    ui.Publish<messages.ui.OpenRuneMenu>();
+                break;
+            case BookMenuKey:
+                if (inventory.Contains(StdItemId.FairyBook))
+                    ui.Publish<messages.ui.OpenBookMenu>();
+                break;
+            case MapMenuKey:
+                if (inventory.Contains(StdItemId.MapFairyGarden))
+                    ui.Publish<messages.ui.OpenMapMenu>();
+                break;
+            case MenuKey:
+            case DeckMenuKey:
+                if (inventory.Contains(StdItemId.FairyBag))
+                    ui.Publish<messages.ui.OpenDeck>();
+                break;
         }
     }
 

zzre/game/systems/ui/BaseScreen.cs

@@ -24,13 +24,15 @@ protected enum BlockFlags
     private readonly IDisposable removedSubscription;
     protected readonly IZanzarahContainer zzContainer;
     protected readonly Zanzarah zanzarah;
+    protected Inventory inventory => zanzarah.CurrentGame!.PlayerEntity.Get<Inventory>();
     protected readonly UI ui;
     protected readonly DefaultEcs.World uiWorld;// necessary as Dialog UI is owned by the game and not by the UI.
                                                 // Probably worth some cleanup but this would mean merging 
                                                 // Game and UI world which I did not decided to be a good idea
     protected readonly UIBuilder preload;
     protected event Action<DefaultEcs.Entity, components.ui.ElementId>? OnElementDown;
     protected event Action<DefaultEcs.Entity, components.ui.ElementId>? OnElementUp;
+    protected event Action? OnRightClick;
 
     protected Vector2 ScreenCenter => ui.LogicalScreen.Center;
 
@@ -62,6 +64,7 @@ protected virtual void HandleAdded(in DefaultEcs.Entity entity, in TComponent _)
         zzContainer.OnMouseDown += HandleMouseDown;
         zzContainer.OnMouseUp += HandleMouseUp;
         zzContainer.OnKeyDown += HandleKeyDown;
+        zzContainer.OnScroll += HandleScroll;
 
         if (zanzarah.CurrentGame != null && blockFlags.HasFlag(BlockFlags.DisableGameUpdate))
             zanzarah.CurrentGame.IsUpdateEnabled = false;
@@ -76,6 +79,7 @@ protected virtual void HandleRemoved(in DefaultEcs.Entity entity, in TComponent
         zzContainer.OnMouseDown -= HandleMouseDown;
         zzContainer.OnMouseUp -= HandleMouseUp;
         zzContainer.OnKeyDown -= HandleKeyDown;
+        zzContainer.OnScroll -= HandleScroll;
 
         if (zanzarah.CurrentGame != null && blockFlags.HasFlag(BlockFlags.DisableGameUpdate))
             zanzarah.CurrentGame.IsUpdateEnabled = true;
@@ -89,6 +93,12 @@ protected virtual void HandleRemoved(in DefaultEcs.Entity entity, in TComponent
     private void HandleMouseUp(MouseButton button, Vector2 pos) => HandleMouse(button, pos, isDown: false);
     private void HandleMouse(MouseButton button, Vector2 pos, bool isDown)
     {
+        if (button == MouseButton.Right)
+        {
+            if (isDown)
+                OnRightClick?.Invoke();
+            return;
+        }
         if (button != MouseButton.Left)
             return;
 
@@ -105,10 +115,12 @@ private void HandleMouse(MouseButton button, Vector2 pos, bool isDown)
     protected virtual void HandleKeyDown(KeyCode key)
     {
     }
-
+    protected virtual void HandleScroll(float scrollAmount)
+    {
+    }
     protected abstract void HandleOpen(in TMessage message);
 
     [Update]
     protected virtual void Update(float timeElapsed, in DefaultEcs.Entity entity, ref TComponent component) { }
 
-}
+}

zzre/game/systems/ui/InGameScreen.cs

@@ -1,5 +1,8 @@
-using System.Numerics;
+using System.Collections.Generic;
+using System.Numerics;
+using System.Linq;
 using zzio;
+using KeyCode = Silk.NET.SDL.KeyCode;
 
 namespace zzre.game.systems.ui;
 
@@ -14,13 +17,13 @@ public static class InGameScreen
     public static readonly components.ui.ElementId IDOpenMap = new(1004);
     public static readonly components.ui.ElementId IDSaveGame = new(1005);
 
-    private record struct TabInfo(components.ui.ElementId Id, int PosX, int TileI, UID TooltipUID, StdItemId Item);
-    private static readonly TabInfo[] Tabs =
+    private record struct TabInfo(components.ui.ElementId Id, int PosX, int TileI, UID TooltipUID, KeyCode Key, StdItemId Item);
+    private static readonly List<TabInfo> Tabs =
     [
-        new(IDOpenDeck,      PosX: 553, TileI: 21, TooltipUID: new(0x6659B4A1), StdItemId.FairyBag),
-        new(IDOpenRunes,     PosX: 427, TileI: 12, TooltipUID: new(0x6636B4A1), StdItemId.RuneFairyGarden),
-        new(IDOpenFairybook, PosX: 469, TileI: 15, TooltipUID: new(0x8D1BBCA1), StdItemId.FairyBook),
-        new(IDOpenMap,       PosX: 511, TileI: 18, TooltipUID: new(0xC51E6991), StdItemId.MapFairyGarden)
+        new(IDOpenDeck,      PosX: 553, TileI: 21, TooltipUID: new(0x6659B4A1), KeyCode.KF5, StdItemId.FairyBag),
+        new(IDOpenRunes,     PosX: 427, TileI: 12, TooltipUID: new(0x6636B4A1), KeyCode.KF2, StdItemId.RuneFairyGarden),
+        new(IDOpenFairybook, PosX: 469, TileI: 15, TooltipUID: new(0x8D1BBCA1), KeyCode.KF3, StdItemId.FairyBook),
+        new(IDOpenMap,       PosX: 511, TileI: 18, TooltipUID: new(0xC51E6991), KeyCode.KF4, StdItemId.MapFairyGarden)
     ];
 
     public static void CreateTopButtons(UIBuilder preload, in DefaultEcs.Entity parent, Inventory inventory, components.ui.ElementId curTab)
@@ -35,7 +38,7 @@ public static void CreateTopButtons(UIBuilder preload, in DefaultEcs.Entity pare
 
         preload.CreateButton(parent)
             .With(IDSaveGame)
-            .With(Mid + new Vector2(384, 3))
+            .With(Mid + new Vector2(385, 3))
             .With(new components.ui.ButtonTiles(26, 27))
             .With(UIPreloadAsset.Btn002)
             .WithTooltip(0x7113B8A1)
@@ -60,4 +63,60 @@ public static void CreateTopButtons(UIBuilder preload, in DefaultEcs.Entity pare
             }
         }
     }
+
+    public static void HandleNavClick(components.ui.ElementId id, Zanzarah zanzarah, DefaultEcs.Entity uiEntity, components.ui.ElementId curTab)
+    {
+        var tab = Tabs.FirstOrDefault(tab => tab.Id == id);
+        if (tab.Id == curTab)
+        {
+            // Ignore current tab
+            return;
+        }
+        if (tab != default)
+            TryOpenTab(tab, zanzarah, uiEntity, curTab);
+        if (id == IDClose)
+            uiEntity.Dispose();
+    }
+
+    public static void HandleNavKeyDown(KeyCode key, Zanzarah zanzarah, DefaultEcs.Entity uiEntity, components.ui.ElementId curTab)
+    {
+        var tab = Tabs.FirstOrDefault(tab => tab.Key == key);
+        if (tab.Id == curTab)
+        {
+            // Exit current tab
+            uiEntity.Dispose();
+            return;
+        }
+        if (tab != default)
+            TryOpenTab(tab, zanzarah, uiEntity, curTab);
+        if (key == KeyCode.KReturn || key == KeyCode.KEscape)
+            uiEntity.Dispose();
+    }
+
+    private static void TryOpenTab(TabInfo tab, Zanzarah zanzarah, DefaultEcs.Entity uiEntity, components.ui.ElementId curTab)
+    {
+        var inventory = zanzarah.CurrentGame!.PlayerEntity.Get<Inventory>();
+        if (!inventory.Contains(tab.Item)) return;
+        switch (tab.Key)
+        {
+            case KeyCode.KF2:
+                uiEntity.Dispose();
+                zanzarah.UI.Publish<messages.ui.OpenRuneMenu>();
+                break;
+            case KeyCode.KF3:
+                uiEntity.Dispose();
+                zanzarah.UI.Publish<messages.ui.OpenBookMenu>();
+                break;
+            case KeyCode.KF4:
+                uiEntity.Dispose();
+                zanzarah.UI.Publish<messages.ui.OpenMapMenu>();
+                break;
+            case KeyCode.KF5:
+                uiEntity.Dispose();
+                zanzarah.UI.Publish<messages.ui.OpenDeck>();
+                break;
+            default:
+                break;
+        }
+    }
 }