diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-04-08 23:41:41 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-04-08 23:41:41 +0300 |
| commit | 690b587d1693ebed5504731b091472c0f35d1bad (patch) | |
| tree | 184097208670883e138620cf5720df84c4c3e111 | |
| parent | 5d8e1a54f175d519be170ce7485f24bc04a13ec6 (diff) | |
| download | evol-tools-690b587d1693ebed5504731b091472c0f35d1bad.tar.gz evol-tools-690b587d1693ebed5504731b091472c0f35d1bad.tar.bz2 evol-tools-690b587d1693ebed5504731b091472c0f35d1bad.tar.xz evol-tools-690b587d1693ebed5504731b091472c0f35d1bad.zip | |
testxml: fix wrong report about duplicate action with same name and different hp.
| -rwxr-xr-x | testxml/testxml.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/testxml/testxml.py b/testxml/testxml.py index 373f1d0..3752076 100755 --- a/testxml/testxml.py +++ b/testxml/testxml.py @@ -594,6 +594,10 @@ def testSpriteFile(id, fullPath, file, fileLoc, dnum, variant, checkAction, iser showMsgSprite("no action name", iserr) continue try: + hp = action.attributes["hp"].value + except: + hp = "" + try: setname = action.attributes["imageset"].value except: setname = "" @@ -604,10 +608,10 @@ def testSpriteFile(id, fullPath, file, fileLoc, dnum, variant, checkAction, iser showMsgSprite(fileLoc, "using incorrect imageset name in action: " + name, iserr) frameSet = frameSet | testSpriteAction(fileLoc, name, action, num, iserr) - if name in actset: + if name + "|" + hp in actset: showMsgSprite(fileLoc, "duplicate action: " + name, iserr) continue - actset.add(name) + actset.add(name + "|" + hp) if len(frameSet) > 0: errIds = "" |