Change approach to tracking the new Bounty Hunter stats

README.md

@@ -106,10 +106,10 @@ Activities consist of all levels of clue scrolls as well as minigames and bosses
 
 | Minigame                        |       Param       |
 | ------------------------------- | :---------------: |
-| Bounty Hunter (Rogue)           |     `rogueBH`     |
+| Bounty Hunter (Legacy - Rogue)  |     `rogueBH`     |
-| Bounty Hunter (Hunter)          |    `hunterBH`     |
+| Bounty Hunter (Legacy - Hunter) |    `hunterBH`     |
-| Bounty Hunter (Legacy - Rogue)  |  `rogueLegacyBH`  |
+| Bounty Hunter (Rogue)           |    `rogueBHV2`    |
-| Bounty Hunter (Legacy - Hunter) | `hunterLegacyBH`  |
+| Bounty Hunter (Hunter)          |   `hunterBHV2`    |
 | Last Man Standing               | `lastManStanding` |
 | PvP Arena                       |    `pvpArena`     |
 | Soul Wars Zeal                  |  `soulWarsZeal`   |

__tests__/hiscores.test.ts

@@ -78,10 +78,10 @@ test('Parse CSV to json', () => {
   810,99,37688883
   92,99,32005622
   23423,478
-  99831,23
-  89912,37
   89914,35
   99834,25
+  99831,23
+  89912,37
   32,12148
   3105,76
   1997,505
@@ -177,10 +177,10 @@ test('Parse CSV to json', () => {
     },
     leaguePoints: { rank: 23423, score: 478 },
     bountyHunter: {
+      hunterV2: { rank: 89914, score: 35 },
+      rogueV2: { rank: 99834, score: 25 },
       hunter: { rank: 99831, score: 23 },
       rogue: { rank: 89912, score: 37 },
-      legacyHunter: { rank: 89914, score: 35 },
-      legacyRogue: { rank: 99834, score: 25 }
     },
     lastManStanding: { rank: 4814, score: 898 },
     pvpArena: { rank: 13, score: 4057 },

src/types.ts

@@ -60,7 +60,7 @@ export type ClueType =
 
 export type Clues = { [Type in ClueType]: Activity };
 
-export type BHType = 'rogue' | 'hunter' | 'legacyRogue' | 'legacyHunter';
+export type BHType = 'rogue' | 'hunter' | 'rogueV2' | 'hunterV2';
 
 export type BH = { [Type in BHType]: Activity };
 
@@ -124,10 +124,10 @@ export type Bosses = { [Type in Boss]: Activity };
 
 export type ActivityName =
   | 'leaguePoints'
+  | 'hunterBHV2'
+  | 'rogueBHV2'
   | 'hunterBH'
   | 'rogueBH'
-  | 'hunterLegacyBH'
-  | 'rogueLegacyBH'
   | 'lastManStanding'
   | 'pvpArena'
   | 'soulWarsZeal'

src/utils/constants.ts

@@ -62,7 +62,7 @@ export const CLUES: ClueType[] = [
   'elite',
   'master'
 ];
-export const BH_MODES: BHType[] = ['hunter', 'rogue', 'legacyHunter', 'legacyRogue'];
+export const BH_MODES: BHType[] = ['hunterV2', 'rogueV2', 'hunter', 'rogue'];
 export const GAMEMODES: Gamemode[] = [
   'main',
   'ironman',
@@ -130,10 +130,10 @@ export const BOSSES: Boss[] = [
 ];
 export const ACTIVITIES: ActivityName[] = [
   'leaguePoints',
+  'hunterBHV2',
+  'rogueBHV2',
   'hunterBH',
   'rogueBH',
-  'hunterLegacyBH',
-  'rogueLegacyBH',
   'allClues',
   'beginnerClues',
   'easyClues',
@@ -259,10 +259,10 @@ export type FormattedBHNames = {
 };
 
 export const FORMATTED_BH_NAMES: FormattedBHNames = {
-  rogue: 'Bounty Hunter - Rogue',
+  rogue: 'Bounty Hunter (Legacy) - Rogue',
-  hunter: 'Bounty Hunter - Hunter',
+  hunter: 'Bounty Hunter (Legacy) - Hunter',
-  legacyRogue: 'Bounty Hunter (Legacy) - Rogue',
+  rogueV2: 'Bounty Hunter - Rogue',
-  legacyHunter: 'Bounty Hunter (Legacy) - Hunter'
+  hunterV2: 'Bounty Hunter - Hunter'
 };
 
 export const FORMATTED_LMS = 'Last Man Standing';