custom url bug fix

js/bullet.js

@@ -750,7 +750,7 @@ const b = {
                     this.lockedOn = powerUp[i]
                   }
                 }
-                if (Vector.magnitudeSquared(Vector.sub(this.position, powerUp[i].position)) < 60000) {
+                if (Vector.magnitudeSquared(Vector.sub(this.position, powerUp[i].position)) < 60000 && !game.isChoosing) {
                   powerUps.onPickUp();
                   powerUp[i].effect();
                   Matter.World.remove(engine.world, powerUp[i]);
@@ -909,7 +909,6 @@ const b = {
             this.collisionFilter.category = cat.bullet;
             this.collisionFilter.mask = cat.mob //| cat.mobShield //cat.map | cat.body | cat.mob | cat.mobBullet | cat.mobShield
             if (mod.isFoamGrowOnDeath && bullet.length < 300) {
-              console.log(bullet.length)
               let targets = []
               for (let i = 0, len = mob.length; i < len; i++) {
                 const dist = Vector.magnitudeSquared(Vector.sub(this.position, mob[i].position));
@@ -1539,8 +1538,8 @@ const b = {
       name: "minigun",
       description: "<strong>rapidly</strong> fire a stream of small <strong>bullets</strong><br>fire <strong>delay</strong> decreases as you shoot",
       ammo: 0,
-      ammoPack: 70,
+      ammoPack: 65,
-      defaultAmmoPack: 70,
+      defaultAmmoPack: 65,
       recordedAmmo: 0,
       have: false,
       nextFireCycle: 0, //use to remember how longs its been since last fire, used to reset count
@@ -1648,7 +1647,7 @@ const b = {
       name: "super balls",
       description: "fire <strong>four</strong> balls in a wide arc<br>balls <strong>bounce</strong> with no momentum loss",
       ammo: 0,
-      ammoPack: 13,
+      ammoPack: 12,
       have: false,
       num: 5,
       fire() {
@@ -1703,8 +1702,8 @@ const b = {
       name: "flechettes",
       description: "fire a volley of <strong class='color-p'>uranium-235</strong> <strong>needles</strong><br>does <strong class='color-d'>damage</strong> over <strong>3</strong> seconds",
       ammo: 0,
-      ammoPack: 38,
+      ammoPack: 35,
-      defaultAmmoPack: 38,
+      defaultAmmoPack: 35,
       have: false,
       count: 0, //used to track how many shots are in a volley before a big CD
       lastFireCycle: 0, //use to remember how longs its been since last fire, used to reset count
@@ -1807,7 +1806,7 @@ const b = {
       name: "wave beam",
       description: "emit a <strong>sine wave</strong> of oscillating particles<br>particles <strong>slowly</strong> propagate through <strong>solids</strong>",
       ammo: 0,
-      ammoPack: 100,
+      ammoPack: 90,
       have: false,
       fire() {
         mech.fireCDcycle = mech.cycle + Math.floor(3 * b.fireCD); // cool down
@@ -1942,7 +1941,7 @@ const b = {
       name: "missiles",
       description: "launch missiles that <strong>accelerate</strong> towards <strong>mobs</strong><br><strong class='color-e'>explodes</strong> when near target",
       ammo: 0,
-      ammoPack: 4,
+      ammoPack: 3,
       have: false,
       fireCycle: 0,
       ammoLoaded: 0,
@@ -1998,8 +1997,8 @@ const b = {
       name: "flak",
       description: "fire a <strong>cluster</strong> of short range <strong>projectiles</strong><br><strong class='color-e'>explodes</strong> on <strong>contact</strong> or after half a second",
       ammo: 0,
-      ammoPack: 5,
+      ammoPack: 4,
-      defaultAmmoPack: 5, //use to revert ammoPack after mod changes drop rate
+      defaultAmmoPack: 4, //use to revert ammoPack after mod changes drop rate
       have: false,
       fire() {
         mech.fireCDcycle = mech.cycle + Math.floor((mech.crouch ? 25 : 10) * b.fireCD); // cool down
@@ -2042,7 +2041,7 @@ const b = {
       name: "grenades",
       description: "lob a single <strong>bouncy</strong> projectile<br><strong class='color-e'>explodes</strong> on <strong>contact</strong> or after one second",
       ammo: 0,
-      ammoPack: 6,
+      ammoPack: 5,
       have: false,
       fire() {
         const me = bullet.length;
@@ -2093,7 +2092,7 @@ const b = {
       name: "vacuum bomb",
       description: "fire a bomb that <strong>sucks</strong> before <strong class='color-e'>exploding</strong><br><strong>click</strong> left mouse again to <strong>detonate</strong>",
       ammo: 0,
-      ammoPack: 2.5,
+      ammoPack: 2,
       have: false,
       fire() {
         const me = bullet.length;
@@ -2212,7 +2211,7 @@ const b = {
       name: "neutron bomb",
       description: "toss a chunk of <strong class='color-p'>Cf-252</strong> that emits <strong class='color-p'>neutrons</strong><br><strong class='color-d'>damages</strong> and drains <strong class='color-f'>energy</strong> in area of effect",
       ammo: 0,
-      ammoPack: 6,
+      ammoPack: 5,
       have: false,
       fire() {
         const me = bullet.length;
@@ -2370,7 +2369,7 @@ const b = {
       name: "mine",
       description: "toss a <strong>proximity</strong> mine that <strong>sticks</strong> to walls<br>fires <strong>nails</strong> at mobs within range",
       ammo: 0,
-      ammoPack: 3,
+      ammoPack: 2.7,
       have: false,
       fire() {
         const pos = {
@@ -2392,7 +2391,7 @@ const b = {
       name: "spores",
       description: "fire a <strong>sporangium</strong> that discharges <strong class='color-p' style='letter-spacing: 2px;'>spores</strong><br><strong class='color-p' style='letter-spacing: 2px;'>spores</strong> seek out nearby mobs",
       ammo: 0,
-      ammoPack: 4,
+      ammoPack: 3.5,
       have: false,
       fire() {
         const me = bullet.length;
@@ -2523,7 +2522,7 @@ const b = {
       name: "ice IX",
       description: "synthesize <strong>short-lived</strong> ice crystals<br>crystals <strong>seek</strong> out and <strong class='color-s'>freeze</strong> mobs",
       ammo: 0,
-      ammoPack: 69,
+      ammoPack: 64,
       have: false,
       fire() {
         if (mech.crouch) {
@@ -2540,7 +2539,7 @@ const b = {
       name: "foam",
       description: "spray bubbly foam that <strong>sticks</strong> to mobs<br><strong class='color-s'>slows</strong> mobs and does <strong class='color-d'>damage</strong> over time",
       ammo: 0,
-      ammoPack: 45,
+      ammoPack: 40,
       have: false,
       fire() {
         mech.fireCDcycle = mech.cycle + Math.floor((mech.crouch ? 20 : 6) * b.fireCD); // cool down
@@ -2562,7 +2561,7 @@ const b = {
       name: "rail gun",
       description: "use <strong class='color-f'>energy</strong> to launch a high-speed <strong>dense</strong> rod<br><strong>hold</strong> left mouse to charge, <strong>release</strong> to fire",
       ammo: 0,
-      ammoPack: 3,
+      ammoPack: 2.6,
       have: false,
       fire() {
         const me = bullet.length;

js/index.js

@@ -57,6 +57,20 @@ window.addEventListener('load', (event) => {
     for (const property in set) {
       // console.log(set[property], property);
       set[property] = set[property].replace(/%20/g, " ")
+
+      if (property === "field") {
+        let found = false
+        let index
+        for (let i = 0; i < mech.fieldUpgrades.length; i++) {
+          if (set[property] === mech.fieldUpgrades[i].name) {
+            index = i;
+            found = true;
+            break;
+          }
+        }
+        if (found) build.choosePowerUp(document.getElementById(`field-${index}`), index, 'field')
+      }
+
       if (property.substring(0, 3) === "gun") {
         let found = false
         let index
@@ -80,26 +94,14 @@ window.addEventListener('load', (event) => {
             break;
           }
         }
-        if (found) build.choosePowerUp(document.getElementById(`mod-${index}`), index, 'mod')
+        if (found) build.choosePowerUp(document.getElementById(`mod-${index}`), index, 'mod', true)
       }
 
-      if (property === "field") {
-        let found = false
-        let index
-        for (let i = 0; i < mech.fieldUpgrades.length; i++) {
-          if (set[property] === mech.fieldUpgrades[i].name) {
-            index = i;
-            found = true;
-            break;
-          }
-        }
-        if (found) build.choosePowerUp(document.getElementById(`field-${index}`), index, 'field')
-      }
       if (property === "difficulty") {
         game.difficultyMode = Number(set[property])
-        localSettings.difficultyMode = Number(set[property])
+        // localSettings.difficultyMode = Number(set[property])
-        localStorage.setItem("localSettings", JSON.stringify(localSettings)); //update local storage
+        // localStorage.setItem("localSettings", JSON.stringify(localSettings)); //update local storage
-        document.getElementById("difficulty-select").value = Number(set[property])
+        // document.getElementById("difficulty-select").value = Number(set[property])
         document.getElementById("difficulty-select-custom").value = Number(set[property])
       }
       if (property === "level") {
@@ -206,7 +208,7 @@ const build = {
     window.scrollTo(0, 0);
   },
   isCustomSelection: true,
-  choosePowerUp(who, index, type) {
+  choosePowerUp(who, index, type, isAllowed = false) {
     if (type === "gun") {
       let isDeselect = false
       for (let i = 0, len = b.inventory.length; i < len; i++) { //look for selection in inventory
@@ -265,7 +267,7 @@ const build = {
           modID.classList.add("build-grid-disabled");
           modID.onclick = null
         }
-        if (mod.mods[i].count > 0) {
+        if (mod.mods[i].count > 0 && !isAllowed) {
           mod.removeMod(i)
         }
         if (modID.classList.contains("build-mod-selected")) {
@@ -348,12 +350,14 @@ const build = {
   shareURL() {
     let url = "https://landgreen.github.io/sidescroller/index.html?"
     let count = 0;
-    for (let i = 0; i < b.guns.length; i++) {
+
-      if (b.guns[i].have) {
+    for (let i = 0; i < b.inventory.length; i++) {
-        url += `&gun${count}=${encodeURIComponent(b.guns[i].name.trim())}`
+      if (b.guns[b.inventory[i]].have) {
+        url += `&gun${count}=${encodeURIComponent(b.guns[b.inventory[i]].name.trim())}`
         count++
       }
     }
+
     count = 0;
     for (let i = 0; i < mod.mods.length; i++) {
       for (let j = 0; j < mod.mods[i].count; j++) {

js/level.js

@@ -421,7 +421,7 @@ const level = {
     const balance2 = level.spinner(2605, 500, 390, 25, 0.005) //falling
     const balance3 = level.spinner(2608, 1900, 584, 25, 0.005) //falling
     const balance4 = level.spinner(9300, 2205, 25, 380, 0.001) //exit
-    console.log(balance1)
+
     level.custom = () => {
       button.query();
       button.draw();
@@ -1789,7 +1789,7 @@ const level = {
     // spawn.mapRect(-1950, -400, 100, 25);
     spawn.mapRect(-3150, 50, 775, 100);
     spawn.mapRect(-2600, -250, 775, 100);
-    spawn.bodyRect(-1350, -200, 200, 200, 1, spawn.propsSlide); //weight
+    spawn.bodyRect(-1350, -100, 100, 100, 1, spawn.propsSlide); //weight
     spawn.bodyRect(-1800, 0, 300, 100, 1, spawn.propsHoist); //hoist
     cons[cons.length] = Constraint.create({
       pointA: {
@@ -1801,7 +1801,7 @@ const level = {
       length: 1
     });
 
-    spawn.bodyRect(400, 400, 200, 200, 1, spawn.propsSlide); //weight
+    spawn.bodyRect(400, 500, 100, 100, 1, spawn.propsSlide); //weight
     spawn.bodyRect(800, 600, 300, 100, 1, spawn.propsHoist); //hoist
     cons[cons.length] = Constraint.create({
       pointA: {

js/mods.js

@@ -37,32 +37,31 @@ const mod = {
                 }
                 if (!found) return //if name not found don't give any mod
             }
-
             mod.mods[index].effect(); //give specific mod
             mod.mods[index].count++
             mod.totalCount++ //used in power up randomization
             game.updateModHUD();
         }
     },
-    giveBasicMod(index = 'random') {
+    // giveBasicMod(index = 'random') {
-        // if (isNaN(index)) { //find index by name
+    //     // if (isNaN(index)) { //find index by name
-        //     let found = false;
+    //     //     let found = false;
-        //     for (let i = 0; i < mod.mods.length; i++) {
+    //     //     for (let i = 0; i < mod.mods.length; i++) {
-        //         if (index === mod.mods[i].name) {
+    //     //         if (index === mod.mods[i].name) {
-        //             index = i;
+    //     //             index = i;
-        //             found = true;
+    //     //             found = true;
-        //             break;
+    //     //             break;
-        //         }
+    //     //         }
-        //     }
+    //     //     }
-        //     if (!found) return //if name not found don't give any mod
+    //     //     if (!found) return //if name not found don't give any mod
-        // }
+    //     // }
 
-        mod.basicMods[index].effect(); //give specific mod
+    //     mod.basicMods[index].effect(); //give specific mod
-        mod.mods[index].count++
+    //     mod.mods[index].count++
-        mod.totalCount++ //used in power up randomization
+    //     mod.totalCount++ //used in power up randomization
-        game.updateModHUD();
+    //     game.updateModHUD();
 
-    },
+    // },
     haveGunCheck(name) {
         for (i = 0, len = b.inventory.length; i < len; i++) {
             if (b.guns[b.inventory[i]].name === name) return true
@@ -1927,7 +1926,7 @@ const mod = {
         },
         {
             name: "necrophoresis",
-            description: "if the mob <strong>foam</strong> is stuck to <strong>dies</strong><br><strong>foam</strong> grows and splits into 3 <strong>copies</strong>",
+            description: "<strong>foam</strong> bullets grow and split into 3 <strong>copies</strong><br> when the mob they are stuck to <strong>dies</strong>",
             maxCount: 1,
             count: 0,
             allowed() {

js/spawn.js

@@ -781,7 +781,7 @@ const spawn = {
         stiffness: attachmentStiffness,
         damping: 0.01
       });
-      console.log(consBB[consBB.length - 1])
+      // console.log(consBB[consBB.length - 1])
     }
   },
   timeSkipBoss(x, y, radius = 55) {

todo.txt

@@ -1,15 +1,7 @@
 
-ammo power ups give ammo to every gun in your inventory now,
-  but they only give half as much for each ammo power up
-  this should give a greater incentive for having more guns
-mod: logistics now gives double ammo to only your current gun
-
-custom build links now bring you to the custom build menu, not directly into the game
 
 ************** TODO - n-gon **************
 
-have custom links goto the custom build menu, not the intro level
-
 performance issues with large numbers of spores
 consider limiting total bullets?
   300?