From b965b9e5f5831bd4daf07bde8f3e3396024d30a1 Mon Sep 17 00:00:00 2001 From: whaffman Date: Tue, 10 Jun 2025 19:39:52 +0200 Subject: [PATCH] Add battery management constants and update related calculations --- inc/cub3d.h | 6 +++++- src/game/collision.c | 16 ++++++++-------- src/game/game_hud.c | 16 ++++++++-------- src/game/moves.c | 16 ++++++++-------- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/inc/cub3d.h b/inc/cub3d.h index ea7991f..a53c33e 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -6,7 +6,7 @@ /* By: qmennen +#+ */ /* +#+ */ /* Created: 2025/04/15 12:22:29 by qmennen #+# #+# */ -/* Updated: 2025/06/10 19:29:49 by whaffman ######## odam.nl */ +/* Updated: 2025/06/10 19:36:23 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -19,6 +19,10 @@ # define WIDTH 1920 # define HEIGHT 1080 # define TITLE "Cub3D" +# define ATTACK_DAMAGE 0.05f +# define INITIAL_BATTERY 0.5f +# define BATTERY_RATE 0.01f +# define FLASH_BATTERY 0.05f # ifndef FULLSCREEN # define FULLSCREEN 1 diff --git a/src/game/collision.c b/src/game/collision.c index 676f63d..ec79411 100644 --- a/src/game/collision.c +++ b/src/game/collision.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* ::: :::::::: */ -/* collision.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: qmennen +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2025/04/22 14:40:59 by qmennen #+# #+# */ -/* Updated: 2025/06/10 14:41:31 by qmennen ### ########.fr */ +/* :::::::: */ +/* collision.c :+: :+: */ +/* +:+ */ +/* By: qmennen +#+ */ +/* +#+ */ +/* Created: 2025/04/22 14:40:59 by qmennen #+# #+# */ +/* Updated: 2025/06/10 19:34:32 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -51,7 +51,7 @@ int collision_sprite(t_game *game, double xa, double ya) && fabs(player->pos.y + ya - sprites[i].pos.y) < 0.5)) { if (sprites[i].type == SPRITE_TYPE_ENEMY) - damage_player(player, 0.05f); + damage_player(player, ATTACK_DAMAGE); else collect(game, &sprites[i]); return (1); diff --git a/src/game/game_hud.c b/src/game/game_hud.c index 2386540..2d7397a 100644 --- a/src/game/game_hud.c +++ b/src/game/game_hud.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* ::: :::::::: */ -/* game_hud.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: qmennen +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2025/05/28 14:26:29 by qmennen #+# #+# */ -/* Updated: 2025/06/05 18:41:43 by qmennen ### ########.fr */ +/* :::::::: */ +/* game_hud.c :+: :+: */ +/* +:+ */ +/* By: qmennen +#+ */ +/* +#+ */ +/* Created: 2025/05/28 14:26:29 by qmennen #+# #+# */ +/* Updated: 2025/06/10 19:37:31 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -53,7 +53,7 @@ static void draw_battery(mlx_image_t *img, float battery) void handle_battery(t_game *game) { - game->player->battery -= game->screen->mlx->delta_time / 50; + game->player->battery -= game->screen->mlx->delta_time * BATTERY_RATE; if (game->player->battery < 0) { game->player->battery = 0; diff --git a/src/game/moves.c b/src/game/moves.c index b75db67..6edd5ec 100644 --- a/src/game/moves.c +++ b/src/game/moves.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* ::: :::::::: */ -/* moves.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: qmennen +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2025/05/14 20:08:27 by whaffman #+# #+# */ -/* Updated: 2025/06/04 18:42:35 by qmennen ### ########.fr */ +/* :::::::: */ +/* moves.c :+: :+: */ +/* +:+ */ +/* By: qmennen +#+ */ +/* +#+ */ +/* Created: 2025/05/14 20:08:27 by whaffman #+# #+# */ +/* Updated: 2025/06/10 19:38:49 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -94,7 +94,7 @@ void player_update(t_game *game, double delta_time) if (get_key(game, MLX_KEY_SPACE)) { game->screen->flash = 3; - game->player->battery -= 0.1f; + game->player->battery -= FLASH_BATTERY; interact_door(game); } if (game->player->hit_timer > 0)