From d853ed6eee7f64edd5e8a3a93e80286a6e81ce0a Mon Sep 17 00:00:00 2001 From: Simmo Saan Date: Tue, 8 Oct 2019 21:21:43 +0300 Subject: [PATCH] City Shaper scoring --- Protected Webpages/Score_Entry.html | 2 +- language/Data.xml | 592 ++++++++++++++-------------- 2 files changed, 300 insertions(+), 294 deletions(-) diff --git a/Protected Webpages/Score_Entry.html b/Protected Webpages/Score_Entry.html index bd7996c..d2f305c 100644 --- a/Protected Webpages/Score_Entry.html +++ b/Protected Webpages/Score_Entry.html @@ -510,7 +510,7 @@
FIRST LEGO League
- Hydro Dynamics Score Sheet + City Shaper Score Sheet
Select Team
diff --git a/language/Data.xml b/language/Data.xml index d90ebc3..795d9d8 100644 --- a/language/Data.xml +++ b/language/Data.xml @@ -2,367 +2,373 @@ - M01 Pipe Removal - Broken Pipe complete in Base - m01 - - - - - - - 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':''};]]> - - - - - M03 Pump Addition - Pump Addition has contact with the mat completely inside the target area - m03 - - - - - - - M04 Rain - At least one Rain is out of the Rain Cloud - m04 - - - + Advantage + Your Robot and Equipment fit in the Small Inspection Area + m00 + + - M05 Filter - Lock latch is in dropped position - m05 - - - - - - - M06 Water Treatment - Big Water is ejected from Water Treatment model - m06 - - - - - - - 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':''};]]> - + M01 Elevated Places + The Robot is Supported by the Bridge + m01a + + + - M08 Manhole Covers - Manhole cover(s) are flipped over past vertical - m08a + M01 Elevated Places + Number of flags that are clearly raised any distance, only by the Robot + m01b - - - - - M08 Manhole Covers - Both covers are flipped over and completely in separate Tripod target - m08b - - - - - - - - - M09 Tripod - All the Tripod's feet are touching the mat - m09a - - - - - - M09 Tripod - Tripod is partially in a Tripod target - m09b - - - - - + - M09 Tripod - Tripod is completely in a Tripod target - m09c - - - - - + M02 Crane + The Hooked Blue Unit is clearly lowered any distance from the Guide Hole + m02a + + + - M10 Pipe Replacement - New pipe is installed where Broken Pipe was - m10a - - + M02 Crane + The Hooked Blue Unit is Independent and Supported by another Blue Unit + m02b + + + - M10 Pipe Replacement - This New Pipe has full/flat contact with the mat - m10b - - - + M02 Crane + And Level 1 is Completely in the Blue Circle + m02c + + + - M11 Pipe Construction - New Pipe has full/flat contact with the mat - m11a - - - - - - M11 Pipe Construction - This New Pipe is partially in its target - m11b - - - - - + M03 Inspection Drone + The Inspection Drone is Supported by the axle on the Bridge + m03 + + + - M11 Pipe Construction - This New Pipe is completely in its target - m11c - - - - - + M04 Design For Wildlife + The Bat is Supported by the branch on the Tree + m04 + + + - M12 Sludge - Sludge touching visible wood of a drawn garden box - m12 - - - + M05 Treehouse + Number of Units Independent and Supported by the Tree’s Large Branches + m05a + + + + + + + + + + + + + + + + + + + + 16) ? + {"highlight": true, "msg": "Too many units in use"} : + {"highlight": false, "msg": ""} + ]]> - 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':''};]]> - + M05 Treehouse + Number of Units Independent and Supported by the Tree’s Small Branches + m05b + + + + + + + + + + + + + + + + + + + + 16) ? + {"highlight": true, "msg": "Too many units in use"} : + {"highlight": false, "msg": ""} + ]]> - M13 Flower - At least one rain is in the purple part, touching nothing bug Flower model - m13b - - - + M06 Traffic Jam + The Traffic Jam is lifted, its moving part is Independent, and it is Supported only by its hinges + m06 + + + - 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 - - - + M07 Swing + The Swing is released + m07 + + + - M16 Water Collection - Water Target is East of Off-Limits line - m16a - - + M08 Elevator + The Elevator’s moving parts are Independent and Supported only by its hinges, in the following position + m08 + + + + - M16 Water Collection - At least one Rain is touching mat in the Water Target - m16b - - - + M09 Safety Factor + The Test Building is Independent and Supported only by the blue beams + m09a + + - M16 Water Collection - Big Water touching mat in the Water Target - m16c + M09 Safety Factor + Number of blue beams knocked out at least half way + m09b - 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':''};]]> - + + - 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':''};]]> - + M10 Steel Construction + The Steel Structure is standing, and is Independent and Supported only by its hinges + m10 + + + - - M17 Slingshot - Slingshot is completely in the Slingshot target - m17a - - - + + M11 Innovative Architecture + The Structure is bigger than a Blue Building Unit and built from the team’s white LEGO bricks + m11a + + - M17 Slingshot - Rain AND Dirty Water completely in the Slingshot target - m17b - - - + M11 Innovative Architecture + The Structure is in any Circle + m11b + + + + - M18 Faucet - Water level is more blue than white - m18 - - - + M12 Design & Build + Number of Circles with a color-matching Unit, flat down on the Mat, and Completely in Circle + m12a + + + + + + this.answers["m12b"] * 1) ? + {"highlight": true, "msg": "Too small height sum"} : + {"highlight": false, "msg": ""} + ]]> - Penalties - Penalty discs in the white triangle area - m19 - - + M12 Design & Build + Sum of height Levels of Independent Stacks at least partly in any Circle + m12b + + - + + + + + + + + + + + + + + + + + + + + + + + + + + 16) ? + {"highlight": true, "msg": "Too many units in use"} : + ((2 * this.answers["m12a"] * 1 - Math.min(this.answers["m12a"] * 1, 1)) > this.answers["m12b"] * 1) ? + {"highlight": true, "msg": "Too small height sum"} : + {"highlight": false, "msg": ""} + ]]> + + + + M13 Sustainability Upgrades + Number of Upgrades that are Independent and Supported only by a Stack which is at least partly in a Circle + m13 + + + + + + + + M14 Precision + Number of Precision Tokens left on the field + m14 + + + + + + + + + +