diff --git a/assets/ammo.png b/assets/ammo.png new file mode 100644 index 0000000..9e5dd02 Binary files /dev/null and b/assets/ammo.png differ diff --git a/assets/barrel.png b/assets/barrel.png index eea212d..d583fb9 100755 Binary files a/assets/barrel.png and b/assets/barrel.png differ diff --git a/assets/bkey.png b/assets/bkey.png new file mode 100644 index 0000000..9fee2bf Binary files /dev/null and b/assets/bkey.png differ diff --git a/assets/die1.png b/assets/die1.png new file mode 100644 index 0000000..ee72421 Binary files /dev/null and b/assets/die1.png differ diff --git a/assets/die2.png b/assets/die2.png new file mode 100644 index 0000000..e3f18be Binary files /dev/null and b/assets/die2.png differ diff --git a/assets/die3.png b/assets/die3.png new file mode 100644 index 0000000..77d746b Binary files /dev/null and b/assets/die3.png differ diff --git a/assets/die4.png b/assets/die4.png new file mode 100644 index 0000000..caa9414 Binary files /dev/null and b/assets/die4.png differ diff --git a/assets/die5.png b/assets/die5.png new file mode 100644 index 0000000..53399f0 Binary files /dev/null and b/assets/die5.png differ diff --git a/assets/fire1.png b/assets/fire1.png new file mode 100644 index 0000000..f8015c9 Binary files /dev/null and b/assets/fire1.png differ diff --git a/assets/fire2.png b/assets/fire2.png new file mode 100644 index 0000000..8300ac6 Binary files /dev/null and b/assets/fire2.png differ diff --git a/assets/fire3.png b/assets/fire3.png new file mode 100644 index 0000000..46479db Binary files /dev/null and b/assets/fire3.png differ diff --git a/assets/food.png b/assets/food.png new file mode 100644 index 0000000..1af89f7 Binary files /dev/null and b/assets/food.png differ diff --git a/assets/ggun.png b/assets/ggun.png new file mode 100644 index 0000000..ac846d0 Binary files /dev/null and b/assets/ggun.png differ diff --git a/assets/ggun1.png b/assets/ggun1.png new file mode 100644 index 0000000..6a798d7 Binary files /dev/null and b/assets/ggun1.png differ diff --git a/assets/ggun2.png b/assets/ggun2.png new file mode 100644 index 0000000..7299325 Binary files /dev/null and b/assets/ggun2.png differ diff --git a/assets/ggun3.png b/assets/ggun3.png new file mode 100644 index 0000000..007c53c Binary files /dev/null and b/assets/ggun3.png differ diff --git a/assets/ggun4.png b/assets/ggun4.png new file mode 100644 index 0000000..fc67824 Binary files /dev/null and b/assets/ggun4.png differ diff --git a/assets/ggun5.png b/assets/ggun5.png new file mode 100644 index 0000000..b2ccef3 Binary files /dev/null and b/assets/ggun5.png differ diff --git a/assets/gkey.png b/assets/gkey.png new file mode 100644 index 0000000..c0f8568 Binary files /dev/null and b/assets/gkey.png differ diff --git a/assets/greenlight.png b/assets/greenlight.png deleted file mode 100755 index 2345e8e..0000000 Binary files a/assets/greenlight.png and /dev/null differ diff --git a/assets/guard1.png b/assets/guard1.png new file mode 100644 index 0000000..6f6d7f6 Binary files /dev/null and b/assets/guard1.png differ diff --git a/assets/guard2.png b/assets/guard2.png new file mode 100644 index 0000000..bfa19a6 Binary files /dev/null and b/assets/guard2.png differ diff --git a/assets/guard3.png b/assets/guard3.png new file mode 100644 index 0000000..23ea5ab Binary files /dev/null and b/assets/guard3.png differ diff --git a/assets/guard4.png b/assets/guard4.png new file mode 100644 index 0000000..5d4f38e Binary files /dev/null and b/assets/guard4.png differ diff --git a/assets/guard5.png b/assets/guard5.png new file mode 100644 index 0000000..3e21143 Binary files /dev/null and b/assets/guard5.png differ diff --git a/assets/gun1.png b/assets/gun1.png new file mode 100644 index 0000000..717cd1e Binary files /dev/null and b/assets/gun1.png differ diff --git a/assets/gun2.png b/assets/gun2.png new file mode 100644 index 0000000..df8aefb Binary files /dev/null and b/assets/gun2.png differ diff --git a/assets/gun3.png b/assets/gun3.png new file mode 100644 index 0000000..3d123c2 Binary files /dev/null and b/assets/gun3.png differ diff --git a/assets/gun4.png b/assets/gun4.png new file mode 100644 index 0000000..e851827 Binary files /dev/null and b/assets/gun4.png differ diff --git a/assets/gun5.png b/assets/gun5.png new file mode 100644 index 0000000..6cf0cf8 Binary files /dev/null and b/assets/gun5.png differ diff --git a/assets/hlamp.png b/assets/hlamp.png new file mode 100644 index 0000000..5cfbb20 Binary files /dev/null and b/assets/hlamp.png differ diff --git a/assets/hpkit.png b/assets/hpkit.png new file mode 100644 index 0000000..d399f57 Binary files /dev/null and b/assets/hpkit.png differ diff --git a/assets/knife1.png b/assets/knife1.png new file mode 100644 index 0000000..905d859 Binary files /dev/null and b/assets/knife1.png differ diff --git a/assets/knife2.png b/assets/knife2.png new file mode 100644 index 0000000..803286e Binary files /dev/null and b/assets/knife2.png differ diff --git a/assets/knife3.png b/assets/knife3.png new file mode 100644 index 0000000..5481d1d Binary files /dev/null and b/assets/knife3.png differ diff --git a/assets/knife4.png b/assets/knife4.png new file mode 100644 index 0000000..284f3bd Binary files /dev/null and b/assets/knife4.png differ diff --git a/assets/knife5.png b/assets/knife5.png new file mode 100644 index 0000000..84c8e3a Binary files /dev/null and b/assets/knife5.png differ diff --git a/assets/mgun.png b/assets/mgun.png new file mode 100644 index 0000000..0f97345 Binary files /dev/null and b/assets/mgun.png differ diff --git a/assets/mgun1.png b/assets/mgun1.png new file mode 100644 index 0000000..8a10ac8 Binary files /dev/null and b/assets/mgun1.png differ diff --git a/assets/mgun2.png b/assets/mgun2.png new file mode 100644 index 0000000..19e5507 Binary files /dev/null and b/assets/mgun2.png differ diff --git a/assets/mgun3.png b/assets/mgun3.png new file mode 100644 index 0000000..c98c370 Binary files /dev/null and b/assets/mgun3.png differ diff --git a/assets/mgun4.png b/assets/mgun4.png new file mode 100644 index 0000000..4e17a10 Binary files /dev/null and b/assets/mgun4.png differ diff --git a/assets/mgun5.png b/assets/mgun5.png new file mode 100644 index 0000000..c99250e Binary files /dev/null and b/assets/mgun5.png differ diff --git a/assets/pillar.png b/assets/pillar.png deleted file mode 100755 index f5b4766..0000000 Binary files a/assets/pillar.png and /dev/null differ diff --git a/assets/slamp.png b/assets/slamp.png new file mode 100644 index 0000000..ebde0ba Binary files /dev/null and b/assets/slamp.png differ diff --git a/assets/treasure1.png b/assets/treasure1.png new file mode 100644 index 0000000..e9ef84b Binary files /dev/null and b/assets/treasure1.png differ diff --git a/assets/treasure2.png b/assets/treasure2.png new file mode 100644 index 0000000..4b1125e Binary files /dev/null and b/assets/treasure2.png differ diff --git a/assets/treasure3.png b/assets/treasure3.png new file mode 100644 index 0000000..adf9dd8 Binary files /dev/null and b/assets/treasure3.png differ diff --git a/assets/treasure4.png b/assets/treasure4.png new file mode 100644 index 0000000..153d852 Binary files /dev/null and b/assets/treasure4.png differ diff --git a/src/init.c b/src/init.c index 0f16ddd..1b3be38 100644 --- a/src/init.c +++ b/src/init.c @@ -6,7 +6,7 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 16:49:12 by houtworm #+# #+# */ -/* Updated: 2023/11/01 15:43:34 by houtworm ######## odam.nl */ +/* Updated: 2023/11/01 21:41:55 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ diff --git a/src/keys.c b/src/keys.c index 12b4130..1c3f82b 100644 --- a/src/keys.c +++ b/src/keys.c @@ -6,7 +6,7 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 16:50:23 by houtworm #+# #+# */ -/* Updated: 2023/10/29 19:33:50 by houtworm ######## odam.nl */ +/* Updated: 2023/11/02 02:21:54 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -24,6 +24,12 @@ void ft_movementkeys(t_varlist *vl) distance = vl->sidedistx - vl->deltadistx; if (mlx_is_mouse_down(vl->mlx, MLX_MOUSE_BUTTON_LEFT)) ft_putendl("shoot"); + if (mlx_is_key_down(vl->mlx, MLX_KEY_SPACE)) + ft_putendl("jump"); + if (mlx_is_key_down(vl->mlx, MLX_KEY_LEFT_CONTROL)) + vl->hoffset = 0; + else + vl->hoffset = 50; if (mlx_is_key_down(vl->mlx, MLX_KEY_W)) { if (vl->map[(int)(vl->posx + vl->dirx * vl->movespeed)][(int)vl->posy] == '0' && distance > 0.4) @@ -94,6 +100,10 @@ void ft_movementkeys(t_varlist *vl) vl->planex = vl->planex * cos(-vl->rotspeed) - vl->planey * sin(-vl->rotspeed); vl->planey = oldplanex * sin(-vl->rotspeed) + vl->planey * cos(-vl->rotspeed); } + if (mlx_is_key_down(vl->mlx, MLX_KEY_LEFT_SHIFT)) + vl->run = 2; + else + vl->run = 1; } void keyhook(mlx_key_data_t kd, void *param) @@ -110,10 +120,6 @@ void keyhook(mlx_key_data_t kd, void *param) } if ((kd.key == MLX_KEY_H || kd.key == MLX_KEY_F1) && kd.action == MLX_PRESS) ft_putendl("H is pressed"); - if (kd.modifier == MLX_SHIFT) - vl->run = 2; - else - vl->run = 1; } void scrollhook(double xdelta, double ydelta, void *param)