From 41a5459ef95d3ee3960e39b58d5515082b296ac2 Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Fri, 1 Jun 2018 09:09:14 -0400
Subject: [PATCH 1/6] Making some names more consistent

---
 stroll.html | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/stroll.html b/stroll.html
index 7f952f0..95722b1 100644
--- a/stroll.html
+++ b/stroll.html
@@ -686,7 +686,7 @@
                 <div class="preview" id="baseBallDiameterPreview"></div>
               </li>
               <li>
-                <label for="baseCumRatio" class="has-tooltip" title="scales how much cum is released with each shot">Orgasm cum ratio</label>
+                <label for="baseCumRatio" class="has-tooltip" title="scales how much cum is released with each shot">Orgasm cum factor</label>
                 <input autocomplete="off" type="number" step="any" id="baseCumRatio" name="baseCumRatio" placeholder="1" />
                 <div class="preview" id="baseCumRatioPreview"></div>
               </li>
@@ -696,7 +696,7 @@
                 <div class="preview" id="cumScalePreview"></div>
               </li>
               <li>
-                <label for="cumStorageScale">Cum storage multiplier</label>
+                <label for="cumStorageScale">Cum storage factor</label>
                 <input autocomplete="off" type="number" step="any" id="cumStorageScale" name="cumStorageScale" placeholder="1" />
                 <div class="preview" id="cumStorageScalePreview"></div>
               </li>
@@ -724,7 +724,7 @@
                     <label class="custom-header" for="maleMuskEnabled">Musk</label>
                     <div class="reveal-if-active">
                       <li>
-                        <label for="baseMaleMuskArea">Musk area</label>
+                        <label for="baseMaleMuskArea">Musk factor</label>
                         <input autocomplete="off" type="number" step="any" id="baseMaleMuskArea" name="baseMaleMuskArea" placeholder="0.5" />
                       </li>
                     </div>
@@ -760,7 +760,7 @@
                         <div class="preview" id="lactationScalePreview"></div>
                       </li>
                       <li>
-                        <label for="milkStorageScale">Milk storage multiplier</label>
+                        <label for="milkStorageScale">Milk storage factor</label>
                         <input autocomplete="off" type="number" step="any" id="milkStorageScale" name="milkStorageScale" placeholder="1" />
                         <div class="preview" id="milkStorageScalePreview"></div>
                       </li>
@@ -817,7 +817,7 @@
                 <input autocomplete="off" type="number" step="any" name="vaginaStretchiness" placeholder="1" />
               </li>
               <li>
-                <label for="baseFemcumRatio" class="has-tooltip" title="scales how much femcum is released with each shot">Orgasm femcum ratio</label>
+                <label for="baseFemcumRatio" class="has-tooltip" title="scales how much femcum is released with each shot">Orgasm femcum factor </label>
                 <input autocomplete="off" type="number" step="any" id="baseFemcumRatio" name="baseFemcumRatio" placeholder="1" />
                 <div class="preview" id="baseFemcumRatioPreview"></div>
               </li>
@@ -827,7 +827,7 @@
                 <div class="preview" id="femcumScalePreview"></div>
               </li>
               <li>
-                <label for="femcumStorageScale">Femcum storage multiplier</label>
+                <label for="femcumStorageScale">Femcum storage factor</label>
                 <input autocomplete="off" type="number" step="any" id="femcumStorageScale" name="femcumStorageScale" placeholder="1" />
                 <div class="preview" id="femcumStorageScalePreview"></div>
               </li>
@@ -851,7 +851,7 @@
                     <label class="custom-header" for="femaleMuskEnabled">Musk</label>
                     <div class="reveal-if-active">
                       <li>
-                        <label for="baseFemaleMuskArea">Musk area</label>
+                        <label for="baseFemaleMuskArea">Musk factor</label>
                         <input autocomplete="off" type="number" step="any" id="baseFemaleMuskArea" name="baseFemaleMuskArea" placeholder="0.5" />
                       </li>
                     </div>
@@ -867,19 +867,19 @@
             <div class="reveal-if-active">
               <div>Areas are ratios; 1 means stomping 100 people catches 100 in stench</div>
               <li>
-                <label for="basePawStenchArea">Paw stench area</label>
+                <label for="basePawStenchArea">Paw stench factor</label>
                 <input autocomplete="off" type="number" step="any" id="basePawStenchArea" name="basePawStenchArea" placeholder="1" />
               </li>
               <li>
-                <label for="baseAssStenchArea">Ass stench area</label>
+                <label for="baseAssStenchArea">Ass stench factor</label>
                 <input autocomplete="off" type="number" step="any" id="baseAssStenchArea" name="baseAssStenchArea" placeholder="2" />
               </li>
               <li>
-                <label for="basePissStenchArea">Piss stench area</label>
+                <label for="basePissStenchArea">Piss stench factor</label>
                 <input autocomplete="off" type="number" step="any" id="basePissStenchArea" name="basePissStenchArea" placeholder="0.75" />
               </li>
               <li>
-                <label for="baseScatStenchArea">Scat stench area</label>
+                <label for="baseScatStenchArea">Scat stench factor</label>
                 <input autocomplete="off" type="number" step="any" id="baseScatStenchArea" name="baseScatStenchArea" placeholder="1.5" />
               </li>
             </div>
@@ -903,7 +903,7 @@
                 <div class="preview" id="gasScalePreview"></div>
               </li>
               <li>
-                <label for="gasStorageScale">Gas storage multiplier</label>
+                <label for="gasStorageScale">Gas storage factor</label>
                 <input autocomplete="off" type="number" step="any" id="gasStorageScale" name="gasStorageScale" placeholder="1" />
                 <div class="preview" id="gasStorageScalePreview"></div>
               </li>
@@ -948,12 +948,12 @@
             <label class="custom-header" for="pissEnabled">Watersports</label>
             <div class="reveal-if-active">
               <li>
-                <label for="pissScale" >Piss production scale</label>
+                <label for="pissScale" >Piss production factor</label>
                 <input autocomplete="off" type="number" step="any" id="pissScale" name="pissScale" placeholder="1" />
                 <div class="preview" id="pissScalePreview"></div>
               </li>
               <li>
-                <label for="pissStorageScale">Piss storage multiplier</label>
+                <label for="pissStorageScale">Piss storage factor</label>
                 <input autocomplete="off" type="number" step="any" id="pissStorageScale" name="pissStorageScale" placeholder="1" />
                 <div class="preview" id="pissStorageScalePreview"></div>
               </li>
@@ -1009,7 +1009,7 @@
                 <div class="preview" id="scatScalePreview"></div>
               </li>
               <li>
-                <label for="scatStorageScale">Scat storage multiplier</label>
+                <label for="scatStorageScale">Scat storage factor</label>
                 <input autocomplete="off" type="number" step="any" id="scatStorageScale" name="scatStorageScale" placeholder="1" />
                 <div class="preview" id="scatStorageScalePreview"></div>
               </li>

From 733329447bbcd15a112c6dcd464bb08b39caca16 Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Fri, 1 Jun 2018 09:16:52 -0400
Subject: [PATCH 2/6] Fixed inner list elements being too wide

---
 style.css | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 {

From b541cfcaf6cabab459dce9be4cee73b5adf9e135 Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Fri, 1 Jun 2018 09:32:34 -0400
Subject: [PATCH 3/6] Fixed soldiers not counting as living

---
 recursive-macro.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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];
     }
   }

From 339f0192f4085668c500a9a94f2678de5c31afff Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Fri, 1 Jun 2018 09:47:20 -0400
Subject: [PATCH 4/6] Fixed stomps ignoring footwear when molten

---
 game.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game.js b/game.js
index 98f31db..09c6898 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;
   }

From 302db782d2712aaad9545475630944771da1eeb5 Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Fri, 1 Jun 2018 09:50:37 -0400
Subject: [PATCH 5/6] Fixed flooding showing too few prey

---
 recursive-desc.js | 2 +-
 units.js          | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

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/units.js b/units.js
index 46afcd3..ea7faf7 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";
         }
     }

From fc7ba45b45c6c4e27477cae9d7f282f1d7a46aa9 Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Fri, 1 Jun 2018 10:00:38 -0400
Subject: [PATCH 6/6] Full numbers still go to scientific once they get
 sufficiently large

---
 units.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/units.js b/units.js
index ea7faf7..ba55251 100644
--- a/units.js
+++ b/units.js
@@ -43,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);