paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix scenario .rnc/.rng validation errors.

Browse Source 
Patch by vladislavbelov
Differential Revision: https://code.wildfiregames.com/D391
This was SVN commit r19500.
This commit is contained in:
FeXoR 2017-05-01 10:26:36 +00:00
parent 08c40e23db
commit b22b58f13d
3 changed files with 72 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
binaries/data/mods/public/maps/scenario.rnc
View File

@ -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

65
binaries/data/mods/public/maps/scenario.rng
View File

@ -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>

BIN
binaries/data/mods/public/maps/scenarios/Pathfinding_demo.xml (Stored with Git LFS)
View File

Binary file not shown.