mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

better messages when dropping Dead Orbs impossible

This commit is contained in:
Zeno Rogue 2018-04-23 12:14:29 +02:00
parent cf6d2a36c4
commit 4a8e33a2d5
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
game.cpp
View File

@ -6815,9 +6815,9 @@ bool collectItem(cell *c2, bool telekinesis) {
}
void dropGreenStone(cell *c) {
if(!passable(c, NULL, P_MONSTER)) {
if(items[itGreenStone] && !passable(c, NULL, P_MONSTER)) {
// NOTE: PL/CZ translations assume that itGreenStone is dropped to avoid extra forms!
addMessage("Cannot drop %the1 here!", itGreenStone);
addMessage(XLAT("Cannot drop %the1 here!", itGreenStone));
return;
}
if(items[itGreenStone] && c->item == itNone) {
@ -6834,7 +6834,15 @@ void dropGreenStone(cell *c) {
}
}
else {
if(gold() >= 300)
if(items[itGreenStone] && c->item == itGreenStone)
addMessage(XLAT("You juggle the Dead Orbs."));
else if(items[itGreenStone] && c->item)
addMessage(XLAT("You give %the1 a grim look.", c->item));
else if(items[itGreenStone]) {
addMessage(XLAT("Cannot drop %the1 here!", itGreenStone));
return;
}
else if(gold() >= 300)
addMessage(XLAT("You feel great, like a true treasure hunter."));
else if(gold() >= 200)
addMessage(XLAT("Your eyes shine like gems."));

2
language-pl.cpp
View File

@ -6888,3 +6888,5 @@ S("fisheye", "rybie oko")
S("paint pictures", "maluj obrazki")
S("list of slides", "lista slajdów")
S("back to the start menu", "powrót do menu startowego")
S("You juggle the Dead Orbs.", "Żonglujesz Martwymi Sferami.")
S("You give %the1 a grim look.", "Spoglądasz ponuro na %a1.")