summaryrefslogtreecommitdiff
path: root/testxml
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-07 18:09:12 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-07 18:09:12 +0300
commita23e7cf3a06901565fd664b9609b1373d184a054 (patch)
treeb922f07d07be017812d1369ccbde31e36e0afe26 /testxml
parent315323cd838643bf04b10ae72985538b12da83dd (diff)
downloadevol-tools-a23e7cf3a06901565fd664b9609b1373d184a054.tar.gz
evol-tools-a23e7cf3a06901565fd664b9609b1373d184a054.tar.bz2
evol-tools-a23e7cf3a06901565fd664b9609b1373d184a054.tar.xz
evol-tools-a23e7cf3a06901565fd664b9609b1373d184a054.zip
testxml: fix dye channel messages.
Diffstat (limited to 'testxml')
-rwxr-xr-xtestxml/testxml.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/testxml/testxml.py b/testxml/testxml.py
index e1d2b32..90670a8 100755
--- a/testxml/testxml.py
+++ b/testxml/testxml.py
@@ -295,14 +295,14 @@ def testDyeColors(id, color, text, src, iserr):
continue
return len(colors)
-def testDyeMark(file, color, text, iserr):
+def testDyeChannel(file, color, text, iserr):
if len(color) < 1:
- showMsgSprite(file, "dye mark size to small:" + text, iserr)
+ showMsgSprite(file, "dye channel size to small:" + text, iserr)
return -1
colors = dyesplit1.split(color)
for c in colors:
if len(c) != 1:
- showMsgSprite(file, "dye mark incorrect size: " + text, iserr)
+ showMsgSprite(file, "dye channel incorrect size: " + text, iserr)
continue
if c != "R" and c != "G" and c != "B" and c != "Y" and c != "M" \
and c != "C" and c != "W" and c != "S":
@@ -481,7 +481,7 @@ def testSpriteFile(id, fullPath, file, fileLoc, dnum, variant, checkAction, iser
showMsgSprite(fileLoc, "no height attribute", iserr)
if imagecolor != "":
- num = testDyeMark(fileLoc, imagecolor, image0, iserr)
+ num = testDyeChannel(fileLoc, imagecolor, image0, iserr)
if safeDye == False and dnum != num:
if dnum > num:
e = iserr
@@ -1111,7 +1111,7 @@ def testItems(fileName, imgDir):
if colors is None:
testDye(id, imagecolor, "image=" + image0, fileName, True)
else:
- testDyeMark(id, imagecolor, "image=" + image0, True)
+ testDyeChannel(id, imagecolor, "image=" + image0, True)
if colors not in colorsList:
print "error: " + fileName + ": colors value " + colors + " not found in itemcolors.xml"
errors = errors + 1
@@ -1120,7 +1120,7 @@ def testItems(fileName, imgDir):
if colors is None:
testDye(id, floorcolor, "floor=" + floor0, fileName, True)
else:
- testByeMark(id, imagecolor, "floor=" + floor0, True);
+ testDyeChannel(id, imagecolor, "floor=" + floor0, True);
if colors not in colorsList:
print "error: " + fileName + ": colors value " + colors + " not found in itemcolors.xml"
errors = errors + 1