Fix merge issues
This commit is contained in:
parent
4c7a2e9f3b
commit
0ea10546ac
|
@ -420,7 +420,7 @@ class Game:
|
||||||
except KeyError as error:
|
except KeyError as error:
|
||||||
self.message = _("Some keys are missing in your save file.\n"
|
self.message = _("Some keys are missing in your save file.\n"
|
||||||
"Your save seems to be corrupt. It got deleted.")\
|
"Your save seems to be corrupt. It got deleted.")\
|
||||||
+ f"\n{error}"
|
+ f"\n{error}"
|
||||||
os.unlink(ResourceManager.get_config_path("save.json"))
|
os.unlink(ResourceManager.get_config_path("save.json"))
|
||||||
self.display_actions(DisplayActions.UPDATE)
|
self.display_actions(DisplayActions.UPDATE)
|
||||||
return
|
return
|
||||||
|
|
|
@ -7,7 +7,7 @@ from functools import reduce
|
||||||
from itertools import product
|
from itertools import product
|
||||||
from math import ceil, sqrt
|
from math import ceil, sqrt
|
||||||
from queue import PriorityQueue
|
from queue import PriorityQueue
|
||||||
from random import choice, choices, randint
|
from random import choice, randint
|
||||||
from typing import Any, Dict, List, Optional, Tuple
|
from typing import Any, Dict, List, Optional, Tuple
|
||||||
|
|
||||||
from .display.texturepack import TexturePack
|
from .display.texturepack import TexturePack
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
|
# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
from random import random, randint, shuffle, choice, choices
|
from random import choice, choices, randint, random, shuffle
|
||||||
from typing import List, Tuple
|
from typing import List, Tuple
|
||||||
|
|
||||||
from ..interfaces import Map, Tile, Entity
|
from ..interfaces import Entity, Map, Tile
|
||||||
|
|
||||||
DEFAULT_PARAMS = {
|
DEFAULT_PARAMS = {
|
||||||
"width": 120,
|
"width": 120,
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
|
# Copyright (C) 2020 by ÿnérant, eichhornchen, nicomarg, charlse
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
import unittest
|
|
||||||
from random import randint
|
from random import randint
|
||||||
from typing import List
|
from typing import List
|
||||||
|
import unittest
|
||||||
|
|
||||||
from squirrelbattle.interfaces import Map, Tile
|
from ..display.texturepack import TexturePack
|
||||||
from squirrelbattle.mapgeneration import broguelike
|
from ..interfaces import Map, Tile
|
||||||
from squirrelbattle.display.texturepack import TexturePack
|
from ..mapgeneration import broguelike
|
||||||
|
|
||||||
|
|
||||||
class TestBroguelike(unittest.TestCase):
|
class TestBroguelike(unittest.TestCase):
|
||||||
|
|
Loading…
Reference in New Issue