Merge branch 'p2_develop' into main

Kersoph · Jul 27, 2021 · 7354c5b · 7354c5b
2 parents 01ba949 + 2d51905
commit 7354c5b
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 25 deletions.
diff --git a/lessons/1/User/Results.json b/lessons/1/User/Results.json
@@ -1,3 +1,3 @@
 {
-    "Stars": 2
+    "Stars": 0
 }
diff --git a/lessons/1/User/ThreeStar.sfc b/lessons/1/User/ThreeStar.sfc
diff --git a/lessons/1/User/TwoStar.sfc b/lessons/1/User/TwoStar.sfc
diff --git a/lessons/2/User/Flicker.sfc b/lessons/2/User/Flicker.sfc
diff --git a/lessons/2/User/Results.json b/lessons/2/User/Results.json
@@ -1,3 +1,3 @@
 {
-	"Stars": 3
+	"Stars": 0
 }
diff --git a/lessons/2/User/ThreeStar.sfc b/lessons/2/User/ThreeStar.sfc
diff --git a/lessons/3/User/Diagram_Full.sfc b/lessons/3/User/Diagram_Full.sfc
diff --git a/lessons/3/User/Diagram_Sensor.sfc b/lessons/3/User/Diagram_Sensor.sfc
diff --git a/lessons/3/User/Diagram_Timed.sfc b/lessons/3/User/Diagram_Timed.sfc
diff --git a/lessons/3/User/Results.json b/lessons/3/User/Results.json
@@ -1,3 +1,3 @@
 {
-	"Stars": 2
+	"Stars": 0
 }
diff --git a/lessons/4/Description.json b/lessons/4/Description.json
@@ -1,7 +1,7 @@
 {
-    "Title": "[center]Crossroad[/center]",
-    "Description": "My Description.",
-    "Goal": "Goal Text.",
-	"Simulation": "",
-	"Test": ""
+    "Title": "[center]Reactor\nEmergency\nSystem[/center]",
+    "Description": "TBD",
+    "Goal": "TBD",
+    "Simulation": "",
+    "Test": ""
 }
diff --git a/lessons/4/User/Results.json b/lessons/4/User/Results.json
@@ -1,3 +1,3 @@
 {
-    "Stars": 1
+    "Stars": 0
 }
diff --git a/lessons/5/Description.json b/lessons/5/Description.json
@@ -1,7 +1,7 @@
 {
-    "Title": "[center]Logistic\nPlant[/center]",
-    "Description": "My Description.",
-    "Goal": "Goal Text.",
-	"Simulation": "",
-	"Test": ""
+    "Title": "[center]Anomalous\nMaterials\nLabs[/center]",
+    "Description": "In a (maybe) fictional scenario Dr. Rosenberg explores the areas outside of the classical concept of matter. The task is described by Dr. Rosenberg:\n'When we start the process, the two carts (we simply call them [b]Emitter[/b] and [b]Focus[/b]) need to be at the frontal position and turned on together. This will build up the needed mass in the central trap which can already be heated up to the needed 2000k with the [b]laser[/b]. If the targeted mass is hit, turn off the Emitter and move it back, as it is not used anymore. When the temperature and the mass is correct, we want to turn on the [b]field generator[/b], turn off the Focus and move the Focus back as fast as possible to prevent damage on the (kind of expensive) pole. [i](We still need to think about how to improve this part)[/i]. If everything went correct, we should observe a vertical discharge and record it. May be we come closer to a new type of spectrometers.'",
+    "Goal": "Automate the process to be quick but prevent damage and unnecessary waste.",
+    "Simulation": "res://data/plant_models/mass_test_chamber/MassTestChamber.tscn",
+    "Test": "res://data/plant_models/mass_test_chamber/Test.tscn"
 }
diff --git a/lessons/6/Description.json b/lessons/6/Description.json
@@ -1,7 +1,7 @@
 {
-    "Title": "[center]Chemical\nPlant[/center]",
-    "Description": "My Description.",
-    "Goal": "Goal Text.",
-	"Simulation": "",
-	"Test": ""
+    "Title": "[center]Logistic\nPlant[/center]",
+    "Description": "TBD",
+    "Goal": "TBD",
+    "Simulation": "",
+    "Test": ""
 }
diff --git a/lessons/7/Description.json b/lessons/7/Description.json
@@ -1,7 +1,7 @@
 {
-    "Title": "[center]Anomalous\nMaterials\nLabs[/center]",
-    "Description": "In a (maybe) fictional scenario Dr. Rosenberg explores the areas outside of the classical concept of matter. The task is described by Dr. Rosenberg:\n'When we start the process, the two carts (we simply call them [b]Emitter[/b] and [b]Focus[/b]) need to be at the frontal position and turned on together. This will build up the needed mass in the central trap which can already be heated up to the needed 2000k with the [b]laser[/b]. If the targeted mass is hit, turn off the Emitter and move it back, as it is not used anymore. When the temperature and the mass is correct, we want to turn on the [b]field generator[/b], turn off the Focus and move the Focus back as fast as possible to prevent damage on the (kind of expensive) pole. [i](We still need to think about how to improve this part)[/i]. If everything went correct, we should observe a vertical discharge and record it. May be we come closer to a new type of spectrometers.'",
-    "Goal": "Automate the process to be quick but prevent damage and unnecessary waste.",
-	"Simulation": "res://data/plant_models/mass_test_chamber/MassTestChamber.tscn",
-	"Test": "res://data/plant_models/mass_test_chamber/Test.tscn"
+    "Title": "[center]Sandbox\nPlant[/center]",
+    "Description": "A general testing site to create and test diagrams.",
+    "Goal": "Create your own scenario.",
+    "Simulation": "",
+    "Test": ""
 }
diff --git a/lessons/7/User/OneStar.sfc b/lessons/7/User/OneStar.sfc
diff --git a/lessons/7/User/Random.sfc b/lessons/7/User/Random.sfc
diff --git a/lessons/7/User/ThreeStar.sfc b/lessons/7/User/ThreeStar.sfc
diff --git a/lessons/7/User/TwoStar.sfc b/lessons/7/User/TwoStar.sfc
diff --git a/lessons/8/User/Results.json b/lessons/8/User/Results.json
@@ -1,3 +1,3 @@
 {
-    "Stars": 2
+    "Stars": 0
 }