Add Account.uses_screenreader. Added evadventure mini-map

evennia/contrib/tutorials/evadventure/tests/mixins.py

@@ -4,10 +4,17 @@ Helpers for testing evadventure modules.
 """
 
 from evennia.utils import create
-from ..characters import EvAdventureCharacter
-from ..objects import EvAdventureObject
-from ..rooms import EvAdventureRoom
+
 from .. import enums
+from ..characters import EvAdventureCharacter
+from ..objects import (
+    EvAdventureArmor,
+    EvAdventureHelmet,
+    EvAdventureObject,
+    EvAdventureShield,
+    EvAdventureWeapon,
+)
+from ..rooms import EvAdventureRoom
 
 
 class EvAdventureMixin:
@@ -23,27 +30,27 @@ class EvAdventureMixin:
             EvAdventureCharacter, key="testchar", location=self.location
         )
         self.helmet = create.create_object(
-            EvAdventureObject,
+            EvAdventureHelmet,
             key="helmet",
             attributes=[("inventory_use_slot", enums.WieldLocation.HEAD), ("armor", 1)],
         )
         self.shield = create.create_object(
-            EvAdventureObject,
+            EvAdventureShield,
             key="shield",
             attributes=[("inventory_use_slot", enums.WieldLocation.SHIELD_HAND), ("armor", 1)],
         )
         self.armor = create.create_object(
-            EvAdventureObject,
+            EvAdventureArmor,
             key="armor",
             attributes=[("inventory_use_slot", enums.WieldLocation.BODY), ("armor", 11)],
         )
         self.weapon = create.create_object(
-            EvAdventureObject,
+            EvAdventureWeapon,
             key="weapon",
             attributes=[("inventory_use_slot", enums.WieldLocation.WEAPON_HAND)],
         )
         self.big_weapon = create.create_object(
-            EvAdventureObject,
+            EvAdventureWeapon,
             key="big_weapon",
             attributes=[("inventory_use_slot", enums.WieldLocation.TWO_HANDS)],
         )

evennia/contrib/tutorials/evadventure/tests/test_dungeon.py

@@ -10,7 +10,6 @@ from evennia.utils.test_resources import BaseEvenniaTest
 from evennia.utils.utils import inherits_from
 
 from .. import dungeon
-from ..rooms import EvAdventureDungeonRoom
 from .mixins import EvAdventureMixin
 
 
@@ -33,7 +32,7 @@ class TestDungeon(EvAdventureMixin, BaseEvenniaTest):
         self.start_room = create_object(droomclass, key="bottom of well")
 
         self.assertEqual(
-            self.start_room.scripts.get("evadventure_startroom_resetter")[0].interval, -1
+            self.start_room.scripts.get("evadventure_dungeon_startroom_resetter")[0].interval, -1
         )
         self.start_north = create_object(
             dungeon.EvAdventureDungeonStartRoomExit,
@@ -71,7 +70,7 @@ class TestDungeon(EvAdventureMixin, BaseEvenniaTest):
         # first go north, this should generate a new room
         new_room_north = self._move_character("north")
         self.assertNotEqual(self.start_room, new_room_north)
-        self.assertTrue(inherits_from(new_room_north, EvAdventureDungeonRoom))
+        self.assertTrue(inherits_from(new_room_north, dungeon.EvAdventureDungeonRoom))
 
         # check if Orchestrator was created
         orchestrator = new_room_north.db.dungeon_orchestrator