Alamantus
/
Trade-Winds
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remembered the Oversimplified.GameObject.SimpleMove() function and replaced ship movement with that to help with collisions later.

This commit is contained in:
Robbie Antenesse 2016-04-06 14:40:42 -06:00
parent b46fcf8d0f
commit beecc22cb5
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
prefabs/shipPrefab.js
View File

@ -51,38 +51,43 @@ pr_ship.Do = function () {
} }
pr_ship.AfterDo = function () { pr_ship.AfterDo = function () {
this.CheckMovement();
}
pr_ship.CheckMovement = function () {
var moveAmount = (G.stats.speed + this.currentSpeed) * OS.S.pixelScale;
switch (this.direction) { switch (this.direction) {
case 0: case 0:
if (this.image.currentAnimation != "Ship Right") this.SetAnimation("Ship Right"); if (this.image.currentAnimation != "Ship Right") this.SetAnimation("Ship Right");
if (this.doTakeStep) this.x += (this.speedStat + this.currentSpeed) * OS.S.pixelScale; if (this.doTakeStep) this.SimpleMove(moveAmount, 0, true);
break; break;
case 45: case 45:
if (this.image.currentAnimation != "Ship Up-Right") this.SetAnimation("Ship Up-Right"); if (this.image.currentAnimation != "Ship Up-Right") this.SetAnimation("Ship Up-Right");
if (this.doTakeStep) { this.x += (this.speedStat + this.currentSpeed) * OS.S.pixelScale; this.y -= (this.speedStat + this.currentSpeed) * OS.S.pixelScale; } if (this.doTakeStep) this.SimpleMove(moveAmount, -moveAmount, true);
break; break;
case 90: case 90:
if (this.image.currentAnimation != "Ship Up") this.SetAnimation("Ship Up"); if (this.image.currentAnimation != "Ship Up") this.SetAnimation("Ship Up");
if (this.doTakeStep) this.y -= (this.speedStat + this.currentSpeed) * OS.S.pixelScale; if (this.doTakeStep) this.SimpleMove(0, -moveAmount, true);
break; break;
case 135: case 135:
if (this.image.currentAnimation != "Ship Up-Left") this.SetAnimation("Ship Up-Left"); if (this.image.currentAnimation != "Ship Up-Left") this.SetAnimation("Ship Up-Left");
if (this.doTakeStep) { this.x -= (this.speedStat + this.currentSpeed) * OS.S.pixelScale; this.y -= (this.speedStat + this.currentSpeed) * OS.S.pixelScale; } if (this.doTakeStep) this.SimpleMove(-moveAmount, -moveAmount, true);
break; break;
case 180: case 180:
if (this.image.currentAnimation != "Ship Left") this.SetAnimation("Ship Left"); if (this.image.currentAnimation != "Ship Left") this.SetAnimation("Ship Left");
if (this.doTakeStep) this.x -= (this.speedStat + this.currentSpeed) * OS.S.pixelScale; if (this.doTakeStep) this.SimpleMove(-moveAmount, 0, true);
break; break;
case 225: case 225:
if (this.image.currentAnimation != "Ship Down-Left") this.SetAnimation("Ship Down-Left"); if (this.image.currentAnimation != "Ship Down-Left") this.SetAnimation("Ship Down-Left");
if (this.doTakeStep) { this.x -= (this.speedStat + this.currentSpeed) * OS.S.pixelScale; this.y += (this.speedStat + this.currentSpeed) * OS.S.pixelScale; } if (this.doTakeStep) this.SimpleMove(-moveAmount, moveAmount, true);
break; break;
case 270: case 270:
if (this.image.currentAnimation != "Ship Down") this.SetAnimation("Ship Down"); if (this.image.currentAnimation != "Ship Down") this.SetAnimation("Ship Down");
if (this.doTakeStep) this.y += (this.speedStat + this.currentSpeed) * OS.S.pixelScale; if (this.doTakeStep) this.SimpleMove(0, moveAmount, true);
break; break;
case 315: case 315:
if (this.image.currentAnimation != "Ship Down-Right") this.SetAnimation("Ship Down-Right"); if (this.image.currentAnimation != "Ship Down-Right") this.SetAnimation("Ship Down-Right");
if (this.doTakeStep) { this.x += (this.speedStat + this.currentSpeed) * OS.S.pixelScale; this.y += (this.speedStat + this.currentSpeed) * OS.S.pixelScale; } if (this.doTakeStep) this.SimpleMove(moveAmount, moveAmount, true);
break; break;
default: default:
console.log("No valid direction"); console.log("No valid direction");