summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-11-11 17:58:43 +0000
committerJesusaves <cpntb1@ymail.com>2020-11-11 17:58:43 +0000
commitf2762163d34a627716b5c18eb3e8cd80b0119c88 (patch)
treec6b97e8832f2b3970b4af956126dc7adfc47399f
parent5ee5a4b0ffb5b5ad9026770ecc62d2b778b2bf35 (diff)
parent98ae10329739b47f3bb94c917fe5f84e36f0514f (diff)
downloadevol-tools-f2762163d34a627716b5c18eb3e8cd80b0119c88.tar.gz
evol-tools-f2762163d34a627716b5c18eb3e8cd80b0119c88.tar.bz2
evol-tools-f2762163d34a627716b5c18eb3e8cd80b0119c88.tar.xz
evol-tools-f2762163d34a627716b5c18eb3e8cd80b0119c88.zip
Merge branch 'strike_event_remove' into 'master'
Strike event remove See merge request evol/evol-tools!28
-rwxr-xr-xtestxml/testxml.py8
-rw-r--r--testxml/xsd/tmw.xsd1
2 files changed, 1 insertions, 8 deletions
diff --git a/testxml/testxml.py b/testxml/testxml.py
index 85401d5..dfa3814 100755
--- a/testxml/testxml.py
+++ b/testxml/testxml.py
@@ -1309,7 +1309,6 @@ def testParticles(id, node, nodeName, src):
def testSounds(id, node, type):
global errors
- havemiss = False
for sound in node.getElementsByTagName("sound"):
try:
event = sound.attributes["event"].value
@@ -1323,14 +1322,9 @@ def testSounds(id, node, type):
print "error: incorrect sound event name " + event + " in id=" + id
errors = errors + 1
elif type == "item":
- if event != "hit" and event != "strike" and event != "miss":
+ if event != "hit" and event != "miss":
print "error: incorrect sound event name " + event + " in id=" + id
errors = errors + 1
- if event == "strike" or event == "miss":
- if havemiss:
- print "error: miss and strike attributes at same time in id=" + id
- errors = errors + 1
- havemiss = True
testSound(sound.childNodes[0].data, sfxDir, "")
diff --git a/testxml/xsd/tmw.xsd b/testxml/xsd/tmw.xsd
index 3c37b0f..ec41775 100644
--- a/testxml/xsd/tmw.xsd
+++ b/testxml/xsd/tmw.xsd
@@ -1001,7 +1001,6 @@
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="hit"/>
- <xs:enumeration value="strike"/>
<xs:enumeration value="miss"/>
<xs:enumeration value="use"/>
<xs:enumeration value="equip"/>