From a75790b060ba1e1e2d91b5ac65915e4efb01e574 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Sun, 18 Feb 2018 21:51:42 -0500 Subject: [PATCH] Fixed buttcrush being marked as non-fatal; simplified parking garage descriptions, fixed skyscraper person count --- game.js | 2 +- recursive-macro.js | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/game.js b/game.js index 17205b5..01246a4 100644 --- a/game.js +++ b/game.js @@ -147,7 +147,7 @@ function anal_vore() var prey = getOnePrey(0.25*scale*scale); var crushed = getPrey("suburb",3*scale*scale); var line1 = prey.anal_vore(baseHeight*scale) + " " + summarize(prey.sum(), false); - var line2 = crushed.buttcrush() + " " + summarize(crushed.sum(), false) + var line2 = crushed.buttcrush() + " " + summarize(crushed.sum(), true) var preyMass = prey.sum_property("mass"); var crushedMass = prey.sum_property("mass"); diff --git a/recursive-macro.js b/recursive-macro.js index 45f79f9..e7dde4c 100644 --- a/recursive-macro.js +++ b/recursive-macro.js @@ -683,7 +683,7 @@ function SmallSkyscraper(count = 1) { this.count = count; this.contents = {}; - var amount = distribution(50,500,1); + var amount = distribution(50,500,count); this.contents.person = new Person(amount); amount = distribution(10,50,count); this.contents.emptycar = new EmptyCar(amount); @@ -733,15 +733,7 @@ function ParkingGarage(count = 1) { } this.describe = function(verbose = true) { - if (this.count <= 3) { - list = []; - for (var i = 0; i < this.count; i++) { - list.push(this.describeOne(this.count < 2)); - } - return merge_things(list) + " with " + describe_all(this.contents) + " inside"; - } else { - return this.count + " parking garages with " + describe_all(this.contents) + " inside"; - } + return (this.count == 1 ? "a parking garage" : this.count + " parking garages") + " with " + describe_all(this.contents) + " inside"; } }