mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-05-17 14:44:08 +00:00
Code Issues Releases Wiki Activity

fixed kill counting

Browse Source
This commit is contained in:
Zeno Rogue 2020-03-07 15:13:32 +01:00
parent 92f682596e
commit 99c497e86b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcmove.cpp
View File

@ -885,6 +885,7 @@ bool pcmove::attack() {
mirror::act(origd, mirror::SPINMULTI | mirror::ATTACK); mirror::act(origd, mirror::SPINMULTI | mirror::ATTACK);
int tk = tkills(); int tk = tkills();
plague_kills = 0;
if(good_tortoise) { if(good_tortoise) {
changes.at_commit([c2] { changes.at_commit([c2] {
@ -925,7 +926,7 @@ bool pcmove::attack() {
} }
} }
sideAttack(cwt.at, d, moPlayer, tkills() - tk); sideAttack(cwt.at, d, moPlayer, tkills() - tk - plague_kills);
lastmovetype = lmAttack; lastmove = c2; lastmovetype = lmAttack; lastmove = c2;
swordAttackStatic(); swordAttackStatic();
@ -1303,11 +1304,9 @@ EX int plague_kills;
EX void spread_plague(cell *mf, cell *mt, int dir, eMonster who) { EX void spread_plague(cell *mf, cell *mt, int dir, eMonster who) {
if(!(who == moPlayer ? markOrb(itOrbPlague) : !markEmpathy(itOrbPlague))) return; if(!(who == moPlayer ? markOrb(itOrbPlague) : !markEmpathy(itOrbPlague))) return;
int kk = tkills();
forCellEx(mx, mt) if(celldistance(mx, mf) > celldistance(mx, mf->modmove(dir)) && celldistance(mx, mf) <= 4) { forCellEx(mx, mt) if(celldistance(mx, mf) > celldistance(mx, mf->modmove(dir)) && celldistance(mx, mf) <= 4) {
sideAttackAt(mf, dir, mx, who, itOrbPlague, mt); sideAttackAt(mf, dir, mx, who, itOrbPlague, mt);
} }
plague_kills += tkills() - kk;
} }
EX void sideAttackAt(cell *mf, int dir, cell *mt, eMonster who, eItem orb, cell *pf) { EX void sideAttackAt(cell *mf, int dir, cell *mt, eMonster who, eItem orb, cell *pf) {
@ -1329,7 +1328,11 @@ EX void sideAttackAt(cell *mf, int dir, cell *mt, eMonster who, eItem orb, cell
changes.ccell(mt); changes.ccell(mt);
plague_particles(); plague_particles();
if(who != moPlayer) markOrb(itOrbEmpathy); if(who != moPlayer) markOrb(itOrbEmpathy);
int kk = 0;
if(orb == itOrbPlague) kk = tkills();
if(attackMonster(mt, AF_NORMAL | AF_SIDE | AF_MSG, who) || isAnyIvy(m)) { if(attackMonster(mt, AF_NORMAL | AF_SIDE | AF_MSG, who) || isAnyIvy(m)) {
if(orb == itOrbPlague && kk < tkills())
plague_kills++;
if(mt->monst != m) spread_plague(mf, mt, dir, who); if(mt->monst != m) spread_plague(mf, mt, dir, who);
produceGhost(mt, m, who); produceGhost(mt, m, who);
} }
@ -1378,7 +1381,7 @@ EX void sideAttack(cell *mf, int dir, eMonster who, int bonuskill) {
sideAttack(mf, dir, who, 1, itOrbSide1); sideAttack(mf, dir, who, 1, itOrbSide1);
sideAttack(mf, dir, who, 2, itOrbSide2); sideAttack(mf, dir, who, 2, itOrbSide2);
sideAttack(mf, dir, who, 3, itOrbSide3); sideAttack(mf, dir, who, 3, itOrbSide3);
k -= tkills() - plague_kills; k += plague_kills;
if(who == moPlayer) { if(who == moPlayer) {
int kills = tkills() - k + bonuskill; int kills = tkills() - k + bonuskill;