mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-11-09 18:23:00 +00:00
Only show messages about lands that are in-game
This commit is contained in:
13
attack.cpp
13
attack.cpp
@@ -1036,7 +1036,7 @@ EX bool attackMonster(cell *c, flagtype flags, eMonster killer) {
|
||||
int ntk = tkills();
|
||||
int ntkt = killtypes();
|
||||
|
||||
if(tkt < R20 && ntkt >= R20 && in_full_game()) {
|
||||
if(tkt < R20 && ntkt >= R20 && in_full_game() && isLandIngame(laDragon)) {
|
||||
addMessage(XLAT("You hear a distant roar!"));
|
||||
playSound(NULL, "message-roar");
|
||||
}
|
||||
@@ -1056,22 +1056,23 @@ EX bool attackMonster(cell *c, flagtype flags, eMonster killer) {
|
||||
if(tk < 10 && ntk >= 10 && in_full_game() && !big_unlock)
|
||||
addMessage(XLAT("Good to know that your fighting skills serve you well in this strange world."));
|
||||
|
||||
if(tk < R100/2 && ntk >= R100/2 && in_full_game())
|
||||
if(tk < R100/2 && ntk >= R100/2 && in_full_game() && isLandIngame(laGraveyard))
|
||||
addMessage(XLAT("You wonder where all these monsters go, after their death..."));
|
||||
|
||||
if(tk < R100 && ntk >= R100 && in_full_game())
|
||||
if(tk < R100 && ntk >= R100 && in_full_game() && isLandIngame(laGraveyard))
|
||||
addMessage(XLAT("You feel that the souls of slain enemies pull you to the Graveyard..."));
|
||||
|
||||
if(!tu && landUnlocked(laTrollheim) && in_full_game()) {
|
||||
if(!tu && landUnlocked(laTrollheim) && in_full_game() && isLandIngame(laTrollheim)) {
|
||||
playSound(c, "message-troll");
|
||||
addMessage(XLAT("%The1 says, \"I die, but my clan in Trollheim will avenge me!\"", m));
|
||||
}
|
||||
|
||||
if(!eu && landUnlocked(laElementalWall) && in_full_game())
|
||||
if(!eu && landUnlocked(laElementalWall) && in_full_game() && isLandIngame(laElementalWall))
|
||||
addMessage(XLAT("After killing %the1, you feel able to reach the Elemental Planes!", m));
|
||||
|
||||
if(m == moVizier && c->monst != moVizier && kills[moVizier] == 1 && in_full_game()) {
|
||||
addMessage(XLAT("Hmm, he has been training in the Emerald Mine. Interesting..."));
|
||||
if(isLandIngame(laEmerald))
|
||||
addMessage(XLAT("Hmm, he has been training in the Emerald Mine. Interesting..."));
|
||||
princess::forceMouse = true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user