Merge branch 'master' of https://github.com/chemicalcrux/stroll

game.js

@@ -1913,7 +1913,7 @@ function chew()
 
 function stomp()
 {
-  if (macro.gooMolten) {
+  if (macro.gooMolten && !macro.footShoeWorn && !macro.footSockWorn) {
     stomp_goo();
     return;
   }

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.";
   }
 }
 

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

stroll.html

@@ -690,7 +690,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>
@@ -700,7 +700,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>
@@ -728,7 +728,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>
@@ -764,7 +764,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>
@@ -821,7 +821,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>
@@ -831,7 +831,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>
@@ -855,7 +855,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>
@@ -871,19 +871,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>
@@ -907,7 +907,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>
@@ -957,7 +957,7 @@
                 <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>
@@ -1013,7 +1013,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>

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 {

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);