From 220920b1727aca2bba625cccd26b6a80c910e621 Mon Sep 17 00:00:00 2001 From: Nic0Nic0Nii Date: Mon, 17 Jul 2023 20:24:57 +0000 Subject: [PATCH] Use the icon, border color, and grade icon data from external shn files --- .../FiestaCraftingCalculator.cpp | 338 +++++------------- .../assets/{collectibles.png => Cllct000.png} | Bin .../assets/{grade.png => ItemGrade.png} | Bin .../{production_icons.png => Prdct000.png} | Bin .../{collectibles2.png => QstItem000.png} | Bin 5 files changed, 93 insertions(+), 245 deletions(-) rename FiestaCraftingCalculator/assets/{collectibles.png => Cllct000.png} (100%) rename FiestaCraftingCalculator/assets/{grade.png => ItemGrade.png} (100%) rename FiestaCraftingCalculator/assets/{production_icons.png => Prdct000.png} (100%) rename FiestaCraftingCalculator/assets/{collectibles2.png => QstItem000.png} (100%) diff --git a/FiestaCraftingCalculator/FiestaCraftingCalculator.cpp b/FiestaCraftingCalculator/FiestaCraftingCalculator.cpp index 69d0b87..b23e746 100644 --- a/FiestaCraftingCalculator/FiestaCraftingCalculator.cpp +++ b/FiestaCraftingCalculator/FiestaCraftingCalculator.cpp @@ -1,3 +1,4 @@ +#define OLC_PGE_HEADLESS #define OLC_PGE_APPLICATION #include "olcPixelGameEngine.h" #define OLC_PGEX_QUICKGUI @@ -13,75 +14,25 @@ int PANEL_HEIGHT=240; class FiestaCraftingCalculator : public olc::PixelGameEngine { - enum Image{ - PRODUCTION, - COLLECTIBLE, - COLLECTIBLE2 - }; - - enum Grade{ - GRADE_NONE, - GRADEL, - GRADEM, - GRADEH, - GRADE1, - GRADE2, - GRADE3, - GRADE4, - GRADE5, - }; - struct ItemData{ std::string name; Pixel borderCol; vi2d tilesheetPos={0,0}; - Image img=COLLECTIBLE; - Grade grade=GRADE_NONE; + std::pair img; + std::pair grade; void DrawIcon(PixelGameEngine*pge,vf2d pos){ - Renderable*r=nullptr; - switch(img){ - case PRODUCTION:{ - r=&FiestaCraftingCalculator::ProdIcon; - }break; - case COLLECTIBLE:{ - r=&FiestaCraftingCalculator::CollectibleIcons; - }break; - case COLLECTIBLE2:{ - r=&FiestaCraftingCalculator::CollectibleIcons2; - }break; - } + Renderable*r=FilePathToImage[img.first]; + tilesheetPos={img.second%7,img.second/7}; pge->DrawPartialDecal(pos,{32,32},r->Decal(),tilesheetPos*32,{32,32}); - switch(grade){ - case GRADEL:{ - pge->DrawPartialDecal(pos,FiestaCraftingCalculator::GradeIcons.Decal(),{0,0},{32,32}); - }break; - case GRADEM:{ - pge->DrawPartialDecal(pos,FiestaCraftingCalculator::GradeIcons.Decal(),{32,0},{32,32}); - }break; - case GRADEH:{ - pge->DrawPartialDecal(pos,FiestaCraftingCalculator::GradeIcons.Decal(),{64,0},{32,32}); - }break; - case GRADE1:{ - pge->DrawPartialDecal(pos,FiestaCraftingCalculator::GradeIcons.Decal(),{96,0},{32,32}); - }break; - case GRADE2:{ - pge->DrawPartialDecal(pos,FiestaCraftingCalculator::GradeIcons.Decal(),{0,32},{32,32}); - }break; - case GRADE3:{ - pge->DrawPartialDecal(pos,FiestaCraftingCalculator::GradeIcons.Decal(),{32,32},{32,32}); - }break; - case GRADE4:{ - pge->DrawPartialDecal(pos,FiestaCraftingCalculator::GradeIcons.Decal(),{64,32},{32,32}); - }break; - case GRADE5:{ - pge->DrawPartialDecal(pos,FiestaCraftingCalculator::GradeIcons.Decal(),{96,32},{32,32}); - }break; + if(grade.first!="-"){ + pge->DrawPartialDecal(pos,FiestaCraftingCalculator::GradeIcons.Decal(),vi2d{grade.second%7,grade.second/7}*32,{32,32}); } pge->DrawRectDecal(pos,{32,32},borderCol); } }; static std::mapIDToName; + static std::mapFilePathToImage; class Recipe{ public: @@ -112,6 +63,11 @@ class FiestaCraftingCalculator : public olc::PixelGameEngine static std::vectorScrollProdRecipes; static std::vectorCompRecipes; static std::vectorDecompRecipes; + static std::map PotionProdRecipeLink; + static std::map StoneProdRecipeLink; + static std::map ScrollProdRecipeLink; + static std::map CompRecipeLink; + static std::map DecompRecipeLink; class Calculator{ Manager manager; vf2d displayPos={10,10}; @@ -349,6 +305,13 @@ public: std::string column=""; std::vectordata; + //HACK ALERT! If the number of recipes for any of these exceeds 300, a reallocation occurs and all pointers move... + //We need to keep this number high enough to avoid ever reallocating. + StoneProdRecipes.reserve(300); + PotionProdRecipes.reserve(300); + ScrollProdRecipes.reserve(300); + CompRecipes.reserve(300); + DecompRecipes.reserve(300); for(int i=0;iProduceIndex]; + item.borderCol={uint8_t(stoi(data[8])),uint8_t(stoi(data[9])),uint8_t(stoi(data[10]))}; + item.img={data[3],stoi(data[2])}; + item.grade={data[5],stoi(data[4])}; + } + data.clear(); + } else { + column+=fileContents[i]; + } + } + + + std::sort(StoneProdRecipes.begin(),StoneProdRecipes.end(),[](Recipe&r1,Recipe&r2){return r1.requiredExpheight-240)},{172,36},{2,2}); return true; } @@ -462,189 +486,13 @@ std::vector FiestaCraftingCalculator::StonePro std::vector FiestaCraftingCalculator::ScrollProdRecipes; std::vector FiestaCraftingCalculator::CompRecipes; std::vector FiestaCraftingCalculator::DecompRecipes; -std::mapFiestaCraftingCalculator::IDToName={ - {"El1",{"Elrue [1]",{0,0,0},{6,2},PRODUCTION,GRADE1}}, - {"El2",{"Elrue [2]",{0,0,0},{6,2},PRODUCTION,GRADE2}}, - {"El3",{"Elrue [3]",{0,0,0},{6,2},PRODUCTION,GRADE3}}, - {"El4",{"Elrue [4]",{0,0,0},{6,2},PRODUCTION,GRADE4}}, - {"El5",{"Elrue [5]",{0,0,0},{6,2},PRODUCTION,GRADE5}}, - {"Lix1",{"Lix [1]",{0,0,0},{1,3},PRODUCTION,GRADE1}}, - {"Lix2",{"Lix [2]",{0,0,0},{1,3},PRODUCTION,GRADE2}}, - {"Lix3",{"Lix [3]",{0,0,0},{1,3},PRODUCTION,GRADE3}}, - {"Lix4",{"Lix [4]",{0,0,0},{1,3},PRODUCTION,GRADE4}}, - {"Lix5",{"Lix [5]",{0,0,0},{1,3},PRODUCTION,GRADE5}}, - {"Xir1",{"Xir [1]",{0,0,0},{4,3},PRODUCTION,GRADE1}}, - {"Xir2",{"Xir [2]",{0,0,0},{4,3},PRODUCTION,GRADE2}}, - {"Xir3",{"Xir [3]",{0,0,0},{4,3},PRODUCTION,GRADE3}}, - {"Xir4",{"Xir [4]",{0,0,0},{4,3},PRODUCTION,GRADE4}}, - {"Xir5",{"Xir [5]",{0,0,0},{4,3},PRODUCTION,GRADE5}}, - {"BestLowHpPotion",{"HP Potion (Tier 1)",{0,0,0},{0,0},PRODUCTION}}, - {"LowHpPotion",{"HP Potion (Tier 2)",{0,0,0},{0,0},PRODUCTION,GRADEL}}, - {"NorHpPotion",{"HP Potion (Tier 3)",{0,0,0},{1,0},PRODUCTION,GRADEM}}, - {"HighHpPotion",{"HP Potion (Tier 4)",{0,0,0},{1,0},PRODUCTION,GRADEH}}, - {"BestHighHpPotion",{"HP Potion (Tier 5)",{0,0,0},{2,0},PRODUCTION}}, - {"BestLowSpPotion",{"SP Potion (Tier 1)",{0,0,0},{3,0},PRODUCTION}}, - {"LowSpPotion",{"SP Potion (Tier 2)",{0,0,0},{3,0},PRODUCTION,GRADEL}}, - {"NorSpPotion",{"SP Potion (Tier 3)",{0,0,0},{4,0},PRODUCTION,GRADEM}}, - {"HighSpPotion",{"SP Potion (Tier 4)",{0,0,0},{4,0},PRODUCTION,GRADEH}}, - {"BestHighSpPotion",{"SP Potion (Tier 5)",{0,0,0},{5,0},PRODUCTION}}, - {"BestLowConHPPotion",{"HP Regeneration Potion (Tier 1)",{0,0,0},{0,0},PRODUCTION}}, - {"LowConHPPotion",{"HP Regeneration Potion (Tier 2)",{0,0,0},{0,0},PRODUCTION,GRADEL}}, - {"NorConHPPotion",{"HP Regeneration Potion (Tier 3)",{0,0,0},{1,0},PRODUCTION,GRADEM}}, - {"HighConHPPotion",{"HP Regeneration Potion (Tier 4)",{0,0,0},{1,0},PRODUCTION,GRADEH}}, - {"BestHighConHPPotion",{"HP Regeneration Potion (Tier 5)",{0,0,0},{2,0},PRODUCTION}}, - {"BestLowConSPPotion",{"SP Regeneration Potion (Tier 1)",{0,0,0},{3,0},PRODUCTION}}, - {"LowConSPPotion",{"SP Regeneration Potion (Tier 2)",{0,0,0},{3,0},PRODUCTION,GRADEL}}, - {"NorConSPPotion",{"SP Regeneration Potion (Tier 3)",{0,0,0},{4,0},PRODUCTION,GRADEM}}, - {"HighConSPPotion",{"SP Regeneration Potion (Tier 4)",{0,0,0},{4,0},PRODUCTION,GRADEH}}, - {"BestHighConSPPotion",{"SP Regeneration Potion (Tier 5)",{0,0,0},{5,0},PRODUCTION}}, - {"BestLowTHScroll",{"Aim(Tier 1)",{0,0,0},{4,1},PRODUCTION}}, - {"LowTHScroll",{"Aim(Tier 2)",{0,0,0},{4,1},PRODUCTION,GRADEL}}, - {"NorTHScroll",{"Aim(Tier 3)",{0,0,0},{4,1},PRODUCTION,GRADEM}}, - {"HighTHScroll",{"Aim(Tier 4)",{0,0,0},{4,1},PRODUCTION,GRADEH}}, - {"BestHighTHScroll",{"Aim(Tier 5)",{0,0,0},{4,1},PRODUCTION}}, - {"BestLowTBScroll",{"Nature's Agility (Tier 1)",{0,0,0},{5,1},PRODUCTION}}, - {"LowTBScroll",{"Nature's Agility (Tier 2)",{0,0,0},{5,1},PRODUCTION,GRADEL}}, - {"NorTBScroll",{"Nature's Agility (Tier 3)",{0,0,0},{5,1},PRODUCTION,GRADEM}}, - {"HighTBScroll",{"Nature's Agility (Tier 4)",{0,0,0},{5,1},PRODUCTION,GRADEH}}, - {"BestHighTBScroll",{"Nature's Agility (Tier 5)",{0,0,0},{5,1},PRODUCTION}}, - {"BestLowMRScroll",{"Magical Defense (Tier 1)",{0,0,0},{6,1},PRODUCTION}}, - {"LowMRScroll",{"Magical Defense (Tier 2)",{0,0,0},{6,1},PRODUCTION,GRADEL}}, - {"NorMRScroll",{"Magical Defense (Tier 3)",{0,0,0},{6,1},PRODUCTION,GRADEM}}, - {"HighMRScroll",{"Magical Defense (Tier 4)",{0,0,0},{6,1},PRODUCTION,GRADEH}}, - {"BestHighMRScroll",{"Magical Defense (Tier 5)",{0,0,0},{6,1},PRODUCTION}}, - {"BestLowACScroll",{"Shield Increase (Tier 1)",{0,0,0},{6,1},PRODUCTION}}, - {"LowACScroll",{"Shield Increase (Tier 2)",{0,0,0},{6,1},PRODUCTION,GRADEL}}, - {"NorACScroll",{"Shield Increase (Tier 3)",{0,0,0},{6,1},PRODUCTION,GRADEM}}, - {"HighACScroll",{"Shield Increase (Tier 4)",{0,0,0},{6,1},PRODUCTION,GRADEH}}, - {"BestHighACScroll",{"Shield Increase (Tier 5)",{0,0,0},{6,1},PRODUCTION}}, - {"BestLowMaxHPScroll",{"Vitality (Tier 1)",{0,0,0},{0,2},PRODUCTION}}, - {"LowMaxHPScroll",{"Vitality (Tier 2)",{0,0,0},{0,2},PRODUCTION,GRADEL}}, - {"NorMaxHPScroll",{"Vitality (Tier 3)",{0,0,0},{0,2},PRODUCTION,GRADEM}}, - {"HighMaxHPScroll",{"Vitality (Tier 4)",{0,0,0},{0,2},PRODUCTION,GRADEH}}, - {"BestHighMaxHPScroll",{"Vitality (Tier 5)",{0,0,0},{0,2},PRODUCTION}}, - {"BestLowMaxSPScroll",{"Mentality (Tier 1)",{0,0,0},{1,2},PRODUCTION}}, - {"LowMaxSPScroll",{"Mentality (Tier 2)",{0,0,0},{1,2},PRODUCTION,GRADEL}}, - {"NorMaxSPScroll",{"Mentality (Tier 3)",{0,0,0},{1,2},PRODUCTION,GRADEM}}, - {"HighMaxSPScroll",{"Mentality (Tier 4)",{0,0,0},{1,2},PRODUCTION,GRADEH}}, - {"BestHighMaxSPScroll",{"Mentality (Tier 5)",{0,0,0},{1,2},PRODUCTION}}, - {"NorMSScroll",{"Speed Increase (Tier 3)",{0,0,0},{1,2},PRODUCTION,GRADEM}}, - {"LowMSScroll",{"Speed Increase (Tier 2)",{0,0,0},{1,2},PRODUCTION,GRADEL}}, - {"HighMSScroll",{"Speed Increase (Tier 4)",{0,0,0},{1,2},PRODUCTION,GRADEH}}, - {"BestMSScroll",{"Speed Increase (Tier 5)",{0,0,0},{1,2},PRODUCTION}}, - {"BestLowMSScroll",{"Speed Increase (Tier 1)",{0,0,0},{1,2},PRODUCTION}}, - {"LowPsnResiPotion",{"Antitoxin (Tier 1)",{0,0,0},{6,0},PRODUCTION,GRADEL}}, - {"NorPsnResiPotion",{"Antitoxin (Tier 2)",{0,0,0},{7,0},PRODUCTION,GRADEM}}, - {"HighPsnResiPotion",{"Antitoxin (Tier 3)",{0,0,0},{0,1},PRODUCTION,GRADEH}}, - {"LowDssResiPotion",{"Antibiotic (Tier 1)",{0,0,0},{6,0},PRODUCTION,GRADEL}}, - {"NorDssResiPotion",{"Antibiotic (Tier 2)",{0,0,0},{7,0},PRODUCTION,GRADEM}}, - {"HighDssResiPotion",{"Antibiotic (Tier 3)",{0,0,0},{0,1},PRODUCTION,GRADEH}}, - {"LowCurResiPotion",{"Bless (Tier 1)",{0,0,0},{6,0},PRODUCTION,GRADEL}}, - {"NorCurResiPotion",{"Bless (Tier 2)",{0,0,0},{7,0},PRODUCTION,GRADEM}}, - {"HighCurResiPotion",{"Bless (Tier 3)",{0,0,0},{0,1},PRODUCTION,GRADEH}}, - {"LowPsnCurPotion",{"Antidote (Tier 1)",{0,0,0},{6,0},PRODUCTION,GRADEL}}, - {"NorPsnCurPotion",{"Antidote (Tier 2)",{0,0,0},{7,0},PRODUCTION,GRADEM}}, - {"HighPsnCurPotion",{"Antidote (Tier 3)",{0,0,0},{0,1},PRODUCTION,GRADEH}}, - {"LowDssCurPotion",{"Cure (Tier 1)",{0,0,0},{6,0},PRODUCTION,GRADEL}}, - {"NorDssCurPotion",{"Cure (Tier 2)",{0,0,0},{7,0},PRODUCTION,GRADEM}}, - {"HighDssCurPotion",{"Cure (Tier 3)",{0,0,0},{0,1},PRODUCTION,GRADEH}}, - {"BestLowCurScroll",{"Divine Magic (Tier 1)",{0,0,0},{2,2},PRODUCTION}}, - {"LowCurScroll",{"Divine Magic (Tier 2)",{0,0,0},{2,2},PRODUCTION,GRADEL}}, - {"NorCurScroll",{"Divine Magic (Tier 3)",{0,0,0},{2,2},PRODUCTION,GRADEM}}, - {"HighCurScroll",{"Divine Magic (Tier 4)",{0,0,0},{2,2},PRODUCTION,GRADEH}}, - {"BestHighCurScroll",{"Divine Magic (Tier 5)",{0,0,0},{2,2},PRODUCTION}}, - {"NorBeastLeather",{"Beast Leather (Normal Quality)",{255,255,0},{7,1}}}, - {"HighBeastLeather",{"Beast Leather (High Quality)",{0,255,0},{0,2}}}, - {"BeastHead",{"Beast Head",{0,255,255},{1,2}}}, - {"NorBeastTooth",{"Beast Dogtooth (Normal Quality)",{255,255,0},{5,1}}}, - {"HighBeastTooth",{"Beast Dogtooth (High Quality)",{0,255,0},{6,1}}}, - {"NorBrokenBone",{"Bone (Normal Quality)",{255,255,0},{4,0}}}, - {"HighBrokenBone",{"Bone (High Quality)",{0,255,0},{4,0}}}, - {"BestBrokenBone",{"Bone (Highest Quality)",{0,255,255},{4,0}}}, - {"NorCleanWater",{"Spirit's Nectar (Normal Quality)",{255,255,0},{7,5}}}, - {"HighCleanWater",{"Spirit's Nectar (High Quality)",{0,255,0},{0,6}}}, - {"BestCleanWater",{"Spirit's Nectar (Highest Quality)",{0,255,255},{0,6}}}, - {"IronBadge",{"Iron Badge",{255,255,0},{2,4}}}, - {"NorCopperOre",{"Copper Ore (Normal Quality)",{255,255,0},{4,4}}}, - {"HighCopperOre",{"Copper Ore (High Quality)",{0,255,0},{5,4}}}, - {"NorGemDust",{"Gem Dust (Normal Quality)",{255,255,0},{6,0}}}, - {"HighGemDust",{"Gem Dust (High Quality)",{0,255,0},{6,0}}}, - {"BestGemDust",{"Gem Dust (Highest Quality)",{0,255,255},{6,0}}}, - {"Violet",{"Vilolet",{0,0,0},{1,1},COLLECTIBLE2}}, - {"Ramsear",{"Ramsear",{0,0,0},{1,1},COLLECTIBLE2}}, - {"Salvia",{"Eucalyptus",{255,255,255},{5,7}}}, - {"LowGoldOre",{"Gold Ore (Low Quality)",{255,255,255},{1,6}}}, - {"NorGoldOre",{"Gold Ore (Normal Quality)",{255,255,0},{2,6}}}, - {"HighGoldOre",{"Gold Ore (High Quality)",{0,255,0},{3,6}}}, - {"NorKylinLeather",{"Summoned Beast Leather (Normal Quality)",{255,255,0},{3,2}}}, - {"HighKylinLeather",{"Summoned Beast Leather (High Quality)",{0,255,0},{4,2}}}, - {"KylinTooth",{"Summoned Beast's Tooth",{0,255,0},{7,2}}}, - {"MermaidScale",{"Mermaid's Scale",{0,0,0},{2,3}}}, - {"KylinFighterTail",{"Summoned Beast Fighter's Tail",{255,255,0},{6,2}}}, - {"NorMagicCrystal",{"Magic Crystal (Normal Quality)",{255,255,0},{4,5}}}, - {"HighMagicCrystal",{"Magic Crystal (High Quality)",{0,255,0},{5,5}}}, - {"BestMagicCrystal",{"Magic Crystal (Highest Quality)",{0,255,255},{5,5}}}, - {"NorMeat",{"Meat (Normal Quality)",{255,255,0},{1,0}}}, - {"HighMeat",{"Meat (High Quality)",{0,255,0},{1,0}}}, - {"BestMeat",{"Meat (Highest Quality)",{0,255,255},{1,0}}}, - {"NorMushrooms",{"Mushroom (Normal Quality)",{255,255,0},{4,3}}}, - {"HighMushrooms",{"Mushroom (High Quality)",{0,255,0},{4,3}}}, - {"BestMushrooms",{"Mushroom (Highest Quality)",{0,255,255},{4,3}}}, - {"NorPledge",{"Sign (Normal Quality)",{255,255,0},{3,0}}}, - {"HighPledge",{"Sign (High Quality)",{0,255,0},{3,0}}}, - {"BestPledge",{"Sign (Highest Quality)",{0,255,255},{3,0}}}, - {"Rosemary",{"Rosemary",{0,255,0},{4,7}}}, - {"Basil",{"Basil",{0,255,255},{5,7}}}, - {"Marigold",{"Marigold",{0,0,255},{6,7}}}, - {"LowSilverOre",{"Silver Ore (Low Quality)",{255,255,255},{6,4}}}, - {"NorSilverOre",{"Silver Ore (Normal Quality)",{255,255,0},{7,4}}}, - {"HighSilverOre",{"Silver Ore (High Quality)",{0,255,0},{0,5}}}, - {"NorSkin",{"Leather (Normal Quality)",{255,255,0},{5,0}}}, - {"HighSkin",{"Leather (High Quality)",{0,255,0},{5,0}}}, - {"BestSkin",{"Leather (Highest Quality)",{0,255,255},{5,0}}}, - {"NorSoulDust",{"Soul Dust (Normal Quality)",{255,255,0},{2,1}}}, - {"HighSoulDust",{"Soul Dust (High Quality)",{0,255,0},{2,1}}}, - {"BestSoulDust",{"Soul Dust (Highest Quality)",{0,255,255},{2,1}}}, - {"NorSpiritDust",{"Spirit Dust (Normal Quality)",{255,255,0},{0,0}}}, - {"HighSpiritDust",{"Spirit Dust (High Quality)",{0,255,0},{0,0}}}, - {"BestSpiritDust",{"Spirit Dust (Highest Quality)",{0,255,255},{0,0}}}, - {"NorToadStool",{"Toadstool (Normal Quality)",{255,255,0},{3,3}}}, - {"HighToadStool",{"Toadstool (High Quality)",{0,255,0},{3,3}}}, - {"BestToadStool",{"Toadstool (Highest Quality)",{0,255,255},{3,3}}}, - {"Ruby",{"Ruby",{255,255,0},{2,5}}}, - {"Sapphire",{"Sapphire",{0,255,0},{4,6}}}, - {"NorWoodSab",{"Sap (Normal Quality)",{255,255,0},{6,6}}}, - {"HighWoodSab",{"Sap (High Quality)",{0,255,0},{7,6}}}, - {"BestWoodSab",{"Sap (Highest Quality)",{0,255,255},{0,7}}}, - {"LowBeastLeather",{"Beast Leather (Low Quality)",{255,255,255},{7,1}}}, - {"LowBeastTooth",{"Beast Dogtooth (Low Quality)",{255,255,255},{4,1}}}, - {"LowBrokenBone",{"Bone (Low Quality)",{255,255,255},{4,0}}}, - {"LowCleanWater",{"Spirit's Nectar (Low Quality)",{255,255,255},{6,5}}}, - {"CommanderBadge",{"Master Commander's Badge",{255,255,255},{1,4}}}, - {"LowCopperOre",{"Copper Ore (Low Quality)",{255,255,255},{3,4}}}, - {"LowGemDust",{"Gem Dust (Low Quality)",{255,255,255},{6,0}}}, - {"Geranium",{"Geranium",{0,0,0},{1,1},COLLECTIBLE2}}, - {"LowKylinLeather",{"Summoned Beast Leather (Low Quality)",{255,255,255},{2,2}}}, - {"KylinTail",{"Summoned Beast's Tail",{255,255,255},{5,2}}}, - {"LowMagicCrystal",{"Magic Crystal (Low Quality)",{255,255,255},{3,5}}}, - {"LowMeat",{"Meat (Low Quality)",{255,255,255},{1,0}}}, - {"LowMushrooms",{"Mushroom (Low Quality)",{255,255,255},{4,3}}}, - {"LowPledge",{"Sign (Low Quality)",{255,255,255},{3,0}}}, - {"Sage",{"Sage",{255,255,0},{3,7}}}, - {"LowSkin",{"Leather (Low Quality)",{255,255,255},{5,0}}}, - {"LowSoulDust",{"Soul Dust (Low Quality)",{255,255,255},{2,1}}}, - {"LowSpiritDust",{"Spirit Dust (Low Quality)",{255,255,255},{0,0}}}, - {"LowToadStool",{"Toadstool (Low Quality)",{255,255,255},{3,3}}}, - {"Topaz",{"Topaz",{255,255,255},{1,5}}}, - {"LowWoodSab",{"Sap (Low Quality)",{255,255,255},{5,6}}}, - {"LowSlimeJelly",{"Slime Jelly (Low Quality)",{255,255,255},{0,3}}}, - {"HighSlimeJelly",{"Slime Jelly (High Quality)",{255,255,0},{1,3}}}, - {"Converter1",{"Alchemy Stone[1]",{255,255,255},{4,2},PRODUCTION}}, - {"Converter3",{"Alchemy Stone[3]",{0,255,0},{4,2},PRODUCTION}}, - {"Converter5",{"Alchemy Stone[5]",{0,255,255},{4,2},PRODUCTION}}, - {"Converter2",{"Alchemy Stone[2]",{255,255,0},{4,2},PRODUCTION}}, - {"Converter4",{"Alchemy Stone[4]",{0,255,255},{4,2},PRODUCTION}}, -}; +std::map FiestaCraftingCalculator::PotionProdRecipeLink; +std::map FiestaCraftingCalculator::StoneProdRecipeLink; +std::map FiestaCraftingCalculator::ScrollProdRecipeLink; +std::map FiestaCraftingCalculator::CompRecipeLink; +std::map FiestaCraftingCalculator::DecompRecipeLink; +std::mapFiestaCraftingCalculator::FilePathToImage; +std::mapFiestaCraftingCalculator::IDToName; std::vectorFiestaCraftingCalculator::calculators; bool FiestaCraftingCalculator::Calculator::disabledAllCalculators=false; int main() diff --git a/FiestaCraftingCalculator/assets/collectibles.png b/FiestaCraftingCalculator/assets/Cllct000.png similarity index 100% rename from FiestaCraftingCalculator/assets/collectibles.png rename to FiestaCraftingCalculator/assets/Cllct000.png diff --git a/FiestaCraftingCalculator/assets/grade.png b/FiestaCraftingCalculator/assets/ItemGrade.png similarity index 100% rename from FiestaCraftingCalculator/assets/grade.png rename to FiestaCraftingCalculator/assets/ItemGrade.png diff --git a/FiestaCraftingCalculator/assets/production_icons.png b/FiestaCraftingCalculator/assets/Prdct000.png similarity index 100% rename from FiestaCraftingCalculator/assets/production_icons.png rename to FiestaCraftingCalculator/assets/Prdct000.png diff --git a/FiestaCraftingCalculator/assets/collectibles2.png b/FiestaCraftingCalculator/assets/QstItem000.png similarity index 100% rename from FiestaCraftingCalculator/assets/collectibles2.png rename to FiestaCraftingCalculator/assets/QstItem000.png