Skip to content

Rework removed tiles in Crystal World #483

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
Dec 11, 2025
Merged

Rework removed tiles in Crystal World #483

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
2 changes: 1 addition & 1 deletion help.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ EX void describeMouseover() {
}
#endif

if(c->wall && !(c->wall == waChasm && c->land == laDual && ctof(c)) &&
if(c->wall && !(c->land == laDual && pseudohept(c)) &&
!(c->land == laMemory) &&
!((c->wall == waFloorA || c->wall == waFloorB) && c->item)) {

Expand Down
3 changes: 2 additions & 1 deletion passable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ EX bool anti_alchemy(cell *w, cell *from) {
EX bool passable(cell *w, cell *from, flagtype flags) {
bool vrevdir = bool(flags&P_VOID);

if(w->land == laDual && pseudohept(w) && !F(P_BULLET)) return false;

if(from && from != w && nonAdjacent(from, w) && !F(P_IGNORE37 | P_BULLET)) return false;

if((isWateryOrBoat(w) || w->wall == waShallow) && F(P_WATERCURSE))
Expand All @@ -169,7 +171,6 @@ EX bool passable(cell *w, cell *from, flagtype flags) {
if(airdist(w) < 3) return false;
if(againstWind(w,from)) return false;
if(isGravityLand(w)) return false;
if(w->wall == waChasm && w->land == laDual) return false;
}

if(from && strictlyAgainstGravity(w, from, vrevdir, flags)
Expand Down
2 changes: 1 addition & 1 deletion pcmove.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,7 @@ void pcmove::tell_why_impassable() {
if(vmsg(miRESTRICTED, siGRAVITY, c2, moNone))
addMessage(XLAT("Gravity does not allow this!"));
}
else if(c2->wall == waChasm && c2->land == laDual) {
else if(c2->land == laDual && pseudohept(c2)) {
if(vmsg(miRESTRICTED, siWALL, c2, moNone))
addMessage(XLAT("You cannot move there!"));
}
Expand Down