Merge pull request #571 from virtual-world-framework/failure-fix

Failure fix
virtual-world-framework · May 18, 2015 · 52f0e39 · 52f0e39
2 parents 51c71f5 + 2bc722f
commit 52f0e39
Show file tree

Hide file tree

Showing 10 changed files with 242 additions and 126 deletions.
diff --git a/source/scenario/mission3task1.vwf.yaml b/source/scenario/mission3task1.vwf.yaml
@@ -105,7 +105,6 @@ children:
     extends: ../triggers/triggerManager.vwf
     properties: 
       triggers$:
-
         succeedOnSuccessfulMovement_3_1:
           group: successOrFailure
           priority: 0
@@ -123,7 +122,7 @@ children:
           - playSound:
             - musicSuccessShort
 
-        scenarioEnded:
+        scenarioEnded3_1:
           triggerCondition:
           - or: 
             - onScenarioSucceeded:
@@ -134,7 +133,7 @@ children:
           - clearBlackboardEntry:
             - signalPosition
 
-        disableFailOnIncomplete:
+        disableFailOnIncomplete3_1:
           triggerCondition:
           - or:
             - onBlocklyStarted:

diff --git a/source/scenario/mission4task1.vwf.yaml b/source/scenario/mission4task1.vwf.yaml
@@ -16,24 +16,23 @@
 extends: ../scenario/scenario.vwf
 properties:
   scenarioName: mission4task1
-  nextScenarioPath: mission4task2
+  nextScenarioPath: 'mission4task2'
+  scenePath: /
 
   startState:
 
   # objective
   - setObjective:
     - "Lay down nanobuilders in a triangle with vertices at (-10,0), (-10,3), and (-13,0)."
 
-  # sounds/music
+  # sound/video
+
   - playSound:
     - musicMission4Intro
   - playSound:
     - musicMission4Loop_AfterIntro
   - playSound:
     - environmentWind
-
-  # movie preload
-  # TODO: switch to the appropriate success movie
   - setProperty:
     - videoManager  
     - url 
@@ -53,7 +52,7 @@ properties:
     - rover2
     - blockly_xml
     - <xml><block type="variables_set" deletable="false" movable="false" editable="false" inline="true" x="119" y="-7"><field name="VAR">vertex1_x</field><value name="VALUE"></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex1_y</field><value name="VALUE"></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex2_x</field><value name="VALUE"></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex2_y</field><value name="VALUE"></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex3_x</field><value name="VALUE"></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex3_y</field><value name="VALUE"></value><next><block type="rover_moveRadial_absolute" deletable="false" movable="false" editable="false" inline="true"><value name="x"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex1_x</field></block></value><value name="y"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex1_y</field></block></value><next><block type="start_triangle" deletable="false" movable="false" editable="false"><next><block type="mark_point" deletable="false" movable="false" editable="false"><next><block type="rover_moveRadial_absolute" deletable="false" movable="false" editable="false" inline="true"><value name="x"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex2_x</field></block></value><value name="y"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex2_y</field></block></value><next><block type="mark_point" deletable="false" movable="false" editable="false"><next><block type="rover_moveRadial_absolute" deletable="false" movable="false" editable="false" inline="true"><value name="x"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex3_x</field></block></value><value name="y"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex3_y</field></block></value><next><block type="mark_point" deletable="false" movable="false" editable="false"><next><block type="rover_moveRadial_absolute" deletable="false" movable="false" editable="false" inline="true"><value name="x"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex1_x</field></block></value><value name="y"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex1_y</field></block></value><next><block type="mark_point" deletable="false" movable="false" editable="false"><next><block type="end_triangle" deletable="false" movable="false" editable="false"></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></xml>
-    
+
   # Manny
   - addToGrid:
     - rover
@@ -105,22 +104,14 @@ properties:
     - rover2
     - lowRam
     - 5
-
-  # Rosie disabled
   - setProperty:
     - rover3
     - visible
     - false
-
-  # Draw the desired triangle
   - drawTriangle:
     - [ -10, 0 ]
     - [ -10, 3 ]
     - [ -13, 0 ]
-
-  # objects
-  # TODO: can we place these in the world without having to put them in every
-  #  scenario?  They never change (and should be visible off-grid)
   - addToGrid:
     - cargoPod2
     - [ -10, -13 ]
@@ -145,7 +136,6 @@ children:
     extends: ../triggers/triggerManager.vwf
     properties: 
       triggers$:
-
         succeedOnTriangle_4_1:
           group: successOrFailure
           priority: 0
@@ -156,10 +146,38 @@ children:
           actions:
           - showAlert:
             - "I created the correct triangle!"
+          - callMethod:
+            - rover2
+            - stopExecution
+          - clearBlockly:
           - scenarioSuccess:
           - playSound:
             - musicSuccessShort
 
+        scenarioEnded4_1:
+          triggerCondition:
+          - or: 
+            - onScenarioSucceeded:
+            - onScenarioFailed:
+          actions:
+          - setProperty:
+            - rover2
+            - surveyArray
+            - []
+
+        disableFailOnIncomplete4_1:
+          triggerCondition:
+          - or:
+            - onBlocklyStarted:
+              - rover
+            - onBlocklyStarted:
+              - rover2
+            - onBlocklyStarted:
+              - rover3
+          actions:
+          - writeToBlackboard:
+            - disableFailOnIncompleteProgram
+
   grid:
     includes: source/grid.vwf
     properties:

diff --git a/source/scenario/mission4task2.vwf.yaml b/source/scenario/mission4task2.vwf.yaml
@@ -20,24 +20,15 @@ properties:
 
   startState:
 
-  # objective
+  # objectives
   - setObjective:
     - "Translate your triangle so that it is 10 spaces farther to the right."
 
-  # sounds/music
-  - playSound:
-    - musicMission4Loop
-  - playSound:
-    - environmentWind
-
-  # movie preload
-  # TODO: switch to the appropriate success movie
-  - setProperty:
-    - videoManager  
-    - url 
-    - [ "assets/video/end_cinematic.webm", "assets/video/end_cinematic.mp4" ]
-
   # blockly
+  - setProperty:
+    - rover2
+    - blockly_xml
+    - <xml><block type="variables_set" deletable="false" movable="false" editable="false" inline="true" x="119" y="-7"><field name="VAR">vertex1_x</field><value name="VALUE"><block type="math_number_field" deletable="false" movable="false" editable="false" inline="false"><field name="VALUE">-10</field></block></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex1_y</field><value name="VALUE"><block type="math_number_field" deletable="false" movable="false" editable="false" inline="false"><field name="VALUE">0</field></block></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex2_x</field><value name="VALUE"><block type="math_number_field" deletable="false" movable="false" editable="false" inline="false"><field name="VALUE">-10</field></block></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex2_y</field><value name="VALUE"><block type="math_number_field" deletable="false" movable="false" editable="false" inline="false"><field name="VALUE">3</field></block></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex3_x</field><value name="VALUE"><block type="math_number_field" deletable="false" movable="false" editable="false" inline="false"><field name="VALUE">-13</field></block></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex3_y</field><value name="VALUE"><block type="math_number_field" deletable="false" movable="false" editable="false" inline="false"><field name="VALUE">0</field></block></value><next><block type="rover_moveRadial_absolute" deletable="false" movable="false" editable="false" inline="true"><value name="x"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex1_x</field></block></value><value name="y"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex1_y</field></block></value><next><block type="start_triangle" deletable="false" movable="false" editable="false"><next><block type="mark_point" deletable="false" movable="false" editable="false"><next><block type="rover_moveRadial_absolute" deletable="false" movable="false" editable="false" inline="true"><value name="x"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex2_x</field></block></value><value name="y"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex2_y</field></block></value><next><block type="mark_point" deletable="false" movable="false" editable="false"><next><block type="rover_moveRadial_absolute" deletable="false" movable="false" editable="false" inline="true"><value name="x"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex3_x</field></block></value><value name="y"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex3_y</field></block></value><next><block type="mark_point" deletable="false" movable="false" editable="false"><next><block type="rover_moveRadial_absolute" deletable="false" movable="false" editable="false" inline="true"><value name="x"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex1_x</field></block></value><value name="y"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex1_y</field></block></value><next><block type="mark_point" deletable="false" movable="false" editable="false"><next><block type="end_triangle" deletable="false" movable="false" editable="false"></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></xml>
   - enableBlocklyNodes:
     - rover
     - rover2
@@ -47,10 +38,12 @@ properties:
   - loadToolbox:
     - rover2
     - source/scenario/blockly/mission4_perry.xml
-  - setProperty:
-    - rover2
-    - blockly_xml
-    - <xml><block type="variables_set" deletable="false" movable="false" editable="false" inline="true" x="119" y="-7"><field name="VAR">vertex1_x</field><value name="VALUE"><block type="math_number_field" deletable="false" movable="false" editable="false" inline="false"><field name="VALUE">-10</field></block></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex1_y</field><value name="VALUE"><block type="math_number_field" deletable="false" movable="false" editable="false" inline="false"><field name="VALUE">0</field></block></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex2_x</field><value name="VALUE"><block type="math_number_field" deletable="false" movable="false" editable="false" inline="false"><field name="VALUE">-10</field></block></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex2_y</field><value name="VALUE"><block type="math_number_field" deletable="false" movable="false" editable="false" inline="false"><field name="VALUE">3</field></block></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex3_x</field><value name="VALUE"><block type="math_number_field" deletable="false" movable="false" editable="false" inline="false"><field name="VALUE">-13</field></block></value><next><block type="variables_set" deletable="false" movable="false" editable="false" inline="true"><field name="VAR">vertex3_y</field><value name="VALUE"><block type="math_number_field" deletable="false" movable="false" editable="false" inline="false"><field name="VALUE">0</field></block></value><next><block type="rover_moveRadial_absolute" deletable="false" movable="false" editable="false" inline="true"><value name="x"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex1_x</field></block></value><value name="y"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex1_y</field></block></value><next><block type="start_triangle" deletable="false" movable="false" editable="false"><next><block type="mark_point" deletable="false" movable="false" editable="false"><next><block type="rover_moveRadial_absolute" deletable="false" movable="false" editable="false" inline="true"><value name="x"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex2_x</field></block></value><value name="y"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex2_y</field></block></value><next><block type="mark_point" deletable="false" movable="false" editable="false"><next><block type="rover_moveRadial_absolute" deletable="false" movable="false" editable="false" inline="true"><value name="x"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex3_x</field></block></value><value name="y"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex3_y</field></block></value><next><block type="mark_point" deletable="false" movable="false" editable="false"><next><block type="rover_moveRadial_absolute" deletable="false" movable="false" editable="false" inline="true"><value name="x"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex1_x</field></block></value><value name="y"><block type="variables_get_noin" deletable="false" movable="false" editable="false" inline="false"><field name="VAR">vertex1_y</field></block></value><next><block type="mark_point" deletable="false" movable="false" editable="false"><next><block type="end_triangle" deletable="false" movable="false" editable="false"></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></next></block></xml>
+
+  # sounds/music
+  - playSound:
+    - musicMission4Loop
+  - playSound:
+    - environmentWind
 
   # Manny
   - addToGrid:
@@ -133,7 +126,6 @@ children:
     extends: ../triggers/triggerManager.vwf
     properties: 
       triggers$:
-
         succeedOnTriangle_4_2:
           group: successOrFailure
           priority: 0
@@ -144,10 +136,38 @@ children:
           actions:
           - showAlert:
             - "I created the correct triangle!"
+          - callMethod:
+            - rover2
+            - stopExecution
+          - clearBlockly:
           - scenarioSuccess:
           - playSound:
             - musicSuccessShort
 
+        scenarioEnded4_2:
+          triggerCondition:
+          - or: 
+            - onScenarioSucceeded:
+            - onScenarioFailed:
+          actions:
+          - setProperty:
+            - rover2
+            - surveyArray
+            - []
+
+        disableFailOnIncomplete4_2:
+          triggerCondition:
+          - or:
+            - onBlocklyStarted:
+              - rover
+            - onBlocklyStarted:
+              - rover2
+            - onBlocklyStarted:
+              - rover3
+          actions:
+          - writeToBlackboard:
+            - disableFailOnIncompleteProgram
+
   grid:
     includes: source/grid.vwf
     properties: