From 3d628b151133e71aa550e69b168f224aef465816 Mon Sep 17 00:00:00 2001 From: jsb5468 Date: Sat, 16 Mar 2019 19:46:09 -0400 Subject: [PATCH] Update recursive-macro.js remvoed duplicate inside on parking garages, and akward comma on tanks and helicopters --- recursive-macro.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recursive-macro.js b/recursive-macro.js index 0326788..6aba238 100644 --- a/recursive-macro.js +++ b/recursive-macro.js @@ -1139,7 +1139,7 @@ function ParkingGarage(count = 1) { this.describe = function(verbose = true) { if (verbose) { - return (this.count == 1 ? "a parking garage" : this.count + " parking garages") + " with " + describe_all(this.contents, verbose) + " inside"; + return (this.count == 1 ? "a parking garage" : this.count + " parking garages") + " with " + describe_all(this.contents, verbose); } else { return (this.count == 1 ? "a parking garage" : this.count + " parking garages"); } @@ -1322,7 +1322,7 @@ function Tank(count = 1) { this.describe = function(verbose = true) { if (verbose) { - return (this.count == 1 ? "a tank" : this.count + " tanks") + " with " + describe_all(this.contents, verbose) + " trapped inside."; + return (this.count == 1 ? "a tank" : this.count + " tanks") + " with " + describe_all(this.contents, verbose) + " trapped inside"; } else { return (this.count == 1 ? "a tank" : this.count + " tanks"); } @@ -1338,7 +1338,7 @@ function Artillery(count = 1) { this.describe = function(verbose = true) { if (verbose) { - return (this.count == 1 ? "an artillery unit" : this.count + " artillery units") + " with " + describe_all(this.contents, verbose) + " trapped inside."; + return (this.count == 1 ? "an artillery unit" : this.count + " artillery units") + " with " + describe_all(this.contents, verbose) + " trapped inside"; } else { return (this.count == 1 ? "an artillery unit" : this.count + " artillery units"); } @@ -1354,7 +1354,7 @@ function Helicopter(count = 1) { this.describe = function(verbose = true) { if (verbose) { - return (this.count == 1 ? "a helicopter" : this.count + " helicopters") + " with " + describe_all(this.contents, verbose) + " riding inside."; + return (this.count == 1 ? "a helicopter" : this.count + " helicopters") + " with " + describe_all(this.contents, verbose) + " riding inside"; } else { return (this.count == 1 ? "a helicopter" : this.count + " helicopters"); }