view levels and maxrange strat

5 files changed, 96 insertions, 84 deletions

diff --git a/build/content/autolevel.py b/build/content/autolevel.py
index 345bccf..51d30f3 100644
--- a/build/content/autolevel.py
+++ b/build/content/autolevel.py
@@ -33,4 +33,6 @@ if __name__ == "__main__":
     #comp("brains", ["name"])
     #comp("brains", ["name"])
     
-    #comp("armor", ["weight"], query, lambda x: [x[i]/5 for i in range(3)])
+    amt = .5
+    perc_inc = lambda x: [x[i]*(1.0+(i/2.0)*amt) for i in range(3)]
+    comp("weapons", ["damage"], query, perc_inc)
diff --git a/build/content/batteries.txt b/build/content/batteries.txt
index 18ae48e..baf7201 100644
--- a/build/content/batteries.txt
+++ b/build/content/batteries.txt
@@ -38,9 +38,9 @@
             150.0
         ],
         "recharge": [
-            1.0,
-            1.0,
-            1.0
+            1,
+            1,
+            1
         ]
     },
     {
@@ -56,9 +56,9 @@
             500.0
         ],
         "recharge": [
-            1.0,
-            1.0,
-            1.0
+            1,
+            1,
+            1
         ]
     },
     {
@@ -74,9 +74,9 @@
             800.0
         ],
         "recharge": [
-            1.0,
-            1.0,
-            1.0
+            1,
+            1,
+            1
         ]
     },
     {
@@ -92,9 +92,9 @@
             1500.0
         ],
         "recharge": [
-            1.0,
-            1.0,
-            1.0
+            1,
+            1,
+            1
         ]
     },
     {
@@ -110,9 +110,9 @@
             2000.0
         ],
         "recharge": [
-            1.0,
-            1.0,
-            1.0
+            1,
+            1,
+            1
         ]
     },
     {
diff --git a/build/content/gf.bmp b/build/content/gf.bmp
index a3750be..b2f7aa5 100644
--- a/build/content/gf.bmp
+++ b/build/content/gf.bmp
diff --git a/build/content/templates/default.txt b/build/content/templates/default.txt
index dece5bd..f99915c 100644
--- a/build/content/templates/default.txt
+++ b/build/content/templates/default.txt
@@ -6,7 +6,7 @@
         "battery": "0",
         "weapons": [ -1, -1, -1, -1, -1, -1, -1, -1 ],
         "armor": [ -1, -1, -1, -1, -1, -1, -1, -1 ],
-        "augs": [ -1, -1, -1, -1, -1, -1, -1, -1 ],
+        "augs": [ 4, -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 ]
     },
     { 
@@ -21,12 +21,22 @@
     },
     { 
         "name": "well done",
-        "chassis": "9",
+        "chassis": "10",
         "brain": "2",
         "battery": "2",
-        "weapons": [ 2, 1, -1, -1, -1, -1, -1, -1 ],
+        "weapons": [ 27, -1, -1, -1, -1, -1, -1, -1 ],
         "armor": [ 0, 0, -1, -1, -1, -1, -1, -1 ],
-        "augs": [ 0, 0, 0, -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 ]
+    },
+    { 
+        "name": "range tester",
+        "chassis": "12",
+        "brain": "0",
+        "battery": "1",
+        "weapons": [ 1, -1, -1, -1, -1, -1, -1, -1 ],
+        "armor": [ 0, 0, 0, 0, -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 ]
     } 
 ]
\ No newline at end of file
diff --git a/build/content/weapons.txt b/build/content/weapons.txt
index 8d20804..324b66a 100644
--- a/build/content/weapons.txt
+++ b/build/content/weapons.txt
@@ -14,8 +14,8 @@
         ],
         "damage": [
             10.0,
-            10.0,
-            10.0
+            12.5,
+            15.0
         ],
         "range": [
             4.0,
@@ -38,8 +38,8 @@
         ],
         "damage": [
             15.0,
-            15.0,
-            15.0
+            18.75,
+            22.5
         ],
         "range": [
             5.0,
@@ -62,8 +62,8 @@
         ],
         "damage": [
             20.0,
-            20.0,
-            20.0
+            25.0,
+            30.0
         ],
         "range": [
             5.0,
@@ -86,8 +86,8 @@
         ],
         "damage": [
             32.0,
-            32.0,
-            32.0
+            40.0,
+            48.0
         ],
         "range": [
             6.0,
@@ -110,8 +110,8 @@
         ],
         "damage": [
             40.0,
-            40.0,
-            40.0
+            50.0,
+            60.0
         ],
         "range": [
             6.0,
@@ -134,8 +134,8 @@
         ],
         "damage": [
             250.0,
-            250.0,
-            250.0
+            312.5,
+            375.0
         ],
         "range": [
             7.0,
@@ -158,8 +158,8 @@
         ],
         "damage": [
             8.0,
-            8.0,
-            8.0
+            10.0,
+            12.0
         ],
         "range": [
             3.0,
@@ -182,8 +182,8 @@
         ],
         "damage": [
             25.0,
-            25.0,
-            25.0
+            31.25,
+            37.5
         ],
         "range": [
             4.0,
@@ -206,8 +206,8 @@
         ],
         "damage": [
             40.0,
-            40.0,
-            40.0
+            50.0,
+            60.0
         ],
         "range": [
             5.0,
@@ -230,8 +230,8 @@
         ],
         "damage": [
             400.0,
-            400.0,
-            400.0
+            500.0,
+            600.0
         ],
         "range": [
             1.0,
@@ -259,8 +259,8 @@
         ],
         "damage": [
             6.0,
-            6.0,
-            6.0
+            7.5,
+            9.0
         ],
         "range": [
             1.0,
@@ -283,8 +283,8 @@
         ],
         "damage": [
             60.0,
-            60.0,
-            60.0
+            75.0,
+            90.0
         ],
         "range": [
             1.0,
@@ -312,8 +312,8 @@
         ],
         "damage": [
             100.0,
-            100.0,
-            100.0
+            125.0,
+            150.0
         ],
         "range": [
             8.0,
@@ -336,8 +336,8 @@
         ],
         "damage": [
             60.0,
-            60.0,
-            60.0
+            75.0,
+            90.0
         ],
         "range": [
             7.0,
@@ -365,8 +365,8 @@
         ],
         "damage": [
             100.0,
-            100.0,
-            100.0
+            125.0,
+            150.0
         ],
         "range": [
             8.0,
@@ -394,8 +394,8 @@
         ],
         "damage": [
             300.0,
-            300.0,
-            300.0
+            375.0,
+            450.0
         ],
         "range": [
             9.0,
@@ -423,8 +423,8 @@
         ],
         "damage": [
             8.0,
-            8.0,
-            8.0
+            10.0,
+            12.0
         ],
         "range": [
             5.0,
@@ -447,8 +447,8 @@
         ],
         "damage": [
             20.0,
-            20.0,
-            20.0
+            25.0,
+            30.0
         ],
         "range": [
             6.0,
@@ -471,8 +471,8 @@
         ],
         "damage": [
             45.0,
-            45.0,
-            45.0
+            56.25,
+            67.5
         ],
         "range": [
             6.0,
@@ -495,8 +495,8 @@
         ],
         "damage": [
             150.0,
-            150.0,
-            150.0
+            187.5,
+            225.0
         ],
         "range": [
             7.0,
@@ -519,8 +519,8 @@
         ],
         "damage": [
             125.0,
-            125.0,
-            125.0
+            156.25,
+            187.5
         ],
         "range": [
             5.0,
@@ -543,8 +543,8 @@
         ],
         "damage": [
             110.0,
-            110.0,
-            110.0
+            137.5,
+            165.0
         ],
         "range": [
             5.0,
@@ -567,8 +567,8 @@
         ],
         "damage": [
             100.0,
-            100.0,
-            100.0
+            125.0,
+            150.0
         ],
         "range": [
             7.0,
@@ -596,8 +596,8 @@
         ],
         "damage": [
             15.0,
-            15.0,
-            15.0
+            18.75,
+            22.5
         ],
         "range": [
             1.0,
@@ -620,8 +620,8 @@
         ],
         "damage": [
             45.0,
-            45.0,
-            45.0
+            56.25,
+            67.5
         ],
         "range": [
             2.0,
@@ -644,8 +644,8 @@
         ],
         "damage": [
             90.0,
-            90.0,
-            90.0
+            112.5,
+            135.0
         ],
         "range": [
             6.0,
@@ -668,8 +668,8 @@
         ],
         "damage": [
             450.0,
-            450.0,
-            450.0
+            562.5,
+            675.0
         ],
         "range": [
             7.0,
@@ -692,8 +692,8 @@
         ],
         "damage": [
             1000.0,
-            1000.0,
-            1000.0
+            1250.0,
+            1500.0
         ],
         "range": [
             8.0,
@@ -740,8 +740,8 @@
         ],
         "damage": [
             80.0,
-            80.0,
-            80.0
+            100.0,
+            120.0
         ],
         "damage_battery": [
             5.0,
@@ -822,8 +822,8 @@
         ],
         "damage": [
             200.0,
-            200.0,
-            200.0
+            250.0,
+            300.0
         ],
         "damage_battery": [
             12.0,
@@ -933,8 +933,8 @@
         ],
         "damage": [
             100.0,
-            100.0,
-            100.0
+            125.0,
+            150.0
         ],
         "range": [
             0.0,
@@ -962,8 +962,8 @@
         ],
         "damage": [
             40.0,
-            40.0,
-            40.0
+            50.0,
+            60.0
         ],
         "range": [
             7.0,