Merge branch 'copperwater/sokoban_penalties' into NetHack-3.7

Closes #260
This commit is contained in:
Patric Mueller
2020-01-06 01:00:46 +01:00
4 changed files with 1 additions and 3 deletions

View File

@@ -106,6 +106,7 @@ default shk sell prompt to N (github #265)
teach non-mindless monsters about the Castle trapdoors (github #265)
always print a message when the hero teleports (github #265)
always print a message when the hero level teleports (github #265)
remove Sokoban luck penalties for actions you can't cheat with (github #260)
Code Cleanup and Reorganization

View File

@@ -1808,7 +1808,6 @@ int magic; /* 0=Physical, otherwise skill level */
* the effects of landing on the final position.
*/
teleds(cc.x, cc.y, FALSE);
sokoban_guilt();
nomul(-1);
g.multi_reason = "jumping around";
g.nomovemsg = "";

View File

@@ -967,7 +967,6 @@ xchar x, y;
newsym(u.ux0, u.uy0); /* clean up old position */
if (u.ux0 != u.ux || u.uy0 != u.uy) {
spoteffects(TRUE);
sokoban_guilt();
}
}
}

View File

@@ -842,7 +842,6 @@ boolean verbose;
You("%s in the opposite direction.", range > 1 ? "hurtle" : "float");
/* if we're in the midst of shooting multiple projectiles, stop */
endmultishot(TRUE);
sokoban_guilt();
uc.x = u.ux;
uc.y = u.uy;
/* this setting of cc is only correct if dx and dy are [-1,0,1] only */