diff --git a/ASCII/plugin.py b/ASCII/plugin.py index a840a34..a9d6d19 100644 --- a/ASCII/plugin.py +++ b/ASCII/plugin.py @@ -991,7 +991,7 @@ class ASCII(callbacks.Plugin): aimg[k] += "\x03{0},{1} ▀".format(color1, color2) old_color1 = color1 old_color2 = color2 - old_char = gsval + old_char = '^^▀' elif gsval == " " and color1 == old_color1 and old_char != '█' and 'tops' not in optlist: aimg[k] += "█" old_char = '█' @@ -999,22 +999,40 @@ class ASCII(callbacks.Plugin): aimg[k] += "\x03{0}█".format(color1) old_color1 = color1 old_char = '^█' - elif gsval == "▀" and color1 == old_color2 and color2 == old_color1 and 'tops' not in optlist: + elif gsval != " " and color1 == old_color1 and color2 != old_color2 and old_char == "^^▀" and 'tops' not in optlist: + aimg[k] = aimg[k][:-7] + aimg[k] += "\x03{0},{1}▄\x03{2}▄".format(old_color2, color1, color2) + old_color1 = color2 + old_color2 = color1 + old_char = '▄' + elif gsval != " " and color1 == old_color1 and color2 != old_color2 and old_char == "^▀" and 'tops' not in optlist: + aimg[k] = aimg[k][:-4] + aimg[k] += "\x03{0},{1}▄\x03{2}▄".format(old_color2, color1, color2) + old_color1 = color2 + old_color2 = color1 + old_char = '▄' + elif gsval != " " and color1 == old_color2 and color2 == old_color1 and 'tops' not in optlist: aimg[k] += "▄" old_char = '▄' - elif gsval == "▀" and color1 == old_color2 and 'tops' not in optlist: + elif gsval != " " and color1 == old_color2 and 'tops' not in optlist: aimg[k] += "\x03{0}▄".format(color2) old_color1 = color2 old_char = '▄' elif color1 != old_color1 and color2 == old_color2: aimg[k] += "\x03{0}{1}".format(color1, gsval) old_color1 = color1 - old_char = gsval + if gsval == ' ': + old_char = gsval + else: + old_char = '^▀' else: aimg[k] += "\x03{0},{1}{2}".format(color1, color2, gsval) old_color1 = color1 old_color2 = color2 - old_char = gsval + if gsval == ' ': + old_char = gsval + else: + old_char = '^^▀' aimg[k] = re.sub("\x0301,(\d\d)(\s+)\x03(\d\d)([^,])", "\x03\g<3>,\g<1>\g<2>\g<4>", aimg[k]) for i in range(0,98): i = '%02d' % i