diff --git a/killproof_me/KillproofUITable.cpp b/killproof_me/KillproofUITable.cpp index 3c801e9..a730044 100644 --- a/killproof_me/KillproofUITable.cpp +++ b/killproof_me/KillproofUITable.cpp @@ -296,6 +296,7 @@ const char* KillproofUITable::getCategoryName(const std::string& pCat) { if (pCat == "1") return Localization::STranslate(KMT_Raids).c_str(); if (pCat == "2") return Localization::STranslate(KMT_Fractals).c_str(); if (pCat == "3") return Localization::STranslate(KMT_Strikes).c_str(); + if (pCat == "4") return Localization::STranslate(KMT_Misc).c_str(); if (pCat == "1.1") return "W1"; if (pCat == "1.2") return "W2"; if (pCat == "1.3") return "W3"; diff --git a/killproof_me/KillproofUITable.h b/killproof_me/KillproofUITable.h index 34aa0d2..f1bd89f 100644 --- a/killproof_me/KillproofUITable.h +++ b/killproof_me/KillproofUITable.h @@ -97,13 +97,15 @@ static const std::vector COLUMN_SETUP { {38, [] {return to_string_short(Killproof::ankkaCM);}, []{ return GET_TEXTURE_CUSTOM(ANKKA_TEXTURE, ID_Ankka); }, "3", [] {return to_string_long(Killproof::ankkaCM);}, false}, {39, [] {return to_string_short(Killproof::ministerLiCM);}, []{ return GET_TEXTURE_CUSTOM(LI_TEXTURE, ID_Minister_Li); }, "3", [] {return to_string_long(Killproof::ministerLiCM);}, false}, {40, [] {return to_string_short(Killproof::harvestCM);}, []{ return GET_TEXTURE_CUSTOM(HARVEST_TEXTURE, ID_Harvest); }, "3", [] {return to_string_long(Killproof::harvestCM);}, false}, + + {41, [] {return to_string_short(Killproof::bananas);}, []{ return GET_TEXTURE(Bananas, ID_Bananas); }, "4", [] {return to_string_long(Killproof::bananas);}, false}, }; // Key is the mapId found in the mumbleLink // Value is a vector of columns that should be shown for that map. The Values are the UserIds from the ColumnSetup. // TODO: update this when the above vector changes! static const std::unordered_map> mapIdToColumnSetup = { - {1155, {0, 1, 2, 7, 9, 12, 16, 20, 23, 26}}, // Aerodrome + {1155, {0, 1, 2, 7, 9, 12, 16, 20, 23, 26, 41}}, // Aerodrome {1062, {0, 1, 2, 5, 6, 7}}, // W1 {1149, {0, 1, 2, 8, 9}}, // W2 {1156, {0, 1, 2, 10, 11, 12}}, // W3 diff --git a/killproof_me/Killproofs.cpp b/killproof_me/Killproofs.cpp index f17f3e4..638169b 100644 --- a/killproof_me/Killproofs.cpp +++ b/killproof_me/Killproofs.cpp @@ -4,42 +4,6 @@ #include "extension/Localization.h" -bool defaultHidden(const Killproof& kp) { - switch (kp) { - case Killproof::li: - case Killproof::ld: - case Killproof::liLd: - case Killproof::uce: - case Killproof::ufe: - case Killproof::dhuum: - case Killproof::qadim: - case Killproof::qadim2: - case Killproof::boneskinnerVial: - return false; - case Killproof::vg: - case Killproof::gorse: - case Killproof::sabetha: - case Killproof::sloth: - case Killproof::matthias: - case Killproof::escort: - case Killproof::kc: - case Killproof::xera: - case Killproof::cairn: - case Killproof::mo: - case Killproof::samarog: - case Killproof::deimos: - case Killproof::desmina: - case Killproof::river: - case Killproof::statues: - case Killproof::ca: - case Killproof::twins: - case Killproof::sabir: - case Killproof::adina: - return true; - default: return false; - } -} - const std::string& toStringShort(Killproof e) { switch (e) { case Killproof::li: return Localization::STranslate(KMT_Li_Short); @@ -78,6 +42,7 @@ const std::string& toStringShort(Killproof e) { case Killproof::ankkaCM: return Localization::STranslate(KMT_AnkkaCM_Short); case Killproof::ministerLiCM: return Localization::STranslate(KMT_MinisterLiCM_Short); case Killproof::harvestCM: return Localization::STranslate(KMT_HarvestCM_Short); + case Killproof::bananas: return Localization::STranslate(KMT_Bananas); default: return Localization::STranslate(ET_Unknown); } } diff --git a/killproof_me/Killproofs.h b/killproof_me/Killproofs.h index 68e4951..77c49bc 100644 --- a/killproof_me/Killproofs.h +++ b/killproof_me/Killproofs.h @@ -63,11 +63,12 @@ enum class Killproof : int { ministerLiCM = 39, harvestCM = 40, + // MISC + bananas = 41, + // no final entry anymore, use `magic_enum` to iterate over the enum. }; -bool defaultHidden(const Killproof& kp); - const std::string& toStringShort(Killproof e); inline const std::string& to_string_short(Killproof e) { @@ -284,6 +285,9 @@ class Killproofs { case 95986: killproofs[Killproof::harvestCM] = amount; break; + case 12251: + killproofs[Killproof::bananas] = amount; + break; default: break; } } diff --git a/killproof_me/Lang.h b/killproof_me/Lang.h index ac3e339..13df7a4 100644 Binary files a/killproof_me/Lang.h and b/killproof_me/Lang.h differ diff --git a/killproof_me/icons/Banana.png b/killproof_me/icons/Banana.png new file mode 100644 index 0000000..347e24d Binary files /dev/null and b/killproof_me/icons/Banana.png differ diff --git a/killproof_me/killproof_me.rc b/killproof_me/killproof_me.rc index d0cade8..424f5e0 100644 --- a/killproof_me/killproof_me.rc +++ b/killproof_me/killproof_me.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,8,2,0 - PRODUCTVERSION 2,8,2,0 + FILEVERSION 2,9,0,0 + PRODUCTVERSION 2,9,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -41,12 +41,12 @@ BEGIN BEGIN BLOCK "000004b0" BEGIN - VALUE "FileVersion", "2.8.2.0" + VALUE "FileVersion", "2.9.0.0" VALUE "InternalName", "d3d9_arcdps_killproof_me.dll" VALUE "LegalCopyright", "Copyright (C) 2021" VALUE "OriginalFilename", "d3d9_arcdps_killproof_me.dll" VALUE "ProductName", "killproof.me-plugin" - VALUE "ProductVersion", "2.8.2.0" + VALUE "ProductVersion", "2.9.0.0" END END BLOCK "VarFileInfo" @@ -161,6 +161,8 @@ ID_Minister_Li PNG "icons\\MinisterLi.png" ID_Harvest PNG "icons\\Harvest.png" +ID_Bananas PNG "icons\\Banana.png" + #endif // German (Germany) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/killproof_me/killproof_me.vcxproj b/killproof_me/killproof_me.vcxproj index 5ec0113..9decfc5 100644 --- a/killproof_me/killproof_me.vcxproj +++ b/killproof_me/killproof_me.vcxproj @@ -178,6 +178,7 @@ + diff --git a/killproof_me/killproof_me.vcxproj.filters b/killproof_me/killproof_me.vcxproj.filters index 4e7ef48..ebd956e 100644 --- a/killproof_me/killproof_me.vcxproj.filters +++ b/killproof_me/killproof_me.vcxproj.filters @@ -180,5 +180,8 @@ Resource Files + + Resource Files + \ No newline at end of file diff --git a/killproof_me/resource.h b/killproof_me/resource.h index c5cb54b..7c60337 100644 --- a/killproof_me/resource.h +++ b/killproof_me/resource.h @@ -56,12 +56,14 @@ #define ID_Minister_Li 133 #define IDB_PNG10 134 #define ID_Harvest 134 +#define IDB_PNG11 167 +#define ID_Bananas 167 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 167 +#define _APS_NEXT_RESOURCE_VALUE 168 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101 diff --git a/killproof_me/vcpkg.json b/killproof_me/vcpkg.json index cf09c82..b9007d9 100644 --- a/killproof_me/vcpkg.json +++ b/killproof_me/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "arcdps-killproof-me-plugin", - "version-string": "2.8.2", + "version-string": "2.9.0", "dependencies": [ "cpr", "nlohmann-json",