mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-07-03 10:12:51 +00:00
Code Issues Releases Wiki Activity

slime destroyed by lava; winter picks up ice-encased items

Browse Source
This commit is contained in:
Zeno Rogue 2017-10-15 01:32:16 +02:00
parent d2d15cae7c
commit 2ec42f0469
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
game.cpp
View File

@ -2467,8 +2467,8 @@ void checkTide(cell *c) {
if(c->land == laVolcano) { if(c->land == laVolcano) {
int id = lavatide(c, 0); int id = lavatide(c, 0);
if(id < 96) { if(id < 96) {
if(c->wall == waNone || isWateryOrBoat(c) || c->wall == waVinePlant) { if(c->wall == waNone || isWateryOrBoat(c) || c->wall == waVinePlant || isAlch(c)) {
if(isWateryOrBoat(c)) if(isWateryOrBoat(c) || isAlch(c))
playSound(c, "steamhiss"); playSound(c, "steamhiss");
c->wall = waMagma; c->wall = waMagma;
if(itemBurns(c->item)) { if(itemBurns(c->item)) {
@ -7299,6 +7299,10 @@ bool movepcto(int d, int subdir, bool checkonly) {
cwt.c->wall = waIcewall; cwt.c->wall = waIcewall;
} }
if(items[itOrbWinter])
forCellEx(c3, c2) if(c3->wall == waIcewall && c3->item)
markOrb(itOrbWinter), collectItem(c3);
movecost(cwt.c, c2); movecost(cwt.c, c2);
{ {

4
help.cpp
View File

@ -219,6 +219,10 @@ string generateHelpForItem(eItem it) {
help += XLAT("\n\nThis Orb protects you from attacks, scents, and insulates you " help += XLAT("\n\nThis Orb protects you from attacks, scents, and insulates you "
"from electricity. It does not let you go through deadly terrain, but " "from electricity. It does not let you go through deadly terrain, but "
"if you are attacked with fire, it lets you stay in place in it."); "if you are attacked with fire, it lets you stay in place in it.");
if(it == itOrbWinter)
help += XLAT("\n\nThis Orb also allows you to collect items encased in ice.");
if(it == itOrbEmpathy) { if(it == itOrbEmpathy) {
int cnt = 0; int cnt = 0;
for(int i=0; i<ittypes; i++) { for(int i=0; i<ittypes; i++) {