added HT CM

knoxfighter · Jul 13, 2022 · 5540a75 · 5540a75
1 parent cd3cde5
commit 5540a75
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/killproof_me/KillproofUITable.h b/killproof_me/KillproofUITable.h
@@ -96,6 +96,7 @@ static const std::vector<MainTableColumn> COLUMN_SETUP {
 	{36, [] {return to_string_short(Killproof::maiTrinCM);}, []{ return GET_TEXTURE_CUSTOM(MAI_TRIN_TEXTURE, ID_Mai_Trin);  }, "3", [] {return to_string_long(Killproof::maiTrinCM);}, false},
 	{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},
 };
 
 // Key is the mapId found in the mumbleLink
@@ -113,8 +114,8 @@ static const std::unordered_map<uint32_t, std::vector<size_t>> mapIdToColumnSetu
 	{1370, {0, 1, 2, 27}}, // Eye of the north
 	{1432, {0, 1, 2, 35, 36}}, // MaiTrin strike
 	{1451, {0, 1, 2, 37, 39}}, // MinisterLi strike
-	{1437, {0, 1, 2, 34}}, // HarvestTemple strike
-	{1428, {0, 1, 2, 33, 34, 35, 36, 37, 38, 39}}, // Arborstone
+	{1437, {0, 1, 2, 34, 40}}, // HarvestTemple strike
+	{1428, {0, 1, 2, 33, 34, 35, 36, 37, 38, 39, 40}}, // Arborstone
 };
 
 class KillproofUITable : public MainTable<> {

diff --git a/killproof_me/Killproofs.cpp b/killproof_me/Killproofs.cpp
@@ -77,6 +77,7 @@ const std::string& toStringShort(Killproof e) {
 	case Killproof::maiTrinCM: return Localization::STranslate(KMT_MaiTrinCM_Short);
 	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);
 	default: return Localization::STranslate(ET_Unknown);
 	}
 }
@@ -103,6 +104,7 @@ const std::string& toStringLong(Killproof e) {
 	case Killproof::maiTrinCM: return Localization::STranslate(KMT_MaiTrinCM_Long);
 	case Killproof::ankkaCM: return Localization::STranslate(KMT_AnkkaCM_Long);
 	case Killproof::ministerLiCM: return Localization::STranslate(KMT_MinisterLiCM_Long);
+	case Killproof::harvestCM: return Localization::STranslate(KMT_HarvestCM_Long);
 	default: return Localization::STranslate(ET_Unknown);
 	}
 }

diff --git a/killproof_me/Killproofs.h b/killproof_me/Killproofs.h
@@ -61,6 +61,7 @@ enum class Killproof : int {
 	ministerLi = 37,
 	ankkaCM = 38,
 	ministerLiCM = 39,
+	harvestCM = 40,
 
 	// no final entry anymore, use `magic_enum` to iterate over the enum.
 };
@@ -280,6 +281,9 @@ class Killproofs {
 				case 96419:
 					killproofs[Killproof::ministerLiCM] = amount;
 					break;
+				case 95986:
+					killproofs[Killproof::harvestCM] = amount;
+					break;
 				default: break;
 			}
 		}

diff --git a/killproof_me/Lang.h b/killproof_me/Lang.h