mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-11-19 07:05:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/zenorogue/hyperrogue

Browse Source
This commit is contained in:
Zeno Rogue
2025-11-11 19:08:23 +01:00
parent 85e42a0105 ab714bb2dc
commit ce95c9084a
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
landlock.cpp
View File

@@ -222,13 +222,15 @@ EX bool landUnlockedRPM(eLand n) {
EX int lands_for_hell() {
int desired = casual ? 40 : 9;
int available = std::count_if(land_over.begin(), land_over.end(), [] (eLand l) { return !among(l, laHell, laCocytus, laPower) && !isCrossroads(l) && isLandIngame(l); });
int available = std::count_if(land_over.begin(), land_over.end(), [] (eLand l) { return !among(l, laHell, laCocytus, laPower) && !isCrossroads(l) && iinf[linf[l].treasure].itemclass == IC_TREASURE && isLandIngame(l); });
if(isLandIngame(laMirror) && isLandIngame(laMirrorOld)) --available;
return min(desired, available);
}
EX int lands_for_cr3() {
int desired = casual ? 20 : 9;
int available = std::count_if(land_over.begin(), land_over.end(), [] (eLand l) { return !isCrossroads(l) && isLandIngame(l); });
int available = std::count_if(land_over.begin(), land_over.end(), [] (eLand l) { return !isCrossroads(l) && iinf[linf[l].treasure].itemclass == IC_TREASURE && isLandIngame(l); });
if(isLandIngame(laMirror) && isLandIngame(laMirrorOld)) --available;
return min(desired, available);
}

16
mapeditor.cpp
View File

@@ -1335,6 +1335,7 @@ EX namespace mapeditor {
int paintstatueid = 0;
int radius = 0;
string paintwhat_str = "clear monster";
bool preserveparams = false;
cellwalker copysource;
@@ -1749,7 +1750,10 @@ EX namespace mapeditor {
if(anyshiftclick) { c->land = laNone; c->wall = waNone; map_version++; break; }
eLand last = c->land;
c->land = eLand(paintwhat);
if(isIcyLand(c) && isIcyLand(last))
if(preserveparams) {
// do nothing
}
else if(isIcyLand(c) && isIcyLand(last))
HEAT(c) += spillinc() / 100.;
else if(last == laDryForest && c->land == laDryForest)
c->landparam += spillinc();
@@ -1766,7 +1770,10 @@ EX namespace mapeditor {
c->wall = eWall(anyshiftclick ? paintwhat_alt_wall : paintwhat);
map_version++;
if(last != c->wall) {
if(preserveparams) {
// do nothing
}
else if(last != c->wall) {
if(hasTimeout(c))
c->wparam = 10;
else if(c->wall == waWaxWall)
@@ -1776,7 +1783,7 @@ EX namespace mapeditor {
c->wparam += spillinc();
if(c->wall == waEditStatue) {
c->wparam = paintstatueid;
if(!preserveparams) c->wparam = paintstatueid;
c->mondir = cdir;
}
@@ -3389,6 +3396,9 @@ EX namespace mapeditor {
dialog::addItem(XLAT("change the pattern/color of new Canvas cells"), 'c');
dialog::add_action_push(patterns::showPrePatternNoninstant);
dialog::addBoolItem_action(XLAT("preserve parameters when editing walls and lands"), preserveparams, 'P');
dialog::addInfo(XLAT("(unexpected parameter values may cause undesired behavior)"));
dialog::addItem(XLAT("configure WFC"), 'W');
dialog::add_action_push(wfc::wfc_menu);