Skip to content

Only show messages about lands that are in-game #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zenorogue merged 1 commit into from
Aug 19, 2025
Merged

Only show messages about lands that are in-game #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions attack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand All @@ -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;
}

Expand Down
6 changes: 3 additions & 3 deletions quit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,11 +433,11 @@ EX void showGameMenu() {
else if(peace::on) ;
else if(racing::on) ;
else if(!in_full_game()) ;
else if(tkills() < R100)
else if(tkills() < R100 && isLandIngame(laGraveyard))
dialog::addInfo(XLAT("Defeat %1 enemies to access the Graveyard", its(R100)));
else if(kills[moVizier] == 0 && (items[itFernFlower] < U5 || items[itGold] < U5))
else if(kills[moVizier] == 0 && (items[itFernFlower] < U5 || items[itGold] < U5) && isLandIngame(laEmerald))
dialog::addInfo(XLAT("Kill a Vizier in the Palace to access Emerald Mine"));
else if(items[itEmerald] < U5)
else if(items[itEmerald] < U5 && isLandIngame(laCamelot))
dialog::addInfo(XLAT("Collect 5 Emeralds to access Camelot"));
else if(landUnlocked(laHell) && ls::any_order()) {
eLand l = nextHyperstone();
Expand Down
Loading