From b8f032f8db61ee9955d32228f5573060751067cb Mon Sep 17 00:00:00 2001 From: lilgreenland Date: Mon, 2 Dec 2019 15:26:30 -0800 Subject: [PATCH] added build clicking --- index.html | 4 +--- js/index.js | 31 ++++++++++++++++++++----------- js/level.js | 8 ++++---- js/spawn.js | 6 +++--- style.css | 2 +- 5 files changed, 29 insertions(+), 22 deletions(-) diff --git a/index.html b/index.html index d1cf3e7..32ed923 100644 --- a/index.html +++ b/index.html @@ -86,9 +86,7 @@ --> -
- -
+
diff --git a/js/index.js b/js/index.js index 1754156..0cee5b9 100644 --- a/js/index.js +++ b/js/index.js @@ -116,36 +116,45 @@ map: 0x000001 0x111111 */ //build build grid display -let isShowingBuilds = false +const build = { + isShowingBuilds: false, + list: [], + choosePowerUp(index, type) { + build.list[build.list.length] = { + index: index, + type: type + } + console.log(build.list) + }, +} + document.getElementById("build-button").addEventListener("click", () => { const el = document.getElementById("build-grid") - if (isShowingBuilds) { + if (build.isShowingBuilds) { el.style.display = "none" - isShowingBuilds = false + build.isShowingBuilds = false document.body.style.overflow = "hidden" document.getElementById("controls").style.display = 'inline' } else { - let text = "" - for (let i = 0, len = mech.fieldUpgrades.length; i < len; i++) { - text += `
  ${mech.fieldUpgrades[i].name}
${mech.fieldUpgrades[i].description}
` + let text = '

click on 5 powers, then click begin

' + for (let i = 1, len = mech.fieldUpgrades.length; i < len; i++) { + text += `
  ${mech.fieldUpgrades[i].name}
${mech.fieldUpgrades[i].description}
` } for (let i = 0, len = b.guns.length; i < len; i++) { - text += `
  ${b.guns[i].name}
${b.guns[i].description}
` + text += `
  ${b.guns[i].name}
${b.guns[i].description}
` } for (let i = 0, len = b.mods.length; i < len; i++) { - text += `
  ${b.mods[i].name}
${b.mods[i].description}
` + text += `
  ${b.mods[i].name}
${b.mods[i].description}
` } el.innerHTML = text el.style.display = "grid" - isShowingBuilds = true + build.isShowingBuilds = true document.body.style.overflowY = "scroll"; document.body.style.overflowX = "hidden"; document.getElementById("controls").style.display = 'none' } }); - - //set up canvas var canvas = document.getElementById("canvas"); //using "const" causes problems in safari when an ID shares the same name. diff --git a/js/level.js b/js/level.js index 04c00dd..264394f 100644 --- a/js/level.js +++ b/js/level.js @@ -14,14 +14,14 @@ const level = { start() { if (level.levelsCleared === 0) { // game.difficulty = 6; //for testing to simulate possible mobs spawns - // level.startBuildRun(2) + // level.startBuildRun(5) // b.giveGuns(11) // mech.fieldUpgrades[2].effect(); // b.giveMod(13) // spawn.pickList = ["ghoster", "ghoster"] - this.intro(); //starting level - // this.testingMap(); + // this.intro(); //starting level + this.testingMap(); // this.bosses(); // this.aerie(); // this.rooftops(); @@ -217,7 +217,7 @@ const level = { powerUps.spawn(450, -400, "mod", false, 6); // powerUps.spawn(450, -400, "mod", false); // spawn.bodyRect(-45, -100, 40, 50); - // spawn.focuser(800, -1150); + spawn.spawner(800, -1150); spawn.groupBoss(-600, -550); // spawn.hopper(800, -150); // spawn.beamer(800, -150); diff --git a/js/spawn.js b/js/spawn.js index 78b1c3e..b378099 100644 --- a/js/spawn.js +++ b/js/spawn.js @@ -952,10 +952,10 @@ const spawn = { // me.dropPowerUp = false; me.onDeath = function () { //run this function on death for (let i = 0; i < Math.ceil(this.mass * 0.2 + Math.random() * 3); ++i) { - spawn.spawns(this.position.x + (Math.random() - 0.5) * radius * 2, this.position.y + (Math.random() - 0.5) * radius * 2); + spawn.spawns(this.position.x + (Math.random() - 0.5) * radius * 2.5, this.position.y + (Math.random() - 0.5) * radius * 2.5); Matter.Body.setVelocity(mob[mob.length - 1], { - x: (Math.random() - 0.5) * 25, - y: (Math.random() - 0.5) * 25 + x: this.velocity.x + (Math.random() - 0.5) * 15, + y: this.velocity.x + (Math.random() - 0.5) * 15 }); } }; diff --git a/style.css b/style.css index 13582b8..f6d2d04 100644 --- a/style.css +++ b/style.css @@ -44,7 +44,7 @@ summary { } #build-button { - position: absolute; + position: sticky; bottom: 0px; right: 1px; z-index: 12;