From 8154059b8fa1e2be8bd431c7213cfd00da033c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asier=20Nu=C3=B1ez?= <45818936+Asiern@users.noreply.github.com> Date: Wed, 13 Oct 2021 20:57:22 +0200 Subject: [PATCH] fixed: Inventory --- Source/ReplicantGadget/InventoryPanel.cpp | 416 +++++++++++----------- 1 file changed, 214 insertions(+), 202 deletions(-) diff --git a/Source/ReplicantGadget/InventoryPanel.cpp b/Source/ReplicantGadget/InventoryPanel.cpp index 0ee948e..4ef7cd4 100644 --- a/Source/ReplicantGadget/InventoryPanel.cpp +++ b/Source/ReplicantGadget/InventoryPanel.cpp @@ -6,7 +6,13 @@ InventoryPanel::InventoryPanel(wxNotebook* parent, ReplicantHook* hook) : wxPane { this->hook = hook; - this->_Recovery = new wxArrayString(); + _Recovery = new wxArrayString(); + _Cultivation = new wxArrayString(); + _Fishing = new wxArrayString(); + _Materials = new wxArrayString(); + _Key = new wxArrayString(); + + // Recovery _Recovery->Add("Medicinal Herb"); _Recovery->Add("Health Salve"); _Recovery->Add("Recovery Potion"); @@ -20,7 +26,7 @@ InventoryPanel::InventoryPanel(wxNotebook* parent, ReplicantHook* hook) : wxPane _Recovery->Add("Spirit Capsule"); _Recovery->Add("Antidotal Weed"); - this->_Cultivation = new wxArrayString(); + // Cultivation _Cultivation->Add("Speed Fertilizer"); _Cultivation->Add("Flowering Fertilizer"); _Cultivation->Add("Bounty Fertilizer"); @@ -65,208 +71,214 @@ InventoryPanel::InventoryPanel(wxNotebook* parent, ReplicantHook* hook) : wxPane _Cultivation->Add("Indigo Moonflower"); _Cultivation->Add("White Moonflower"); - this->_Fishing = new wxArrayString(); - this->_Fishing->Add("Lugworm"); - this->_Fishing->Add("Earthworm"); - this->_Fishing->Add("Lure"); - this->_Fishing->Add("Sardine"); - this->_Fishing->Add("Carp"); - this->_Fishing->Add("Blowfish"); - this->_Fishing->Add("Bream"); - this->_Fishing->Add("Shark"); - this->_Fishing->Add("Blue Marlin"); - this->_Fishing->Add("Dunkleosteus"); - this->_Fishing->Add("Rainbow Trout"); - this->_Fishing->Add("Black Bass"); - this->_Fishing->Add("Giant Catfish"); - this->_Fishing->Add("Royal Fish"); - this->_Fishing->Add("Hyneria"); - this->_Fishing->Add("Sandfish"); - this->_Fishing->Add("Rhizodont"); - this->_Fishing->Add("Shaman FIsh"); + // Fishing + _Fishing->Add("Lugworm"); + _Fishing->Add("Earthworm"); + _Fishing->Add("Lure"); + _Fishing->Add("Sardine"); + _Fishing->Add("Carp"); + _Fishing->Add("Blowfish"); + _Fishing->Add("Bream"); + _Fishing->Add("Shark"); + _Fishing->Add("Blue Marlin"); + _Fishing->Add("Dunkleosteus"); + _Fishing->Add("Rainbow Trout"); + _Fishing->Add("Black Bass"); + _Fishing->Add("Giant Catfish"); + _Fishing->Add("Royal Fish"); + _Fishing->Add("Hyneria"); + _Fishing->Add("Sandfish"); + _Fishing->Add("Rhizodont"); + _Fishing->Add("Shaman Fish"); + + // Materials + _Materials->Add("Aquatic Plant"); + _Materials->Add("Deadwood"); + _Materials->Add("Rusty Bucket"); + _Materials->Add("Empty Can"); + _Materials->Add("Gold Ore"); + _Materials->Add("Silvert Ore"); + _Materials->Add("Copper Ore"); + _Materials->Add("Iron Ore"); + _Materials->Add("Crystal"); + _Materials->Add("Pyrite"); + _Materials->Add("Moldavite"); + _Materials->Add("Meteorite"); + _Materials->Add("Amber"); + _Materials->Add("Fluorite"); + _Materials->Add("Clay"); + _Materials->Add("Berries"); + _Materials->Add("Royal Fern"); + _Materials->Add("Tree Branch"); + _Materials->Add("Log"); + _Materials->Add("Natural Rubber"); + _Materials->Add("Ivy"); + _Materials->Add("Lichen"); + _Materials->Add("Mushroom"); + _Materials->Add("Sap"); + _Materials->Add("Mutton"); + _Materials->Add("Boar Meat"); + _Materials->Add("Wool"); + _Materials->Add("Boar Hide"); + _Materials->Add("Wolf Hide"); + _Materials->Add("Wolf Fang"); + _Materials->Add("Giant Spider Silk"); + _Materials->Add("Bat Fang"); + _Materials->Add("Bat Wing"); + _Materials->Add("Goat Meat"); + _Materials->Add("Goat Hide"); + _Materials->Add("Venison"); + _Materials->Add("Rainbow Spider Silk"); + _Materials->Add("Boar Liver"); + _Materials->Add("Scorpion Claw"); + _Materials->Add("Scorpion Tail"); + _Materials->Add("Dented Metal Board"); + _Materials->Add("Stripped Bolt "); + _Materials->Add("Broken Lens"); + _Materials->Add("Severed Cable"); + _Materials->Add("Broken Arm"); + _Materials->Add("Broken Antena"); + _Materials->Add("Broken Motor"); + _Materials->Add("Broken Battery"); + _Materials->Add("Mysterious Switch"); + _Materials->Add("Large Gear"); + _Materials->Add("Titanium Alloy"); + _Materials->Add("Memory Alloy"); + _Materials->Add("Rusted Clump"); + _Materials->Add("Machine Oil"); + _Materials->Add("Forlorn Necklace"); + _Materials->Add("Twisted Ring"); + _Materials->Add("Broken Earring"); + _Materials->Add("Pretty Choker"); + _Materials->Add("Metal Piercing"); + _Materials->Add("Subdued Bracelet"); + _Materials->Add("Technical Guide"); + _Materials->Add("Grubby Book"); + _Materials->Add("Thick Dictionary"); + _Materials->Add("Closed Book"); + _Materials->Add("Used Coloring Book"); + _Materials->Add("Old Schoolbook"); + _Materials->Add("Dirty Bag"); + _Materials->Add("Flashyh Hat"); + _Materials->Add("Leather Gloves"); + _Materials->Add("Silk Handkerchief"); + _Materials->Add("Leather Boots"); + _Materials->Add("Complex Machine"); + _Materials->Add("Elaborate Machine"); + _Materials->Add("Simple Machine"); + _Materials->Add("Stopped Clock"); + _Materials->Add("Broken Wristwatch"); + _Materials->Add("Rusty Kitchen Knife"); + _Materials->Add("Broken Saw"); + _Materials->Add("Dented Metal Bat"); + _Materials->Add("Shell"); + _Materials->Add("Gastropod"); + _Materials->Add("Bivalve"); + _Materials->Add("Seaweed"); + _Materials->Add("Empty Bottle"); + _Materials->Add("Driftwood"); + _Materials->Add("Pearl"); + _Materials->Add("Black Pearl"); + _Materials->Add("Crab"); + _Materials->Add("Starfish"); + _Materials->Add("Sea Turtle Egg"); + _Materials->Add("Broken Pottery"); + _Materials->Add("Desert Rose"); + _Materials->Add("Giant Egg"); + _Materials->Add("Damascus Steel"); + _Materials->Add("Eagle Egg"); + _Materials->Add("Chicken Egg"); + _Materials->Add("Mouse Tail"); + _Materials->Add("Lizard Tail"); + _Materials->Add("Deer Antler"); - this->_Materials = new wxArrayString(); - this->_Materials->Add("Aquatic Plant"); - this->_Materials->Add("Deadwood"); - this->_Materials->Add("Rusty Bucket"); - this->_Materials->Add("Empty Can"); - this->_Materials->Add("Gold Ore"); - this->_Materials->Add("Silvert Ore"); - this->_Materials->Add("Copper Ore"); - this->_Materials->Add("Iron Ore"); - this->_Materials->Add("Crystal"); - this->_Materials->Add("Pyrite"); - this->_Materials->Add("Moldavite"); - this->_Materials->Add("Meteorite"); - this->_Materials->Add("Amber"); - this->_Materials->Add("Fluorite"); - this->_Materials->Add("Clay"); - this->_Materials->Add("Berries"); - this->_Materials->Add("Royal Fern"); - this->_Materials->Add("Tree Branch"); - this->_Materials->Add("Log"); - this->_Materials->Add("Natural Rubber"); - this->_Materials->Add("Ivy"); - this->_Materials->Add("Lichen"); - this->_Materials->Add("Mushroom"); - this->_Materials->Add("Sap"); - this->_Materials->Add("Mutton"); - this->_Materials->Add("Boar Meat"); - this->_Materials->Add("Woll"); - this->_Materials->Add("Boar Hide"); - this->_Materials->Add("Wolf Hide"); - this->_Materials->Add("Wolf Fang"); - this->_Materials->Add("Giant Spider Silk"); - this->_Materials->Add("Bat Fang"); - this->_Materials->Add("Bat Wing"); - this->_Materials->Add("Goat Meat"); - this->_Materials->Add("Goat Hide"); - this->_Materials->Add("Venison"); - this->_Materials->Add("Rainbow Spider Silk"); - this->_Materials->Add("Boar Liver"); - this->_Materials->Add("Scorpion Claw"); - this->_Materials->Add("Scorpion Tail"); - this->_Materials->Add("Dented Metal Board"); - this->_Materials->Add("Stripped Bolt"); - this->_Materials->Add("Broken Lens"); - this->_Materials->Add("Severed Cable"); - this->_Materials->Add("Broken Arm"); - this->_Materials->Add("Broken Antena"); - this->_Materials->Add("Broken Motor"); - this->_Materials->Add("Broken Battery"); - this->_Materials->Add("Mysterious Switch"); - this->_Materials->Add("Large Gear"); - this->_Materials->Add("Titanium Alloy"); - this->_Materials->Add("Memory Alloy"); - this->_Materials->Add("Rusted Clump"); - this->_Materials->Add("Machine Oil"); - this->_Materials->Add("Forlorn Necklace"); - this->_Materials->Add("Twisted Ring"); - this->_Materials->Add("Broken Earring"); - this->_Materials->Add("Pretty Choker"); - this->_Materials->Add("Metal Piercing"); - this->_Materials->Add("Subdued Bracelet"); - this->_Materials->Add("Technical Guide"); - this->_Materials->Add("Grubby Book"); - this->_Materials->Add("Thick Dictionary"); - this->_Materials->Add("Closed Book"); - this->_Materials->Add("Used Coloring Book"); - this->_Materials->Add("Old Schoolbook"); - this->_Materials->Add("Dirty Bag"); - this->_Materials->Add("Flashyh Hat"); - this->_Materials->Add("Leather Gloves"); - this->_Materials->Add("Silk Handkerchief"); - this->_Materials->Add("Leather Boots"); - this->_Materials->Add("Complex Machine"); - this->_Materials->Add("Elaborate Machine"); - this->_Materials->Add("Simple Machine"); - this->_Materials->Add("Stopped Clock"); - this->_Materials->Add("Broken Wristwatch"); - this->_Materials->Add("Rusty Kitchen Knife"); - this->_Materials->Add("Broken Saw"); - this->_Materials->Add("Dented Metal Bat"); - this->_Materials->Add("Shell"); - this->_Materials->Add("Gastropod"); - this->_Materials->Add("Bivalve"); - this->_Materials->Add("Seaweed"); - this->_Materials->Add("Empty Bottle"); - this->_Materials->Add("Driftwood"); - this->_Materials->Add("Pearl"); - this->_Materials->Add("Black Pearl"); - this->_Materials->Add("Crab"); - this->_Materials->Add("Starfish"); - this->_Materials->Add("Sea Turtle Egg"); - this->_Materials->Add("Broken Pottery"); - this->_Materials->Add("Desert Rose"); - this->_Materials->Add("Giant Egg"); - this->_Materials->Add("Damascus Steel"); - this->_Materials->Add("Eagle Egg"); - this->_Materials->Add("Chicken Egg"); - this->_Materials->Add("Mouse Tail"); - this->_Materials->Add("Lizard Tail"); - this->_Materials->Add("Deer Antler"); + // Key + _Key->Add("Moon Key"); + _Key->Add("Star Key"); + _Key->Add("Light Key"); + _Key->Add("Darkness Key"); + _Key->Add("Fine Flour"); + _Key->Add("Coarse FLour"); + _Key->Add("Perfume Bottle"); + _Key->Add("Postman's Parcel"); + _Key->Add("Lover's Letter"); + _Key->Add("Water Filter"); + _Key->Add("Royal Compass"); + _Key->Add("Vapor Moss"); + _Key->Add("Valley Spoder Silk"); + _Key->Add("Animal Guidebook"); + _Key->Add("Ore Guidebook"); + _Key->Add("Plant Guidebook"); + _Key->Add("Red Book"); + _Key->Add("Blue Book"); + _Key->Add("Old Lady's Elixer"); + _Key->Add("Old Lady's Elixer+"); + _Key->Add("Parcel for The Aerie"); + _Key->Add("Parcel for Seafront"); + _Key->Add("Cookbook"); + _Key->Add("Parcel for Facade"); + _Key->Add("Max's Herbs"); + _Key->Add("Drifting Cargo"); + _Key->Add("Drifting Cargo 2"); + _Key->Add("Drifting Cargo 3"); + _Key->Add("Drifting Cargo 4"); + _Key->Add("Old Package"); + _Key->Add("Mermaid Tear"); + _Key->Add("Mandrake Leaf"); + _Key->Add("Energizer"); + _Key->Add("Tad Oil"); + _Key->Add("Sleep-B-Gone"); + _Key->Add("Antidote"); + _Key->Add("Gold Bracelet"); + _Key->Add("Elite Kitchen Knife"); + _Key->Add("Elevator Parts"); + _Key->Add("Dirty Treasure Map"); + _Key->Add("Restored Treasure Map"); + _Key->Add("Jade Hair Ornament"); + _Key->Add("Employee List"); + _Key->Add("Small Safe"); + _Key->Add("Safe Key"); + _Key->Add("Greaty Tree Root"); + _Key->Add("Eye of Power"); + _Key->Add("Ribbon"); + _Key->Add("Yonah's Ribbon"); + _Key->Add("Bronze Key"); + _Key->Add("Brass Key"); + _Key->Add("Boar Tusk"); + _Key->Add("Pressed Freesia"); + _Key->Add("Potted Freesia"); + _Key->Add("Fressia (Delivery)"); + _Key->Add("Pile of Junk"); + _Key->Add("Old Gold Coin"); + _Key->Add("Market Map"); + _Key->Add("AA Keycard"); + _Key->Add("KA Keycard"); + _Key->Add("SA Keycard"); + _Key->Add("TA Keycard"); + _Key->Add("NA Keycard"); + _Key->Add("HA Keycard"); + _Key->Add("MA Keycard"); + _Key->Add("YA Keycard"); + _Key->Add("RA Keycard"); + _Key->Add("WA Keycard"); + _Key->Add("Cultivator's Handbook"); + _Key->Add("Red Bag"); + _Key->Add("Lantern"); + _Key->Add("Empty Lantern"); + _Key->Add("Hold Key "); + _Key->Add("Passageway Key"); + _Key->Add("Goat Key"); + _Key->Add("Lizard Key"); + _Key->Add("Unlocking Procedure Memo "); + _Key->Add("Red Jewel"); + _Key->Add("Red Flowers "); + _Key->Add("Apples"); - this->_Key = new wxArrayString(); - this->_Key->Add("Moon Key"); - this->_Key->Add("Star Key"); - this->_Key->Add("Light Key"); - this->_Key->Add("Darkness Key"); - this->_Key->Add("Fine Flour"); - this->_Key->Add("Coarse FLour"); - this->_Key->Add("Perfume Bottle"); - this->_Key->Add("Postman's Parcel"); - this->_Key->Add("Lover's Letter"); - this->_Key->Add("Water Filter"); - this->_Key->Add("Royal Compass"); - this->_Key->Add("Vapor Moss"); - this->_Key->Add("Valley Spoder Silk"); - this->_Key->Add("Animal Guidebook"); - this->_Key->Add("Ore Guidebook"); - this->_Key->Add("Plant Guidebook"); - this->_Key->Add("Red Book"); - this->_Key->Add("Blue Book"); - this->_Key->Add("Old Lady's Elixer"); - this->_Key->Add("Old Lady's Elixer+"); - this->_Key->Add("Parcel for The Aerie"); - this->_Key->Add("Parcel for Seafront"); - this->_Key->Add("Cookbook"); - this->_Key->Add("Parcel for Facade"); - this->_Key->Add("Max's Herbs"); - this->_Key->Add("Drifting Cargo"); - this->_Key->Add("Drifting Cargo 2"); - this->_Key->Add("Drifting Cargo 3"); - this->_Key->Add("Drifting Cargo 4"); - this->_Key->Add("Old Package"); - this->_Key->Add("Mermaid Tear"); - this->_Key->Add("Mandrake Leaf"); - this->_Key->Add("Energizer"); - this->_Key->Add("Tad Oil"); - this->_Key->Add("Sleep-B-Gone"); - this->_Key->Add("Antidote"); - this->_Key->Add("Gold Bracelet"); - this->_Key->Add("Elite Kitchen Knife"); - this->_Key->Add("Elevator Parts"); - this->_Key->Add("Dirty Treasure Map"); - this->_Key->Add("Restored Treasure Map"); - this->_Key->Add("Jade Hair Ornament"); - this->_Key->Add("Employee List"); - this->_Key->Add("Small Safe"); - this->_Key->Add("Safe Key"); - this->_Key->Add("Greaty Tree Root"); - this->_Key->Add("Eye of Power"); - this->_Key->Add("Ribbon"); - this->_Key->Add("Yonah's Ribbon"); - this->_Key->Add("Bronze Key"); - this->_Key->Add("Brass Key"); - this->_Key->Add("Boar Tusk"); - this->_Key->Add("Pressed Freesia"); - this->_Key->Add("Potted Freesia"); - this->_Key->Add("Fressia(Delivery)"); - this->_Key->Add("Pile of Junk"); - this->_Key->Add("Old Gold Coin"); - this->_Key->Add("Market Map"); - this->_Key->Add("AA Keycard"); - this->_Key->Add("KA Keycard"); - this->_Key->Add("SA Keycard"); - this->_Key->Add("TA Keycard"); - this->_Key->Add("NA Keycard"); - this->_Key->Add("HA Keycard"); - this->_Key->Add("MA Keycard"); - this->_Key->Add("YA Keycard"); - this->_Key->Add("RA Keycard"); - this->_Key->Add("WA Keycard"); - this->_Key->Add("Cultivator's Handbook"); - this->_Key->Add("Red Bag"); - this->_Key->Add("Lantern"); - this->_Key->Add("Empty Lantern"); - this->_Key->Add("Hold Key"); - this->_Key->Add("Passageway Key"); - this->_Key->Add("Goat Key"); - this->_Key->Add("Lizard Key"); - this->_Key->Add("Unlocking Procedure Memo"); - this->_Key->Add("Red Jewel"); - this->_Key->Add("Red Flowers"); - this->_Key->Add("Apples"); + _Recovery->Sort(); + _Fishing->Sort(); + _Cultivation->Sort(); + _Materials->Sort(); + _Key->Sort(); //Panel Components wxArrayString* ItemCategories = new wxArrayString();