From 2d4fb248814ada9b4eb6c6ce98c0097da47bbe80 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 10 May 2022 16:41:30 +0200 Subject: [PATCH] wip #5228 @1 --- PPD/Map2/Map2.zip | Bin 2321129 -> 2321183 bytes PPD/Map2/map2.js | 25 +++++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/PPD/Map2/Map2.zip b/PPD/Map2/Map2.zip index 9343b948093ffc1472dd6d9655636aa38cd43429..d16bafd8955af5e43ddc6e977724473b70413bb4 100644 GIT binary patch delta 2682 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 YM}Hj(E8EZS;sGxuC;&|RBEhHs0YuI9tpET3 delta 2628 zcmY+`cR1T?8wcnlZ*K^(1^S$rqdH#BG#uC9xqlw^15|{)b(UIs$3?xPp z6N#C`LSiMc)v&uTahRHv*tGa9se3SkKx$-PCUzO(roBWE!KAD4^j;H3T1}$00dG=p z&H9fxGz8p)qoqJTMKorvK5PuId@JrZ9c{cmv_p3@&r0sekkt*rd4yYpxx|!QQc7MbU6Uv-i?9m`t?Y%qt^(Ya(>R8QZ$3 z(QnMBHzM(RREV^~P(?6<&&Xhsr~GuVagFQz1#<-KKqfNApKUNh7W<{n6Ed!P@^TZ` zwObUWvF)11XC9NWlJIIGT_&4*GkmdH^{|X+yr3N=iRkSdIS_8(ci0(Na3avM+uLRq z*^(q5zxtrQQ^3splhnL$nrJT2Vxw-oT@c1wXN(zQYPXwAR|v|Fysl zMU-%82>EV=F$eh58(MgD#n}XBsiL&t)1BtK?(}T6QV@>fIT|8f@z5Y&(W_ymt+d<)VsYH24RnT7_ z%~q&;`EAX`{Ysv+9?2pGvA~i!dz_Lq1pzfO5u4n!4vR11yZeXR-2I$v_vXs{%DM1{ zG<>*cdz-pfLaUA!nt7{03U<(TWP5@$+f{>c@imxkUp6)hm3+kBGLR>GCx>HgT)VvK zDH+bPbjghQ^|v;bV`nGBMPge|0UEVktmaYq(A3${HvM#b&+w?0EwwuOc5(B^`z zVXc;lyL|ia=jm!SEEe(;lDaE~=$~eyRTO%da1zgVnJ9kp+B{NJu^@AKv6puB7t-`^ z>)!eEuKj@Z6zvb~hPsefp1Gsg*g{KMr+Brj6@TUmmy1spX??mx4NDx_w9Jb0HITV5 zF}NJzsabmcDk7)6KG#^bMksdfQCbkTe$2Zi6Yf+#EE+8A=-AuZ2ggs2J)dBG7u7%T z)TC~0S?9q_1!~97R5A<#Do6dDoM+w!fTESX0mB9~IW1`vk6;p_Mgj zq#~P{_@dPtS7E#O@QC<+3zDO_jFb46_?BY+;dSQxpzbl``b<+ekXkX!& zqcWy~&?wOrAz;BD3p>^yzQ>Ya$Esy#s%fbiF~FL?ctd=PK=F3Oc+WAJ;o|q{YI*WJ z{`x79z~=xlPFXPZoX+hfw5_!*1@i9&gfpTei(SOalqY{+HuMp$!jbYfQ`T2%p zGD}|lC=GOhTjCOkt{-T|d+G8gt@@mlg4jXo7;?IyH<;BU4@;Ydb zTweP-fh`>Q+y?zD#~YTugX+f#VEt!ATc;o1P_569>0qw=W*fgPf-&(F zcoOo#cdHt1RQ0sE(tGg3I$lDiH5QEbuSc|S3F&Z!Kqp)vFU%uOos&WuYn@+FtDz$# z8}u0B2Mia)MtP@LnmxRBJBe;v1)RE87T2J_TJR)Fo5-P)xAStCa!P-;<7nO8KIvO} z8cd{IIyx(nABkU2doLw6+1^d1!TeDHO9l#xxaK`X1>WU;D)G!tUs`<=&w(&J|9R z!YtGF)Fe)Fsef*IlfECoGMqX+gW6^sf+8C_Hl|>>O7uQ z3pGQ>pCGevMnOCB6RngL%5XdfpgHVni1v zH=w28YZUZa%*lirA=0eos%B)vU{p_ebL<&*VoO+R_egMiZ&nc%;;=h|Iw^LD-wf^$ z_9@@Jd^2@#H53)e*=*y!IQ;rG>@?(rxKi3)>(p|Xu`Ts;PaHbzV!AS_mKWxHG)B3T$A}dO&dbh;@@G1a1i0A&8~{!L z7l0eU1K+~&l-zKYh zL2Z-@zB~uk<6t<9@LbGo9DE%OhFk&hgFql=(EtB`%DkY892lNXO}#tg;K=JLT6*Lu zFQ^t|l8Y?t4V7R#??gs=Lp8y9>TjsA&whvU3iPS6& z)V2Ta#G0RWGO6^9o$8RVS!V|3;xSaemVC-sH1i^&(Fw@IwCua6iYh diff --git a/PPD/Map2/map2.js b/PPD/Map2/map2.js index 3582b94..62d406a 100644 --- a/PPD/Map2/map2.js +++ b/PPD/Map2/map2.js @@ -9,6 +9,8 @@ var NB_STEPS = 25; var currentFlashing = 1; var completedSteps = []; var completedPart1 = false; +var lastPassedStep = 0; + var STEPS = { 1: {"layers": [], 'e': 's1'}, @@ -75,7 +77,8 @@ $(function () { try { currentFlashing = parseInt(fluidbook.cache.get('map2_current_flashing', 1).toString()); completedSteps = fluidbook.cache.get('map2_completed_steps', []).sort(); - if (completedSteps.length === NB_STEPS) { + lastPassedStep = fluidbook.cache.get('map2_last_passed_step', 0); + if (lastPassedStep == 26) { _end(); } else if (congratSteps.diff(completedSteps).length === 0) { completedPart1 = true; @@ -127,11 +130,12 @@ function setStep(s) { try { fluidbook.cache.set('map2_completed_steps', completedSteps); + fluidbook.cache.set('map2_last_passed_step', s); } catch (e) { console.log(e); } if (completedSteps.length === NB_STEPS) { - end(s); + } else if (congratSteps.diff(completedSteps).length === 0) { congratulations(s); } @@ -153,18 +157,19 @@ function setStep(s) { } function end(s) { - if (!isPopupStep(s)) { - return _end(); - } else { - pJquery(fluidbook).one('fluidbook.view.close.all', function () { - _end(); - }); - } + } function _end() { setTimeout(function () { - fluidbook.links.triggerLinkById('m2end'); + try { + if (fluidbook.cache.get('map2_end_seen', 0) == 0) { + fluidbook.cache.set('map2_end_seen', 1); + fluidbook.links.triggerLinkById('m2end'); + } + } catch (e) { + + } }, 1000); } -- 2.39.5