diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity
index db57f12ce3bf68dc3c1a5f96a058a21b5de95693..bd8bb3eb0f792570950735f921ac514df49e7730 100644
--- a/Assets/Scenes/Worlds/RiverWorld.unity
+++ b/Assets/Scenes/Worlds/RiverWorld.unity
@@ -2199,6 +2199,7 @@ Transform:
- {fileID: 1022641573}
- {fileID: 1738359117}
- {fileID: 224606876}
+ - {fileID: 1772126845}
- {fileID: 1961703113}
- {fileID: 1403024657}
- {fileID: 778909919}
@@ -3870,7 +3871,7 @@ Mesh:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: pb_Mesh272762
+ m_Name: pb_Mesh30446
serializedVersion: 10
m_SubMeshes:
- serializedVersion: 2
@@ -8407,7 +8408,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 117995034}
- m_RootOrder: 7
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &387397069
MeshCollider:
@@ -14851,6 +14852,120 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 609533837}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &609957610
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 609957611}
+ - component: {fileID: 609957615}
+ - component: {fileID: 609957614}
+ - component: {fileID: 609957613}
+ - component: {fileID: 609957612}
+ m_Layer: 20
+ m_Name: TopSnapZone (1)
+ m_TagString: SnapZone
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &609957611
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 609957610}
+ m_LocalRotation: {x: 0.84378076, y: -0.03475872, z: 0.53532517, w: 0.015902298}
+ m_LocalPosition: {x: -0.384, y: -0.861, z: 0.151}
+ m_LocalScale: {x: 0.27480695, y: 0.42518657, z: 0.30265692}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1489740373}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &609957612
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 609957610}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 03387d215a8db5c47985ef548da953d8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ ColliderRadius: 0
+ Collidersize_ID: 1
+ use_ColliderRadius: 0
+ myCollider: {fileID: 609957615}
+--- !u!23 &609957613
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 609957610}
+ m_Enabled: 0
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: e3750cc498409144f8fd06ac559355b8, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 0
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &609957614
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 609957610}
+ m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!135 &609957615
+SphereCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 609957610}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.5
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &610861512
PrefabInstance:
m_ObjectHideFlags: 0
@@ -17865,7 +17980,7 @@ Transform:
- {fileID: 804378692}
- {fileID: 2141872373}
m_Father: {fileID: 117995034}
- m_RootOrder: 5
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &778909920
MonoBehaviour:
@@ -24457,6 +24572,86 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1089288796}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1092756307
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1772126845}
+ m_Modifications:
+ - target: {fileID: 1493958779012120596, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_Name
+ value: Branch_01 (1)
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 11.724
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 7.978
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 39.854
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: -0.483636
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.71233815
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.38189718
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.33589453
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: -25.624
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 250.124
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 105.47
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: b9de24523a11d714db3851b5f0f9d527, type: 3}
+--- !u!4 &1092756308 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ m_PrefabInstance: {fileID: 1092756307}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1093963207
PrefabInstance:
m_ObjectHideFlags: 0
@@ -29968,7 +30163,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 117995034}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!136 &1403024658
CapsuleCollider:
@@ -31814,6 +32009,96 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1488704536}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1489740372
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1772126845}
+ m_Modifications:
+ - target: {fileID: 7405846476849542632, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_Name
+ value: Sling Rock
+ objectReference: {fileID: 0}
+ - target: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 2.4094193
+ objectReference: {fileID: 0}
+ - target: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 1.7600998
+ objectReference: {fileID: 0}
+ - target: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 2.8016531
+ objectReference: {fileID: 0}
+ - target: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 11.41
+ objectReference: {fileID: 0}
+ - target: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 7.2722
+ objectReference: {fileID: 0}
+ - target: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 40.59
+ objectReference: {fileID: 0}
+ - target: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.015902298
+ objectReference: {fileID: 0}
+ - target: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0.84378076
+ objectReference: {fileID: 0}
+ - target: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.03475872
+ objectReference: {fileID: 0}
+ - target: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.53532517
+ objectReference: {fileID: 0}
+ - target: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0.595
+ objectReference: {fileID: 0}
+ - target: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 115.237
+ objectReference: {fileID: 0}
+ - target: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: -175.659
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: c6308cb7062fac34e8e50600086b12a1, type: 3}
+--- !u!4 &1489740373 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 7405846476849834440, guid: c6308cb7062fac34e8e50600086b12a1,
+ type: 3}
+ m_PrefabInstance: {fileID: 1489740372}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1494877857
PrefabInstance:
m_ObjectHideFlags: 0
@@ -33674,6 +33959,86 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1594468538}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1606466864
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1772126845}
+ m_Modifications:
+ - target: {fileID: 1493958779012120596, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_Name
+ value: Branch_01
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 2.2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 11.211
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 7.990138
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 39.65
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: -0.12834564
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.52889407
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0.7336173
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.40694487
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 27.472
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 224.22
+ objectReference: {fileID: 0}
+ - target: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 82.921
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: b9de24523a11d714db3851b5f0f9d527, type: 3}
+--- !u!4 &1606466865 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 1493958779012619316, guid: b9de24523a11d714db3851b5f0f9d527,
+ type: 3}
+ m_PrefabInstance: {fileID: 1606466864}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &1606843714
PrefabInstance:
m_ObjectHideFlags: 0
@@ -36651,6 +37016,40 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1770423821}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1772126844
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1772126845}
+ m_Layer: 0
+ m_Name: SlingShot
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1772126845
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1772126844}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1606466865}
+ - {fileID: 1489740373}
+ - {fileID: 1092756308}
+ m_Father: {fileID: 117995034}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1772391926
PrefabInstance:
m_ObjectHideFlags: 0
@@ -38536,7 +38935,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 117995034}
- m_RootOrder: 6
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 65.647, y: 6.9600005, z: -8.707001}
--- !u!108 &1840687080
Light:
@@ -55348,7 +55747,7 @@ Transform:
- {fileID: 1932528655}
- {fileID: 98795657}
m_Father: {fileID: 117995034}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1961703114
MonoBehaviour:
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs
index 6799e7c73b0a376d0bf7f9d01319238f0f4025b3..64fa2c0670c61dfd7f3902330010188f013c55c9 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs
@@ -632,9 +632,16 @@ public static List<Fact> MMTFactory(MMTFact ingredient)
List<Fact> ret = new();
// First try static approach
- ParsingDictionary.parseFactDictionary[ingredient.getType()]
- .Invoke(ret, ingredient)
- .FastForward();
+ try
+ {
+ ParsingDictionary.parseFactDictionary[ingredient.getType()]
+ .Invoke(ret, ingredient)
+ .FastForward();
+ }
+ catch
+ {
+ Debug.Log($"Could not statically parse {nameof(MMTFact)} {nameof(ingredient)}. Using dynamic Fallback...");
+ }
if (ret.Count != 0)
return ret;
diff --git a/Assets/Scripts/InventoryStuff/ScrollDetails.cs b/Assets/Scripts/InventoryStuff/ScrollDetails.cs
index c9656d80f0bc6588265571ce39ada059021c7e59..09de155b607f51e0f8b23cb7bf904abe2b41afba 100644
--- a/Assets/Scripts/InventoryStuff/ScrollDetails.cs
+++ b/Assets/Scripts/InventoryStuff/ScrollDetails.cs
@@ -456,6 +456,13 @@ void _processRenderedScroll(Scroll rendered, List<string> hintUris)
RenderedScrollFact RenderedScrollFact = ParameterDisplays
.Find(RSF => RSF.ScrollFactURI == rendered.requiredFacts[i].@ref.uri);
+ if (RenderedScrollFact == null)
+ {
+ Debug.Log($"Descrapancy between requiredFacts and displayed facts:" +
+ $"Could not find display with ref: {rendered.requiredFacts[i].@ref.uri}");
+ continue;
+ }
+
if (DynamicScrollDescriptionsActive)
//Update ScrollParameter label
RenderedScrollFact.Scroll = rendered;
diff --git a/Assets/StreamingAssets/scrolls.json b/Assets/StreamingAssets/scrolls.json
index 8ee1e6e677c762d8c3754468e938014512b21424..bc84faf6c1c32fb75131b00fff85ed5e9d81e78c 100644
--- a/Assets/StreamingAssets/scrolls.json
+++ b/Assets/StreamingAssets/scrolls.json
@@ -22454,6 +22454,52 @@
],
"acquiredFacts": []
},
+
+ {
+ "ref": "http://mathhub.info/FrameIT/frameworld?RiverScroll",
+ "label": "RiverScroll",
+ "description": "River.",
+ "requiredFacts": [
+ {
+ "ref": {
+ "uri": "http://mathhub.info/FrameIT/frameworld?RiverScroll/Problem?A"
+ },
+ "kind": "general"
+ },
+ {
+ "ref": {
+ "uri": "http://mathhub.info/FrameIT/frameworld?RiverScroll/Problem?B"
+ },
+ "kind": "general"
+ },
+ {
+ "ref": {
+ "uri": "http://mathhub.info/FrameIT/frameworld?RiverScroll/Problem?C"
+ },
+ "kind": "general"
+ },
+ {
+ "ref": {
+ "uri": "http://mathhub.info/FrameIT/frameworld?RiverScroll/Problem?D"
+ },
+ "kind": "general"
+ },
+ {
+ "ref": {
+ "uri": "http://mathhub.info/FrameIT/frameworld?RiverScroll/Problem?G"
+ },
+ "kind": "general"
+ },
+ {
+ "ref": {
+ "uri": "http://mathhub.info/FrameIT/frameworld?RiverScroll/Problem?angleA"
+ },
+ "kind": "general"
+ }
+ ],
+ "acquiredFacts": []
+ },
+
{
"ref": "http://mathhub.info/FrameIT/frameworld?CircleLineAngleScroll",
"label": "CircleLineAngleScroll",
diff --git a/Assets/Terrain/New Terrain 1.asset b/Assets/Terrain/New Terrain 1.asset
index 11f70c50795995cf355f709531e2a47052ded9da..21038801806d4a9e2c0fd08c25eaabae319585c6 100644
Binary files a/Assets/Terrain/New Terrain 1.asset and b/Assets/Terrain/New Terrain 1.asset differ