aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozanLeClerc <bousset.rudy@gmail.com>2020-03-31 21:49:18 +0200
committerJozanLeClerc <bousset.rudy@gmail.com>2020-03-31 21:49:18 +0200
commit2f7026b4a1721016dbba55e6ec4d5e3b0723952d (patch)
tree3e73ddbac98d34044e2edd75d2e6309090dfee57
parentAlright alright (diff)
download42-cub3d-2f7026b4a1721016dbba55e6ec4d5e3b0723952d.tar.gz
42-cub3d-2f7026b4a1721016dbba55e6ec4d5e3b0723952d.tar.bz2
42-cub3d-2f7026b4a1721016dbba55e6ec4d5e3b0723952d.tar.xz
42-cub3d-2f7026b4a1721016dbba55e6ec4d5e3b0723952d.tar.zst
42-cub3d-2f7026b4a1721016dbba55e6ec4d5e3b0723952d.zip
GOTY
Diffstat
-rw-r--r--inc/cub3d_defines.h8
-rw-r--r--map/lvl_five.cub26
-rw-r--r--map/lvl_four.cub12
-rw-r--r--map/lvl_one.cub2
-rw-r--r--map/lvl_six.cub38
-rw-r--r--map/lvl_three.cub14
-rw-r--r--map/map_four.cub2
-rw-r--r--src/ft_draw_sprite.c1
-rw-r--r--src/ft_shoot.c2
-rw-r--r--src/ft_time.c2
10 files changed, 72 insertions, 35 deletions
diff --git a/inc/cub3d_defines.h b/inc/cub3d_defines.h
index 3389daf..ab69ac0 100644
--- a/inc/cub3d_defines.h
+++ b/inc/cub3d_defines.h
@@ -223,7 +223,7 @@ enum
# define FT_ERR_ALR_SET "duplicate entry"
# define FT_ERR_ILL_MAP "map contains illegal char"
# define FT_ERR_MULT_SPAWN "multiple spawn points"
-# define FT_ERR_MULT_NLVL "multiple spawn new level access points"
+# define FT_ERR_MULT_NLVL "multiple new level access points"
# define FT_ERR_NO_MAP "No map"
# define FT_ERR_MAP_WALLS "bad space or map is not surrounded by walls"
# define FT_ERR_MAP_EMPL "empty line in map"
@@ -309,10 +309,10 @@ enum
# define FT_WEAP_THREE_STRT_AMMO 24
# define FT_WEAP_MAX_AMMO 1000
# define FT_ENMY_STRT_LIFE 10
-# define FT_ENMY_SIGHT_RANGE 7.0
-# define FT_ENMY_DAMAGE_AMOUNT 15
+# define FT_ENMY_SIGHT_RANGE 5.5
+# define FT_ENMY_DAMAGE_AMOUNT 14
# define FT_W_ONE_DANAGE_AMOUNT 5
-# define FT_W_TWO_DANAGE_AMOUNT 2
+# define FT_W_TWO_DANAGE_AMOUNT 3
# define FT_W_THREE_DANAGE_AMOUNT 4
/*
diff --git a/map/lvl_five.cub b/map/lvl_five.cub
index 4d14045..171005b 100644
--- a/map/lvl_five.cub
+++ b/map/lvl_five.cub
@@ -9,28 +9,28 @@ S ./media/img/sprites/pillar.xpm
C ./media/img/tex/plate_small.xpm
F ./media/img/tex/plate_small.xpm
-LT ./media/img/tex/cowtits.xpm
-L ./map/map_four.cub
+LT ./media/img/tex/terre.xpm
+L ./map/lvl_six.cub
T ./media/img/sprites/spikes.xpm
SH 16
MU ./media/sound/BITURE-ET-MELANCOLIE.wav
111111111111111111111111111111
-1T00000000000000000000000000+1
+1T+++0000000000000000000000++1
11111101111110110111111110111111
- 1111101 101T01 10000001
+ 1111101 101T01 10000++1
1000001 11101101 1111110111111
- 11T1101 1+0#0001 1T00000000001
- 1+1101 111111101 1111111111101
+ 1101101 1+0#0001 1T0000e000001
+ 101101 111111101 1111111111101
111101 101 101 1000001 101
- 1011101 101 1011101 101
- 11110000011111N1 101T001 101
- 1011011111101111 10111111101
- 101101 1L0011 1+000000001
- 100001 110111111111111111101
- 101101 11110000000000000000001
+ 1e11101 101 1011101 101
+ 11110000011111N1 101##@1 101
+ 10110111111+1111 10111111101
+ 101101 1L++11 1+000000001
+ 100001 11+111111111111111101
+ 101101 1111++++0000000000000e1
101101 1011111111111T011111101
111011111101111111111110111111011
-1T00000000000000000000000000000T1
+1T0e00000000000000000000000e000T1
111111111111111111111111111111111
diff --git a/map/lvl_four.cub b/map/lvl_four.cub
index 2694723..b787415 100644
--- a/map/lvl_four.cub
+++ b/map/lvl_four.cub
@@ -10,7 +10,7 @@ C ./media/img/tex/left_arrow.xpm
F ./media/img/tex/arrow5.xpm
MU ./media/sound/BITURE-ET-MELANCOLIE.wav
-SH 8
+SH 6
T ./media/img/sprites/spikes.xpm
LT ./media/img/tex/plate_small.xpm
@@ -24,13 +24,13 @@ L ./map/lvl_five.cub
11011 101
101 1L1
101 11T11
- 101111111111111110111
- 1000000@1111111000TT11
+ 10111111111111111e111
+ 1000e0000#11111000TT11
10111111111111101111111
- 101 1+000000000+1
- 101 11111T111111011
+ 101 1e000000000+1
+ 101 111110111111011
101 11111111111T10111
- 101 11+00000000000000+1
+ 101 11+000000000000@++1
101 111111111110111111111
101 1E0000000000000000000T1
101 1111111111111111111110111
diff --git a/map/lvl_one.cub b/map/lvl_one.cub
index deb2fce..205a7ec 100644
--- a/map/lvl_one.cub
+++ b/map/lvl_one.cub
@@ -1,4 +1,4 @@
-R 1500 950
+R 1450 1080
NO ./media/img/tex/BRIQUASSE_3.xpm
SO ./media/img/tex/BRIQUASSE_3.xpm
diff --git a/map/lvl_six.cub b/map/lvl_six.cub
new file mode 100644
index 0000000..026b20f
--- /dev/null
+++ b/map/lvl_six.cub
@@ -0,0 +1,38 @@
+R 10 10
+
+NO ./media/img/tex/plate_small.xpm
+SO ./media/img/tex/plate_small.xpm
+EA ./media/img/tex/plate_small.xpm
+WE ./media/img/tex/plate_small.xpm
+S ./media/img/sprites/pillar.xpm
+
+C ./media/img/tex/plate_small.xpm
+F ./media/img/tex/plate_small.xpm
+
+LT ./media/img/tex/cowtits.xpm
+L ./map/map_four.cub
+
+T ./media/img/sprites/spikes.xpm
+SH 5
+MU ./media/sound/DEVANT-LES-KAISSONS.wav
+
+1111111111111111111
+11111111L1111111111
+1000000eee000000001
+1000000000000000001
+100e00000e00000e001
+1000000000000000001
+1000000000000000001
+100e00e00e00e00e001
+1000000000000000001
+1000000000000000001
+100e0000000000e0001
+1000000000000000001
+1000000000000000001
+1000000000000000001
+1000000000000000001
+1000000000000000001
+10000000N0000000001
+1000000000000000001
+1++++++!@#++++++++1
+1111111111111111111
diff --git a/map/lvl_three.cub b/map/lvl_three.cub
index a7e0efe..c3714ed 100644
--- a/map/lvl_three.cub
+++ b/map/lvl_three.cub
@@ -19,13 +19,13 @@ MU ./media/sound/BITURE-ET-MELANCOLIE.wav
11111111111111111111111
10000000000000000000001
-12011111111111111111101
-1001 101
-1001 101
+10011111111111111111101
+10+1 101
+10+1 101
10011111111111111111101
1E00000000+1L0000000001
-10011111011111111111101
-1001 101 101
-10011111011111111111101
-1200000000000T000000001
+10+11111011111111111101
+10+1 101 1e1
+10+11111011111111111101
+1000000000000T000000001
11111111111111111111111
diff --git a/map/map_four.cub b/map/map_four.cub
index 8f4443b..71507a0 100644
--- a/map/map_four.cub
+++ b/map/map_four.cub
@@ -10,7 +10,7 @@ C 26,165,204
F 24,170,25
-MU ./media/sound/BITURE-ET-MELANCOLIE.wav
+MU ./media/sound/DEVANT-LES-KAISSONS.wav
11111111111111111111111
10000000000000000000001
diff --git a/src/ft_draw_sprite.c b/src/ft_draw_sprite.c
index df7e11c..6afac08 100644
--- a/src/ft_draw_sprite.c
+++ b/src/ft_draw_sprite.c
@@ -86,7 +86,6 @@ void
int32_t d;
sprite->x = sprite->drawstartx;
- ft_printf("%d\n", sprite->current_sprite);
while (sprite->x < sprite->drawendx)
{
sprite->tex_x = (int32_t)((sprite->x - (-sprite->spritewidth / 2 +
diff --git a/src/ft_shoot.c b/src/ft_shoot.c
index 5342509..7f12eb6 100644
--- a/src/ft_shoot.c
+++ b/src/ft_shoot.c
@@ -49,7 +49,7 @@ static int8_t
{
if (cl->plist.handles_weapon == 0 &&
sqrtf(powf(cl->plist.pos_x - cl->rlist.sqy, 2)
- + powf(cl->plist.pos_y - cl->rlist.sqx, 2)) > 1.7)
+ + powf(cl->plist.pos_y - cl->rlist.sqx, 2)) > 1.3)
return (0);
return (1);
}
diff --git a/src/ft_time.c b/src/ft_time.c
index a2ab4a0..88822f5 100644
--- a/src/ft_time.c
+++ b/src/ft_time.c
@@ -30,7 +30,7 @@ void
curr = clock();
dt += curr - before;
- if (dt > 0 && ft_clock_to_ms(dt) > 700.0)
+ if (dt > 0 && ft_clock_to_ms(dt) > 1000.0)
{
cl->plist.fire = 0;
dt = 0;
powered by cgit. Copyright (c) 2020-2023, Joe - this website does not use cookies or php or js