aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--inc/cub3d_defines.h8
-rw-r--r--map/map_seven.cub2
-rw-r--r--src/ft_damage_bad_boy.c5
3 files changed, 8 insertions, 7 deletions
diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h
index 42a74b2..702b73e 100644
--- a/inc/cub3d_defines.h
+++ b/inc/cub3d_defines.h
@@ -303,12 +303,12 @@ enum
# define FT_WEAP_TWO_STRT_AMMO 30
# define FT_WEAP_THREE_STRT_AMMO 24
# define FT_WEAP_MAX_AMMO 1000
-# define FT_ENMY_STRT_LIFE 15
+# define FT_ENMY_STRT_LIFE 10
# define FT_ENMY_SIGHT_RANGE 7.0
# define FT_ENMY_DAMAGE_AMOUNT 54
-# define FT_W_ONE_DANAGE_AMOUNT 2
-# define FT_W_TWO_DANAGE_AMOUNT 1
-# define FT_W_THREE_DANAGE_AMOUNT 3
+# define FT_W_ONE_DANAGE_AMOUNT 5
+# define FT_W_TWO_DANAGE_AMOUNT 2
+# define FT_W_THREE_DANAGE_AMOUNT 4
/*
** ====== OTHER ======
diff --git a/map/map_seven.cub b/map/map_seven.cub
index 2422220..d8677d0 100644
--- a/map/map_seven.cub
+++ b/map/map_seven.cub
@@ -22,7 +22,7 @@ C 150,150,150
1000000000000000001
1000000000000000001
1000000000000000001
-10000000@0000000001
+100000!0@0#00000001
1000000000000000001
10000000N0000000001
1111111111111111111
diff --git a/src/ft_damage_bad_boy.c b/src/ft_damage_bad_boy.c
index c8a04fa..b6eb7df 100644
--- a/src/ft_damage_bad_boy.c
+++ b/src/ft_damage_bad_boy.c
@@ -37,9 +37,10 @@ void
id = ft_get_bad_boy_id(cl);
if (cl->plist.handles_weapon == 0)
cl->bad_boy[id].life -= FT_W_ONE_DANAGE_AMOUNT;
- else if (cl->plist.handles_weapon == 1)
- cl->bad_boy[id].life -= FT_W_TWO_DANAGE_AMOUNT;
else if (cl->plist.handles_weapon == 2)
+ cl->bad_boy[id].life -= FT_W_TWO_DANAGE_AMOUNT;
+ else if (cl->plist.handles_weapon == 4)
cl->bad_boy[id].life -= FT_W_THREE_DANAGE_AMOUNT;
+ ft_printf("%hhd\n", cl->bad_boy[0].life);
/* TODO: sfx enemy scream and death */
}