diff --git a/killproof_me/KillproofUITable.h b/killproof_me/KillproofUITable.h index 46e0f4b..1a84ddd 100644 --- a/killproof_me/KillproofUITable.h +++ b/killproof_me/KillproofUITable.h @@ -105,6 +105,7 @@ static const std::vector COLUMN_SETUP { {44, [] {return to_string_short(Killproof::co);}, []{ return GET_TEXTURE_CUSTOM(DAGDA_TEXTURE, ID_Dagda); }, "3", [] {return to_string_long(Killproof::co);}, false}, {45, [] {return to_string_short(Killproof::coCM);}, []{ return GET_TEXTURE_CUSTOM(DAGDA_TEXTURE, ID_Dagda); }, "3", [] {return to_string_long(Killproof::coCM);}, false}, {46, [] {return to_string_short(Killproof::febe);}, []{ return GET_TEXTURE_CUSTOM(CERUS_TEXTURE, ID_Cerus); }, "3", [] {return to_string_long(Killproof::febe);}, false}, + {47, [] {return to_string_short(Killproof::febeCM);}, []{ return GET_TEXTURE_CUSTOM(CERUS_TEXTURE, ID_Cerus); }, "3", [] {return to_string_long(Killproof::febeCM);}, false}, {41, [] {return to_string_short(Killproof::bananas);}, []{ return GET_TEXTURE(Bananas, ID_Bananas); }, "4", [] {return to_string_long(Killproof::bananas);}, false}, }; @@ -128,9 +129,9 @@ static const std::unordered_map> mapIdToColumnSetu {1437, {2, 34, 40}}, // HarvestTemple strike {1485, {2, 42, 43}}, // OLC Strike {1428, {2, 33, 34, 35, 36, 37, 38, 39, 40, 42, 43}}, // Arborstone - {1509, {2, 44, 45, 46}}, // Wizard's Tower + {1509, {2, 44, 45, 46, 47}}, // Wizard's Tower {1515, {2, 44, 45}}, // Cosmic Observatory - {1520, {2, 46}}, // Temple of Febe + {1520, {2, 46, 47}}, // Temple of Febe }; class KillproofUITable : public MainTable<> { diff --git a/killproof_me/Killproofs.cpp b/killproof_me/Killproofs.cpp index 14e0712..925b5bf 100644 --- a/killproof_me/Killproofs.cpp +++ b/killproof_me/Killproofs.cpp @@ -47,6 +47,7 @@ const std::string& toStringShort(Killproof e) { case Killproof::co: return Localization::STranslate(KMT_CO_Short); case Killproof::coCM: return Localization::STranslate(KMT_COCM_Short); case Killproof::febe: return Localization::STranslate(KMT_FEBE_Short); + case Killproof::febeCM: return Localization::STranslate(KMT_FEBECM_Short); case Killproof::bananas: return Localization::STranslate(KMT_Bananas); default: return Localization::STranslate(ET_Unknown); } @@ -80,6 +81,7 @@ const std::string& toStringLong(Killproof e) { case Killproof::co: return Localization::STranslate(KMT_CO_Long); case Killproof::coCM: return Localization::STranslate(KMT_COCM_Long); case Killproof::febe: return Localization::STranslate(KMT_FEBE_Long); + case Killproof::febeCM: return Localization::STranslate(KMT_FEBECM_Long); 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 cefd863..4dc2d6e 100644 --- a/killproof_me/Killproofs.h +++ b/killproof_me/Killproofs.h @@ -68,6 +68,7 @@ enum class Killproof : int { co = 44, coCM = 45, febe = 46, + febeCM = 47, // MISC bananas = 41, @@ -306,6 +307,9 @@ class Killproofs { case 100858: killproofs[Killproof::febe] = amount; break; + case 101542: + killproofs[Killproof::febeCM] = amount; + break; case 12251: killproofs[Killproof::bananas] = amount; break; diff --git a/killproof_me/Lang.h b/killproof_me/Lang.h index bff8095..15d22fd 100644 Binary files a/killproof_me/Lang.h and b/killproof_me/Lang.h differ