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

Make evadventure get_sides more consistent. Resolve #3199

Browse source
This commit is contained in:
Griatch 2023-07-14 13:39:04 +02:00
parent 0d8533e61e
commit eed5ea78a4
9 changed files with 20 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

5
evennia/contrib/tutorials/evadventure/combat_twitch.py
View file

@ -106,11 +106,11 @@ class EvAdventureCombatTwitchHandler(EvAdventureCombatBaseHandler):
npcs = [comb for comb in combatants if comb not in pcs]
if combatant in pcs:
# combatant is a PC, so NPCs are all enemies
allies = [comb for comb in pcs if comb != combatant]
allies = pcs
enemies = npcs
else:
# combatant is an NPC, so PCs are all enemies
allies = [comb for comb in npcs if comb != combatant]
allies = npcs
enemies = pcs
return allies, enemies
@ -216,7 +216,6 @@ class EvAdventureCombatTwitchHandler(EvAdventureCombatBaseHandler):
"""
allies, enemies = self.get_sides(self.obj)
allies.append(self.obj)
location = self.obj.location