Merge branch 'master' into 'lighting'

# Conflicts:
#   squirrelbattle/display/mapdisplay.py
#   squirrelbattle/interfaces.py

squirrelbattle/display/texturepack.py

@@ -6,6 +6,9 @@ from typing import Any, Union, Tuple
 
 
 class TexturePack:
+    """
+    A class to handle displaying several textures.
+    """
     _packs = dict()
 
     name: str
@@ -30,6 +33,7 @@ class TexturePack:
     SWORD: str
     TEDDY_BEAR: str
     TIGER: str
+    TRUMPET: str
     WALL: str
 
     ASCII_PACK: "TexturePack"
@@ -66,6 +70,7 @@ TexturePack.ASCII_PACK = TexturePack(
     EMPTY=' ',
     EXPLOSION='%',
     FLOOR='.',
+    LADDER='H',
     HAZELNUT='¤',
     HEART='❤',
     HEDGEHOG='*',
@@ -76,6 +81,7 @@ TexturePack.ASCII_PACK = TexturePack(
     SWORD='\u2020',
     TEDDY_BEAR='8',
     TIGER='n',
+    TRUMPET='/',
     WALL='#',
 )
 
@@ -93,6 +99,7 @@ TexturePack.SQUIRREL_PACK = TexturePack(
     EMPTY='  ',
     EXPLOSION='💥',
     FLOOR='██',
+    LADDER=('🪜', curses.COLOR_WHITE, curses.COLOR_WHITE),
     HAZELNUT='🌰',
     HEART='💜',
     HEDGEHOG='🦔',
@@ -100,8 +107,9 @@ TexturePack.SQUIRREL_PACK = TexturePack(
     MERCHANT='🦜',
     RABBIT='🐇',
     SUNFLOWER='🌻',
-    SWORD='🗡️',
+    SWORD='🗡️ ',
     TEDDY_BEAR='🧸',
     TIGER='🐅',
+    TRUMPET='🎺',
     WALL='🧱',
 )