diff --git a/game.js b/game.js
index 3add931..ab1d423 100644
--- a/game.js
+++ b/game.js
@@ -1913,7 +1913,7 @@ function chew()
function stomp()
{
- if (macro.gooMolten) {
+ if (macro.gooMolten && !macro.footShoeWorn && !macro.footSockWorn) {
stomp_goo();
return;
}
diff --git a/recursive-desc.js b/recursive-desc.js
index 7f35d2b..9b866d0 100644
--- a/recursive-desc.js
+++ b/recursive-desc.js
@@ -874,7 +874,7 @@ function defaultFlood(container, macro, verbose) {
if (container.count == 0) {
return "Your gooey body melts and floods outward..but doesn't catch anything.";
} else {
- return "Your gooey body melts and floods outward, burying " + container.describe(verbose) + " in your thick, slimy self. You slowly reform, grinning as you feel the " + numberRough(container.count, "of") + " prey sloshing about within.";
+ return "Your gooey body melts and floods outward, burying " + container.describe(verbose) + " in your thick, slimy self. You slowly reform, grinning as you feel " + numberRough(get_living_prey(container.sum()), "of") + " prey sloshing about within.";
}
}
diff --git a/recursive-macro.js b/recursive-macro.js
index 4387946..d78d89a 100644
--- a/recursive-macro.js
+++ b/recursive-macro.js
@@ -227,11 +227,12 @@ function initContents(name,count) {
return result;
}
+
function get_living_prey(sum) {
let total = 0;
for (let key in sum) {
if (sum.hasOwnProperty(key)) {
- if (key == "Micro" || key == "Macro" || key == "Person" || key == "Cow")
+ if (key == "Micro" || key == "Macro" || key == "Person" || key == "Cow" || key == 'Soldier')
total += sum[key];
}
}
diff --git a/stroll.html b/stroll.html
index 41bcb48..e9f042f 100644
--- a/stroll.html
+++ b/stroll.html
@@ -690,7 +690,7 @@
-
+
@@ -700,7 +700,7 @@
-
+
@@ -728,7 +728,7 @@
-
+
@@ -764,7 +764,7 @@
-
+
@@ -821,7 +821,7 @@
-
+
@@ -831,7 +831,7 @@
-
+
@@ -855,7 +855,7 @@
-
+
@@ -871,19 +871,19 @@
@@ -907,7 +907,7 @@
-
+
@@ -957,7 +957,7 @@
-
+
@@ -1013,7 +1013,7 @@
-
+
diff --git a/style.css b/style.css
index ee89e80..15c1885 100644
--- a/style.css
+++ b/style.css
@@ -326,8 +326,7 @@ body.dark input[type="checkbox"]:checked+
display: none;
}
-.flex-outer li,
-.flex-inner {
+.flex-outer li {
display: flex;
flex-wrap: wrap;
align-items: center;
@@ -392,7 +391,7 @@ body.light .flex-outer input[type="checkbox"]:checked + label:not(.custom-header
display: flex;
flex-wrap: wrap;
align-items: center;
- width: 80%;
+ width: 400px;
}
body.light .has-tooltip {
diff --git a/units.js b/units.js
index 46afcd3..ba55251 100644
--- a/units.js
+++ b/units.js
@@ -33,6 +33,8 @@ function numberRough(value,suffix="") {
case 2: return prefix + "millions " + suffix;
case 3: return prefix + "billions " + suffix;
case 4: return prefix + "trillions " + suffix;
+ case 5: return prefix + "quadrillions " + suffix;
+ case 6: return prefix + "quintillions " + suffix;
default: return "uncountably many";
}
}
@@ -41,7 +43,11 @@ function numberRough(value,suffix="") {
function number(value, type="full", precision=3) {
var val = parseFloat(value);
switch(type) {
- case "full": return val.toString();
+ case "full":
+ if (Math.log(value) / Math.log(10) < 10) {
+ return val.toString();
+ }
+
case "scientific": return val.toExponential(precision).toString();
case "words": return number_words_repeated(val);
case "prefix": return number_prefix(val);