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

Prevent moving ship if inventory screen is open. Also resize map.

This commit is contained in:
Robbie Antenesse 2016-04-11 17:00:27 -06:00
parent aac13ca552
commit 3208d230bf
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
loadRooms.js
View File

@ -1,8 +1,8 @@
// var rm_TitleScreen = OS.R.Add("Default");
// var rm_Ocean = OS.R.Add("Ocean", {
var rm_Ocean = OS.R.Add("Default", {
width: (64 * OS.S.pixelScale) * 64, //32 64x64 squares for the map.
height: (64 * OS.S.pixelScale) * 64,
width: (64 * OS.S.pixelScale) * 50, //50x50 map of 64x64 squares. This will allow a single pixel on the map to represent a 64x square and fit comfortably on screen.
height: (64 * OS.S.pixelScale) * 50,
backgroundColor: "#1b2632"
});

25
prefabs/shipPrefab.js
View File

@ -27,19 +27,22 @@ var pr_ship = OS.P.Add("Ship", {
});
pr_ship.Do = function () {
if (ct_left().down) {
this.direction += 45;
} else if (ct_right().down) {
this.direction -= 45;
if (!guiControl.inventory.show) {
if (ct_left().down) {
this.direction += 45;
} else if (ct_right().down) {
this.direction -= 45;
}
this.direction = Math.clampAngle(this.direction);
if (ct_up().down) {
this.currentSpeed++;
} else if (ct_down().down) {
this.currentSpeed--;
}
this.AdjustSpeedBasedOnEnergy();
}
this.direction = Math.clampAngle(this.direction);
if (ct_up().down) {
this.currentSpeed++;
} else if (ct_down().down) {
this.currentSpeed--;
}
this.AdjustSpeedBasedOnEnergy();
this.currentSpeed = Math.clamp(this.currentSpeed, 0, 4);
this.moveStepProgress += this.currentSpeed * this.moveStepAmount;