Collision

logic.js

@@ -86,7 +86,7 @@ function gameStart() {
 	player.lastShot = Date.now()
 
 	enemies = new Collection()
-	enemies.add(new Shooter({x: 400, y: 200}, {x: 15, y: 20}, 1)) //test enemy
+	enemies.add(new Shooter({x: 400, y: 200}, {x: 15, y: 20}, 2)) //test enemy
 
 	document.addEventListener('keydown', (event) => {
 		switch (event.code) {
@@ -158,6 +158,7 @@ function update() {
 	window.requestAnimationFrame(update)
 }
 
+//player input
 function handleInput() {
 	if (iLeft) {
 		hor = -1

objects.js

@@ -67,12 +67,16 @@ let player = {
 	drill: false,
 	drillCount: 3,
 	drillStrength: 3,
-	shotDelay: 1,
+	drillSpeed: 10,
+	shotDelay: 1,//seconds
+	hitStunLength: .3,//seconds
 	direction: 'right',
+	isHit: false,
+	//hitStun,
 	//bullets,
 	//lastShot,
 	move: function() {
-
+		//keep track for shot direction
 		if (iRight) {
 			this.direction = 'right'
 		}
@@ -83,7 +87,10 @@ let player = {
 			this.direction = 'up'
 		}
 
-
+		if (this.isGrounded) {
+			this.g = 200
+		}
+		//drill ability
 		if (!this.isGrounded && iDown && this.drillCount > 0) {
 			this.drill = true
 		} else {
@@ -117,27 +124,65 @@ let player = {
 
 		this.hSpeed = Math.clamp(this.hSpeed + 20, 10, this.speed)
 		this.vSpeed = Math.clamp(this.vSpeed + 20, 10, this.speed)
-		this.g = Math.clamp(this.g * 2, 100, 1000)
+		this.g = Math.clamp(Math.pow(this.g, 1.25), 2, 1000)
 
+		//disable input during hitstun
+		if (this.hitStun != undefined && !isDelayFinished(this.hitStun, this.hitStunLength)) {
+			console.log('input disabled')
+			hor = 0
+			ver = 0
+		}
+		let vCap = (this.drill) ? this.vMax : this.vMax - this.drillSpeed  
 		//next position (before collision)
 		this.velocity.x = Math.clamp((this.velocity.x + (hor  * this.hSpeed)) * delta, -this.hMax, this.hMax)
-		this.velocity.y = Math.clamp(((this.velocity.y + (ver * this.vSpeed) + this.g) * delta), -this.vMax, this.vMax) 
+		this.velocity.y = Math.clamp(((this.velocity.y + (ver * this.vSpeed) + this.g) * delta), -this.vMax, vCap) 
 
-		//adds responsiveness to controls
-		if ((this.velocity.x > 0 && hor < 0) || (this.velocity.x < 0 && hor > 0)) {
-			this.velocity.x = 0
-			this.hSpeed = 50
+		//disable control adjustment when stunned
+		if (this.hitStun == undefined || isDelayFinished(this.hitStun, this.hitStunLength)) {
+
+			//adds responsiveness to controls
+			if ((this.velocity.x > 0 && hor < 0) || (this.velocity.x < 0 && hor > 0)) { //never triggering
+				this.velocity.x = 0
+				this.hSpeed = 50
+			}
+			if (hor === 0 && Math.abs(this.velocity.x) < 0.01) {
+				this.velocity.x = 0
+				this.hSpeed = 50
+			}
 		}
-		if (hor === 0 && Math.abs(this.velocity.x) < 0.01) {
-			this.velocity.x = 0
-			this.hSpeed = 50
+
+		//hitstun logic (pushback and damage)
+		if (this.isHit) {
+			// console.log('hit')
+			if (this.hitstun == undefined || isDelayFinished(this.hitStun, this.hitStunLength)) {
+				this.hitStun = Date.now()
+
+				if (!this.drill) {
+					this.health -= 1
+					if (this.velocity.x < 1 && this.velocity.x > -1) {
+						if (this.velocity.x >= 0) {
+							this.velocity.x += 20
+						} else {
+							this.velocity.x -= 20
+						}
+					} else {
+						this.velocity.x *= -3
+					}
+					this.velocity.y *= -2
+				} else {
+					this.g = 1
+					this.velocity.y *= -3
+				}
+
+			}	
 		}
 
 		let nextX
 		let nextY
 		let checkRow
 		let checkBlock
 
+		//level collision
 		//collision right
 		if (this.velocity.x > 0) {
 			nextX = this.origin.x + this.size.x + this.velocity.x
@@ -203,7 +248,6 @@ let player = {
 							this.origin.y = (blockL.origin.y + level.origin.y) - this.size.y
 							this.velocity.y = Math.min(0, this.velocity.y)
 							this.isGrounded = true
-							this.g = 100
 						} else {
 							level.rows[checkRow][Math.floor((left - level.origin.x) / cell.x)] = null
 							drilled = true							
@@ -214,7 +258,6 @@ let player = {
 							this.origin.y = (blockR.origin.y + level.origin.y) - this.size.y
 							this.velocity.y = Math.min(0, this.velocity.y)
 							this.isGrounded = true
-							this.g = 100
 						} else {
 							level.rows[checkRow][Math.floor((right - level.origin.x) / cell.x)] = null
 							drilled = true
@@ -250,11 +293,34 @@ let player = {
 				}
 			}
 		} 
+
+		//enemy collision
+		let e = enemies.head
+		let world = {x: this.origin.x - level.origin.x,
+					 y: this.origin.y - level.origin.y}
+		let nextPos = new CollisionObj({x: world.x + this.velocity.x, 
+									   y: world.y + this.velocity.y},
+									  {x: world.x + this.velocity.x + this.size.x, 
+									   y: world.y + this.velocity.y + this.size.y})
+		this.isHit = false
+		while (e !== null) {
+			if (isColliding(new CollisionObj(e.origin, {x: e.origin.x + e.size.x, 
+														y: e.origin.y + e.size.y}), 
+							nextPos)) {
+				this.isHit = true
+				if (this.drill) {
+					e.health -= 1
+				}
+			}
+			e = e.next
+		}
+		// console.log(this.velocity.y)
+		//move player
 		this.origin.x += this.velocity.x
 		this.origin.y += this.velocity.y
 	},
 	fire: function() {
-//spawn bullet in origin determined by direction and pass speed params accordingly
+		//spawn bullet in origin determined by direction and pass speed params accordingly
 		switch (this.direction) {
 			case 'right':
 				this.bullets.add(new Bullet(

utility.js

@@ -4,18 +4,23 @@
 Math.clamp = function(number, min, max) {
 	return Math.max(min, Math.min(number, max));
 }
-
 function drawObject(obj, color) {
 	ctx.save()
 	ctx.translate(obj.origin.x + level.origin.x, obj.origin.y + level.origin.y)
 	ctx.fillStyle = color
 	ctx.fillRect(0, 0, obj.size.x, obj.size.y)
 	ctx.restore()
 }
-
+function isDelayFinished(last, delay) {
+	if ((time - last)/1000 >= delay) {
+		return true
+	} else {
+		return false
+	}
+}
 function canFire(obj) {
-	if ((obj.bullets.head == null && ((time - obj.lastShot)/1000 >= obj.shotDelay / 2)) 
-		|| (time - obj.lastShot)/1000 >= obj.shotDelay) {
+	if ((obj.bullets.head == null && isDelayFinished(obj.lastShot, obj.shotDelay / 2)) 
+		|| isDelayFinished(obj.lastShot, obj.shotDelay)) {
 		return true
 	} else {
 		return false