Merge pull request #1 from jh0ker/master

Update 1
This commit is contained in:
DO97 2019-06-11 13:25:56 +02:00 committed by GitHub
commit ce85e83a19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View file

@ -83,7 +83,7 @@ STICKERS = {
'g_6': 'BQADBAADAwIAAl9XmQABaaMxxa4MihwC', 'g_6': 'BQADBAADAwIAAl9XmQABaaMxxa4MihwC',
'g_7': 'BQADBAADBQIAAl9XmQABv5Q264Crz8gC', 'g_7': 'BQADBAADBQIAAl9XmQABv5Q264Crz8gC',
'g_8': 'BQADBAADBwIAAl9XmQABjMH-X9UHh8sC', 'g_8': 'BQADBAADBwIAAl9XmQABjMH-X9UHh8sC',
'g_9': 'CAADBAADJgQAAl9XmQABFlNIhcr9D5UC', 'g_9': 'BQADBAADCQIAAl9XmQAB26fZ2fW7vM0C',
'g_draw': 'BQADBAADCwIAAl9XmQAB64jIZrgXrQUC', 'g_draw': 'BQADBAADCwIAAl9XmQAB64jIZrgXrQUC',
'g_skip': 'BQADBAADDwIAAl9XmQAB17yhhnh46VQC', 'g_skip': 'BQADBAADDwIAAl9XmQAB17yhhnh46VQC',
'g_reverse': 'BQADBAADDQIAAl9XmQAB_xcaab0DkegC', 'g_reverse': 'BQADBAADDQIAAl9XmQAB_xcaab0DkegC',
@ -95,7 +95,7 @@ STICKERS = {
'r_5': 'BQADBAADGwIAAl9XmQABbdLt4gdntBQC', 'r_5': 'BQADBAADGwIAAl9XmQABbdLt4gdntBQC',
'r_6': 'BQADBAADHQIAAl9XmQABqEI274p3lSoC', 'r_6': 'BQADBAADHQIAAl9XmQABqEI274p3lSoC',
'r_7': 'BQADBAADHwIAAl9XmQABCw8u67Q4EK4C', 'r_7': 'BQADBAADHwIAAl9XmQABCw8u67Q4EK4C',
'r_8': 'CAADBAADJwQAAl9XmQABVjOx36q1ogIC', 'r_8': 'BQADBAADIQIAAl9XmQAB8iDJmLxp8ogC',
'r_9': 'BQADBAADIwIAAl9XmQAB_HCAww1kNGYC', 'r_9': 'BQADBAADIwIAAl9XmQAB_HCAww1kNGYC',
'r_draw': 'BQADBAADJQIAAl9XmQABuz0OZ4l3k6MC', 'r_draw': 'BQADBAADJQIAAl9XmQABuz0OZ4l3k6MC',
'r_skip': 'BQADBAADKQIAAl9XmQAC2AL5Ok_ULwI', 'r_skip': 'BQADBAADKQIAAl9XmQAC2AL5Ok_ULwI',

View file

@ -58,6 +58,8 @@ class Deck(object):
def dismiss(self, card): def dismiss(self, card):
"""Returns a card to the deck""" """Returns a card to the deck"""
if card.special:
card.color = None
self.graveyard.append(card) self.graveyard.append(card)
def _fill_classic_(self): def _fill_classic_(self):