From 34cce6a5c0d090a893a2114904706e3f0e498bdd Mon Sep 17 00:00:00 2001 From: mcolonna Date: Fri, 19 Apr 2024 23:07:15 +0200 Subject: [PATCH] feat: levels finished except ending * TODO: feat: - ultimate ketchup ending fix: - fix firsk left run animation - fix firsk attack animation - check if all the memclasses make sense - norminette --- includes/main/env.h | 4 ++-- rooms/01.ber | 8 ++++++++ rooms/02.ber | 8 ++++++++ rooms/03.ber | 8 ++++++++ rooms/04.ber | 8 ++++++++ rooms/05.ber | 8 ++++++++ rooms/06.ber | 8 ++++++++ rooms/07.ber | 8 ++++++++ rooms/08.ber | 8 ++++++++ rooms/09.ber | 8 ++++++++ rooms/1.ber | 3 --- rooms/10.ber | 17 +++++++++++++++++ rooms/2.ber | 3 --- rooms/3.ber | 3 --- src/main/env.c | 15 +++++++++++---- .../good/{biiig.ber => biiig_impossible.ber} | 0 .../good/{hard.ber => hard_impossible.ber} | 0 17 files changed, 102 insertions(+), 15 deletions(-) create mode 100644 rooms/01.ber create mode 100644 rooms/02.ber create mode 100644 rooms/03.ber create mode 100644 rooms/04.ber create mode 100644 rooms/05.ber create mode 100644 rooms/06.ber create mode 100644 rooms/07.ber create mode 100644 rooms/08.ber create mode 100644 rooms/09.ber delete mode 100644 rooms/1.ber create mode 100644 rooms/10.ber delete mode 100644 rooms/2.ber delete mode 100644 rooms/3.ber rename test_rooms/good/{biiig.ber => biiig_impossible.ber} (100%) rename test_rooms/good/{hard.ber => hard_impossible.ber} (100%) diff --git a/includes/main/env.h b/includes/main/env.h index 7302942..a734e40 100644 --- a/includes/main/env.h +++ b/includes/main/env.h @@ -6,7 +6,7 @@ /* By: mcolonna +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/26 15:26:13 by mcolonna #+# #+# */ -/* Updated: 2024/04/19 19:39:18 by mcolonna ### ########.fr */ +/* Updated: 2024/04/19 23:08:32 by mcolonna ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,7 +19,7 @@ # define FPS 20 # define TEXT_SPACE 9 -# define LEVEL_COUNT 3 +# define LEVEL_COUNT 10 extern const t_const_string g_levels[LEVEL_COUNT]; typedef struct s_env diff --git a/rooms/01.ber b/rooms/01.ber new file mode 100644 index 0000000..e28fc8c --- /dev/null +++ b/rooms/01.ber @@ -0,0 +1,8 @@ +111111111111 +100000000001 +101111110001 +101P0C010001 +101111E10001 +100001110001 +100000000001 +111111111111 diff --git a/rooms/02.ber b/rooms/02.ber new file mode 100644 index 0000000..baa3540 --- /dev/null +++ b/rooms/02.ber @@ -0,0 +1,8 @@ +111111111111 +111000000111 +11C000000011 +100011111001 +10001EP00001 +1CCC11111111 +1000000000C1 +111111111111 diff --git a/rooms/03.ber b/rooms/03.ber new file mode 100644 index 0000000..4e0766e --- /dev/null +++ b/rooms/03.ber @@ -0,0 +1,8 @@ +111111111111111111111111 +100P1000100000F00C000001 +101010101011011111111101 +10101010C011010000000001 +1010001000110100C0000001 +1001111111111000000C0001 +1E0000000000C00000000001 +111111111111111111111111 diff --git a/rooms/04.ber b/rooms/04.ber new file mode 100644 index 0000000..2033f52 --- /dev/null +++ b/rooms/04.ber @@ -0,0 +1,8 @@ +111111111111 +1E0000000001 +111111101111 +100C000000C1 +101011101101 +10101F101101 +1P10001C0001 +111111111111 diff --git a/rooms/05.ber b/rooms/05.ber new file mode 100644 index 0000000..b1873ee --- /dev/null +++ b/rooms/05.ber @@ -0,0 +1,8 @@ +111111111111 +1P0000000001 +1011111111E1 +100C00000111 +1011101001F1 +101110100101 +100C00100C01 +111111111111 diff --git a/rooms/06.ber b/rooms/06.ber new file mode 100644 index 0000000..dcf59b6 --- /dev/null +++ b/rooms/06.ber @@ -0,0 +1,8 @@ +111111111111 +1C00001F00C1 +1011101111P1 +100000000001 +11111B111111 +1C0000000C01 +100C0E0C0001 +111111111111 diff --git a/rooms/07.ber b/rooms/07.ber new file mode 100644 index 0000000..19cb235 --- /dev/null +++ b/rooms/07.ber @@ -0,0 +1,8 @@ +111111111111 +1BBBBBBBBBB1 +101000000001 +101000000001 +101000000001 +1F1000C00001 +1E000CPC0001 +111111111111 diff --git a/rooms/08.ber b/rooms/08.ber new file mode 100644 index 0000000..7788f5f --- /dev/null +++ b/rooms/08.ber @@ -0,0 +1,8 @@ +111111111111 +10BBBBBBBBB1 +10B00C000001 +10B0000C0001 +10BF00000E01 +10B0000C0001 +1PB00C000001 +111111111111 diff --git a/rooms/09.ber b/rooms/09.ber new file mode 100644 index 0000000..dcf52cb --- /dev/null +++ b/rooms/09.ber @@ -0,0 +1,8 @@ +1111111111111111111111 +1111111111111111111111 +10000000000CF000000001 +1000000000011111C111B1 +100P0000000111111111B1 +1000000000000000000001 +1E11111111111111111111 +1111111111111111111111 diff --git a/rooms/1.ber b/rooms/1.ber deleted file mode 100644 index d2ec825..0000000 --- a/rooms/1.ber +++ /dev/null @@ -1,3 +0,0 @@ -1111111 -1FBPCE1 -1111111 diff --git a/rooms/10.ber b/rooms/10.ber new file mode 100644 index 0000000..67b85a9 --- /dev/null +++ b/rooms/10.ber @@ -0,0 +1,17 @@ +111111111111 +10000001E101 +100000010101 +100000010101 +100000010101 +100000010101 +100000010101 +100000010101 +100000010101 +111111110111 +1000000001F1 +101C1C1C0101 +101111111101 +1000000000C1 +101111111B01 +1P0000000001 +111111111111 diff --git a/rooms/2.ber b/rooms/2.ber deleted file mode 100644 index 3b83470..0000000 --- a/rooms/2.ber +++ /dev/null @@ -1,3 +0,0 @@ -11111111 -1FBPCCE1 -11111111 diff --git a/rooms/3.ber b/rooms/3.ber deleted file mode 100644 index 2c41fa2..0000000 --- a/rooms/3.ber +++ /dev/null @@ -1,3 +0,0 @@ -111111111 -1FBPCCCE1 -111111111 diff --git a/src/main/env.c b/src/main/env.c index 72a8243..d23e647 100644 --- a/src/main/env.c +++ b/src/main/env.c @@ -6,16 +6,23 @@ /* By: mcolonna +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/02/26 16:32:36 by mcolonna #+# #+# */ -/* Updated: 2024/04/19 14:12:41 by mcolonna ### ########.fr */ +/* Updated: 2024/04/20 12:17:48 by mcolonna ### ########.fr */ /* */ /* ************************************************************************** */ #include "includes.h" const t_const_string g_levels[LEVEL_COUNT] = { -"rooms/1.ber", -"rooms/2.ber", -"rooms/3.ber", +"rooms/01.ber", +"rooms/02.ber", +"rooms/03.ber", +"rooms/04.ber", +"rooms/05.ber", +"rooms/06.ber", +"rooms/07.ber", +"rooms/08.ber", +"rooms/09.ber", +"rooms/10.ber", }; t_env g_env; diff --git a/test_rooms/good/biiig.ber b/test_rooms/good/biiig_impossible.ber similarity index 100% rename from test_rooms/good/biiig.ber rename to test_rooms/good/biiig_impossible.ber diff --git a/test_rooms/good/hard.ber b/test_rooms/good/hard_impossible.ber similarity index 100% rename from test_rooms/good/hard.ber rename to test_rooms/good/hard_impossible.ber