mirror of
https://github.com/evennia/evennia.git
synced 2026-04-01 21:47:17 +02:00
Restore minor fixes
Restores some minor fixes I committed and accidentally reverted when I failed to update my local copy of the module. Note to self: start actually using GitHub correctly.
This commit is contained in:
parent
8849366ae9
commit
49cf1220a6
1 changed files with 2 additions and 1 deletions
|
|
@ -528,7 +528,7 @@ class TurnHandler(DefaultScript):
|
|||
for fighter in self.db.fighters:
|
||||
combat_cleanup(fighter) #Clean up leftover combat attributes beforehand, just in case.
|
||||
fighter.db.Combat_ActionsLeft = 1 #Actions remaining - start of turn adds to this, turn ends when it reaches 0
|
||||
fighter.db.Combat_TurnHandler = self #Add a reference to this scrip to the character
|
||||
fighter.db.Combat_TurnHandler = self #Add a reference to this script to the character
|
||||
fighter.db.Combat_LastAction = "null" #Track last action taken in combat
|
||||
# Roll initiative and sort the list of fighters depending on who rolls highest to determine turn order.
|
||||
# The initiative roll is determined by the roll_init function and can be customized easily.
|
||||
|
|
@ -557,6 +557,7 @@ class TurnHandler(DefaultScript):
|
|||
# If the current character has no actions remaining, go to the next turn.
|
||||
if not currentchar.db.Combat_ActionsLeft:
|
||||
self.next_turn()
|
||||
return
|
||||
|
||||
# Warn the current character if they're about to time out.
|
||||
if self.db.timer == 10: # 10 seconds left
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue