DEVBUG (mercs): fix incorrect level computation from experience

Zero-to-Heroes · Oct 13, 2021 · 5eac935 · 5eac935
1 parent 933bd95
commit 5eac935
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/core/package-lock.json b/core/package-lock.json
diff --git a/core/package.json b/core/package.json
@@ -45,7 +45,7 @@
 		"@firestone-hs/retrieve-users-duels-runs": "^1.0.3",
 		"@firestone-hs/save-dungeon-loot-info": "^1.0.8",
 		"@firestone-hs/simulate-bgs-battle": "^1.1.120",
-		"@firestone-hs/trigger-process-mercenaries-review": "^1.0.3",
+		"@firestone-hs/trigger-process-mercenaries-review": "^1.0.4",
 		"@firestone-hs/user-bgs-post-match-stats": "^1.0.3",
 		"@ng-select/ng-select": "^6.1.0",
 		"@sebastientromp/ngx-charts": "^19.0.5",

diff --git a/core/src/js/components/mercenaries/overlay/teams/mercenaries-team-mercenary.component.ts b/core/src/js/components/mercenaries/overlay/teams/mercenaries-team-mercenary.component.ts
@@ -17,7 +17,7 @@ import { CardsFacadeService } from '../../../../services/cards-facade.service';
 				<div class="role-icon" *ngIf="roleIcon"><img [src]="roleIcon" /></div>
 				<div class="name">
 					<span>{{ name }}</span>
-					<span class="level" *ngIf="level">({{ level }})</span>
+					<span class="level" *ngIf="level" helpTooltip="Current mercenary level">({{ level }})</span>
 				</div>
 			</div>
 			<div

diff --git a/core/src/js/services/game-events.service.ts b/core/src/js/services/game-events.service.ts
@@ -147,6 +147,9 @@ export class GameEvents {
 	}
 
 	public async dispatchGameEvent(gameEvent) {
+		if (!gameEvent) {
+			return;
+		}
 		// if (gameEvent.Type !== 'GAME_STATE_UPDATE') {
 		// 	console.debug('[debug] game event', gameEvent.Type, gameEvent);
 		// }

diff --git a/core/src/js/services/mercenaries/mercenaries-utils.ts b/core/src/js/services/mercenaries/mercenaries-utils.ts
@@ -31,20 +31,13 @@ export const getMercCardLevel = (cardId: string): number => {
 };
 
 export const getMercLevelFromExperience = (totalXp: number, referenceData: MercenariesReferenceData): number => {
-	if (totalXp <= 0) {
-		return null;
-	}
-
-	let currentLevel = 1;
-	let xpToAttribute = totalXp;
+	let currentLevel = 0;
 	for (const levelMapping of referenceData.mercenaryLevels) {
-		if (xpToAttribute < levelMapping.xpToNext) {
+		if (levelMapping.xpToNext > totalXp) {
 			break;
 		}
 		currentLevel++;
-		xpToAttribute -= levelMapping.xpToNext;
 	}
-
 	return currentLevel;
 };