From db82c254c7b72997cd3f8e09c1a78fa50833ef03 Mon Sep 17 00:00:00 2001 From: ArnoTlse <76259684+ArnoTlse@users.noreply.github.com> Date: Thu, 13 May 2021 14:25:08 +0200 Subject: [PATCH] MP version 1.3 --- js/waypointCollection.js | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/js/waypointCollection.js b/js/waypointCollection.js index 86f44406..14fe1de8 100644 --- a/js/waypointCollection.js +++ b/js/waypointCollection.js @@ -341,7 +341,7 @@ let WaypointCollection = function () { let n = 0 ; let startCount = true; while (startCount && (nLoop!=-1)) { - if (nStart > data[data.length -1].getNumber()) { + if (nStart > data[data.length -1].getNumber() ) { startCount = false; break; } @@ -351,27 +351,24 @@ let WaypointCollection = function () { nStart++; } else if (self.getWaypoint(nStart).getAction() == MWNP.WPTYPE.JUMP) { - console.log("TITI"); - console.log(jumpDict); - if (!Object.keys(jumpDict).includes(self.getWaypoint(nStart).getNumber()) ) { + if (!Object.keys(jumpDict).includes(String(self.getWaypoint(nStart).getNumber())) ) { jumpDict[self.getWaypoint(nStart).getNumber()] = {nStart: self.getWaypoint(nStart).getP1(), nLoop : self.getWaypoint(nStart).getP2(), n : 0}; } - console.log(jumpDict); if (Object.keys(jumpDict).includes(String(self.getWaypoint(nStart).getNumber())) ) { - console.log("TOTO"); - console.log((jumpDict[self.getWaypoint(nStart).getNumber()]["n"]>=jumpDict[self.getWaypoint(nStart).getNumber()]["nLoop"] || jumpDict[self.getWaypoint(nStart).getNumber()]["nLoop"] == 0)); + if (jumpDict[self.getWaypoint(nStart).getNumber()]["nLoop"] == -1) { + nLoop = -1; + } if ( (jumpDict[self.getWaypoint(nStart).getNumber()]["n"]>=jumpDict[self.getWaypoint(nStart).getNumber()]["nLoop"] || jumpDict[self.getWaypoint(nStart).getNumber()]["nLoop"] ==0) ) { nStart++; //jumpDict[self.getWaypoint(nStart).getNumber()]["n"] = 0; } else { - jumpDict[self.getWaypoint(nStart).getNumber()]["n"]++; - console.log(jumpDict[self.getWaypoint(nStart).getNumber()]["nStart"]); - //nStart = 0; //jumpDict[self.getWaypoint(nStart).getNumber()]["nStart"]; + jumpDict[self.getWaypoint(nStart).getNumber()]["n"] = jumpDict[self.getWaypoint(nStart).getNumber()]["n"]+1; + let nStartTemp = jumpDict[self.getWaypoint(nStart).getNumber()]["nStart"]; + nStart = nStartTemp; } } - //nStart++; - console.log(jumpDict); + } else { nStart++;