fix: UI: artifacts after death animation

kiedtl · Sep 7, 2023 · 460627a · 460627a
1 parent e13fee5
commit 460627a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/state.zig b/src/state.zig
@@ -58,8 +58,8 @@ const GeneratorCtx = @import("generators.zig").GeneratorCtx;
 pub const GameState = union(enum) { Game, Win, Lose, Quit, Viewer };
 pub const Layout = union(enum) { Unknown, Room: usize };
 
-pub const HEIGHT = 110;
-pub const WIDTH = 50;
+pub const HEIGHT = 80;
+pub const WIDTH = 40;
 pub const LEVELS = 14; //21;
 pub const PLAYER_STARTING_LEVEL = 13; //19; // TODO: define in data file
 

diff --git a/src/surfaces.zig b/src/surfaces.zig
@@ -1054,7 +1054,7 @@ pub const Shrine = Machine{
                     return false;
                 }
 
-                state.player.max_MP += if (state.player.hasStatus(.Absorbing)) 5 else 2;
+                state.player.max_MP += if (state.player.hasStatus(.Absorbing)) @as(usize, 5) else 2;
                 const total = rng.range(usize, state.player.max_MP / 2, state.player.max_MP * 15 / 10);
                 const pot = @intCast(usize, state.player.stat(.Potential));
                 const amount = player.calculateDrainableMana(total);

diff --git a/src/ui.zig b/src/ui.zig
@@ -4759,7 +4759,7 @@ pub fn animationDeath(ctx: *GeneratorCtx(void), self: *Console) void {
 
     var i: usize = 0;
     var z: isize = @intCast(isize, pdc.distance(Coord.new(self.width, self.height / 2)));
-    const m = math.max(self.width - pdc.x, self.height - pdc.y) * 3;
+    const m = math.max(self.width - pdc.x, self.height - pdc.y) * 15 / 10;
     while (i < m) : (i += 1) {
         var farthest_ray: usize = 0;
         for (rays.slice()) |*ray, angle| {
@@ -4795,9 +4795,10 @@ pub fn animationDeath(ctx: *GeneratorCtx(void), self: *Console) void {
 
                 const cell = self.getCell(x, y);
 
-                if (Coord.new(x, y).distance(pdc) < 3) {
+                if (Coord.new(x, y).distance(pdc) < 2) {
                     ray.dead = true;
-                    self.setCell(x, y, .{ .trans = true });
+                    self.setCell(x, y, .{ .trans = true, .fl = .{ .wide = cell.fl.wide } });
+                    if (cell.fl.wide) self.setCell(x, y, .{ .fl = .{ .skip = true } });
                 } else if (!cell.fl.skip) {
                     ray.c.trans = false;
                     if ((ray.c.bg == colors.BG or rng.percent(33)) and cell.bg != colors.BG) {
@@ -4855,6 +4856,7 @@ pub fn animationDeath(ctx: *GeneratorCtx(void), self: *Console) void {
         ctx.yield({});
     }
 
+    self.clearTo(.{ .trans = true });
     ctx.finish();
 }