add ability to add new GPS item to inventory

WalterCouto · Feb 28, 2022 · 9b80467 · 9b80467
1 parent f05e47d
commit 9b80467
Show file tree

Hide file tree

Showing 22 changed files with 2,721 additions and 1,064 deletions.
diff --git a/D2Editor.exe b/D2Editor.exe
diff --git a/UserGuide.pdf b/UserGuide.pdf
diff --git a/readme.md b/readme.md
@@ -74,7 +74,7 @@ Check the following site for updates at https://github.com/WalterCouto/D2CE<br>
 * [d2s Binary File Format](d2s_File_Format.md)<br>
 
 ### Revision History
-**Version 2.13 (Feb 26, 2022)**
+**Version 2.13 (Feb 28, 2022)**
 - Updated: Fix detection of ID for set items.<br>
 - Updated: Fix up logic for reading/writing 1.00 - 1.06 files<br>
 - Updated: Add alternate ring/amulet images<br>
@@ -85,6 +85,7 @@ Check the following site for updates at https://github.com/WalterCouto/D2CE<br>
 
 - Added: Ability to personalize items or remove the personalization from items.<br>
 - Added: Ability to make weapons or armor indestructible.<br>
+- Added: Gems, Potions & Skulls Creator dialog and menu items. This allows you to add Gems, Potions, Skulls or Runes to empty slots in our inventory.<br>
 <br>
 
 **Version 2.12 (Feb 14, 2022)**

diff --git a/source/D2AddGemsForm.cpp b/source/D2AddGemsForm.cpp
@@ -0,0 +1,292 @@
+/*
+    Diablo II Character Editor
+    Copyright (C) 2022 Walter Couto
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+//---------------------------------------------------------------------------
+
+#include "pch.h"
+#include "D2Editor.h"
+#include "D2AddGemsForm.h"
+#include "afxdialogex.h"
+#include "d2ce\helpers\ItemHelpers.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
+
+namespace
+{
+    CString GetGPSNameFromCode(const std::array<std::uint8_t, 4>& gemCode)
+    {
+        const auto& itemType = d2ce::ItemHelpers::getItemTypeHelper(gemCode);
+        if (!itemType.isPotion() && !itemType.isGem() && !itemType.isRune())
+        {
+            // unknown GPS
+            return _T("");
+        }
+
+        return CString(itemType.name.c_str());
+    }
+}
+
+//---------------------------------------------------------------------------
+// CD2AddGemsForm dialog
+IMPLEMENT_DYNAMIC(CD2AddGemsForm, CDialogEx)
+
+//---------------------------------------------------------------------------
+CD2AddGemsForm::CD2AddGemsForm(CD2MainForm& form)
+    : CDialogEx(CD2AddGemsForm::IDD, (CWnd*)&form), MainForm(form)
+{
+
+}
+//---------------------------------------------------------------------------
+CD2AddGemsForm::CD2AddGemsForm(CD2ItemsForm& form, d2ce::Item* itemPtr)
+    : CDialogEx(CD2AddGemsForm::IDD, (CWnd*)&form), MainForm(form.MainForm), ItemsFormPtr(&form), ItemPtr(itemPtr)
+{
+}
+//---------------------------------------------------------------------------
+CD2AddGemsForm::~CD2AddGemsForm()
+{
+}
+//---------------------------------------------------------------------------
+void CD2AddGemsForm::DoDataExchange(CDataExchange* pDX)
+{
+    CDialogEx::DoDataExchange(pDX);
+}
+//---------------------------------------------------------------------------
+
+BEGIN_MESSAGE_MAP(CD2AddGemsForm, CDialogEx)
+    ON_BN_CLICKED(IDOK, &CD2AddGemsForm::OnBnClickedAdd)
+    ON_BN_CLICKED(IDC_FILL_BUTTON, &CD2AddGemsForm::OnBnClickedFill)
+END_MESSAGE_MAP()
+
+//---------------------------------------------------------------------------
+BOOL CD2AddGemsForm::OnInitDialog()
+{
+    __super::OnInitDialog();
+
+    // Fill in to from combo
+    bool isPotionSelected = false;
+    CComboBox* pFromCombo = (CComboBox*)GetDlgItem(IDC_FROM_COMBO);
+    if (pFromCombo != nullptr)
+    {
+        std::uint32_t selectedItemData = 0;
+        if (ItemPtr != nullptr)
+        {
+            std::array<std::uint8_t, 4> selectedGemCode;
+            if (ItemPtr->getItemCode(selectedGemCode))
+            {
+                selectedItemData = *reinterpret_cast<std::uint32_t*>(selectedGemCode.data());
+                isPotionSelected = ItemPtr->isPotion();
+            }
+
+        }
+        int selectedIdx = 0;
+
+        std::array< std::uint8_t, 4> gemCode = { 0x20, 0x20, 0x20, 0x20 };
+        std::uint32_t& itemData = *reinterpret_cast<std::uint32_t*>(gemCode.data());
+        std::vector<std::string> gpsCodes;
+        d2ce::ItemHelpers::getValidGPSCodes(gpsCodes, MainForm.isExpansionCharacter());
+        for (const auto& code : gpsCodes)
+        {
+            if (code.length() < 3)
+            {
+                continue;
+            }
+
+            gemCode[0] = code[0];
+            gemCode[1] = code[1];
+            gemCode[2] = code[2];
+
+            auto insertedIdx = pFromCombo->AddString(GetGPSNameFromCode(gemCode));
+            pFromCombo->SetItemData(insertedIdx, std::uint64_t(itemData));
+            if (itemData == selectedItemData)
+            {
+                selectedIdx = insertedIdx;
+            }
+        }
+
+        pFromCombo->SetCurSel(selectedIdx);
+    }
+
+    // Fill in to combo
+    CComboBox* pToCombo = (CComboBox*)GetDlgItem(IDC_TO_COMBO);
+    if (pToCombo != nullptr)
+    {
+        std::array< std::uint8_t, 2> locationCode = { 0x00, 0x00 };
+        std::uint16_t& itemData = *reinterpret_cast<std::uint16_t*>(locationCode.data());
+        std::uint8_t& locationID = locationCode[0];
+        std::uint8_t& altLocationId = locationCode[1];
+
+        std::uint16_t selectedItemData = 0;
+        if (ItemPtr != nullptr)
+        {
+            locationID = static_cast<std::underlying_type_t<d2ce::EnumItemLocation>>(ItemPtr->getLocation());
+            altLocationId = static_cast<std::underlying_type_t<d2ce::EnumAltItemLocation>>(ItemPtr->getAltPositionId());
+            selectedItemData = itemData;
+        }
+        int selectedIdx = isPotionSelected ? 0 : 1;
+
+        locationID = static_cast<std::underlying_type_t<d2ce::EnumItemLocation>>(d2ce::EnumItemLocation::BELT);
+        altLocationId = static_cast<std::underlying_type_t<d2ce::EnumAltItemLocation>>(d2ce::EnumAltItemLocation::UNKNOWN);
+        auto insertedIdx = pToCombo->AddString(_T("Belt"));
+        pToCombo->SetItemData(insertedIdx, std::uint64_t(itemData));
+        if (itemData == selectedItemData)
+        {
+            selectedIdx = insertedIdx;
+        }
+
+        if (MainForm.getHasHoradricCube())
+        {
+            locationID = static_cast<std::underlying_type_t<d2ce::EnumItemLocation>>(d2ce::EnumItemLocation::STORED);
+            altLocationId = static_cast<std::underlying_type_t<d2ce::EnumAltItemLocation>>(d2ce::EnumAltItemLocation::HORADRIC_CUBE);
+            insertedIdx = pToCombo->AddString(_T("Horadric Cube"));
+            pToCombo->SetItemData(insertedIdx, std::uint64_t(itemData));
+            if (itemData == selectedItemData)
+            {
+                selectedIdx = insertedIdx;
+            }
+        }
+
+        locationID = static_cast<std::underlying_type_t<d2ce::EnumItemLocation>>(d2ce::EnumItemLocation::STORED);
+        altLocationId = static_cast<std::underlying_type_t<d2ce::EnumAltItemLocation>>(d2ce::EnumAltItemLocation::INVENTORY);
+        insertedIdx = pToCombo->AddString(_T("Inventory"));
+        pToCombo->SetItemData(insertedIdx, std::uint64_t(itemData));
+        if (itemData == selectedItemData)
+        {
+            selectedIdx = insertedIdx;
+        }
+
+        locationID = static_cast<std::underlying_type_t<d2ce::EnumItemLocation>>(d2ce::EnumItemLocation::STORED);
+        altLocationId = static_cast<std::underlying_type_t<d2ce::EnumAltItemLocation>>(d2ce::EnumAltItemLocation::STASH);
+        insertedIdx = pToCombo->AddString(_T("Stash"));
+        pToCombo->SetItemData(insertedIdx, std::uint64_t(itemData));
+        if (itemData == selectedItemData)
+        {
+            selectedIdx = insertedIdx;
+        }
+
+        pToCombo->SetCurSel(selectedIdx);
+    }
+
+    return TRUE;  // return TRUE unless you set the focus to a control
+                  // EXCEPTION: OCX Property Pages should return FALSE
+}
+//---------------------------------------------------------------------------
+// CD2AddGemsForm message handlers
+//---------------------------------------------------------------------------
+void CD2AddGemsForm::OnBnClickedAdd()
+{
+    CComboBox* pFromCombo = (CComboBox*)GetDlgItem(IDC_FROM_COMBO);
+    CComboBox* pToCombo = (CComboBox*)GetDlgItem(IDC_TO_COMBO);
+    if (pFromCombo == nullptr || pToCombo == nullptr)
+    {
+        return;
+    }
+
+    auto fromIdx = pFromCombo->GetCurSel();
+    std::uint64_t itemDataFrom = pFromCombo->GetItemData(fromIdx);
+    std::array<std::uint8_t, 4> gemCode;
+    *reinterpret_cast<std::uint32_t*>(gemCode.data()) = std::uint32_t(itemDataFrom);
+
+    auto toIdx = pToCombo->GetCurSel();
+    std::array< std::uint8_t, 2> locationCode = { 0x00, 0x00 };
+    std::uint8_t& locationID = locationCode[0];
+    std::uint8_t& altLocationId = locationCode[1];
+    std::uint64_t itemDataTo = pToCombo->GetItemData(toIdx);
+    *reinterpret_cast<std::uint16_t*>(locationCode.data()) = std::uint16_t(itemDataTo);
+
+    if (ItemsFormPtr != nullptr)
+    {
+        if (!ItemsFormPtr->addItem(static_cast<d2ce::EnumItemLocation>(locationID), static_cast<d2ce::EnumAltItemLocation>(altLocationId), gemCode))
+        {
+            CString msg(_T("A "));
+            CString temp;
+            pFromCombo->GetLBText(fromIdx, temp);
+            msg += temp;
+            msg += _T(" was added to ");
+            pToCombo->GetLBText(toIdx, temp);
+            msg += temp;
+            AfxMessageBox(msg, MB_ICONINFORMATION | MB_OK);
+        }
+    }
+    else if (!MainForm.addItem(static_cast<d2ce::EnumItemLocation>(locationID), static_cast<d2ce::EnumAltItemLocation>(altLocationId), gemCode))
+    {
+        CString msg(_T("A "));
+        CString temp;
+        pFromCombo->GetLBText(fromIdx, temp);
+        msg += temp;
+        msg += _T(" could not be added to ");
+        pToCombo->GetLBText(toIdx, temp);
+        msg += temp;
+        AfxMessageBox(msg, MB_ICONEXCLAMATION | MB_OK);
+    }
+    else
+    {
+        CString msg(_T("A "));
+        CString temp;
+        pFromCombo->GetLBText(fromIdx, temp);
+        msg += temp;
+        msg += _T(" was added to ");
+        pToCombo->GetLBText(toIdx, temp);
+        msg += temp;
+        AfxMessageBox(msg, MB_ICONINFORMATION | MB_OK);
+    }
+}
+//---------------------------------------------------------------------------
+void CD2AddGemsForm::OnBnClickedFill()
+{
+    CComboBox* pFromCombo = (CComboBox*)GetDlgItem(IDC_FROM_COMBO);
+    CComboBox* pToCombo = (CComboBox*)GetDlgItem(IDC_TO_COMBO);
+    if (pFromCombo == nullptr || pToCombo == nullptr)
+    {
+        return;
+    }
+
+    auto fromIdx = pFromCombo->GetCurSel();
+    std::uint64_t itemDataFrom = pFromCombo->GetItemData(fromIdx);
+    std::array<std::uint8_t, 4> gemCode;
+    *reinterpret_cast<std::uint32_t*>(gemCode.data()) = std::uint32_t(itemDataFrom);
+
+    auto toIdx = pToCombo->GetCurSel();
+    std::array< std::uint8_t, 2> locationCode = { 0x00, 0x00 };
+    std::uint8_t& locationID = locationCode[0];
+    std::uint8_t& altLocationId = locationCode[1];
+    std::uint64_t itemDataTo = pToCombo->GetItemData(toIdx);
+    *reinterpret_cast<std::uint16_t*>(locationCode.data()) = std::uint16_t(itemDataTo);
+
+    size_t numAdded = 0;
+    if (ItemsFormPtr != nullptr)
+    {
+        numAdded = ItemsFormPtr->fillEmptySlots(static_cast<d2ce::EnumItemLocation>(locationID), static_cast<d2ce::EnumAltItemLocation>(altLocationId), gemCode);
+    }
+    else
+    {
+        numAdded = MainForm.fillEmptySlots(static_cast<d2ce::EnumItemLocation>(locationID), static_cast<d2ce::EnumAltItemLocation>(altLocationId), gemCode);
+    }
+
+    CString msg(_T("%zd item(s) of type "));
+    CString temp;
+    pFromCombo->GetLBText(fromIdx, temp);
+    msg += temp;
+    msg += _T(" were added to ");
+    pToCombo->GetLBText(toIdx, temp);
+    msg += temp;
+    temp.Format(msg, numAdded);
+    AfxMessageBox(temp, MB_ICONINFORMATION | MB_OK);
+}
+//---------------------------------------------------------------------------
+
diff --git a/source/D2AddGemsForm.h b/source/D2AddGemsForm.h
@@ -0,0 +1,56 @@
+/*
+    Diablo II Character Editor
+    Copyright (C) 2022 Walter Couto
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+//---------------------------------------------------------------------------
+
+#pragma once
+
+//---------------------------------------------------------------------------
+#include "D2MainForm.h"
+#include "D2ItemsForm.h"
+
+//---------------------------------------------------------------------------
+class CD2AddGemsForm : public CDialogEx
+{
+	DECLARE_DYNAMIC(CD2AddGemsForm)
+
+public:
+	CD2AddGemsForm(CD2MainForm& form);
+    CD2AddGemsForm(CD2ItemsForm& form, d2ce::Item* itemPtr = nullptr);
+	virtual ~CD2AddGemsForm();
+
+// Dialog Data
+	enum { IDD = IDD_ADD_GPS_DIALOG };
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+
+    afx_msg void OnBnClickedAdd();
+    afx_msg void OnBnClickedFill();
+	DECLARE_MESSAGE_MAP()
+
+private:
+    CD2MainForm& MainForm;
+    std::map<size_t, std::uint64_t> GemIdxMap;
+    std::map<std::uint64_t, size_t> NumGemMap;
+    CD2ItemsForm* ItemsFormPtr = nullptr;
+    d2ce::Item * ItemPtr = nullptr;
+
+public:
+    virtual BOOL OnInitDialog();
+};
+//---------------------------------------------------------------------------
diff --git a/source/D2Editor.cpp b/source/D2Editor.cpp
@@ -18,7 +18,7 @@
 
 Revision History
 ================
-Version 2.13 (Feb 26, 2022)
+Version 2.13 (Feb 28, 2022)
    - Updated: Fix detection of ID for set items.
    - Updated: Fix up logic for reading/writing 1.00 - 1.06 files
    - Updated: Add alternate ring/amulet images
@@ -29,6 +29,9 @@ Version 2.13 (Feb 26, 2022)
    - Added: Ability to personalize items or remove the personalization
             from items.
    - Added: Ability to make weapons or armor indestructible.
+   - Added: Gems, Potions & Skulls Creator dialog and menu items. This
+            allows you to add Gems, Potions, Skulls or Runes to empty
+            slots in our inventory.
 
 Version 2.12 (Feb 14, 2022)
    - Updated: Fix detection of change in Character Form.

diff --git a/source/D2Editor.rc b/source/D2Editor.rc