yttt-xdu/XDUPlayer
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Check for when the next mission is disabled will now not fail if the next mission in line is also disabled.

Browse Source
This commit is contained in:
fire bingo 2018-10-24 23:01:44 -07:00
parent 99c7afde04
commit 9ca07cca3b
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Js/Main.js
View File

@ -255,7 +255,16 @@ function missionChanged(mstId, value) {
currentMission = newMission; currentMission = newMission;
currentMissionMst = mstId; currentMissionMst = mstId;
if(!currentMission.Enabled) { if(!currentMission.Enabled) {
missionChanged(currentMissionMst, mst.Missions[currentMissionList[currentMissionIndex+1]].Id); //Check for the next enabled mission. If there are none just reset.
for(let i = currentMissionIndex + 1; i < currentMissionList.length; ++i) {
const mis = mst.Missions[currentMissionList[i]];
if(mis && mis.Enabled) {
missionChanged(currentMissionMst, mis.Id);
return;
}
}
//If we got through the loop there are no more enabled so just end
resetMissions();
return; return;
} }
let promises = []; let promises = [];
@ -349,7 +358,17 @@ function skipClicked(event) {
} else if(player.runEvent && currentMissionIndex !== currentMissionList.length - 1) { } else if(player.runEvent && currentMissionIndex !== currentMissionList.length - 1) {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
missionChanged(currentMissionMst, utage.groupedMissions[currentMissionMst].Missions[currentMissionList[currentMissionIndex+1]].Id); //Find the next enabled mission
for(let i = currentMissionIndex + 1; i < currentMissionList.length; ++i) {
const mis = utage.groupedMissions[currentMissionMst].Missions[currentMissionList[i]];
if(mis && mis.Enabled) {
//missionChanged(currentMissionMst, utage.groupedMissions[currentMissionMst].Missions[currentMissionList[currentMissionIndex+1]].Id);
missionChanged(currentMissionMst, mis.Id);
return;
}
}
//If we got through the loop there are no more enabled so just end
resetMissions();
} }
} }

2
Js/Translations

@ -1 +1 @@
Subproject commit fe1fa06db3afc7fd1a8f967adf6e105cd26fc963 Subproject commit 533c48371ed01ed7265b6b5f052d1b2c3fce940f