diff --git a/listeP.c b/listeP.c index b5fb580cc2981842352a04e26ed6fa6cb57af6aa..af8a6c878485f26107a1ae0bfd804c4fd640cd20 100644 --- a/listeP.c +++ b/listeP.c @@ -61,12 +61,12 @@ bool detecter_collision_perso(ListeP L, ListeE *LE, SDL_Rect rect, int degats, i while(L != NULL){ ax1 = rect.x; ax2 = rect.x + rect.w ; - bx1 = L->data.pos.x; - bx2 = L->data.pos.x + L->data.pos.w; + bx1 = L->data.pos.x - 0.3 * L->data.pos.w; + bx2 = L->data.pos.x + 0.6 * L->data.pos.w; ay1 = rect.y; ay2 = rect.y; - by1 = L->data.pos.y; - by2 = L->data.pos.y + L->data.pos.h; + by1 = L->data.pos.y - 0.3 * L->data.pos.h; + by2 = L->data.pos.y + 0.6 * L->data.pos.h; if(ax1 < bx2 && ax2 > bx1 && ay1 < by2 && ay2 > by1 && L->data.ennemi){ L->data.vie -= degats; diff --git a/main.c b/main.c index 3554096a59b80b178ffeeec4945082fcd85b5654..207bdffc0d9396e8473862a42b769a17376e22b9 100644 --- a/main.c +++ b/main.c @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) fond = charger_image("sprites/fond.png", ecran, -1, -1, -1); perso = charger_image("sprites/perso/handgun/idle/survivor_idle.png", ecran, 255, 255, 255); sprites[0] = perso; - perso = charger_image("sprites/ennemis/zombie/move/zombie_move.png", ecran, 255, 255, 255); + perso = charger_image("sprites/ennemis/zombie/move/zombie_moveV2.png", ecran, 0, 0, -1); sprites[1] = perso; perso = charger_image("sprites/effets/blood/blood_hitv3.png", ecran, 0, 0, -1); sprites[2] = perso; diff --git a/personnage.c b/personnage.c index 93c06e980a82c1cf423217467976a76662566ccb..88109d00d419bc5fb45144d968dac79597d72d88 100644 --- a/personnage.c +++ b/personnage.c @@ -17,6 +17,7 @@ Perso nouveau_joueur(SDL_Renderer *renderer, SDL_Texture **sprites){ p.vie = 100; p.degats = 25; p.vitesse = 4; + p.yMax = 0; p.tir = false; p.ennemi = false; p.animFlip = 1; @@ -30,16 +31,17 @@ Perso nouvel_ennemi_1(SDL_Renderer *renderer, SDL_Texture **sprites){ //g�n�re des coordonn�es de spawn al�atoires(provisoire) p.pos.x = rand()%100 + 0; p.pos.y = rand()%700 + 0; - p.pos.w = 60; - p.pos.h = 60; + p.pos.w = 50; + p.pos.h = 50; p.srcrect.x = 0; p.srcrect.y = 0; - p.srcrect.w = 288; - p.srcrect.h = 311; + p.srcrect.w = 229; + p.srcrect.h = 259; p.angle = 0; p.vie = 100; p.degats = 10; p.vitesse = 2; + p.yMax = 4403; p.tir = false; p.ennemi = true; p.animFlip = 1; @@ -127,14 +129,14 @@ void angle_joueur(Perso *p, float mouseX, float mouseY){ void angle_ennemi(Perso *p){ float angle; - angle = atan2( 350 - (p->pos.y + 20), 500 - (p->pos.x + 20)); + angle = atan2(350 - (p->pos.y + 20), 500 - (p->pos.x + 20)); p->angle = angle; return; } void animer_perso(Perso *p){ p->srcrect.y += p->srcrect.h * p->animFlip; - if(p->srcrect.y > 4976|| p->srcrect.y < 0){ + if(p->srcrect.y >= p->yMax|| p->srcrect.y < 0){ p->animFlip = -p->animFlip; p->srcrect.y += p->srcrect.h * p->animFlip; } diff --git a/sprites/ennemis/zombie/move/skeleton-move_0.png b/sprites/ennemis/zombie/move/skeleton-move_0.png deleted file mode 100644 index efc5f47c0826f2df567779eeedb3762078f72558..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_0.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_1.png b/sprites/ennemis/zombie/move/skeleton-move_1.png deleted file mode 100644 index e32405141468f5601c4d1d26b8af53fa0675a7a2..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_1.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_10.png b/sprites/ennemis/zombie/move/skeleton-move_10.png deleted file mode 100644 index eea6728758c9eb075dfdb8721a22658e654df7eb..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_10.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_11.png b/sprites/ennemis/zombie/move/skeleton-move_11.png deleted file mode 100644 index d6c4bc4b1866944ac018939851f3de3beb790f7c..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_11.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_12.png b/sprites/ennemis/zombie/move/skeleton-move_12.png deleted file mode 100644 index d4457c8d0195b200cdd844eb372adc1de8894ce0..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_12.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_13.png b/sprites/ennemis/zombie/move/skeleton-move_13.png deleted file mode 100644 index f0b4860be42ebd33d0a8510e73525c0e38118225..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_13.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_14.png b/sprites/ennemis/zombie/move/skeleton-move_14.png deleted file mode 100644 index 4cd3b8498a7fced2ac1d8d48e2c3858b12b57141..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_14.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_15.png b/sprites/ennemis/zombie/move/skeleton-move_15.png deleted file mode 100644 index c91f5bcdd0c7ed146340f65e6d30aa44c4e45a2f..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_15.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_16.png b/sprites/ennemis/zombie/move/skeleton-move_16.png deleted file mode 100644 index efc5f47c0826f2df567779eeedb3762078f72558..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_16.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_2.png b/sprites/ennemis/zombie/move/skeleton-move_2.png deleted file mode 100644 index 1e386e06ba473cce660ced1430641358a8aeb7d0..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_2.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_3.png b/sprites/ennemis/zombie/move/skeleton-move_3.png deleted file mode 100644 index 27f2ad4c4fa51be3620b97636afecff6df989b1e..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_3.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_4.png b/sprites/ennemis/zombie/move/skeleton-move_4.png deleted file mode 100644 index 097f77b45d9a8ad9c2aa4cc704b94d6de4bf3e9d..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_4.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_5.png b/sprites/ennemis/zombie/move/skeleton-move_5.png deleted file mode 100644 index 85f29dfdcb752e5f0a3cc117564d24a0ba7888db..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_5.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_6.png b/sprites/ennemis/zombie/move/skeleton-move_6.png deleted file mode 100644 index 8f687160e92e7c3c7f8e7dedaf231e69d8c81273..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_6.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_7.png b/sprites/ennemis/zombie/move/skeleton-move_7.png deleted file mode 100644 index 80e40f78fb99b48dbe5e7e7f91089d756435fd66..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_7.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_8.png b/sprites/ennemis/zombie/move/skeleton-move_8.png deleted file mode 100644 index 03dc64883ff7ea9dfc1ae8ed95bf693134e5825c..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_8.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/skeleton-move_9.png b/sprites/ennemis/zombie/move/skeleton-move_9.png deleted file mode 100644 index bc6713b147c7b6d62d5d27faa45e1c7b1ad36bce..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/skeleton-move_9.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/zombie_move.png b/sprites/ennemis/zombie/move/zombie_move.png deleted file mode 100644 index e1b74dccfb6dac76758ed96e730f7f95f68188e5..0000000000000000000000000000000000000000 Binary files a/sprites/ennemis/zombie/move/zombie_move.png and /dev/null differ diff --git a/sprites/ennemis/zombie/move/zombie_moveV2.png b/sprites/ennemis/zombie/move/zombie_moveV2.png new file mode 100644 index 0000000000000000000000000000000000000000..da7fac5f8d912402c091d416c36096c6b8d5aec3 Binary files /dev/null and b/sprites/ennemis/zombie/move/zombie_moveV2.png differ