tech done, building sprites, upgrade on age up, gui

4 files changed, 20 insertions, 11 deletions

diff --git a/build/content/entities.json b/build/content/entities.json
index 06026e6..db04571 100644
--- a/build/content/entities.json
+++ b/build/content/entities.json
@@ -48,7 +48,7 @@
         "id": 105, "unit": 0, "class": "bld", "level": 1,
         "move" : 0, "attack": 0, "defence": 300,
         "range": 0, "sight": 7,
-        "spritebounds": [ 608, 16 ], 
+        "spritebounds": [ 608, 32 ], 
         "train": [ 5 ], 
         "prod": [ 0, 0 ], 
         "cost": [ 360, 240 ],
@@ -58,7 +58,7 @@
         "id": 106, "unit": 0, "class": "bld", "level": 1,
         "move" : 0, "attack": 0, "defence": 300,
         "range": 0, "sight": 7,
-        "spritebounds": [ 624, 16 ],
+        "spritebounds": [ 624, 32 ],
         "prod": [ 0, 0 ], 
         "cost": [ 285, 165 ],
         "adjacent": [ 100 ]
@@ -67,7 +67,7 @@
         "id": 107, "unit": 0, "class": "bld", "level": 1,
         "move" : 0, "attack": 0, "defence": 300,
         "range": 0, "sight": 7,
-        "spritebounds": [ 640, 16 ],
+        "spritebounds": [ 640, 32 ],
         "prod": [ 0, 0 ], 
         "cost": [ 360, 240 ],
         "adjacent": [ 100 ]
@@ -85,7 +85,7 @@
         "id": 109, "unit": 0, "class": "bld", "level": 2,
         "move" : 0, "attack": 0, "defence": 300,
         "range": 0, "sight": 7,
-        "spritebounds": [ 672, 16 ],
+        "spritebounds": [ 672, 48 ],
         "prod": [ 0, 0 ], 
         "cost": [ 360, 240 ],
         "adjacent": [ 100 ]
@@ -94,7 +94,7 @@
         "id": 110, "unit": 0, "class": "bld", "level": 2,
         "move" : 0, "attack": 0, "defence": 300,
         "range": 0, "sight": 7,
-        "spritebounds": [ 688, 16 ],
+        "spritebounds": [ 688, 48 ],
         "prod": [ 0, 0 ], 
         "cost": [ 360, 240 ],
         "adjacent": [ 100 ]
@@ -103,16 +103,16 @@
         "id": 111, "unit": 0, "class": "bld", "level": 2,
         "move" : 0, "attack": 0, "defence": 300,
         "range": 0, "sight": 7,
-        "spritebounds": [ 704, 16 ],
+        "spritebounds": [ 704, 48 ],
         "prod": [ 0, 0 ], 
         "cost": [ 360, 240 ],
         "adjacent": [ 100 ]
     },{
         "name": "Tower",
-        "id": 112, "unit": 0, "class": "bld", "level": 2,
+        "id": 112, "unit": 0, "class": "bld", "level": 1,
         "move" : 0, "attack": 0, "defence": 300,
         "range": 0, "sight": 7,
-        "spritebounds": [ 720, 16 ],
+        "spritebounds": [ 720, 48 ],
         "prod": [ 0, 0 ], 
         "cost": [ 360, 240 ],
         "diagonal": [ 100 ]
@@ -121,18 +121,19 @@
         "id": 113, "unit": 0, "class": "bld", "level": 2,
         "move" : 0, "attack": 0, "defence": 300,
         "range": 0, "sight": 7,
-        "spritebounds": [ 720, 16 ],
+        "spritebounds": [ 720, 48 ],
         "prod": [ 0, 0 ], 
         "cost": [ 360, 240 ],
         "diagonal": [ 100 ]
     },{
         "name": "Villager",
-        "id": 0, "unit": 1, "class": "inf", "level": -1,
+        "id": 0, "unit": 1, "class": "inf", "level": -1, 
         "move" : 7, "attack": 50, "defence": 50,
         "range": 1, "sight": 7,
         "spritebounds": [ 96, 16 ],
         "build": [
-            100, 101, 102, 103, 104, 105, 106, 107
+            100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 
+            111, 112, 113
         ], 
         "cost": [ 100, 100 ]
     },{
diff --git a/build/content/sprites.bmp b/build/content/sprites.bmp
index 0cb4039..4a70921 100644
--- a/build/content/sprites.bmp
+++ b/build/content/sprites.bmp
diff --git a/build/content/techs.json b/build/content/techs.json
index df2ac8d..3476177 100644
--- a/build/content/techs.json
+++ b/build/content/techs.json
@@ -52,6 +52,7 @@
         "name": "Horse Collar", "id": 7, "level": 1,
         "cost": [ 95, 280 ], "req_id": 101,
         "bonus": {
+            "aff_all": 1,
             "prod": [ 0.15, 0 ]
         }
     },{
@@ -105,18 +106,21 @@
         "name": "Cartography", "id": 14, "level": 1,
         "cost": [ 95, 280 ], "req_id": 107,
         "bonus": {
+            "aff_all": 1,
             "sight": 1
         }
     },{
         "name": "Trading", "id": 15, "level": 1,
         "cost": [ 95, 280 ], "req_id": 107,
         "bonus": {
+            "aff_all": 1,
             "trade": 1
         }
     },{
         "name": "Coniage", "id": 16, "level": 1,
         "cost": [ 125, 375 ], "req_id": 107,
         "bonus": {
+            "aff_all": 1,
             "prod": [ 0, 0.1 ]
         }
     },{
@@ -144,6 +148,7 @@
         "name": "Heavy Plow", "id": 20, "level": 2,
         "cost": [ 150, 450 ], "req_id": 101,
         "bonus": {
+            "aff_all": 1,
             "prod": [ 0.1, 0 ]
         }
     },{
@@ -218,6 +223,7 @@
         "name": "Banking", "id": 30, "level": 2,
         "cost": [ 200, 600 ], "req_id": 107,
         "bonus": {
+            "aff_all": 1,
             "trade": 1,
             "prod": [ 0, 0.05 ]
         }
@@ -267,6 +273,7 @@
         "name": "Crop Rotation", "id": 37, "level": 3,
         "cost": [ 250, 750 ], "req_id": 101,
         "bonus": {
+            "aff_all": 1,
             "prod": [ 0.1, 0 ]
         }
     },{
@@ -335,6 +342,7 @@
         "name": "Guilds", "id": 49, "level": 3,
         "cost": [ 250, 750 ], "req_id": 107, 
         "bonus": {
+            "aff_all": 1,
             "trade": 1,
             "prod": [ 0, 0.05 ]
         }
diff --git a/build/sdl_test.exe b/build/sdl_test.exe
index 12fa827..752ac84 100644
--- a/build/sdl_test.exe
+++ b/build/sdl_test.exe