From 10f1f75d9cd4e5016953974847dfefb23293683e Mon Sep 17 00:00:00 2001
From: MaZiFAU <63099053+MaZiFAU@users.noreply.github.com>
Date: Fri, 19 Jan 2024 01:47:21 +0100
Subject: [PATCH] added support for RiverScrollSimple
---
Assets/Scripts/GenerateDemoFiles.cs | 7 +++--
.../CommunicationProtocoll/MMTConstants.cs | 1 +
Assets/Stages/SlingShot.JSON | 11 +++++++-
Assets/StreamingAssets/scrolls.json | 27 +++++++++++++++++++
4 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/GenerateDemoFiles.cs b/Assets/Scripts/GenerateDemoFiles.cs
index f89fdca5..93c032f0 100644
--- a/Assets/Scripts/GenerateDemoFiles.cs
+++ b/Assets/Scripts/GenerateDemoFiles.cs
@@ -284,7 +284,7 @@ public static void GenerateSlingShotStage()
string GravURI = StageStatic.stage.solution.Add(
new PointFact(new Vector3(0, -9.81f, 0), Vector3.down),
out _, false, null, null);
- //StageStatic.stage.solution.ExposedSolutionFacts.Add(GravURI);
+ StageStatic.stage.solution.ExposedSolutionFacts.Add(GravURI);
string BounceURI = StageStatic.stage.solution.Add(
new RealLitFact(0.8f),
@@ -312,7 +312,7 @@ public static void GenerateSlingShotStage()
// Set Gadgets/ Scrolls
StageStatic.stage.AllowedGadgets = null;
- StageStatic.stage.AllowedScrolls = new() { MMTConstants.ScrollRiver, MMTConstants.ScrollCannonBallT3D };
+ StageStatic.stage.AllowedScrolls = new() { MMTConstants.ScrollRiverSimple, MMTConstants.ScrollRiver, MMTConstants.ScrollCannonBallT3D };
StageStatic.stage.solution.ScrollOverwrites.Add(MMTConstants.ScrollCannonBallT3D, new[] {
(GravURI, 2, false),
@@ -322,6 +322,9 @@ public static void GenerateSlingShotStage()
StageStatic.stage.solution.ScrollOverwrites.Add(MMTConstants.ScrollRiver, new[] {
(GravURI, 4, false),
});
+ StageStatic.stage.solution.ScrollOverwrites.Add(MMTConstants.ScrollRiverSimple, new[] {
+ (GravURI, 2, true),
+ });
// Save
StageStatic.SetMode(StageStatic.Mode.Create);
diff --git a/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs b/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs
index 5d613eac..9b4a1fd1 100644
--- a/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs
+++ b/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs
@@ -130,6 +130,7 @@ public static class MMTConstants
public const string ScrollCannonBall3D = "http://mathhub.info/FrameIT/frameworld?W3DBouncingScroll";
public const string ScrollCannonBallT3D = "http://mathhub.info/FrameIT/frameworld?T3DBouncingScroll";
public const string ScrollRiver = "http://mathhub.info/FrameIT/frameworld?RiverScroll";
+ public const string ScrollRiverSimple = "http://mathhub.info/FrameIT/frameworld?RiverScrollSimple";
/// <summary>
/// <remark>Needs to map to primitives where possible!</remark>
diff --git a/Assets/Stages/SlingShot.JSON b/Assets/Stages/SlingShot.JSON
index c506d295..0d512259 100644
--- a/Assets/Stages/SlingShot.JSON
+++ b/Assets/Stages/SlingShot.JSON
@@ -9,7 +9,8 @@
"ExposedSolutionFacts": [
"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact181",
"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact182",
- "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact183"
+ "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact183",
+ "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact179"
],
"ScrollOverwrites": {
"http://mathhub.info/FrameIT/frameworld?T3DBouncingScroll": [
@@ -35,6 +36,13 @@
"Item2": 4,
"Item3": false
}
+ ],
+ "http://mathhub.info/FrameIT/frameworld?RiverScrollSimple": [
+ {
+ "Item1": "http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact179",
+ "Item2": 2,
+ "Item3": true
+ }
]
},
"ImmutableFacts": [
@@ -2662,6 +2670,7 @@
"record_index": null,
"solution_approches": [],
"AllowedScrolls": [
+ "http://mathhub.info/FrameIT/frameworld?RiverScrollSimple",
"http://mathhub.info/FrameIT/frameworld?RiverScroll",
"http://mathhub.info/FrameIT/frameworld?T3DBouncingScroll"
],
diff --git a/Assets/StreamingAssets/scrolls.json b/Assets/StreamingAssets/scrolls.json
index bc84faf6..63327be2 100644
--- a/Assets/StreamingAssets/scrolls.json
+++ b/Assets/StreamingAssets/scrolls.json
@@ -22500,6 +22500,33 @@
"acquiredFacts": []
},
+ {
+ "ref": "http://mathhub.info/FrameIT/frameworld?RiverScrollSimple",
+ "label": "RiverScrollSimple",
+ "description": "River.Simple.",
+ "requiredFacts": [
+ {
+ "ref": {
+ "uri": "http://mathhub.info/FrameIT/frameworld?RiverScrollSimple/Problem?S"
+ },
+ "kind": "general"
+ },
+ {
+ "ref": {
+ "uri": "http://mathhub.info/FrameIT/frameworld?RiverScrollSimple/Problem?F"
+ },
+ "kind": "general"
+ },
+ {
+ "ref": {
+ "uri": "http://mathhub.info/FrameIT/frameworld?RiverScrollSimple/Problem?G"
+ },
+ "kind": "general"
+ }
+ ],
+ "acquiredFacts": []
+ },
+
{
"ref": "http://mathhub.info/FrameIT/frameworld?CircleLineAngleScroll",
"label": "CircleLineAngleScroll",
--
GitLab