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

Ugh!!! TickerHandler changes, more

Browse source
This commit is contained in:
BattleJenkins 2017-11-29 15:37:40 -08:00
parent 0c8db01d56
commit dc67f4b871
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/contrib/tests.py
View file

@ -1307,7 +1307,7 @@ class TestTurnBattleFunc(EvenniaTest):
turnhandler.stop() turnhandler.stop()
# Now time to test item stuff. # Now time to test item stuff.
user = create_object(tb_items.TBItemsCharacter, key="User") user = create_object(tb_items.TBItemsCharacter, key="User")
tb_items.tickerhandler.remove(interval=30, callback=user.at_update) tb_items.tickerhandler.remove(interval=30, callback=user.at_update, idstring="update")
testroom = create_object(DefaultRoom, key="Test Room") testroom = create_object(DefaultRoom, key="Test Room")
user.location = testroom user.location = testroom
test_healpotion = create_object(key="healing potion") test_healpotion = create_object(key="healing potion")

2
evennia/contrib/turnbattle/tb_items.py
View file

@ -497,7 +497,7 @@ class TBItemsCharacter(DefaultCharacter):
self.db.hp = self.db.max_hp # Set current HP to maximum self.db.hp = self.db.max_hp # Set current HP to maximum
self.db.conditions = {} # Set empty dict for conditions self.db.conditions = {} # Set empty dict for conditions
# Subscribe character to the ticker handler # Subscribe character to the ticker handler
tickerhandler.add(NONCOMBAT_TURN_TIME, self.at_update) tickerhandler.add(NONCOMBAT_TURN_TIME, self.at_update, idstring="update")
""" """
Adds attributes for a character's current and maximum HP. Adds attributes for a character's current and maximum HP.
We're just going to set this value at '100' by default. We're just going to set this value at '100' by default.