diff --git a/src/gui/EndGameGui.hx b/src/gui/EndGameGui.hx index e5b5bdf3..668853f9 100644 --- a/src/gui/EndGameGui.hx +++ b/src/gui/EndGameGui.hx @@ -209,11 +209,11 @@ class EndGameGui extends GuiControl { var text = '

'; // Check for ultimate time TODO if (mission.ultimateTime > 0 && timeState.gameplayClock < mission.ultimateTime) { - text += 'You beat the Ultimate Time!'; + text += 'You beat the Ultimate Time!'; } else { if (mission.goldTime > 0 && timeState.gameplayClock < mission.goldTime) { if (mission.game == "gold" || mission.game.toLowerCase() == "ultra") - text += 'You beat the Gold Time!'; + text += 'You beat the Gold Time!'; else text += 'You beat the Platinum Time!'; } else { @@ -258,11 +258,11 @@ class EndGameGui extends GuiControl { for (i in 0...5) { if (scoreData[i].time < mission.ultimateTime) { - lineelems[i].text.text = '${Util.formatTime(scoreData[i].time)}'; + lineelems[i].text.text = '${Util.formatTime(scoreData[i].time)}'; } else { if (scoreData[i].time < mission.goldTime) { if (mission.game == "gold" || mission.game.toLowerCase() == "ultra") - lineelems[i].text.text = '${Util.formatTime(scoreData[i].time)}'; + lineelems[i].text.text = '${Util.formatTime(scoreData[i].time)}'; else lineelems[i].text.text = '${Util.formatTime(scoreData[i].time)}'; } else { @@ -274,7 +274,7 @@ class EndGameGui extends GuiControl { var leftColumn = new GuiMLText(domcasual24, mlFontLoader); leftColumn.text.lineSpacing = 5; leftColumn.text.textColor = 0xFFFFFF; - leftColumn.text.text = 'Par Time:
${mission.game == "gold" || mission.game.toLowerCase() == "ultra" ? 'Gold Time:' : 'Platinum Time:'}
${mission.ultimateTime != 0 ? 'Ultimate Time:
' : ''}
Time Passed:
Clock Bonuses:
'; + leftColumn.text.text = 'Par Time:
${mission.game == "gold" || mission.game.toLowerCase() == "ultra" ? 'Gold Time:' : 'Platinum Time:'}
${mission.ultimateTime != 0 ? 'Ultimate Time:
' : ''}
Time Passed:
Clock Bonuses:
'; leftColumn.text.filter = new DropShadow(1.414, 0.785, 0x7777777F, 1, 0, 0.4, 1, true); leftColumn.position = new Vector(25, 165); leftColumn.extent = new Vector(293, 211); @@ -286,7 +286,7 @@ class EndGameGui extends GuiControl { var rightColumn = new GuiMLText(domcasual24, mlFontLoader); rightColumn.text.lineSpacing = 5; rightColumn.text.textColor = 0xFFFFFF; - rightColumn.text.text = '${Util.formatTime(mission.qualifyTime == Math.POSITIVE_INFINITY ? 5999.999 : mission.qualifyTime)}
${Util.formatTime(mission.goldTime)}
${mission.ultimateTime != 0 ? '${Util.formatTime(mission.ultimateTime)}
' : ''}
${Util.formatTime(elapsedTime)}
${Util.formatTime(bonusTime)}
'; + rightColumn.text.text = '${Util.formatTime(mission.qualifyTime == Math.POSITIVE_INFINITY ? 5999.999 : mission.qualifyTime)}
${Util.formatTime(mission.goldTime)}
${mission.ultimateTime != 0 ? '${Util.formatTime(mission.ultimateTime)}
' : ''}
${Util.formatTime(elapsedTime)}
${Util.formatTime(bonusTime)}
'; rightColumn.text.filter = new DropShadow(1.414, 0.785, 0xffffff, 1, 0, 0.4, 1, true); rightColumn.position = new Vector(235, 165); rightColumn.extent = new Vector(293, 211); @@ -332,10 +332,10 @@ class EndGameGui extends GuiControl { for (i in 0...5) { if (scoreData[i].time < mission.ultimateTime) { - lineelems[i].text.text = '${Util.formatTime(scoreData[i].time)}'; + lineelems[i].text.text = '${Util.formatTime(scoreData[i].time)}'; } else { if (scoreData[i].time < mission.goldTime) { - lineelems[i].text.text = '${Util.formatTime(scoreData[i].time)}'; + lineelems[i].text.text = '${Util.formatTime(scoreData[i].time)}'; } else { lineelems[i].text.text = '${Util.formatTime(scoreData[i].time)}'; } diff --git a/src/gui/PlayMissionGui.hx b/src/gui/PlayMissionGui.hx index 177c091f..58079988 100644 --- a/src/gui/PlayMissionGui.hx +++ b/src/gui/PlayMissionGui.hx @@ -783,7 +783,7 @@ class PlayMissionGui extends GuiImage { if (topScore.time < currentMission.ultimateTime) { scoreColor = "#FFCC33"; } else if (topScore.time < currentMission.goldTime) { - if (currentMission.game == "gold" || currentMission.game == "Ultra") + if (currentMission.game == "gold" || currentMission.game.toLowerCase() == "ultra") scoreColor = "#FFFF00" else scoreColor = "#CCCCCC";