From 2767215b6b6bcb00cbefaf3dc501536a795a2c48 Mon Sep 17 00:00:00 2001
From: jsb5468 <jetstreambrony@gmail.com>
Date: Wed, 25 Dec 2019 17:45:40 -0500
Subject: [PATCH] Actually fixed defaultDescribe

I had the if conditions wrong, corrected
---
 recursive-macro.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/recursive-macro.js b/recursive-macro.js
index 04bbc65..d01374b 100644
--- a/recursive-macro.js
+++ b/recursive-macro.js
@@ -766,16 +766,16 @@ function defaultDescribe(verbose=true, parent){
       for (var i = 0; i < parent.count; i++) {
         list.push(parent.describeOne(parent.count <= 2));
       }
-      if (things[parent.name].contents.length <= 1){
-        return merge_things(list);
+      if (things[parent.name].contents.length > 0){
+        return merge_things(list) + " with " + describe_all(parent.contents,verbose) + " inside";       
       } else {
-        return merge_things(list) + " with " + describe_all(parent.contents,verbose) + " inside";        
+        return merge_things(list);
       }
     } else {
-      if (things[parent.name].contents.length <= 1){
-        return parent.count + " " + things[parent.name].descriptor[1];
-      } else {
+      if (things[parent.name].contents.length > 0){
         return parent.count + " " + things[parent.name].descriptor[1] +" with " + describe_all(parent.contents,verbose) + " inside";
+      } else {
+        return parent.count + " " + things[parent.name].descriptor[1];
       }
     }
   } else {//not verbose
@@ -1522,5 +1522,6 @@ function Army(count = 1) {
   //racetracks
   //more building types
   //nebula
+  //chemical factory
   //grand army
   //armada
\ No newline at end of file