diff --git a/js/player.js b/js/player.js
index 1ae9455..160dc52 100644
--- a/js/player.js
+++ b/js/player.js
@@ -506,7 +506,7 @@ const m = {
if (tech.isFieldHarmReduction) dmg *= 0.5
if (tech.isHarmMACHO) dmg *= 0.33
if (tech.isImmortal) dmg *= 0.66
- if (tech.isHarmReduceNoKill) dmg *= (m.lastKillCycle + 300 < m.cycle) ? 0.28 : 1.1
+ if (tech.isHarmReduceNoKill && m.lastKillCycle + 300 < m.cycle) dmg *= 0.33
if (tech.healthDrain) dmg *= 1 + 3.33 * tech.healthDrain //tech.healthDrain = 0.03 at one stack //cause more damage
if (tech.squirrelFx !== 1) dmg *= 1 + (tech.squirrelFx - 1) / 5 //cause more damage
if (tech.isAddBlockMass && m.isHolding) dmg *= 0.15
diff --git a/js/tech.js b/js/tech.js
index 9c8b1d8..8f23f10 100644
--- a/js/tech.js
+++ b/js/tech.js
@@ -601,7 +601,7 @@
tech.isCrouchAmmo = true
},
remove() {
- tech.isExtraChoice = false;
+ tech.isCrouchAmmo = false;
}
},
{
@@ -1506,7 +1506,7 @@
{
name: "dynamo-bot upgrade",
link: `dynamo-bot upgrade`,
- description: "convert your current bots to dynamo-bots
increase regen to 19 energy per second",
+ description: "convert your current bots to dynamo-bots
increase regen to 20 energy per second",
maxCount: 1,
count: 0,
frequency: 3,
@@ -2545,7 +2545,7 @@
},
{
name: "Maxwell's demon",
- description: "energy above your max decays 92% slower
+18% JUNK to the potential tech pool",
+ description: "energy above your max decays 95% slower
+10% JUNK to the potential tech pool",
maxCount: 1,
count: 0,
frequency: 2,
@@ -2555,8 +2555,8 @@
},
requires: "energy above your max",
effect() {
- tech.overfillDrain = 0.85 //70% = 1-(1-0.75)/(1-0.15) //92% = 1-(1-0.75)/(1-0.87)
- this.refundAmount += tech.addJunkTechToPool(0.18)
+ tech.overfillDrain = 0.92 //70% = 1-(1-0.75)/(1-0.15) //92% = 1-(1-0.75)/(1-0.87)
+ this.refundAmount += tech.addJunkTechToPool(0.1)
},
refundAmount: 0,
remove() {
@@ -2664,7 +2664,7 @@
},
{
name: "torpor",
- description: "if a mob has not died in the last 5 seconds
reduce harm by 72% else increase it by 10%",
+ description: "if a mob has not died in the last 5 seconds
reduce harm by 66%",
maxCount: 1,
count: 0,
frequency: 1,
@@ -4931,14 +4931,14 @@
name: "fault tolerance",
description: "spawn 8 drones that last forever
remove your drone gun",
isGunTech: true,
- maxCount: 3,
+ maxCount: 1,
count: 0,
- frequency: 2,
- frequencyDefault: 2,
+ frequency: 1,
+ frequencyDefault: 1,
allowed() {
- return tech.haveGunCheck("drones", false) || tech.isForeverDrones
+ return tech.haveGunCheck("drones", false)
},
- requires: "drones, fault tolerance",
+ requires: "drones",
effect() {
const num = 8
tech.isForeverDrones += num
@@ -8552,7 +8552,10 @@
},
requires: "at least 4 research",
effect() {
- for (let i = 0; i < powerUps.research.count; i++) powerUps.directSpawn(m.pos.x + 160 * (Math.random() - 0.5), m.pos.y + 160 * (Math.random() - 0.5), "research");
+ const dist = 10 * powerUps.research.count + 100
+ for (let i = 0; i < powerUps.research.count; i++) {
+ powerUps.directSpawn(m.pos.x + dist * (Math.random() - 0.5), m.pos.y + dist * (Math.random() - 0.5), "research");
+ }
powerUps.research.count = 0
},
remove() {}
diff --git a/todo.txt b/todo.txt
index 2a84870..1bc343b 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,26 +1,16 @@
******************************************************** NEXT PATCH **************************************************
-tech: Occam's razor - remove 50% of your tech and guns; `for each removed get 36% damage
+change: torpor - if you have NOT killed a mob in the last 5 seconds reduce harm by 66% (no negative effect though)
-tech dormancy removed
-tech: predator - if you have killed a mob in the last 5 seconds increase damage by 50% and disable energy regen
-tech: torpor - gives the opposite of it's previous effect
- if you have NOT killed a mob in the last 5 seconds reduce harm by 72%, else increase it by 10%
-
-relativistic momentum - pushes blocks in addition to mobs
- not much benefit, but it's fun
-supply chain: still doubles ammo, but now also adds 5% JUNK (yay)
- it no longer has any tech requirements
-inductive coupling: 600% -> 700% regen while crouched
-
-JUNK tech: density - blocks are 100x times less dense
-
-tech descriptions can change their text dynamically now
- only a few tech are using this option so far
******************************************************** TODO ********************************************************
-if a mob has died in the last 5 seconds 100% damage and no energy regen
+reduce some common in game console triggers, but lengthen default console time
+ don't log ammo?
+ don't log health
+ cap length of console?
+
+tech if you are inside the MACHO halo get a benefit
dart: a new bullet type for string-less harpoons
can turn harder