Various changes, make purple fireball scaled, adding various comments and ideas to the README.md

Author: deckarep

README.md

@@ -103,4 +103,5 @@ dumb shit like that.
   * This would make the game a little more interesting because you can pick up cerrtain heroes
   as part of the strategy to help you cope with the certain level.
 * Introduce themed levels, like a frost level where most or all baddies are cold-based.
-* Introduce upgrades along the way, pick up treason, loot upgrade your heroes.
+* Introduce upgrades along the way, pick up treason, loot upgrade your heroes.
+* Gamepad support, it might be fun to not always use the damn keyboard.

res/drawable/purple_fire_ball

@@ -1 +1 @@
-purple_exp 0 0 16 32 15
+purple_exp 0 0 16 16 30

zsrc/map.zig

@@ -54,6 +54,9 @@ pub fn clearMapGenerator() void {
     hasMap = std.mem.zeroes([MAP_SIZE][MAP_SIZE]bool);
 }
 
+/// Iterates the 8 neighboring cells surrounding a central cell at position
+/// (x,y) and returns a count of how many cells are set to true excluding
+/// the cell itself.
 fn count(x: c_int, y: c_int) c_int {
     var ret: c_int = 0;
 
@@ -280,24 +283,24 @@ fn initMap() void {
 }
 
 fn decorateMap() void {
-    var i: c_int = 0;
     const lim: c_int = @intFromFloat(@as(f64, res.n) * @as(f64, res.m) * MAP_HOW_OLD);
     var x: usize = 0;
     var y: usize = 0;
 
+    var i: c_int = 0;
     while (i < lim) : (i += 1) { // Original out for loop.
         while (true) {
             x = @intCast(hlp.randInt(0, res.n - 2));
             y = @intCast(hlp.randInt(0, res.m - 2));
 
             // r.c. - need ints because how many "trues" get counted.
-            const condition = @as(c_int, @intFromBool((hasMap[x][y] and !isTrap[x][y]))) +
+            const cond = @as(c_int, @intFromBool((hasMap[x][y] and !isTrap[x][y]))) +
                 @as(c_int, @intFromBool((hasMap[x + 1][y] and !isTrap[x + 1][y]))) +
                 @as(c_int, @intFromBool((hasMap[x][y + 1] and !isTrap[x][y + 1]))) +
                 @as(c_int, @intFromBool((hasMap[x + 1][y + 1] and !isTrap[x + 1][y + 1]))) < 4;
 
             // Since we ported a do-while loop, we negate the condition.
-            if (!condition) break;
+            if (!cond) break;
         }
 
         if (hlp.randDouble() < MAP_HOW_OLD) {
@@ -333,6 +336,9 @@ pub fn initBlankMap(w: c_int, h: c_int) void {
         }
     }
 
+    // r.c. this was added by me, to give the title/menu more visual interest.
+    decorateMap();
+
     std.log.info("initBlankMap finished...", .{});
 }
 
@@ -354,6 +360,7 @@ pub fn initRandomMap(floorPercent: f64, smoothTimes: c_int, trapRate: f64) void
         }
     }
 
+    // NOTE: This code places spiked traps.
     var t: c_int = @intFromFloat(@as(f64, res.n) * @as(f64, res.m) * trapRate);
     while (t > 0) : (t -= 1) {
         var x: c_int = undefined;
@@ -391,6 +398,7 @@ pub fn initRandomMap(floorPercent: f64, smoothTimes: c_int, trapRate: f64) void
         }
     }
 
+    // NOTE: This finds a single x,y map location for an exit block.
     // Converted from do-while nonsense to while w/negated if condition.
     while (true) {
         exitX = hlp.randInt(0, res.n - 1);
@@ -404,6 +412,9 @@ pub fn initRandomMap(floorPercent: f64, smoothTimes: c_int, trapRate: f64) void
         if (!cond) break;
     }
 
+    // r.c. - In both the original and this port, i'm not seeing an exit block render.
+    // I have confirmed it's because enable is false. Setting it to true shows the block
+    // but does nothing as it's not used in the game.
     initBlock(
         &gm.map[@intCast(exitX)][@intCast(exitY)],
         .BLOCK_EXIT,
@@ -413,9 +424,7 @@ pub fn initRandomMap(floorPercent: f64, smoothTimes: c_int, trapRate: f64) void
         false,
     );
 
-    // #ifdef DBG
-    //   printf("exit: %d %d\n", exitX, exitY);
-    // #endif
+    std.log.debug("exit: {d},{d}", .{ exitX, exitY });
 
     initMap();
     decorateMap();
@@ -424,10 +433,6 @@ pub fn initRandomMap(floorPercent: f64, smoothTimes: c_int, trapRate: f64) void
 }
 
 pub fn pushMapToRender() void {
-    // BUG: map isn't centered.
-    // CHECK: map is the correct dimensions.
-    // BIG FAT TODO: I'm not sure I ported over the if/else if/else nesting properly...fuck c for having optional curly braces.
-
     // Aliases to cutdown on long names.
     const cpa = ren.createAndPushAnimation;
 

zsrc/render.zig

@@ -249,7 +249,9 @@ pub fn renderCenteredText(text: *const tps.Text, x: c_int, y: c_int, scale: f64)
     return .{ .x = x - @divTrunc(width, 2), .y = y - @divTrunc(height, 1) };
 }
 
-fn renderCenteredTextBackground(text: *tps.Text, x: c_int, y: c_int, scale: f64) void {
+/// Renders a background centered behind some text object. The intention is to render the background
+/// then, followup by rendering the text itself using: renderCenteredText(...).
+fn renderCenteredBGForText(text: *const tps.Text, clr: c.SDL_Color, x: c_int, y: c_int, scale: f64) void {
     const width: f64 = @as(f64, @floatFromInt(text.width)) * scale + 0.5;
     const height: f64 = @as(f64, @floatFromInt(text.height)) * scale + 0.5;
     const dst: c.SDL_Rect = .{
@@ -259,18 +261,26 @@ fn renderCenteredTextBackground(text: *tps.Text, x: c_int, y: c_int, scale: f64)
         .h = @intFromFloat(height),
     };
     _ = c.SDL_SetRenderDrawBlendMode(renderer, c.SDL_BLENDMODE_BLEND);
-    _ = c.SDL_SetRenderDrawColor(renderer, 255, 0, 0, 200);
+    _ = c.SDL_SetRenderDrawColor(renderer, clr.r, clr.g, clr.b, clr.a);
     _ = c.SDL_RenderFillRect(renderer, &dst);
 }
 
 fn renderId() void {
     const powerful = ai.getPowerfulPlayer();
+    const clr: c.SDL_Color = .{
+        .r = 255,
+        .g = 0,
+        .b = 0,
+        .a = 200,
+    };
+
     for (0..@intCast(gm.playersCount)) |i| {
         const snake = gm.spriteSnake[i].?;
         if (snake.sprites.first != null) {
             const snakeHead: *spr.Sprite = @alignCast(@ptrCast(snake.sprites.first.?.data.?));
+
             if (i == powerful) {
-                renderCenteredTextBackground(&res.texts[4 + i], snakeHead.x, snakeHead.y, 0.5);
+                renderCenteredBGForText(&res.texts[4 + i], clr, snakeHead.x, snakeHead.y, 0.5);
             }
             _ = renderCenteredText(&res.texts[4 + i], snakeHead.x, snakeHead.y, 0.5);
         }
@@ -404,6 +414,7 @@ pub fn renderAnimation(a: ?*tps.Animation) void {
     const ani = a.?;
 
     updateAnimationFromBind(ani);
+
     var width = ani.origin.width;
     var height = ani.origin.height;
     var poi: c.SDL_Point = .{
@@ -456,6 +467,7 @@ pub fn renderAnimation(a: ?*tps.Animation) void {
         &poi,
         ani.flip,
     );
+
     if (ani.effect) |_| {
         unsetEffect(ani.origin);
     }
@@ -621,7 +633,7 @@ fn renderInfo() void {
     }
 
     if (gm.playersCount == 1) {
-        var buf: [1 << 8]u8 = undefined;
+        var buf: [64]u8 = undefined;
 
         // TODO: try needs to be here.
         const strResult = std.fmt.bufPrintZ(

zsrc/weapons.zig

@@ -362,7 +362,7 @@ pub fn initWeapons() !void {
     curWep.bulletSpeed = 7;
     curWep.deathAni.?.angle = -1;
     curWep.deathAni.?.scaled = false;
-    curWep.flyAni.?.scaled = false;
+    curWep.flyAni.?.scaled = true;
     curWep.deathAni.?.at = .AT_CENTER;
     curWep.birthAudio = res.AUDIO_ICE_SHOOT;
     curWep.deathAudio = res.AUDIO_ARROW_HIT;