From 0561caf21aedd5f451bdb48f630bd4cb4bc4b06b Mon Sep 17 00:00:00 2001
From: landgreen <rosslandgreen@gmail.com>
Date: Wed, 22 Sep 2021 05:59:38 -0700
Subject: [PATCH] bug fix

---
 .DS_Store   | Bin 6148 -> 6148 bytes
 js/index.js |  12 ++++++++++--
 js/tech.js  |   7 -------
 todo.txt    |   9 ++-------
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 9e65a47a3becb526a34f41682cf7361f2e7a5413..21a921b641dcfe9c451d862839e3ad3eef0b4c84 100644
GIT binary patch
delta 15
WcmZoMXffEJ#mw|%<z^k`8zKNK>;<C$

delta 15
WcmZoMXffEJ#mw}yeX|bp4G{n=Ck284

diff --git a/js/index.js b/js/index.js
index e4fb9df..aa7ae60 100644
--- a/js/index.js
+++ b/js/index.js
@@ -590,10 +590,15 @@ const build = {
             }
             removeOne();
         }
+        let hasExperimentalMode = false
         if (!simulation.isCheating) {
             for (let i = 0, len = tech.tech.length; i < len; i++) {
-                if (tech.tech[i].count > 0 && !tech.tech[i].isLore && !tech.tech[i].isExperimentalMode) {
-                    simulation.isCheating = true;
+                if (tech.tech[i].count > 0) {
+                    if (tech.tech[i].isExperimentalMode) {
+                        hasExperimentalMode = true
+                    } else if (!tech.tech[i].isLore) {
+                        simulation.isCheating = true;
+                    }
                 }
             }
             if (b.inventory.length !== 0 || m.fieldMode !== 0) simulation.isCheating = true;
@@ -611,6 +616,9 @@ const build = {
         } else { //if you have no tech (not cheating) remove all power ups that might have spawned from tech
             for (let i = 0; i < powerUp.length; ++i) Matter.Composite.remove(engine.world, powerUp[i]);
             powerUp = [];
+            if (hasExperimentalMode) {
+                for (let i = 0; i < 7; i++) tech.giveTech("undefined")
+            }
         }
         document.body.style.cursor = "none";
         document.body.style.overflow = "hidden"
diff --git a/js/tech.js b/js/tech.js
index a0105f5..3c2e469 100644
--- a/js/tech.js
+++ b/js/tech.js
@@ -6324,7 +6324,6 @@
                 requires: "",
                 effect() {
                     m.shipMode()
-                    for (let i = 0; i < 7; i++) tech.giveTech("undefined")
                 },
                 remove() {}
             },
@@ -6348,7 +6347,6 @@
                             simulation.trails()
                         }
                     }, 20000); //every 20 seconds
-                    for (let i = 0; i < 7; i++) tech.giveTech("undefined")
 
                 },
                 remove() {
@@ -6375,7 +6373,6 @@
                             }
                         }
                     }, 5000); //every 5 seconds
-                    for (let i = 0; i < 7; i++) tech.giveTech("undefined")
                 },
                 interval: undefined,
                 remove() {
@@ -6403,7 +6400,6 @@
                         m.transX += (m.transSmoothX - m.transX) * 0.07;
                         m.transY += (m.transSmoothY - m.transY) * 0.07;
                     }
-                    for (let i = 0; i < 7; i++) tech.giveTech("undefined")
                 },
                 remove() {
                     if (this.count > 0) m.look = m.lookDefault()
@@ -6432,7 +6428,6 @@
                             }
                         }
                     }, 1000); //every 1 seconds
-                    for (let i = 0; i < 7; i++) tech.giveTech("undefined")
                 },
                 interval: undefined,
                 remove() {
@@ -6453,7 +6448,6 @@
                 requires: "",
                 effect() {
                     tech.deathSpawns = 0.2
-                    for (let i = 0; i < 7; i++) tech.giveTech("undefined")
                 },
                 remove() {
                     tech.deathSpawns = 0
@@ -6473,7 +6467,6 @@
                 requires: "",
                 effect() {
                     tech.wimpExperiment = 5
-                    for (let i = 0; i < 7; i++) tech.giveTech("undefined")
                 },
                 remove() {
                     tech.wimpExperiment = 0
diff --git a/todo.txt b/todo.txt
index 9f2cc0c..78fa146 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,13 +1,6 @@
 ******************************************************** NEXT PATCH **************************************************
 
-harpoon damage is increased 30%
-picks up power ups from farther away
-harpoon's range has been reduced about 20%
-filament and unaaq require about 40% more ammo for the same effect
-harpoon density lowers when it retracts
-  so it doesn't do as much damage on retracting
 
-more bug fixes
 
 ******************************************************** TODO ********************************************************
 
@@ -34,6 +27,8 @@ harpoon
   post launch tracking: more airFriction, more thrust, harder turning
     if no target found slow down and aim much better?
 harpoon tech
+  crouch fire grapple hook
+    attaches to map at long range and pulls player?
   tech that buffs alt fire:
     remove the string, all shots are alt fire
     alt fire has a 50% chance to not use ammo?