Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit daeb473

Browse files
committed
[[ Bug 20102 ]] Don't short-cut 'is changed' tutorial steps
1 parent 5680dc9 commit daeb473

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

Toolset/palettes/tutorial/revtutorial.livecodescript

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2009,7 +2009,7 @@ on revTutorialContinue pBack
20092009
if sSteps[sStepName]["actions"]["wait"] is not empty then
20102010
# Add guide in case wait is 'fits guide'
20112011
revTutorialExecuteAction sSteps[sStepName]["actions"]["add guide"]
2012-
if revTutorialCheckWaitCondition(sSteps[sStepName]["actions"]["wait"]) then
2012+
if revTutorialCheckWaitCondition(sSteps[sStepName]["actions"]["wait"], true) then
20132013
put false into sDontShow
20142014
next repeat
20152015
end if
@@ -2310,7 +2310,7 @@ end revTutorialReturnFromInterlude
23102310
on revTutorialDoWait pActionData
23112311
put empty into sWait
23122312
// Check to see if wait condition is immediately satisfied
2313-
if revTutorialCheckWaitCondition(pActionData) then
2313+
if revTutorialCheckWaitCondition(pActionData, true) then
23142314
exit revTutorialDoWait
23152315
end if
23162316

@@ -2364,7 +2364,7 @@ on revTutorialDoWait pActionData
23642364
end switch
23652365
end revTutorialDoWait
23662366

2367-
function revTutorialCheckWaitCondition pActionData
2367+
function revTutorialCheckWaitCondition pActionData, pBeforeDisplay
23682368
# Deal with non-object wait conditions
23692369
switch pActionData["wait condition"]
23702370
case "there is a palette"
@@ -2381,6 +2381,12 @@ function revTutorialCheckWaitCondition pActionData
23812381

23822382
switch pActionData["wait condition"]
23832383
case "property"
2384+
# If we are waiting for the property to be 'changed' then don't try and
2385+
# shortcut the step
2386+
if pBeforeDisplay and pActionData["is not"] then
2387+
break
2388+
end if
2389+
23842390
local tValue
23852391
# If the step specified a value then we want to compare with this instead
23862392
# of the string "value"

notes/bugfix-20102.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Don't shortcut 'is changed' property steps

0 commit comments

Comments
 (0)