mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 05:52:59 +00:00
Code Issues Releases Wiki Activity

rogueviz::ads:: fixed invincibility blinking, also perma-invincibility in the guided tour

Browse Source
This commit is contained in:
Zeno Rogue
2025-04-08 12:25:02 +02:00
parent f962d5609d
commit e3c551bf69
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rogueviz/ads/display.cpp
View File

@@ -363,9 +363,9 @@ void view_ads_game() {
if(!game_over && !paused && !in_replay && !hv && !which_cross) { if(!game_over && !paused && !in_replay && !hv && !which_cross) {
poly_outline = 0xFF; poly_outline = 0xFF;
if(ship_pt < invincibility_pt) { if(ship_pt < invincibility_pt && invincibility_pt < HUGE_VAL) {
ld u = (invincibility_pt-ship_pt) / ads_how_much_invincibility; ld u = (invincibility_pt-ship_pt) / ads_how_much_invincibility;
poly_outline = gradient(shipcolor, rsrc_color[rtHull], 0, 0.5 + cos(5*u*TAU), 1); poly_outline = gradient(shipcolor, rsrc_color[rtHull], 1, cos(5*u*TAU), -1);
} }
render_ship_parts([&] (const hpcshape& sh, color_t col, int sym) { render_ship_parts([&] (const hpcshape& sh, color_t col, int sym) {
shiftmatrix M = shiftless(spin(ang*degree) * Id); shiftmatrix M = shiftless(spin(ang*degree) * Id);

4
rogueviz/ads/ds-game.cpp
View File

@@ -677,9 +677,9 @@ void view_ds_game() {
if(!game_over && !paused) { if(!game_over && !paused) {
poly_outline = 0xFF; poly_outline = 0xFF;
if(ship_pt < invincibility_pt) { if(ship_pt < invincibility_pt && invincibility_pt < HUGE_VAL) {
ld u = (invincibility_pt-ship_pt) / ds_how_much_invincibility; ld u = (invincibility_pt-ship_pt) / ds_how_much_invincibility;
poly_outline = gradient(shipcolor, rsrc_color[rtHull], 0, 0.5 + cos(5*u*TAU), 1); poly_outline = gradient(shipcolor, rsrc_color[rtHull], 1, cos(5*u*TAU), -1);
} }
render_ship_parts([&] (const hpcshape& sh, color_t col, int sym) { render_ship_parts([&] (const hpcshape& sh, color_t col, int sym) {
if(hv) { if(hv) {

3
rogueviz/ads/tour.cpp
View File

@@ -133,6 +133,7 @@ slide relhell_tour[] = {
tour::slide_backup(texture_off, true); tour::slide_backup(texture_off, true);
dynamicval<ld> fs(future_shown, -10); dynamicval<ld> fs(future_shown, -10);
ds_restart_scaled(); ds_restart_scaled();
tour::slide_backup(invincibility_pt, HUGE_VAL);
rockgen.cshift = 0; rockgen.cshift = 0;
@@ -171,6 +172,7 @@ slide relhell_tour[] = {
tour::slide_backup(texture_off, true); tour::slide_backup(texture_off, true);
dynamicval<ld> fs(future_shown, -10); dynamicval<ld> fs(future_shown, -10);
ds_restart_scaled(); ds_restart_scaled();
tour::slide_backup(invincibility_pt, HUGE_VAL);
rockgen.cshift = 0; rockgen.cshift = 0;
@@ -213,6 +215,7 @@ slide relhell_tour[] = {
tour::slide_backup(view_proper_times, true); tour::slide_backup(view_proper_times, true);
dynamicval<ld> fs(future_shown, -10); dynamicval<ld> fs(future_shown, -10);
ds_restart_scaled(); ds_restart_scaled();
tour::slide_backup(invincibility_pt, HUGE_VAL);
rockgen.cshift = 10; rockgen.cshift = 10;
}); });