2172: Add support for a crafting journal (AscensionGameDev#2173)

* feat: (Day) Add a journal-mode for crafting. Needs winforms update * feat: (Day) Winforms work for crafting journal * remove .resx
cydyn · Mar 11, 2024 · 772a90f · 772a90f
1 parent 4bf172f
commit 772a90f
Show file tree

Hide file tree

Showing 14 changed files with 161 additions and 85 deletions.
diff --git a/Intersect (Core)/GameObjects/Events/Commands/EventCommands.cs b/Intersect (Core)/GameObjects/Events/Commands/EventCommands.cs
@@ -726,6 +726,11 @@ public partial class OpenCraftingTableCommand : EventCommand
         public override EventCommandType Type { get; } = EventCommandType.OpenCraftingTable;
 
         public Guid CraftingTableId { get; set; }
+
+        /// <summary>
+        /// Does not allow crafting, but displays crafts and their requirements.
+        /// </summary>
+        public bool JournalMode { get; set; }
     }
 
     public partial class SetClassCommand : EventCommand

diff --git a/Intersect (Core)/Network/Packets/Server/CraftingTablePacket.cs b/Intersect (Core)/Network/Packets/Server/CraftingTablePacket.cs
@@ -10,10 +10,11 @@ public CraftingTablePacket()
         {
         }
 
-        public CraftingTablePacket(string tableData, bool close)
+        public CraftingTablePacket(string tableData, bool close, bool journalMode)
         {
             TableData = tableData;
             Close = close;
+            JournalMode = journalMode;
         }
 
         [Key(0)]
@@ -22,6 +23,8 @@ public CraftingTablePacket(string tableData, bool close)
         [Key(1)]
         public bool Close { get; set; }
 
+        [Key(2)]
+        public bool JournalMode { get; set; }
     }
 
 }
diff --git a/Intersect.Client/Interface/Game/Crafting/CraftingWindow.cs b/Intersect.Client/Interface/Game/Crafting/CraftingWindow.cs
@@ -71,13 +71,17 @@ public partial class CraftingWindow
 
         public bool IsCrafting => mRemainingCrafts > 0;
 
-        public CraftingWindow(Canvas gameCanvas)
+        private bool mJournalMode { get; set; }
+
+        public CraftingWindow(Canvas gameCanvas, bool journalMode)
         {
             mCraftWindow = new WindowControl(gameCanvas, Globals.ActiveCraftingTable.Name, false, "CraftingWindow");
             mCraftWindow.DisableResizing();
 
             mItemContainer = new ScrollControl(mCraftWindow, "IngredientsContainer");
 
+            mJournalMode = journalMode;
+
             //Labels
             mLblRecipes = new Label(mCraftWindow, "RecipesTitle");
             mLblRecipes.Text = Strings.Crafting.recipes;
@@ -116,6 +120,12 @@ public CraftingWindow(Canvas gameCanvas)
 
             mCraftWindow.LoadJsonUi(GameContentManager.UI.InGame, Graphics.Renderer.GetResolutionString());
 
+            if (mJournalMode)
+            {
+                mCraft.Hide();
+                mCraftAll.Hide();
+            }
+
             Interface.InputBlockingElements.Add(mCraftWindow);
 
             Globals.Me.InventoryUpdatedDelegate = () =>
@@ -290,7 +300,7 @@ private void LoadCraftItems(Guid id)
                 }
             }
 
-            mCraftAll.IsHidden = craftableQuantity < 2;
+            mCraftAll.IsHidden = mJournalMode || craftableQuantity < 2;
             if (!mCraftAll.IsHidden)
             {
                 mCraftAll.SetText(Strings.Crafting.craftall.ToString(craftableQuantity));

diff --git a/Intersect.Client/Interface/Game/GameInterface.cs b/Intersect.Client/Interface/Game/GameInterface.cs
@@ -83,6 +83,8 @@ public partial class GameInterface : MutableInterface
 
         private string mTradingTarget;
 
+        private bool mCraftJournal {  get; set; }
+
         private TradingWindow? mTradingWindow;
 
         public EntityBox PlayerBox;
@@ -235,14 +237,16 @@ public BankWindow GetBankWindow()
         }
 
         //Crafting
-        public void NotifyOpenCraftingTable()
+        public void NotifyOpenCraftingTable(bool journalMode)
         {
             mShouldOpenCraftingTable = true;
+            mCraftJournal = journalMode;
         }
 
         public void NotifyCloseCraftingTable()
         {
             mShouldCloseCraftingTable = true;
+            mCraftJournal = false;
         }
 
         public void OpenCraftingTable()
@@ -252,7 +256,7 @@ public void OpenCraftingTable()
                 mCraftingWindow.Close();
             }
 
-            mCraftingWindow = new CraftingWindow(GameCanvas);
+            mCraftingWindow = new CraftingWindow(GameCanvas, mCraftJournal);
             mShouldOpenCraftingTable = false;
             Globals.InCraft = true;
         }

diff --git a/Intersect.Client/Networking/PacketHandler.cs b/Intersect.Client/Networking/PacketHandler.cs
@@ -1636,7 +1636,7 @@ public void HandlePacket(IPacketSender packetSender, CraftingTablePacket packet)
             {
                 Globals.ActiveCraftingTable = new CraftingTableBase();
                 Globals.ActiveCraftingTable.Load(packet.TableData);
-                Interface.Interface.GameUi.NotifyOpenCraftingTable();
+                Interface.Interface.GameUi.NotifyOpenCraftingTable(packet.JournalMode);
             }
             else
             {

diff --git a/Intersect.Editor/Forms/Editors/Events/CommandPrinter.cs b/Intersect.Editor/Forms/Editors/Events/CommandPrinter.cs
@@ -1203,7 +1203,9 @@ private static string GetCommandText(OpenShopCommand command, MapInstance map)
 
         private static string GetCommandText(OpenCraftingTableCommand command, MapInstance map)
         {
-            return Strings.EventCommandList.opencrafting.ToString(CraftingTableBase.GetName(command.CraftingTableId));
+            return command.JournalMode ?
+                Strings.EventCommandList.OpenCraftingJournal.ToString(CraftingTableBase.GetName(command.CraftingTableId)) :
+                Strings.EventCommandList.opencrafting.ToString(CraftingTableBase.GetName(command.CraftingTableId));
         }
 
         private static string GetCommandText(SetClassCommand command, MapInstance map)

diff --git a/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_OpenCrafting.Designer.cs b/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_OpenCrafting.Designer.cs
diff --git a/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_OpenCrafting.cs b/Intersect.Editor/Forms/Editors/Events/Event Commands/EventCommand_OpenCrafting.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows.Forms;
 
 using Intersect.Editor.Localization;
@@ -24,6 +24,7 @@ public EventCommandOpenCraftingTable(OpenCraftingTableCommand refCommand, FrmEve
             cmbTable.Items.Clear();
             cmbTable.Items.AddRange(CraftingTableBase.Names);
             cmbTable.SelectedIndex = CraftingTableBase.ListIndex(mMyCommand.CraftingTableId);
+            chkJournalMode.Checked = mMyCommand.JournalMode;
         }
 
         private void InitLocalization()
@@ -32,6 +33,16 @@ private void InitLocalization()
             lblTable.Text = Strings.EventOpenCrafting.label;
             btnSave.Text = Strings.EventOpenCrafting.okay;
             btnCancel.Text = Strings.EventOpenCrafting.cancel;
+            chkJournalMode.Text = Strings.EventOpenCrafting.JournalMode;
+
+            ToolTip toolTip1 = new ToolTip();
+
+            toolTip1.AutoPopDelay = 5000;
+            toolTip1.InitialDelay = 1000;
+            toolTip1.ReshowDelay = 500;
+            toolTip1.ShowAlways = true;
+
+            toolTip1.SetToolTip(chkJournalMode, Strings.EventOpenCrafting.JournalModeTooltip);
         }
 
         private void btnSave_Click(object sender, EventArgs e)
@@ -41,6 +52,8 @@ private void btnSave_Click(object sender, EventArgs e)
                 mMyCommand.CraftingTableId = CraftingTableBase.IdFromList(cmbTable.SelectedIndex);
             }
 
+            mMyCommand.JournalMode = chkJournalMode.Checked;
+
             mEventEditor.FinishCommandEdit();
         }
 

diff --git a/Intersect.Editor/Localization/Strings.cs b/Intersect.Editor/Localization/Strings.cs
@@ -2068,6 +2068,9 @@ public partial struct EventCommandList
 
             public static LocalizedString opencrafting = @"Open Crafting Table [{00}]";
 
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+            public static LocalizedString OpenCraftingJournal = @"Open Crafting Journal [{00}]";
+
             public static LocalizedString openshop = @"Open Shop [{00}]";
 
             public static LocalizedString playanimation = @"Play Animation {00} {01}";
@@ -3089,6 +3092,12 @@ public partial struct EventOpenCrafting
 
             public static LocalizedString label = @"Table:";
 
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+            public static LocalizedString JournalMode = @"Journal Mode?";
+
+            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+            public static LocalizedString JournalModeTooltip = @"Opens the crafting window without the option for the player to actually craft.";
+
             public static LocalizedString okay = @"Ok";
 
             public static LocalizedString title = @"Open Crafting";

diff --git a/Intersect.Server.Core/Entities/Events/CommandProcessing.cs b/Intersect.Server.Core/Entities/Events/CommandProcessing.cs
@@ -1238,7 +1238,7 @@ private static void ProcessCommand(
             Stack<CommandInstance> callStack
         )
         {
-            player.OpenCraftingTable(CraftingTableBase.Get(command.CraftingTableId));
+            player.OpenCraftingTable(CraftingTableBase.Get(command.CraftingTableId), command.JournalMode);
             callStack.Peek().WaitingForResponse = CommandInstance.EventResponse.Crafting;
         }