Fixed Challenge XP from being capped on the Player Profile menu

Fixed Freelancer to not have payout when the mission failed
Fixed score screen from crashing when the current location has no mastery drops

components/candle/challengeService.ts

@@ -451,6 +451,7 @@ export class ChallengeService extends ChallengeRegistry {
             session.evergreen = {
                 payout: 0,
                 scoringScreenEndState: undefined,
+                failed: false,
             }
         }
 
@@ -1242,16 +1243,7 @@ export class ChallengeService extends ChallengeRegistry {
             profileData.Sublocations.push(foundSubLocation)
         }
 
-        if (masteryData) {
-            foundSubLocation.Xp = clampValue(
-                foundSubLocation.Xp + masteryXp,
-                0,
-                contract.Metadata.Type !== "evergreen"
-                    ? xpRequiredForLevel(maxLevel)
-                    : xpRequiredForEvergreenLevel(maxLevel),
-            )
-        }
-
+        foundSubLocation.Xp += masteryXp
         foundSubLocation.ActionXp += actionXp
 
         //Update the EvergreenLevel with the latest Mastery Level

components/eventHandler.ts

@@ -562,11 +562,21 @@ function saveEvents(
             session,
         )
 
+        if (event.Name.startsWith("ScoringScreenEndState_")) {
+            session.evergreen.scoringScreenEndState = event.Name
+
+            processed.push(event.Name)
+            response.push(process.hrtime.bigint().toString())
+
+            return
+        }
+
         // these events are important but may be fired after the timer is over
         const canGetAfterTimerOver = [
             "ContractEnd",
             "ObjectiveCompleted",
             "CpdSet",
+            "MissionFailed_Event",
         ]
 
         if (
@@ -586,15 +596,6 @@ function saveEvents(
             return
         }
 
-        if (event.Name.startsWith("ScoringScreenEndState_")) {
-            session.evergreen.scoringScreenEndState = event.Name
-
-            processed.push(event.Name)
-            response.push(process.hrtime.bigint().toString())
-
-            return
-        }
-
         switch (event.Name) {
             case "HeroSpawn_Location":
                 liveSplitManager.missionIntentResolved(
@@ -796,6 +797,11 @@ function saveEvents(
                     event
                 )).Value.Total_Payout
                 break
+            case "MissionFailed_Event":
+                if (session.evergreen) {
+                    session.evergreen.failed = true
+                }
+                break
             // Sinkhole events we don't care about
             case "ItemPickedUp":
                 log(

components/scoreHandler.ts

@@ -51,7 +51,7 @@ import {
 import { getUserData, writeUserData } from "./databaseHandler"
 import axios from "axios"
 import { getFlag } from "./flags"
-import { log, logDebug, LogLevel } from "./loggingInterop"
+import { log, LogLevel } from "./loggingInterop"
 import {
     generateCompletionData,
     getSubLocationByName,
@@ -815,6 +815,7 @@ export async function missionEnd(
                 }
 
                 if (
+                    !sessionDetails.evergreen.failed &&
                     sessionDetails.objectiveStates.get(
                         secondaryObjective.Id,
                     ) === "Success"
@@ -827,8 +828,6 @@ export async function missionEnd(
             }
         })
 
-        logDebug("Payout", sessionDetails.evergreen.payout, totalPayout)
-
         evergreenData.Payout = totalPayout
         evergreenData.EndStateEventName =
             sessionDetails.evergreen.scoringScreenEndState
@@ -995,7 +994,7 @@ export async function missionEnd(
                 req.jwt.unique_name,
             ) as MasteryData[]
 
-        if (masteryData) {
+        if (masteryData.length > 0) {
             drops = masteryData[0].Drops.filter(
                 (e) =>
                     e.Level > oldLocationLevel && e.Level <= newLocationLevel,

components/types/types.ts

@@ -273,6 +273,7 @@ export interface ContractSession {
     evergreen?: {
         payout: number
         scoringScreenEndState: string
+        failed: boolean
     }
 }