diff --git a/Protected Webpages/Score_Entry.html b/Protected Webpages/Score_Entry.html index bd7996c..7991515 100644 --- a/Protected Webpages/Score_Entry.html +++ b/Protected Webpages/Score_Entry.html @@ -510,7 +510,7 @@
FIRST LEGO League
- Hydro Dynamics Score Sheet + Into Orbit Score Sheet
Select Team
diff --git a/language/Data.xml b/language/Data.xml index d90ebc3..f799e8f 100644 --- a/language/Data.xml +++ b/language/Data.xml @@ -2,367 +2,293 @@ - M01 Pipe Removal - Broken Pipe complete in Base - m01 - - - + M01 Space Travel + Vehicle Payload rolled past first track connection + m01a + + + - + - M02 Flow - Big Water is on other team's field - m02 - - - - (5 - (1 - (this.answers['m06'] || 0)*1))) ? - {'highlight': true, 'msg':'Too many big waters in use.'} : // validation failed - {'highlight': false, 'msg':''};]]> - + M01 Space Travel + Supply Payload rolled past first track connection + m01b + + + - M03 Pump Addition - Pump Addition has contact with the mat completely inside the target area - m03 - - - + M01 Space Travel + Crew Payload rolled past first track connection + m01c + + + - M04 Rain - At least one Rain is out of the Rain Cloud - m04 - - - + M02 Solar Panel Array + Both Solar Panels are angled toward the same Field + m02a + + + - M05 Filter - Lock latch is in dropped position - m05 - - - + M02 Solar Panel Array + Your Solar Panel is angled to other team's Field + m02b + + + - M06 Water Treatment - Big Water is ejected from Water Treatment model - m06 - - - + M03 3D Printing + 2×4 Brick is ejected + Due only to a Regolith Core Sample in the 3D Printer + m03a + + - M07 Fountain - Middle layer is raised - m07 - - - - (5 - (1 - (this.answers['m06'] || 0)*1))) ? - {'highlight': true, 'msg':'Too many big waters in use.'} : // validation failed - {'highlight': false, 'msg':''};]]> - + M03 3D Printing + 2×4 Brick is completely in Northeast Planet Area + m03b + + + - M08 Manhole Covers - Manhole cover(s) are flipped over past vertical - m08a - - - - + M04 Crater Crossing + All weight-bearing features of crossing equipment crossed completely between towers + m04a + + - + - M08 Manhole Covers - Both covers are flipped over and completely in separate Tripod target - m08b - - - - - + M04 Crater Crossing + All crossing equipment crossed from east to west, completely past flattened Gate + m04b + + + - + - M09 Tripod - All the Tripod's feet are touching the mat - m09a - - + M05 Extraction + All four Core Samples no longer touching axle of Core Site Model + m05a + + + + - M09 Tripod - Tripod is partially in a Tripod target - m09b - - - - + M05 Extraction + Gas Core Sample touching Mat & completely in Lander's Target Circle + m05b + + + + - M09 Tripod - Tripod is completely in a Tripod target - m09c - - - - + M05 Extraction + Gas Core Sample is completely in Base + m05c + + + + - M10 Pipe Replacement - New pipe is installed where Broken Pipe was - m10a - - + M05 Extraction + Water Core Sample supported only by Food Growth Chamber + m05d + + + - M10 Pipe Replacement - This New Pipe has full/flat contact with the mat - m10b - - - + M06 Space Station Module + Cone Module is completely in Base + m06a + + + - M11 Pipe Construction - New Pipe has full/flat contact with the mat - m11a - - + M06 Space Station Module + Tube Module is in west port of Habitation Hub + m06b + + + - M11 Pipe Construction - This New Pipe is partially in its target - m11b - - - - - + M06 Space Station Module + Dock Module is in east port of Habitation Hub + m06c + + + - M11 Pipe Construction - This New Pipe is completely in its target - m11c - - - - - + M07 Space Walk Emergency + Astronaut "Gerhard" is in the Habitation Hub's Airlock Chamber + m07 + + + + - M12 Sludge - Sludge touching visible wood of a drawn garden box - m12 - - - + M08 Aerobic Exercise + Exercise Pointer tip is in + Due only to moving one or both Handle Assemblies + m08 + + + + + - M13 Flower - Flower is raised - m13a - - - - (5 - (1 - (this.answers['m06'] || 0)*1))) ? - {'highlight': true, 'msg':'Too many big waters in use.'} : // validation failed - {'highlight': false, 'msg':''};]]> - + M09 Strength Exercise + Strength Bar lifted so that tooth-strip's 4th hole is at least partly in view + m09 + + + - M13 Flower - At least one rain is in the purple part, touching nothing bug Flower model - m13b - - - + M10 Food Production + Grey weight is dropped after green, but before tan + Due only to moving the Push Bar + m10 + + + - M14 Water Well - Water Well contacting mat partially inside target area - m14a - - - - 0) && - ((this.answers['m14b'] || 0)*1) > 0)) ? - {'highlight': true, 'msg':'Well cannot be both partially and completely within target.'} : // validation failed - {'highlight': false, 'msg':''};]]> - - - - - M14 Water Well - Water Well contacting mat completely inside target area - m14b - - - // TODO: fix up validation and score - - 0) && - ((this.answers['m14b'] || 0)*1) > 0)) ? - {'highlight': true, 'msg':'Well cannot be both partially and completely within target.'} : // validation failed - {'highlight': false, 'msg':''};]]> - - - - - M15 Fire - Fire is dropped - m15 - - - + M11 Escape Velocity + Spacecraft stays up + Due only to pressing/hitting Strike Pad + m11 + + + - M16 Water Collection - Water Target is East of Off-Limits line - m16a - - + M12 Satellite Orbits + Satellites on or above the area between the two lines of Outer Orbit + m12 + + + + + - M16 Water Collection - At least one Rain is touching mat in the Water Target - m16b - - - + M13 Observatory + The Observatory pointer tip is in + m13 + + + + + - M16 Water Collection - Big Water touching mat in the Water Target - m16c + M14 Meteoroid Deflection + Meteoroids touching the Mat and in the Center Section + m14a - - - - 0 ? (this.answers['m16c'] || 0)*10 : 0;]]> - (5 - (1 - (this.answers['m06'] || 0)*1))) ? - {'highlight': true, 'msg':'Too many big waters in use.'} : // validation failed - {'highlight': false, 'msg':''};]]> + + 2) ? + {'highlight': true, 'msg': 'Too many meteoroids in use'} : // validation failed + {'highlight': false, 'msg': ''};]]> - M16 Water Collection - At least one pair of Big Waters stacked in Water Target - m16d - - - - (5 - (1 - (this.answers['m06'] || 0)*1))) ? - {'highlight': true, 'msg':'Too many big waters in use.'} : // validation failed - {'highlight': false, 'msg':''};]]> + M14 Meteoroid Deflection + Meteoroids touching the Mat and in Either Side Section + m14b + + + + + 2) ? + {'highlight': true, 'msg': 'Too many meteoroids in use'} : // validation failed + {'highlight': false, 'msg': ''};]]> - - M17 Slingshot - Slingshot is completely in the Slingshot target - m17a - - - - - - M17 Slingshot - Rain AND Dirty Water completely in the Slingshot target - m17b - - - + M15 Lander Touch-Down + Lander is intact and touching the Mat + m15a + + - M18 Faucet - Water level is more blue than white - m18 - - - + M15 Lander Touch-Down + Lander is completely in + m15b + + + + + - Penalties - Penalty discs in the white triangle area - m19 + Penalties + Penalty discs in the southeast triangle + p01 - + + +