adyxax/grenade-brothers
1
0
Fork 0
Code Issues Activity

Began adding scoring

Browse source
This commit is contained in:
Julien Dessaux 2022-08-26 21:53:36 +02:00
parent a899bc060b
commit 2c027e787a
Signed by: adyxax
GPG key ID: F92E51B86E07177E
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/brothers.zig
View file

@ -15,6 +15,7 @@ const rightLimit = [2]f64{ 34, 74 }; // (38, 79) minus a brother's width
pub const Brother = struct { pub const Brother = struct {
side: Side, side: Side,
score: u8,
x: f64, x: f64,
y: f64, y: f64,
dx: f64, dx: f64,
@ -43,6 +44,17 @@ pub const Brother = struct {
self.dx += 5 / (1000 / 60.0); self.dx += 5 / (1000 / 60.0);
self.moveDuration = 24; self.moveDuration = 24;
} }
pub fn reset(self: *Brother, side: Side) void {
self.side = side;
self.score = 0;
}
pub fn resetRound(self: *Brother) void {
self.x = startingX[@enumToInt(self.side)];
self.y = 17;
self.dx = 0;
self.dy = 0;
self.moveDuration = 0;
}
pub fn step(self: *Brother, b: *ball.Ball) void { pub fn step(self: *Brother, b: *ball.Ball) void {
// Horizontal movement // Horizontal movement
const x = self.x + self.dx; const x = self.x + self.dx;
@ -104,16 +116,6 @@ pub const Brother = struct {
b.dy = b.dy * strength - 0.04; b.dy = b.dy * strength - 0.04;
} }
} }
pub fn reset(self: *Brother, side: ?Side) void {
if (side) |s| {
self.side = s;
}
self.x = startingX[@enumToInt(self.side)];
self.y = 17;
self.dx = 0;
self.dy = 0;
self.moveDuration = 0;
}
}; };
const brother = const brother =

7
src/game.zig
View file

@ -14,6 +14,13 @@ pub const Game = struct {
try self.brothers[0].draw(rc); try self.brothers[0].draw(rc);
try self.brothers[1].draw(rc); try self.brothers[1].draw(rc);
try self.ball.draw(rc); try self.ball.draw(rc);
var score: [1]u8 = undefined;
try rc.moveCursorTo(1, 3);
score[0] = '0' + self.brothers[0].score;
_ = try rc.buffer.writer().write(score[0..]);
try rc.moveCursorTo(1, 76);
score[0] = '0' + self.brothers[1].score;
_ = try rc.buffer.writer().write(score[0..]);
} }
pub fn moveJump(self: *Game, side: brothers.Side) void { pub fn moveJump(self: *Game, side: brothers.Side) void {
self.brothers[@enumToInt(side)].moveJump(); self.brothers[@enumToInt(side)].moveJump();