before was messy, now is MACRO(MACRO(MACRO(MACRO(clean))))

11 files changed, 23 insertions, 23 deletions

diff --git a/build/army/balance 1000 the second.txt b/build/army/balance 1000 the second.txt
deleted file mode 100644
index ef02fec..0000000
--- a/build/army/balance 1000 the second.txt
+++ /dev/null
diff --git a/build/army/balance 1000.txt b/build/army/balance 1000.txt
deleted file mode 100644
index cecec84..0000000
--- a/build/army/balance 1000.txt
+++ /dev/null
diff --git a/build/army/balance melee maul.txt b/build/army/balance melee maul.txt
deleted file mode 100644
index a3ababa..0000000
--- a/build/army/balance melee maul.txt
+++ /dev/null
diff --git a/build/army/best army ever.txt b/build/army/best army ever.txt
deleted file mode 100644
index 5898346..0000000
--- a/build/army/best army ever.txt
+++ /dev/null
diff --git a/build/army/lotsa dudes.txt b/build/army/lotsa dudes.txt
deleted file mode 100644
index 6314165..0000000
--- a/build/army/lotsa dudes.txt
+++ /dev/null
diff --git a/build/army/balance 1000 melee.txt b/build/army/new army.txt
index 727e08a..e05c988 100644
--- a/build/army/balance 1000 melee.txt
+++ b/build/army/new army.txt
diff --git a/build/army/range test.txt b/build/army/range test.txt
deleted file mode 100644
index 949cda9..0000000
--- a/build/army/range test.txt
+++ /dev/null
diff --git a/build/army/worst.txt b/build/army/worst.txt
deleted file mode 100644
index aac287a..0000000
--- a/build/army/worst.txt
+++ /dev/null
diff --git a/build/content/armor.txt b/build/content/armor.txt
index de31e24..c4f5486 100644
--- a/build/content/armor.txt
+++ b/build/content/armor.txt
@@ -6,12 +6,12 @@
             7.5,
             5.0
         ],
-        "base_pierce": [
+        "base_armor_pierce": [
             5.0,
             6.25,
             7.5
         ],
-        "base_spread": [
+        "base_armor_spread": [
             8.0,
             10.0,
             12.0
@@ -24,17 +24,17 @@
             12.0,
             8.0
         ],
-        "base_pierce": [
+        "base_armor_pierce": [
             7.0,
             8.75,
             10.5
         ],
-        "base_spread": [
+        "base_armor_spread": [
             10.0,
             12.5,
             15.0
         ],
-        "base_impact": [
+        "base_armor_impact": [
             5.0,
             6.25,
             7.5
@@ -47,7 +47,7 @@
             6.0,
             4.0
         ],
-        "base_laser": [
+        "base_armor_laser": [
             10.0,
             12.5,
             15.0
@@ -60,7 +60,7 @@
             7.5,
             5.0
         ],
-        "base_fusion": [
+        "base_armor_fusion": [
             8.0,
             10.0,
             12.0
@@ -73,12 +73,12 @@
             3.0,
             2.0
         ],
-        "base_spread": [
+        "base_armor_spread": [
             5.0,
             6.25,
             7.5
         ],
-        "base_impact": [
+        "base_armor_impact": [
             8.0,
             10.0,
             12.0
@@ -91,7 +91,7 @@
             11.25,
             7.5
         ],
-        "base_explosive": [
+        "base_armor_explosive": [
             12.0,
             15.0,
             18.0
@@ -104,27 +104,27 @@
             3.75,
             2.5
         ],
-        "base_pierce": [
+        "base_armor_pierce": [
             3.0,
             3.75,
             4.5
         ],
-        "base_spread": [
+        "base_armor_spread": [
             3.0,
             3.75,
             4.5
         ],
-        "base_fusion": [
+        "base_armor_fusion": [
             3.0,
             3.75,
             4.5
         ],
-        "base_explosive": [
+        "base_armor_explosive": [
             3.0,
             3.75,
             4.5
         ],
-        "base_laser": [
+        "base_armor_laser": [
             3.0,
             3.75,
             4.5
@@ -137,17 +137,17 @@
             4.5,
             3.0
         ],
-        "base_pierce": [
+        "base_armor_pierce": [
             6.0,
             7.5,
             9.0
         ],
-        "base_spread": [
+        "base_armor_spread": [
             4.0,
             5.0,
             6.0
         ],
-        "base_impact": [
+        "base_armor_impact": [
             3.0,
             3.75,
             4.5
@@ -160,7 +160,7 @@
             1.5,
             1.0
         ],
-        "base_pierce": [
+        "base_armor_pierce": [
             4.0,
             5.0,
             6.0
@@ -173,12 +173,12 @@
             6.75,
             4.5
         ],
-        "base_pierce": [
+        "base_armor_pierce": [
             10.0,
             12.5,
             15.0
         ],
-        "base_spread": [
+        "base_armor_spread": [
             8.0,
             10.0,
             12.0
@@ -191,7 +191,7 @@
             15.0,
             10.0
         ],
-        "base_explosive": [
+        "base_armor_explosive": [
             25.0,
             31.25,
             37.5
diff --git a/build/content/templates/default.txt b/build/content/templates/default.txt
index 88db0c8..775e7d3 100644
--- a/build/content/templates/default.txt
+++ b/build/content/templates/default.txt
@@ -84,7 +84,7 @@
         "chassis": "5",
         "brain": "3",
         "battery": "0",
-        "weapons": [ 10, 10, -1, -1, -1, -1, -1, -1 ],
+        "weapons": [ 10, 1, -1, -1, -1, -1, -1, -1 ],
         "armor": [ 0, 0, 8, -1, -1, -1, -1, -1 ],
         "augs": [ -1, -1, -1, -1, -1, -1, -1, -1 ],
         "levels": [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
diff --git a/build/test.exe b/build/test.exe
index 554180a..1b56cdf 100644
--- a/build/test.exe
+++ b/build/test.exe