From b22b58f13d775edfd63f43ca2664e919a7dab33d Mon Sep 17 00:00:00 2001
From: FeXoR <fexor@wildfiregames.com>
Date: Mon, 1 May 2017 10:26:36 +0000
Subject: [PATCH] Fix scenario .rnc/.rng validation errors.

Patch by vladislavbelov
Differential Revision: https://code.wildfiregames.com/D391
This was SVN commit r19500.
---
 binaries/data/mods/public/maps/scenario.rnc   | 22 +++++--
 binaries/data/mods/public/maps/scenario.rng   | 65 +++++++++++++++----
 .../maps/scenarios/Pathfinding_demo.xml       |  4 +-
 3 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/binaries/data/mods/public/maps/scenario.rnc b/binaries/data/mods/public/maps/scenario.rnc
index f003f3f145..f4abc6c8f5 100644
--- a/binaries/data/mods/public/maps/scenario.rnc
+++ b/binaries/data/mods/public/maps/scenario.rnc
@@ -59,7 +59,8 @@ Scenario = element Scenario {
                 element Height { xsd:decimal } &
                 element Waviness { xsd:decimal } &
                 element Murkiness { xsd:decimal } &
-                element Tint { color_rgb }
+                element Tint { color_rgb } &
+                element WindAngle { xsd:decimal }?
             }
         } &
         element Postproc {
@@ -83,7 +84,7 @@ Scenario = element Scenario {
         element Position { pos_xyz },
         element Rotation { angle },
         element Declination { angle }
-    } &
+    }? &
     element ScriptSettings {
         text
     } &
@@ -107,8 +108,21 @@ Scenario = element Scenario {
             }?
         }*
     }? &
-    element Paths { # Unused
-        empty
+    element Paths {
+        element Path {
+            attribute name { text } &
+            attribute timescale { xsd:decimal } &
+            attribute orientation { text } &
+            attribute mode { text } &
+            attribute style { text } &
+            element Node {
+                attribute deltatime {
+                    xsd:decimal { minInclusive = "0" }
+                } &
+                element Position { pos_xyz }? &
+                element Target { pos_xyz }?
+            }*
+        }*
     }? &
     element Triggers { # Unused
         empty
diff --git a/binaries/data/mods/public/maps/scenario.rng b/binaries/data/mods/public/maps/scenario.rng
index e376f739f3..947f019b14 100644
--- a/binaries/data/mods/public/maps/scenario.rng
+++ b/binaries/data/mods/public/maps/scenario.rng
@@ -147,6 +147,11 @@
                   <element name="Tint">
                     <ref name="color_rgb"/>
                   </element>
+                  <optional>
+                    <element name="WindAngle">
+                      <data type="decimal"/>
+                    </element>
+                  </optional>
                 </interleave>
               </element>
             </element>
@@ -198,18 +203,20 @@
             <text/>
           </element>
         </optional>
-        <element name="Camera">
-          <!-- Camera can have weird float values -->
-          <element name="Position">
-            <ref name="pos_xyz"/>
+        <optional>
+          <element name="Camera">
+            <!-- Camera can have weird float values -->
+            <element name="Position">
+              <ref name="pos_xyz"/>
+            </element>
+            <element name="Rotation">
+              <ref name="angle"/>
+            </element>
+            <element name="Declination">
+              <ref name="angle"/>
+            </element>
           </element>
-          <element name="Rotation">
-            <ref name="angle"/>
-          </element>
-          <element name="Declination">
-            <ref name="angle"/>
-          </element>
-        </element>
+        </optional>
         <element name="ScriptSettings">
           <text/>
         </element>
@@ -263,8 +270,40 @@
         </optional>
         <optional>
           <element name="Paths">
-            <!-- Unused -->
-            <empty/>
+            <zeroOrMore>
+              <element name="Path">
+                <interleave>
+                  <attribute name="name"/>
+                  <attribute name="timescale">
+                    <data type="decimal"/>
+                  </attribute>
+                  <attribute name="orientation"/>
+                  <attribute name="mode"/>
+                  <attribute name="style"/>
+                  <zeroOrMore>
+                    <element name="Node">
+                      <interleave>
+                        <attribute name="deltatime">
+                          <data type="decimal">
+                            <param name="minInclusive">0</param>
+                          </data>
+                        </attribute>
+                        <optional>
+                          <element name="Position">
+                            <ref name="pos_xyz"/>
+                          </element>
+                        </optional>
+                        <optional>
+                          <element name="Target">
+                            <ref name="pos_xyz"/>
+                          </element>
+                        </optional>
+                      </interleave>
+                    </element>
+                  </zeroOrMore>
+                </interleave>
+              </element>
+            </zeroOrMore>
           </element>
         </optional>
         <optional>
diff --git a/binaries/data/mods/public/maps/scenarios/Pathfinding_demo.xml b/binaries/data/mods/public/maps/scenarios/Pathfinding_demo.xml
index 37b7a183ec..f17f7c357b 100644
--- a/binaries/data/mods/public/maps/scenarios/Pathfinding_demo.xml
+++ b/binaries/data/mods/public/maps/scenarios/Pathfinding_demo.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a9a3e1a59390c60ac32f744e592e211e1d71066aa7486ecdded5bf9de492937
-size 20700
+oid sha256:7efabbdad6b243af015e9d5bd0d02ab2e661847e3065e7c005cc52ac4882d8a3
+size 20699