summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--battle/common.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/battle/common.py b/battle/common.py
index 6fee368..a8407fe 100644
--- a/battle/common.py
+++ b/battle/common.py
@@ -24,7 +24,7 @@ from consts import (SC_ATKUP, SC_DEFDOWN, SC_DEFUP, SC_ATKDOWN,
SFLAG_CLEARGEMS, SFLAG_DOUBLEGEMS, SFLAG_SPECIAL,
SFLAG_FIRSTLOOT, SFLAG_DOUBLEEXP, SFLAG_DOUBLEGP,
SPH_WIDEATTACK, SPH_PIERCE, SPH_ASSAULT, SPH_HEAL, SPH_HEALALL, SPH_ATKUP,
- SPH_DEFUP, SPH_NONE, SRV_SPHERE, SRV_WAVE)
+ SPH_DEFUP, SPH_NONE, SRV_SPHERE, SRV_WAVE, SRV_NOCAST)
import random, traceback
import player
@@ -95,13 +95,15 @@ def attackall(token, atker, scope):
for c, i in enumerate(Battle[token][scope]):
if (i["hp"] < 0):
continue
- i["hp"]-=calc_dmg(token, atker, i, atker["atk"], 0.0)
+
+ dmg = calc_dmg(token, atker, i, atker["atk"], 0.0)
+ i["hp"]-=dmg
# If passed with a negative value...
if (i["hp"] > i["max_hp"]):
i["hp"]=0+i["max_hp"]
- #Battle[token]["log"].append(["party", idx, sphere, dmg, scope, c])
+ Battle[token]["log"].append(["", 0, SRV_NOCAST, dmg, scope, c])
return False
#############################################