diff --git a/objects/oPlayer/Collision_oMonster.gml b/objects/oPlayer/Collision_oMonster.gml index c38fe0d..6596ed9 100644 --- a/objects/oPlayer/Collision_oMonster.gml +++ b/objects/oPlayer/Collision_oMonster.gml @@ -1,13 +1,12 @@ -if (pdv <= 0) { - instance_destroy(); - show_debug_message("game overe"); - // GAME OVER -} else if (inv == 0) { - pdv--; +if (inv == 0) { + hit(other, self, other.attack); inv = 120; +} else { + knockBack(other, self); } // pushback +/* knockback = 10; if (other.x > x && !place_meeting(x-knockback-1, y, oWall)) { x -= knockback; @@ -17,4 +16,4 @@ if (other.x > x && !place_meeting(x-knockback-1, y, oWall)) { y -= knockback; } else if (other.y < y && !place_meeting(x, y+knockback+1, oWall)) { y += knockback; -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/objects/oPlayer/Create_0.gml b/objects/oPlayer/Create_0.gml index b829263..f3eec78 100644 --- a/objects/oPlayer/Create_0.gml +++ b/objects/oPlayer/Create_0.gml @@ -1,5 +1,5 @@ seDeplace = 0; -pdv = 100; +pv = 100; inv = 0; //timer invinsiblité indexImageInfo = 0;