mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 01:20:37 +00:00
Code Issues Releases Wiki Activity

non-player multikills are no longer counted for achievements

Browse Source
This commit is contained in:
Zeno Rogue 2018-06-28 10:39:15 +02:00
parent c3feb7ddb7
commit b042a457cc
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game.cpp
View File

@ -4977,9 +4977,11 @@ void sideAttack(cell *mf, int dir, eMonster who, int bonuskill) {
sideAttack(mf, dir, who, 2, itOrbSide2); sideAttack(mf, dir, who, 2, itOrbSide2);
sideAttack(mf, dir, who, 3, itOrbSide3); sideAttack(mf, dir, who, 3, itOrbSide3);
if(who == moPlayer) {
int kills = tkills() - k + bonuskill; int kills = tkills() - k + bonuskill;
if(kills >= 5) achievement_gain("MELEE5"); if(kills >= 5) achievement_gain("MELEE5");
} }
}
void stabbingAttack(cell *mf, cell *mt, eMonster who, int bonuskill) { void stabbingAttack(cell *mf, cell *mt, eMonster who, int bonuskill) {
int numsh = 0, numflail = 0, numlance = 0, numslash = 0; int numsh = 0, numflail = 0, numlance = 0, numslash = 0;
@ -5067,6 +5069,7 @@ void stabbingAttack(cell *mf, cell *mt, eMonster who, int bonuskill) {
} }
} }
if(who == moPlayer) {
if(numsh) achievement_count("STAB", numsh, 0); if(numsh) achievement_count("STAB", numsh, 0);
if(numlance && numflail && numsh) achievement_gain("MELEE3"); if(numlance && numflail && numsh) achievement_gain("MELEE3");
@ -5078,6 +5081,7 @@ void stabbingAttack(cell *mf, cell *mt, eMonster who, int bonuskill) {
lastdouble = turncount; lastdouble = turncount;
} }
} }
}
bool cellDangerous(cell *c) { bool cellDangerous(cell *c) {
return cellUnstableOrChasm(c) || isFire(c) || c->wall == waClosedGate; return cellUnstableOrChasm(c) || isFire(c) || c->wall == waClosedGate;