parent
c89557c15a
commit
1a50760b59
10 changed files with 15 additions and 22 deletions
@ -1 +1 @@ |
||||
hit(self, other, 2); |
||||
hit(self, other); |
@ -0,0 +1 @@ |
||||
attack = 2; |
@ -1,20 +1,6 @@ |
||||
if (inv == 0) { |
||||
audio_play_sound(snHit,1,false); |
||||
hit(other, self, other.attack); |
||||
hit(other, self); |
||||
inv = 30; |
||||
} else { |
||||
knockBack(other, self); |
||||
} |
||||
|
||||
// pushback |
||||
/* |
||||
knockback = 10; |
||||
if (other.x > x && !place_meeting(x-knockback-1, y, oWall)) { |
||||
x -= knockback; |
||||
} else if (other.x < x && !place_meeting(x+knockback+1, y, oWall)) { |
||||
x += knockback; |
||||
} else if (other.y > y && !place_meeting(x, y-knockback-1, oWall)) { |
||||
y -= knockback; |
||||
} else if (other.y < y && !place_meeting(x, y+knockback+1, oWall)) { |
||||
y += knockback; |
||||
}*/ |
||||
knockBack(other, self); |
@ -1,3 +1,3 @@ |
||||
hit (self, other, 10); |
||||
hit (self, other); |
||||
audio_play_sound(snHit,1,false); |
||||
room_goto(asset_get_index("r" + string(oGame.tableau[oGame.posX, oGame.posY]))); |
@ -0,0 +1 @@ |
||||
attack = 10; |
Loading…
Reference in new issue