diff --git a/Include/Game/Globals.hpp b/Include/Game/Globals.hpp index 95f4664..b48a73c 100644 --- a/Include/Game/Globals.hpp +++ b/Include/Game/Globals.hpp @@ -340,51 +340,50 @@ namespace Globals { "Fire Surge", 78, 415, 95 }, //Lunar 70-114 - { "Lunar Home Teleport", 101, 356, 0 }, - { "Bake Pie", 102, 543, 65 }, - { "Geomancy", 142, 613, 65 }, - { "Cure Plant", 103, 617, 66 }, - { "Monster Examine", 104, 627, 66 }, - { "NPC Contact", 105, 618, 67 }, - { "Cure Other", 106, 609, 68 }, - { "Humidify", 107, 578, 69 }, - { "Moonclan Teleport", 108, 594, 69 }, - { "Tele Group Moonclan", 109, 619, 70 }, - { "Cure Me", 110, 612, 71 }, - { "Ourania Teleport", 144, 636, 71 }, - { "Hunter Kit", 111, 629, 71 }, - { "Waterbirth Teleport", 112, 595, 72 }, - { "Tele Group Waterbirth", 113, 620, 73 }, - { "Cure Group", 114, 615, 74 }, - { "Stat Spy", 115, 626, 75 }, - { "Barbarian Teleport", 116, 597, 75 }, - { "Tele Group Barbarian", 117, 621, 76 }, - { "Spin Flax", 143, 635, 76 }, - { "Superglass Make", 118, 598, 77 }, - { "Tan Leather", 119, 633, 78 }, - { "Khazard Teleport", 120, 599, 78 }, - { "Tele Group Khazard", 121, 622, 79 }, - { "Dream", 122, 630, 79 }, - { "String Jewellery", 123, 600, 80 }, - { "Stat Restore Pot Share", 124, 604, 81 }, - { "Magic Imbue", 125, 602, 82 }, - { "Fertile Soil", 126, 603, 83 }, - { "Boost Potion Share", 127, 601, 84 }, - { "Fishing Guild Teleport", 128, 605, 85 }, - { "Teleport to Bounty Target", 70, 409, 85 }, - { "Tele Group Fishing Guild", 129, 623, 86 }, - { "Plank Make", 130, 631, 86 }, - { "Catherby Teleport", 131, 606, 87 }, - { "Tele Group Catherby", 132, 624, 88 }, - { "Recharge Dragonstone", 133, 634, 89 }, - { "Ice Plateau Teleport", 134, 607, 89 }, - { "Tele Group Ice Plateau", 135, 625, 90 }, - { "Energy Transfer", 136, 608, 91 }, - { "Heal Other", 137, 610, 92 }, - { "Vengeance Other", 138, 611, 93 }, - { "Vengeance", 139, 614, 94 }, - { "Heal Group", 140, 616, 95 }, - { "Spellbook Swap", 141, 632, 96 }, + { "Lunar Home Teleport", 104, 356, 0 }, + { "Bake Pie", 105, 543, 65 }, + { "Cure Plant", 106, 617, 66 }, + { "Monster Examine", 107, 627, 66 }, + { "NPC Contact", 108, 618, 67 }, + { "Cure Other", 109, 609, 68 }, + { "Humidify", 110, 578, 69 }, + { "Moonclan Teleport", 111, 594, 69 }, + { "Tele Group Moonclan", 112, 619, 70 }, + { "Cure Me", 113, 612, 71 }, + { "Hunter Kit", 114, 629, 71 }, + { "Waterbirth Teleport", 115, 595, 72 }, + { "Tele Group Waterbirth", 116, 620, 73 }, + { "Cure Group", 117, 615, 74 }, + { "Stat Spy", 118, 626, 75 }, + { "Barbarian Teleport", 119, 597, 75 }, + { "Tele Group Barbarian", 120, 621, 76 }, + { "Superglass Make", 121, 598, 77 }, + { "Tan Leather", 122, 633, 78 }, + { "Khazard Teleport", 123, 599, 78 }, + { "Tele Group Khazard", 124, 622, 79 }, + { "Dream", 125, 630, 79 }, + { "String Jewellery", 126, 600, 80 }, + { "Stat Restore Pot Share", 127, 604, 81 }, + { "Magic Imbue", 128, 602, 82 }, + { "Fertile Soil", 129, 603, 83 }, + { "Boost Potion Share", 130, 601, 84 }, + { "Fishing Guild Teleport", 131, 605, 85 }, + { "Tele Group Fishing Guild", 132, 623, 86 }, + { "Plank Make", 133, 631, 86 }, + { "Catherby Teleport", 134, 606, 87 }, + { "Tele Group Catherby", 135, 624, 88 }, + { "Recharge Dragonstone", 136, 634, 89 }, + { "Ice Plateau Teleport", 137, 607, 89 }, + { "Tele Group Ice Plateau", 138, 625, 90 }, + { "Energy Transfer", 139, 608, 91 }, + { "Heal Other", 140, 610, 92 }, + { "Vengeance Other", 141, 611, 93 }, + { "Vengeance", 142, 614, 94 }, + { "Heal Group", 143, 616, 95 }, + { "Spellbook Swap", 144, 632, 96 }, + { "Geomancy", 145, 613, 65 }, + { "Spin Flax", 146, 635, 76 }, + { "Ourania Teleport", 147, 636, 71 }, //Ancients 115-140 { "Ice Rush", 76, 375, 58 }, diff --git a/Include/Game/Interfaces/Exchange.hpp b/Include/Game/Interfaces/Exchange.hpp index 33e3a99..ecc1766 100644 --- a/Include/Game/Interfaces/Exchange.hpp +++ b/Include/Game/Interfaces/Exchange.hpp @@ -6,6 +6,7 @@ #include #include #include +#include namespace Exchange { @@ -87,6 +88,7 @@ namespace Exchange bool SetSellItem(const std::string& Name, std::int32_t ID = -1); + bool SetSellItem(const std::regex& Name, std::int32_t ID = -1); bool SetSellItem(std::int32_t ID); bool SetBuyItem(const std::string& Name, std::int32_t ID = -1); bool SetOfferAmount(std::uint32_t Amount); diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 5770914..541d1c9 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ