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

Updated typeclass names & added tests for tb_equip commands

Browse source
This commit is contained in:
FlutterSprite 2017-10-09 00:16:14 -07:00 • committed by GitHub
parent da8b20e0b1
commit 576e2b4be6
1 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
evennia/contrib/tests.py
View file

@ -907,7 +907,7 @@ class TestTutorialWorldRooms(CommandTest):
# test turnbattle # test turnbattle
from evennia.contrib.turnbattle import tb_basic from evennia.contrib.turnbattle import tb_basic, tb_equip
from evennia.objects.objects import DefaultRoom from evennia.objects.objects import DefaultRoom
@ -920,13 +920,32 @@ class TestTurnBattleCmd(CommandTest):
self.call(tb_basic.CmdPass(), "", "You can only do that in combat. (see: help fight)") self.call(tb_basic.CmdPass(), "", "You can only do that in combat. (see: help fight)")
self.call(tb_basic.CmdDisengage(), "", "You can only do that in combat. (see: help fight)") self.call(tb_basic.CmdDisengage(), "", "You can only do that in combat. (see: help fight)")
self.call(tb_basic.CmdRest(), "", "Char rests to recover HP.") self.call(tb_basic.CmdRest(), "", "Char rests to recover HP.")
# Test equipment commands
def test_turnbattleequipcmd(self):
# Start with equip module specific commands.
testweapon = create_object(tb_equip.TBEWeapon, key="test weapon")
testarmor = create_object(tb_equip.TBEArmor, key="test armor")
testweapon.move_to(self.char1)
testarmor.move_to(self.char1)
self.call(tb_equip.CmdWield(), "weapon", "Char wields test weapon.")
self.call(tb_equip.CmdUnwield(), "", "Char lowers test weapon.")
self.call(tb_equip.CmdDon(), "armor", "Char dons test armor.")
self.call(tb_equip.CmdDoff(), "", "Char removes test armor.")
# Also test the commands that are the same in the basic module
self.call(tb_equip.CmdFight(), "", "You can't start a fight if you've been defeated!")
self.call(tb_equip.CmdAttack(), "", "You can only do that in combat. (see: help fight)")
self.call(tb_equip.CmdPass(), "", "You can only do that in combat. (see: help fight)")
self.call(tb_equip.CmdDisengage(), "", "You can only do that in combat. (see: help fight)")
self.call(tb_equip.CmdRest(), "", "Char rests to recover HP.")
class TestTurnBattleFunc(EvenniaTest): class TestTurnBattleFunc(EvenniaTest):
# Test combat functions # Test combat functions
def test_turnbattlefunc(self): def test_turnbattlefunc(self):
attacker = create_object(tb_basic.BattleCharacter, key="Attacker") attacker = create_object(tb_basic.TBBasicCharacter, key="Attacker")
defender = create_object(tb_basic.BattleCharacter, key="Defender") defender = create_object(tb_basic.TBBasicCharacter, key="Defender")
testroom = create_object(DefaultRoom, key="Test Room") testroom = create_object(DefaultRoom, key="Test Room")
attacker.location = testroom attacker.location = testroom
defender.loaction = testroom defender.loaction = testroom
@ -957,7 +976,7 @@ class TestTurnBattleFunc(EvenniaTest):
# Is in combat # Is in combat
self.assertFalse(tb_basic.is_in_combat(attacker)) self.assertFalse(tb_basic.is_in_combat(attacker))
# Set up turn handler script for further tests # Set up turn handler script for further tests
attacker.location.scripts.add(tb_basic.TurnHandler) attacker.location.scripts.add(tb_basic.TBBasicTurnHandler)
turnhandler = attacker.db.combat_TurnHandler turnhandler = attacker.db.combat_TurnHandler
self.assertTrue(attacker.db.combat_TurnHandler) self.assertTrue(attacker.db.combat_TurnHandler)
# Force turn order # Force turn order
@ -991,7 +1010,7 @@ class TestTurnBattleFunc(EvenniaTest):
turnhandler.turn_end_check(attacker) turnhandler.turn_end_check(attacker)
self.assertTrue(turnhandler.db.turn == 1) self.assertTrue(turnhandler.db.turn == 1)
# Join fight # Join fight
joiner = create_object(tb_basic.BattleCharacter, key="Joiner") joiner = create_object(tb_basic.TBBasicCharacter, key="Joiner")
turnhandler.db.fighters = [attacker, defender] turnhandler.db.fighters = [attacker, defender]
turnhandler.db.turn = 0 turnhandler.db.turn = 0
turnhandler.join_fight(joiner) turnhandler.join_fight(joiner)
@ -1000,6 +1019,7 @@ class TestTurnBattleFunc(EvenniaTest):
# Remove the script at the end # Remove the script at the end
turnhandler.stop() turnhandler.stop()
# Test of the unixcommand module # Test of the unixcommand module
from evennia.contrib.unixcommand import UnixCommand from evennia.contrib.unixcommand import UnixCommand