Follow only unoccupied resource fileds

Author: pwalig

src/client.zig

@@ -41,7 +41,7 @@ pub const Client = struct {
             try std.io.getStdOut().writer().print("server closed the connection\n", .{});
             return false;
         }
-        print("MSG: {s}\n", .{buff.items});
+        // print("MSG: {s}\n", .{buff.items});
 
         try self.parse(buff.items, allocator);
         return true;
@@ -70,7 +70,6 @@ pub const Client = struct {
                     try self.send("n");
                     try self.send(&(self.name));
                     try self.send("\n");
-                    print("x: {d}, y: {d}\n", .{ self.game.?.board.x, self.game.?.board.y });
                 }
             },
             @intFromEnum(Message.Type.yes) => {
@@ -119,8 +118,6 @@ pub const Client = struct {
                         unit.y = try std.fmt.parseUnsigned(u32, it3.next().?, 10);
                         unit.hp = try std.fmt.parseUnsigned(u32, it3.next().?, 10);
                         try self.game.?.newUnit(playerName, unit);
-
-                        print("{d} {d} {d} {d}\n", .{ self.game.?.units.get(unit.id).?.id, unit.x, self.game.?.units.get(unit.id).?.y, unit.hp });
                     }
                 }
                 self.game.?.printPlayerNames();
@@ -148,7 +145,6 @@ pub const Client = struct {
                 const hp = try std.fmt.parseUnsigned(u32, it.next().?, 10);
 
                 self.game.?.board.getField(x, y).res_hp = hp;
-                // self.game.?.board.printResources();
             },
             @intFromEnum(Message.Type.unit) => {
                 var it = std.mem.tokenizeAny(u8, buff[1..], " \n");
@@ -158,9 +154,7 @@ pub const Client = struct {
                 const x = try std.fmt.parseUnsigned(u32, it.next().?, 10);
                 const y = try std.fmt.parseUnsigned(u32, it.next().?, 10);
 
-                print("{s} got new unit\n", .{playerName});
                 try self.game.?.newUnit(playerName, Unit{ .id = id, .x = x, .y = y, .hp = 100 });
-                self.game.?.board.printUnits(&self.game.?);
             },
             @intFromEnum(Message.Type.leave) => {
                 const playerName = buff[1..]; // player name
@@ -170,10 +164,8 @@ pub const Client = struct {
                     self.state = State.Ready;
                     try self.send("j\n");
                 } else {
-                    print("{s} left\n", .{playerName});
                     try self.game.?.deletePlayer(playerName);
                 }
-                self.game.?.board.printUnits(&self.game.?);
             },
             @intFromEnum(Message.Type.lost) => {
                 const playerName = buff[1..]; // player name
@@ -227,22 +219,22 @@ pub const Client = struct {
             },
             @intFromEnum(Message.Type.join) => {
                 try self.game.?.newPlayer(buff[1..]);
-                print("{s} joined\n", .{buff[1..]});
             },
             @intFromEnum(Message.Type.tick) => {
                 const player = self.game.?.findPlayer(&self.name).?;
                 var it = player.units.valueIterator();
                 while (it.next()) |unit| {
-                    const fieldc = self.game.?.board.getClosestResourceFieldPosition(unit.*.x, unit.*.y);
-                    if (fieldc) |fc| {
-                        const cds = coordOps.towards(unit.*.x, unit.*.y, fc.x, fc.y);
-                        const max_len = 10; // TO DO figure out max_len from config sent by server
-                        var buf: [max_len]u8 = undefined;
-                        if (cds.x == unit.*.x and cds.y == unit.*.y) {
-                            try self.send("d");
-                            try self.send(try std.fmt.bufPrint(&buf, "{}", .{unit.*.id}));
-                            try self.send("\n");
-                        } else {
+                    const max_len = 10; // TO DO figure out max_len from config sent by server
+                    var buf: [max_len]u8 = undefined;
+
+                    if (self.game.?.board.getField(unit.*.x, unit.*.y).res_hp != null) {
+                        try self.send("d");
+                        try self.send(try std.fmt.bufPrint(&buf, "{}", .{unit.*.id}));
+                        try self.send("\n");
+                    } else {
+                        const fieldc = self.game.?.board.getClosestUnoccupiedResourceFieldPosition(unit.*.x, unit.*.y);
+                        if (fieldc) |fc| {
+                            const cds = coordOps.towards(unit.*.x, unit.*.y, fc.x, fc.y);
                             try self.send("m");
                             try self.send(try std.fmt.bufPrint(&buf, "{}", .{unit.*.id}));
                             try self.send(" ");
@@ -254,9 +246,7 @@ pub const Client = struct {
                     }
                 }
             },
-            else => {
-                print("got invalid message type character {c}\n", .{t});
-            },
+            else => {},
         }
     }
 

src/coordinateOps.zig

@@ -26,10 +26,6 @@ pub fn towards(sx: u32, sy: u32, tx: u32, ty: u32) coords {
     return cds;
 }
 
-pub fn same(x1: u32, y1: u32, x2: u32, y2: u32) bool {
-    return (x1 == x2 and y1 == y2);
-}
-
 pub const coords = struct {
     x: u32,
     y: u32,
@@ -42,7 +38,7 @@ pub const coords = struct {
         return ops.towards(sc.x, sc.y, tc.x, tc.y);
     }
 
-    pub fn same(c1: coords, c2: coords) bool {
+    pub fn eql(c1: coords, c2: coords) bool {
         return (c1.x == c2.x and c1.y == c2.y);
     }
 };

src/game.zig

@@ -27,7 +27,7 @@ pub const Board = struct {
         return &self.fields[x * self.y + y];
     }
 
-    pub fn getClosestResourceFieldPosition(self: *Board, x: u32, y: u32) ?coords {
+    pub fn getClosestUnoccupiedResourceFieldPosition(self: *Board, x: u32, y: u32) ?coords {
         // TO DO write optimal version
         //var dist: u32 = 0;
         //const curField = self.getField(x, y);
@@ -41,7 +41,7 @@ pub const Board = struct {
         for (0..self.y) |yi| {
             for (0..self.x) |xi| {
                 const f = self.getField(@intCast(xi), @intCast(yi));
-                if (f.res_hp != null) {
+                if (f.res_hp != null and f.unit_id == null) {
                     const dist = distance(x, y, @intCast(xi), @intCast(yi));
                     if (dist < minDist) {
                         minDist = dist;
@@ -63,6 +63,7 @@ pub const Board = struct {
     }
 
     pub fn printUnits(self: *Board, game: *Game) void {
+        print("units:\n", .{});
         for (0..self.y) |yi| {
             for (0..self.x) |xi| {
                 const f = self.getField(@intCast(xi), @intCast(yi));
@@ -75,6 +76,7 @@ pub const Board = struct {
     }
 
     pub fn printResources(self: *Board) void {
+        print("resources:\n", .{});
         for (0..self.y) |yi| {
             for (0..self.x) |xi| {
                 const f = self.getField(@intCast(xi), @intCast(yi));