From 4eca0c008d509ad11d5a700696464ceec92512cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asier=20Nu=C3=B1ez?= <45818936+Asiern@users.noreply.github.com> Date: Sun, 2 May 2021 08:03:23 +0200 Subject: [PATCH 1/3] fix: Memory Alloy ID --- Source/NieRAutomataGadget/Panels/InventoryPanel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/NieRAutomataGadget/Panels/InventoryPanel.cpp b/Source/NieRAutomataGadget/Panels/InventoryPanel.cpp index 323481a..1457a36 100644 --- a/Source/NieRAutomataGadget/Panels/InventoryPanel.cpp +++ b/Source/NieRAutomataGadget/Panels/InventoryPanel.cpp @@ -139,7 +139,7 @@ InventoryPanel::InventoryPanel(wxNotebook* parent, NieRHook* hook) :wxPanel(pare _Materials.insert(std::pair< wxString, int>(wxString("Machine Leg"), 571)); _Materials.insert(std::pair< wxString, int>(wxString("Machine Oil"), 628)); _Materials.insert(std::pair< wxString, int>(wxString("Machine Torso"), 572)); - _Materials.insert(std::pair< wxString, int>(wxString("Memory Alloy"), 715)); + _Materials.insert(std::pair< wxString, int>(wxString("Memory Alloy"), 536)); _Materials.insert(std::pair< wxString, int>(wxString("Meteorite"), 588)); _Materials.insert(std::pair< wxString, int>(wxString("Meteorite Shard"), 531)); _Materials.insert(std::pair< wxString, int>(wxString("Moldavite"), 687)); From ecc774e70811eb1dff0d5352463049d41f13cf77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asier=20Nu=C3=B1ez?= <45818936+Asiern@users.noreply.github.com> Date: Sun, 2 May 2021 08:27:46 +0200 Subject: [PATCH 2/3] add: Missing key items CEO Bullets Dress Module Machine Mask Sand Mask Valve: Left Eye Valve: Right Eye Valve: Both Eyes Valve: Head Musamune Mask Matsuda Mask Sato Mask White Hair Black Hair Brown Hair Red Hair Blue Hair Green Hair Purple Hair Ash Grey Hair Golden Hair Pastel Pink Hair Light Blue Hair Lime Green Hair Light Purple Hair Neon White Hair Neon Yellow Hair Neon Pink Hair Neon Blue Hair Neon Green Hair Neon Purple Hair --- .../Panels/InventoryPanel.cpp | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Source/NieRAutomataGadget/Panels/InventoryPanel.cpp b/Source/NieRAutomataGadget/Panels/InventoryPanel.cpp index 1457a36..7039c96 100644 --- a/Source/NieRAutomataGadget/Panels/InventoryPanel.cpp +++ b/Source/NieRAutomataGadget/Panels/InventoryPanel.cpp @@ -230,6 +230,37 @@ InventoryPanel::InventoryPanel(wxNotebook* parent, NieRHook* hook) :wxPanel(pare _Key.insert(std::pair< wxString, int>(wxString("Revealing Outfit"), 983)); _Key.insert(std::pair< wxString, int>(wxString("Young Man's Outfit"), 984)); _Key.insert(std::pair< wxString, int>(wxString("Destroyer Outfit"), 985)); + _Key.insert(std::pair< wxString, int>(wxString("CEO Bullets"), 961)); + _Key.insert(std::pair< wxString, int>(wxString("Dress Module"), 980)); + _Key.insert(std::pair< wxString, int>(wxString("Machine Mask"), 990)); + _Key.insert(std::pair< wxString, int>(wxString("Sand Mask"), 994)); + _Key.insert(std::pair< wxString, int>(wxString("Valve: Left Eye"), 997)); + _Key.insert(std::pair< wxString, int>(wxString("Valve: Right Eye"), 998)); + _Key.insert(std::pair< wxString, int>(wxString("Valve: Both Eyes"), 999)); + _Key.insert(std::pair< wxString, int>(wxString("Valve: Head"), 870)); + _Key.insert(std::pair< wxString, int>(wxString("Musamune Mask"), 876)); + _Key.insert(std::pair< wxString, int>(wxString("Matsuda Mask"), 877)); + _Key.insert(std::pair< wxString, int>(wxString("Sato Mask"), 878)); + _Key.insert(std::pair< wxString, int>(wxString("White Hair"), 880)); + _Key.insert(std::pair< wxString, int>(wxString("Black Hair"), 881)); + _Key.insert(std::pair< wxString, int>(wxString("Brown Hair"), 882)); + _Key.insert(std::pair< wxString, int>(wxString("Red Hair"), 883)); + _Key.insert(std::pair< wxString, int>(wxString("Blue Hair"), 884)); + _Key.insert(std::pair< wxString, int>(wxString("Green Hair"), 885)); + _Key.insert(std::pair< wxString, int>(wxString("Purple Hair"), 886)); + _Key.insert(std::pair< wxString, int>(wxString("Ash Grey Hair"), 887)); + _Key.insert(std::pair< wxString, int>(wxString("Golden Hair"), 888)); + _Key.insert(std::pair< wxString, int>(wxString("Pastel Pink Hair"), 889)); + _Key.insert(std::pair< wxString, int>(wxString("Light Blue Hair"), 890)); + _Key.insert(std::pair< wxString, int>(wxString("Lime Green Hair"), 891)); + _Key.insert(std::pair< wxString, int>(wxString("Light Purple Hair"), 892)); + _Key.insert(std::pair< wxString, int>(wxString("Neon White Hair"), 893)); + _Key.insert(std::pair< wxString, int>(wxString("Neon Yellow Hair"), 894)); + _Key.insert(std::pair< wxString, int>(wxString("Neon Pink Hair"), 895)); + _Key.insert(std::pair< wxString, int>(wxString("Neon Blue Hair"), 896)); + _Key.insert(std::pair< wxString, int>(wxString("Neon Green Hair"), 897)); + _Key.insert(std::pair< wxString, int>(wxString("Neon Purple Hair"), 898)); + //Panel Components From 25e5634e75a2714ff10879d0814c0650f8d33f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asier=20Nu=C3=B1ez?= <45818936+Asiern@users.noreply.github.com> Date: Sun, 2 May 2021 08:27:49 +0200 Subject: [PATCH 3/3] Update Main.cpp --- Source/NieRAutomataGadget/Main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/NieRAutomataGadget/Main.cpp b/Source/NieRAutomataGadget/Main.cpp index 2a0e59a..4f31459 100644 --- a/Source/NieRAutomataGadget/Main.cpp +++ b/Source/NieRAutomataGadget/Main.cpp @@ -50,7 +50,7 @@ Main::Main() : wxFrame(nullptr, wxID_ANY, "NieR:Automata Gadget", wxPoint(30, 30 m_hooked->SetFont(font); m_status = new wxStaticText(this, wxID_ANY, "Process: None", wxPoint(margin, margin * 3), wxDefaultSize, 0, wxStaticTextNameStr); m_status->SetFont(font); - m_version = new wxStaticText(this, wxID_ANY, "Version: 1.1.2", wxPoint(width - margin * 6, margin), wxDefaultSize, 0, wxStaticTextNameStr); + m_version = new wxStaticText(this, wxID_ANY, "Version: 1.1.3", wxPoint(width - margin * 6, margin), wxDefaultSize, 0, wxStaticTextNameStr); m_version->SetFont(font); Weapons->Enable(false);