diff --git a/celldrawer.cpp b/celldrawer.cpp index e554c0fa..8859abdf 100644 --- a/celldrawer.cpp +++ b/celldrawer.cpp @@ -617,7 +617,7 @@ void celldrawer::tune_colors() { aura_color = fcol; - if(peace::on && peace::hint && c->land != laTortoise) { + if(peace::on && peace::hint && (c->land != laTortoise || !tortoise::shading_on())) { int d = (c->land == laCamelot || (c->land == laCaribbean && celldistAlt(c) <= 0) || (c->land == laPalace && celldistAlt(c))) ? celldistAlt(c): celldist(c); diff --git a/complex.cpp b/complex.cpp index 53ab5dcf..be138181 100644 --- a/complex.cpp +++ b/complex.cpp @@ -2536,10 +2536,16 @@ EX namespace tortoise { else val = target; } + EX bool shading_enabled = true; + + EX bool shading_on() { + return shading_enabled && seek(); + } + EX void updateVals(int delta) { int currbits = getBits(cwt.at); for(int i=0; i<numbits; i++) - update(seekval[i], seek() && !(peace::on && !peace::hint) ? getBit(seekbits, i) : .5, delta); + update(seekval[i], shading_on() ? getBit(seekbits, i) : .5, delta); for(int i=0; i<numbits; i++) update(currval[i], getBit(currbits, i), delta); } diff --git a/config.cpp b/config.cpp index f031d85c..8a44649c 100644 --- a/config.cpp +++ b/config.cpp @@ -620,6 +620,8 @@ EX void initConfig() { addsaver(racing::standard_centering, "race_standard_centering"); #endif + addsaver(tortoise::shading_enabled, "tortoise_shading", true); + addsaver(bounded_mine_percentage, "bounded_mine_percentage"); addsaver(nisot::geodesic_movement, "solv_geodesic_movement", true); @@ -2091,6 +2093,10 @@ EX void show_color_dialog() { } #endif + if(cwt.at->land == laTortoise) { + dialog::addBoolItem_action(XLAT("Galápagos shading"), tortoise::shading_enabled, 'T'); + } + dialog::addInfo(XLAT("colors of some game objects can be edited by clicking them.")); dialog::addBreak(50); diff --git a/help.cpp b/help.cpp index 491cc236..05c1f32c 100644 --- a/help.cpp +++ b/help.cpp @@ -1083,5 +1083,10 @@ EX void gotoHelpFor(eLand l) { listbeasts(); }}); else listbeasts(); + + if(l == laTortoise) + help_extensions.push_back(help_extension{'t', XLAT("Galápagos shading"), [] () { + tortoise::shading_enabled = !tortoise::shading_enabled; + }}); } }