From 840d0b31e985b70761aad3859df6162bb0daca53 Mon Sep 17 00:00:00 2001
From: mcolonna <mcolonna@student.42perpignan.fr>
Date: Sun, 21 Apr 2024 16:10:13 +0200
Subject: [PATCH] feat: add activable wall

---
 Makefile                        |  2 +-
 dev/ber.vim                     |  3 ++
 includes/room/objects.h         | 12 ++++++--
 rooms/10.ber                    |  2 +-
 src/main/env.c                  |  3 +-
 src/room/object_activablewall.c | 51 +++++++++++++++++++++++++++++++++
 6 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 src/room/object_activablewall.c

diff --git a/Makefile b/Makefile
index 2123d1f..162b5bb 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ CODE =	$(addprefix main/, \
 			visual room1 room2 room3 room_utils1 room_utils2 camera \
 			pathfinding pathfinding_utils \
 			object_character object_snas object_wall object_ketchup object_exit \
-			object_firsk \
+			object_firsk object_activablewall \
 		) \
 		$(addprefix utils/, \
 			point1 point2 map \
diff --git a/dev/ber.vim b/dev/ber.vim
index 54a6352..de332c2 100644
--- a/dev/ber.vim
+++ b/dev/ber.vim
@@ -25,6 +25,9 @@ syntax match berF /F/
 highlight berB cterm=bold ctermfg=grey
 syntax match berB /B/
 
+highlight berA ctermfg=white
+syntax match berA /A/
+
 endif
 endfunction
 autocmd BufReadPost * call BerSyntax()
diff --git a/includes/room/objects.h b/includes/room/objects.h
index dee734e..54c3a43 100644
--- a/includes/room/objects.h
+++ b/includes/room/objects.h
@@ -6,7 +6,7 @@
 /*   By: mcolonna <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/04/02 17:47:01 by mcolonna          #+#    #+#             */
-/*   Updated: 2024/04/18 18:17:16 by mcolonna         ###   ########.fr       */
+/*   Updated: 2024/04/21 16:06:33 by mcolonna         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -55,6 +55,8 @@ typedef struct s_exit_data
 	bool		active;
 }				t_exit_data;
 
+t_object		exit_init(t_memclass mc);
+
 // FIRSK
 typedef struct s_firsk_data
 {
@@ -63,6 +65,12 @@ typedef struct s_firsk_data
 
 t_object		firsk_init(t_memclass mc);
 
-t_object		exit_init(t_memclass mc);
+// ACTIVABLE WALL
+typedef struct s_activablewall_data
+{
+	t_sprite	spr;
+}				t_activablewall_data;
+
+t_object		activablewall_init(t_memclass mc);
 
 #endif
diff --git a/rooms/10.ber b/rooms/10.ber
index e40274c..20aeb7b 100644
--- a/rooms/10.ber
+++ b/rooms/10.ber
@@ -3,7 +3,7 @@
 100000010101
 100000010101
 100000010101
-100000010101
+10000001A101
 100000010101
 100000010101
 100000010101
diff --git a/src/main/env.c b/src/main/env.c
index a609f52..0ee62fb 100644
--- a/src/main/env.c
+++ b/src/main/env.c
@@ -6,7 +6,7 @@
 /*   By: mcolonna <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/02/26 16:32:36 by mcolonna          #+#    #+#             */
-/*   Updated: 2024/04/20 15:47:12 by mcolonna         ###   ########.fr       */
+/*   Updated: 2024/04/21 16:04:08 by mcolonna         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -23,6 +23,7 @@ const t_consts	g_consts = {
 {c: 'E', object: exit_init, surface: CASE_FLOOR_1},
 {c: 'F', object: firsk_init, surface: CASE_FLOOR_1},
 {c: 'B', object: NULL, surface: CASE_BRIDGE},
+{c: 'A', object: activablewall_init, surface: CASE_FLOOR_1},
 {c: '\0'}
 },
 	levels: {
diff --git a/src/room/object_activablewall.c b/src/room/object_activablewall.c
new file mode 100644
index 0000000..717850c
--- /dev/null
+++ b/src/room/object_activablewall.c
@@ -0,0 +1,51 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   object_activablewall.c                             :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: mcolonna <marvin@42.fr>                    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/03/15 15:27:03 by mcolonna          #+#    #+#             */
+/*   Updated: 2024/04/21 16:09:40 by mcolonna         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+#include "includes.h"
+
+static t_point	activablewall_loop(t_object *obj, t_point pos)
+{
+	(void)obj;
+	(void)pos;
+	return (point_init(0, 0));
+}
+
+static void	activablewall_draw(t_object *obj, t_point p)
+{
+	if (g_env.ketchup < g_env.max_ketchup)
+		sprite_draw(p, &((t_activablewall_data *)obj->data)->spr);
+}
+
+static bool	activablewall_walk_through(
+		t_object *obj, t_character *character, t_point pos)
+{
+	(void)obj;
+	(void)character;
+	(void)pos;
+	return (g_env.ketchup == g_env.max_ketchup);
+}
+
+t_object	activablewall_init(t_memclass mc)
+{
+	static const t_objecttype			type
+		= {solid_firsk: false, solid_snas: false,
+		init: activablewall_init, loop: activablewall_loop,
+		draw: activablewall_draw, walk_through: activablewall_walk_through};
+	t_object							r;
+	t_wall_data							*data;
+
+	r.type = type;
+	data = mem_alloc(error_err, mc, sizeof(t_activablewall_data));
+	data->spr = sprite_init(SPR_WALL);
+	r.data = data;
+	return (r);
+}