frzysk/42_so_long
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: gameover with firsk attack

Browse source
This commit is contained in:
mcolonna 2024-04-16 20:05:11 +02:00
parent a492a9a411
commit 3ca6fb18b2
70 changed files with 14324 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

30
includes/display/data_assets.h
View file

@ -6,14 +6,14 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/02/29 17:43:01 by mcolonna #+# #+# */
/* Updated: 2024/04/11 16:20:07 by mcolonna ### ########.fr */
/* Updated: 2024/04/17 17:39:22 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef DATA_ASSETS_H
# define DATA_ASSETS_H
# define NB_ASSETS 61
# define NB_ASSETS 87
typedef struct s_assetmeta
{
@ -96,6 +96,32 @@ typedef enum e_assetsmap_id
OBJECT_FIRSK_WALK_UP_2,
OBJECT_FIRSK_WALK_UP_3,
OBJECT_FIRSK_WALK_UP_4,
ANIM_KNIFEATTACK_1,
ANIM_KNIFEATTACK_2,
ANIM_KNIFEATTACK_3,
ANIM_KNIFEATTACK_4,
ANIM_KNIFEATTACK_5,
ANIM_KNIFEATTACK_6,
ANIM_KNIFEATTACK_7,
ANIM_EXPLOSION_PART1_1,
ANIM_EXPLOSION_PART1_2,
ANIM_EXPLOSION_PART1_3,
ANIM_EXPLOSION_PART1_4,
ANIM_EXPLOSION_PART1_5,
ANIM_EXPLOSION_PART1_6,
ANIM_EXPLOSION_PART1_7,
ANIM_EXPLOSION_PART1_8,
ANIM_EXPLOSION_PART2_1,
ANIM_EXPLOSION_PART2_2,
ANIM_EXPLOSION_PART2_3,
ANIM_EXPLOSION_PART2_4,
ANIM_EXPLOSION_PART2_5,
ANIM_EXPLOSION_PART2_6,
ANIM_EXPLOSION_PART2_7,
ANIM_EXPLOSION_PART2_8,
ANIM_EXPLOSION_PART2_9,
TEXT_GAMEOVER,
TEXT_YOUDED,
} t_assetsmap_id;
# define OBJECT_SNAS OBJECT_SNAS_DOWN

9
includes/display/data_sprites.h
View file

@ -6,14 +6,14 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/11 15:56:31 by mcolonna #+# #+# */
/* Updated: 2024/04/11 16:22:44 by mcolonna ### ########.fr */
/* Updated: 2024/04/17 17:40:16 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef DATA_SPRITES_H
# define DATA_SPRITES_H
# define NB_SPRITES 20
# define NB_SPRITES 25
typedef enum e_spritetype
{
@ -56,6 +56,11 @@ typedef enum e_spritesmap_id
SPR_FIRSK_WALK_UP,
SPR_FIRSK_WALK_RIGHT,
SPR_FIRSK_WALK_LEFT,
SPR_KNIFEATTACK,
SPR_EXPLOSION_1,
SPR_EXPLOSION_2,
SPR_GAMEOVER,
SPR_YOUDED,
} t_spritesmap_id;
#endif

18
includes/gameover/gameover.h Normal file
View file

@ -0,0 +1,18 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* gameover.h :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/16 19:52:08 by mcolonna #+# #+# */
/* Updated: 2024/04/17 13:46:08 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef GAMEOVER_H
# define GAMEOVER_H
void gameover_byfirskattack(t_character *character);
#endif

6
includes/includes.h
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/02 13:53:41 by mcolonna #+# #+# */
/* Updated: 2024/04/15 17:41:18 by mcolonna ### ########.fr */
/* Updated: 2024/04/17 13:48:12 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -36,16 +36,18 @@
# include "display/display.h"
# include "display/sprite.h"
# include "main/error.h"
# include "room/visual.h"
# include "room/object.h"
# include "room/character.h"
# include "gameover/gameover.h"
# include "room/objects.h"
# include "room/room.h"
# include "room/camera.h"
# include "room/pathfinding.h"
# include "main/env.h"
# include "main/error.h"
# include "main/input.h"
# include "main/timedloop.h"
# include "main/main.h"

10
includes/main/main.h
View file

@ -6,13 +6,21 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/04/02 13:39:54 by mcolonna #+# #+# */
/* Updated: 2024/04/09 14:45:55 by mcolonna ### ########.fr */
/* Updated: 2024/04/17 13:17:59 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
#ifndef MAIN_H
# define MAIN_H
typedef struct s_loopfunctions
{
void (*loop)(void);
void (*draw)(void);
} t_loopfunctions;
extern t_loopfunctions g_loopfunctions;
int main(int argc, t_const_string *argv);
#endif

6
includes/room/room.h
View file

@ -6,7 +6,7 @@
/* By: mcolonna <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/03/07 23:00:45 by mcolonna #+# #+# */
/* Updated: 2024/04/15 17:50:29 by mcolonna ### ########.fr */
/* Updated: 2024/04/17 13:19:54 by mcolonna ### ########.fr */
/* */
/* ************************************************************************** */
@ -25,9 +25,9 @@ typedef struct s_room
void room_init(t_const_string path);
void room_loop(t_room room);
void room_loop(void);
void room_draw(t_room room);
void room_draw(void);
void room_free(t_room room);