Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge conflict

Browse source
This commit is contained in:
Griatch 2021-06-10 19:18:25 +02:00
commit 1faaf782c5
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
evennia/contrib/map_and_pathfind/tests.py
View file

@ -458,8 +458,8 @@ class TestMap3(TestCase):
@parameterized.expand([ @parameterized.expand([
((2, 2), 2, None, ((2, 2), 2, None,
' # \n / \n # / \n |/ \n # #\n \\ / ' ' # \n / \n # / \n |/ \n # #\n |\\ / \n # @-# \n '
'\n # @-# \n |/ \\ \n # #\n / \\ \n# # '), '|/ \\ \n # #\n / \\ \n# # '),
((5, 2), 2, None, ' # \n | \n # \n / \\ \n# @\n \\ / \n # \n | \n # ') ((5, 2), 2, None, ' # \n | \n # \n / \\ \n# @\n \\ / \n # \n | \n # ')
]) ])
def test_get_visual_range__nodes__character(self, coord, dist, max_size, expected): def test_get_visual_range__nodes__character(self, coord, dist, max_size, expected):
@ -629,7 +629,6 @@ class TestMap8(TestCase):
Get sub-part of map with node-mode. Get sub-part of map with node-mode.
""" """
mapstr = self.map.get_visual_range(coord, dist=dist, mode='nodes', character='@', mapstr = self.map.get_map_display(coord, dist=dist, mode='nodes', character='@',
max_size=max_size) max_size=max_size)
print(repr(mapstr))
self.assertEqual(expected, mapstr) self.assertEqual(expected, mapstr)