mirror of
				https://github.com/zenorogue/hyperrogue.git
				synced 2025-11-04 15:53:00 +00:00 
			
		
		
		
	rogueviz::ads:: fixed invincibility blinking, also perma-invincibility in the guided tour
This commit is contained in:
		@@ -363,9 +363,9 @@ void view_ads_game() {
 | 
			
		||||
 | 
			
		||||
    if(!game_over && !paused && !in_replay && !hv && !which_cross) {
 | 
			
		||||
      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;
 | 
			
		||||
        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) {
 | 
			
		||||
        shiftmatrix M = shiftless(spin(ang*degree) * Id);
 | 
			
		||||
 
 | 
			
		||||
@@ -677,9 +677,9 @@ void view_ds_game() {
 | 
			
		||||
 | 
			
		||||
    if(!game_over && !paused) {
 | 
			
		||||
      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;
 | 
			
		||||
        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) {
 | 
			
		||||
        if(hv) {
 | 
			
		||||
 
 | 
			
		||||
@@ -133,6 +133,7 @@ slide relhell_tour[] = {
 | 
			
		||||
        tour::slide_backup(texture_off, true);
 | 
			
		||||
        dynamicval<ld> fs(future_shown, -10);
 | 
			
		||||
        ds_restart_scaled();
 | 
			
		||||
        tour::slide_backup(invincibility_pt, HUGE_VAL);
 | 
			
		||||
 | 
			
		||||
        rockgen.cshift = 0;
 | 
			
		||||
 | 
			
		||||
@@ -171,6 +172,7 @@ slide relhell_tour[] = {
 | 
			
		||||
        tour::slide_backup(texture_off, true);
 | 
			
		||||
        dynamicval<ld> fs(future_shown, -10);
 | 
			
		||||
        ds_restart_scaled();
 | 
			
		||||
        tour::slide_backup(invincibility_pt, HUGE_VAL);
 | 
			
		||||
 | 
			
		||||
        rockgen.cshift = 0;
 | 
			
		||||
 | 
			
		||||
@@ -213,6 +215,7 @@ slide relhell_tour[] = {
 | 
			
		||||
        tour::slide_backup(view_proper_times, true);
 | 
			
		||||
        dynamicval<ld> fs(future_shown, -10);
 | 
			
		||||
        ds_restart_scaled();
 | 
			
		||||
        tour::slide_backup(invincibility_pt, HUGE_VAL);
 | 
			
		||||
 | 
			
		||||
        rockgen.cshift = 10;
 | 
			
		||||
        });
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user