tech tostring, all sprites, heal and convert

5 files changed, 247 insertions, 35 deletions

diff --git a/build/content/entities.json b/build/content/entities.json
index 99746a0..45d9b78 100644
--- a/build/content/entities.json
+++ b/build/content/entities.json
@@ -43,7 +43,7 @@
         "move" : 0, "attack": 0, "defence": 300,
         "range": 0, "sight": 7,
         "spritebounds": [ 592, 16 ],
-        "train_class": [ "inf" ], 
+        "train_id": [ 1, 6, 7, 10, 11, 27, 28, 40 ], 
         "prod": [ 0, 0 ], 
         "cost": [ 360, 240 ],
         "adjacent": [ 100 ],
@@ -54,7 +54,7 @@
         "move" : 0, "attack": 0, "defence": 300,
         "range": 0, "sight": 7,
         "spritebounds": [ 608, 32 ], 
-        "train_class": [ "ran" ], 
+        "train_id": [ 3, 4, 13, 14, 15, 24, 29, 30, 31, 32, 39 ], 
         "prod": [ 0, 0 ], 
         "cost": [ 360, 240 ],
         "adjacent": [ 100 ],
@@ -86,7 +86,7 @@
         "move" : 0, "attack": 0, "defence": 300,
         "range": 0, "sight": 7,
         "spritebounds": [ 656, 16 ],
-        "train_class": [ "cav" ], 
+        "train_id": [ 2, 5, 8, 9, 33, 34, 41 ], 
         "prod": [ 0, 0 ], 
         "cost": [ 360, 240 ],
         "adjacent": [ 100 ],
@@ -97,7 +97,7 @@
         "move" : 0, "attack": 0, "defence": 300,
         "range": 0, "sight": 7,
         "spritebounds": [ 672, 48 ],
-        "train_class": [ "sie" ], 
+        "train_id": [ 20, 21, 22, 38, 42, 43 ], 
         "prod": [ 0, 0 ], 
         "cost": [ 450, 300 ],
         "adjacent": [ 100 ],
@@ -108,7 +108,7 @@
         "move" : 0, "attack": 0, "defence": 300,
         "range": 0, "sight": 7,
         "spritebounds": [ 688, 48 ],
-        "train_id": [ 23 ], 
+        "train_id": [ 23, 44 ], 
         "prod": [ 0, 0 ], 
         "cost": [ 360, 240 ],
         "adjacent": [ 100 ],
@@ -132,17 +132,17 @@
         "prod": [ 0, 0 ], 
         "cost": [ 360, 240 ],
         "diagonal": [ 100 ],
-        "defence_bonus": 0.4
+        "defence_bonus": 0.4,
+        "defence_bonus_adj": 0.25
     },{
         "name": "Castle",
         "id": 113, "unit": 0, "class": "bld", "level": 2,
         "move" : 0, "attack": 0, "defence": 300,
         "range": 0, "sight": 7,
         "spritebounds": [ 720, 48 ],
-        "train_class": [ "inf" ], 
+        "train_id": [ 10, 27, 37 ], 
         "prod": [ 0, 0 ], 
         "cost": [ 900, 600 ],
-        "diagonal": [ 100 ],
         "defence_bonus": 0.4
     },{
         "name": "Villager",
@@ -221,7 +221,8 @@
         "range": 1, "sight": 7,
         "spritebounds": [ 128, 48 ], 
         "cost": [ 190, 45 ],
-        "abilities": [ "Plains Charge" ]
+        "abilities": [ "Plains Charge" ],
+        "upgrade": 33
     },{
         "name": "Camels",
         "id": 9, "unit": 1, "class": "cav", "level": 2,
@@ -229,14 +230,16 @@
         "range": 1, "sight": 7,
         "spritebounds": [ 192, 48 ], 
         "cost": [ 200, 50 ],
-        "abilities": [ "Desert Charge", "Scares Horses" ]
+        "abilities": [ "Desert Charge", "Scares Horses" ],
+        "upgrade": 34
     },{
         "name": "Longswordmen",
         "id": 10, "unit": 1, "class": "inf", "level": 2,
         "move" : 7, "attack": 200, "defence": 200,
         "range": 1, "sight": 7,
         "spritebounds": [ 112, 48 ], 
-        "cost": [ 130, 45 ]
+        "cost": [ 130, 45 ],
+        "upgrade": 27
     },{
         "name": "Pikemen",
         "id": 11, "unit": 1, "class": "inf", "level": 2,
@@ -244,7 +247,8 @@
         "range": 1, "sight": 7,
         "spritebounds": [ 144, 48 ], 
         "cost": [ 160, 55 ],
-        "abilities": [ "Anti-Cavalry" ]
+        "abilities": [ "Anti-Cavalry" ],
+        "upgrade": 28
     },{
         "name": "Viking Berserkers",
         "id": 12, "unit": 1, "class": "inf", "level": 2,
@@ -252,7 +256,8 @@
         "range": 1, "sight": 7,
         "spritebounds": [ 208, 48 ], 
         "cost": [ 170, 55 ],
-        "abilities": [ "Frenzy" ]
+        "abilities": [ "Frenzy" ],
+        "upgrade": 35
     },{
         "name": "Crossbowmen",
         "id": 13, "unit": 1, "class": "ran", "level": 2,
@@ -260,7 +265,8 @@
         "range": 3, "sight": 7,
         "spritebounds": [ 224, 48 ], 
         "cost": [ 125, 50 ],
-        "abilities": [ "No Move & Attack" ]
+        "abilities": [ "No Move & Attack" ],
+        "upgrade": 30
     },{
         "name": "Elite Skirmishers",
         "id": 14, "unit": 1, "class": "ran", "level": 2,
@@ -268,22 +274,25 @@
         "range": 2, "sight": 7,
         "spritebounds": [ 176, 48 ], 
         "cost": [ 125, 50 ],
-        "abilities": [ "Skirmish" ]
+        "abilities": [ "Skirmish" ],
+        "upgrade": 31
     },{
         "name": "Horse Archers",
         "id": 15, "unit": 1, "class": "ran", "level": 2,
         "move" : 10, "attack": 150, "defence": 150,
         "range": 2, "sight": 7,
         "spritebounds": [ 240, 48 ], 
-        "cost": [ 125, 50 ]
+        "cost": [ 125, 50 ],
+        "upgrade": 32
     },{
-        "name": "Throwing Axmen",
+        "name": "Throwing Axemen",
         "id": 16, "unit": 1, "class": "inf", "level": 2,
         "move" : 7, "attack": 225, "defence": 250,
         "range": 1, "sight": 7,
         "spritebounds": [ 256, 48 ], 
         "cost": [ 125, 50 ],
-        "abilities": [ "Skirmish", "Woodsman" ]
+        "abilities": [ "Skirmish", "Woodsman" ],
+        "upgrade": 49
     },{
         "name": "Persian War Elephants",
         "id": 17, "unit": 1, "class": "cav", "level": 2,
@@ -291,7 +300,8 @@
         "range": 1, "sight": 7,
         "spritebounds": [ 272, 48 ], 
         "cost": [ 210, 55 ],
-        "abilities": [ "Causes Fear" ]
+        "abilities": [ "Causes Fear" ],
+        "upgrade": 47
     },{
         "name": "Celtic Woad Raiders",
         "id": 18, "unit": 1, "class": "inf", "level": 2,
@@ -299,7 +309,8 @@
         "range": 1, "sight": 7,
         "spritebounds": [ 288, 48 ], 
         "cost": [ 200, 65 ],
-        "abilities": [ "Causes Fear" ]
+        "abilities": [ "Causes Fear" ],
+        "upgrade": 36
     },{
         "name": "Knights Templar",
         "id": 19, "unit": 1, "class": "cav", "level": 2,
@@ -307,7 +318,8 @@
         "range": 1, "sight": 7,
         "spritebounds": [ 304, 48 ], 
         "cost": [ 215, 55 ],
-        "abilities": [ "Plains Charge", "Zeal" ]
+        "abilities": [ "Plains Charge", "Zeal" ],
+        "upgrade": 45
     },{
         "name": "Scorpions",
         "id": 20, "unit": 1, "class": "sie", "level": 2,
@@ -315,7 +327,8 @@
         "range": 3, "sight": 7,
         "spritebounds": [ 320, 48 ], 
         "cost": [ 65, 190 ],
-        "abilities": [ "Units Only", "No Counter", "No Move & Attack" ]
+        "abilities": [ "Units Only", "No Counter", "No Move & Attack" ],
+        "upgrade": 42
     },{
         "name": "Battering Rams",
         "id": 21, "unit": 1, "class": "sie", "level": 2,
@@ -323,7 +336,8 @@
         "range": 1, "sight": 7,
         "spritebounds": [ 336, 48 ], 
         "cost": [ 50, 155 ],
-        "abilities": [ "Buildings Only", "No Counter" ]
+        "abilities": [ "Buildings Only", "No Counter" ],
+        "upgrade": 43
     },{
         "name": "Onagers",
         "id": 22, "unit": 1, "class": "sie", "level": 2,
@@ -335,17 +349,223 @@
     },{
         "name": "Monks",
         "id": 23, "unit": 1, "class": "inf", "level": 2,
-        "move" : 7, "attack": 50, "defence": 200,
+        "move" : 9, "attack": 50, "defence": 150,
         "range": 1, "sight": 7,
         "spritebounds": [ 368, 48 ], 
         "cost": [ 50, 155 ],
-        "abilities": [ "Heal", "Convert" ]
+        "abilities": [ "Heal", "Convert" ],
+        "upgrade": 44
     },{
         "name": "Archers",
         "id": 24, "unit": 1, "class": "ran", "level": 2,
         "move" : 7, "attack": 150, "defence": 100,
         "range": 3, "sight": 7,
         "spritebounds": [ 160, 32 ], 
-        "cost": [ 125, 50 ]
+        "cost": [ 105, 45 ],
+        "upgrade": 29
+    },{
+        "name": "Turkish Janissaries",
+        "id": 25, "unit": 1, "class": "ran", "level": 2,
+        "move" : 7, "attack": 250, "defence": 175,
+        "range": 3, "sight": 7,
+        "spritebounds": [ 432, 48 ], 
+        "cost": [ 145, 60 ],
+        "abilities": [ "No Move & Attack" ],
+        "upgrade": 46
+    },{
+        "name": "Chinese Chu Ko Nu",
+        "id": 26, "unit": 1, "class": "ran", "level": 2,
+        "move" : 7, "attack": 150, "defence": 150,
+        "range": 3, "sight": 7,
+        "spritebounds": [ 384, 48 ], 
+        "cost": [ 125, 55 ],
+        "abilities": [ "No Move & Attack", "Rapid Fire" ],
+        "upgrade": 48
+    },{
+        "name": "Two Handed Swordsman",
+        "id": 27, "unit": 1, "class": "inf", "level": 3,
+        "move" : 7, "attack": 250, "defence": 250,
+        "range": 1, "sight": 7,
+        "spritebounds": [ 112, 64 ], 
+        "cost": [ 190, 65 ]
+    },{
+        "name": "Halberdier",
+        "id": 28, "unit": 1, "class": "inf", "level": 3,
+        "move" : 7, "attack": 200, "defence": 250,
+        "range": 1, "sight": 7,
+        "spritebounds": [ 144, 64 ], 
+        "cost": [ 230, 75 ],
+        "abilities": [ "Anti-Cavalry" ]
+    },{
+        "name": "Elite Archers",
+        "id": 29, "unit": 1, "class": "ran", "level": 3,
+        "move" : 7, "attack": 200, "defence": 200,
+        "range": 3, "sight": 7,
+        "spritebounds": [ 160, 64 ], 
+        "cost": [ 205, 90 ]
+    },{
+        "name": "Arbalests",
+        "id": 30, "unit": 1, "class": "ran", "level": 3,
+        "move" : 7, "attack": 250, "defence": 225,
+        "range": 3, "sight": 7,
+        "spritebounds": [ 224, 64 ], 
+        "cost": [ 180, 75 ], 
+        "abilities": [ "No Move & Attack" ]
+    },{
+        "name": "Expert Skirmishers",
+        "id": 31, "unit": 1, "class": "ran", "level": 3,
+        "move" : 7, "attack": 190, "defence": 190,
+        "range": 2, "sight": 7,
+        "spritebounds": [ 176, 64 ], 
+        "cost": [ 160, 70 ], 
+        "abilities": [ "Skirmish" ]
+    },{
+        "name": "Heavy Horse Archers",
+        "id": 32, "unit": 1, "class": "ran", "level": 3,
+        "move" : 10, "attack": 200, "defence": 200,
+        "range": 2, "sight": 7,
+        "spritebounds": [ 240, 64 ], 
+        "cost": [ 180, 75 ]
+    },{
+        "name": "Cavaliers",
+        "id": 33, "unit": 1, "class": "cav", "level": 3,
+        "move" : 10, "attack": 250, "defence": 250,
+        "range": 1, "sight": 7,
+        "spritebounds": [ 128, 64 ], 
+        "cost": [ 260, 65 ]
+    },{
+        "name": "Heavy Camels",
+        "id": 34, "unit": 1, "class": "cav", "level": 3,
+        "move" : 10, "attack": 250, "defence": 250,
+        "range": 1, "sight": 7,
+        "spritebounds": [ 192, 64 ], 
+        "cost": [ 275, 70 ],
+        "abilities": [ "Desert Charge", "Scares Horses" ]
+    },{
+        "name": "Elite Berserkers",
+        "id": 35, "unit": 1, "class": "inf", "level": 3,
+        "move" : 7, "attack": 250, "defence": 250,
+        "range": 1, "sight": 7,
+        "spritebounds": [ 208, 64 ], 
+        "cost": [ 235, 80 ],
+        "abilities": [ "Frenzy" ]
+    },{
+        "name": "Elite Woad Raiders",
+        "id": 36, "unit": 1, "class": "inf", "level": 3,
+        "move" : 7, "attack": 250, "defence": 250,
+        "range": 1, "sight": 7,
+        "spritebounds": [ 288, 64 ], 
+        "cost": [ 270, 90 ],
+        "abilities": [ "Causes Fear" ]
+    },{
+        "name": "Trebuchets",
+        "id": 37, "unit": 1, "class": "sie", "level": 3,
+        "move" : 7, "attack": 375, "defence": 350,
+        "range": 3, "sight": 7,
+        "spritebounds": [ 400, 64 ], 
+        "cost": [ 90, 270 ],
+        "abilities": [ "Min Range 2", "No Counter", "No Move & Attack" ],
+        "req_tech": [ 55 ]
+    },{
+        "name": "Bombard Cannons",
+        "id": 38, "unit": 1, "class": "sie", "level": 3,
+        "move" : 7, "attack": 325, "defence": 325,
+        "range": 3, "sight": 7,
+        "spritebounds": [ 448, 64 ], 
+        "cost": [ 85, 250 ],
+        "abilities": [ "No Counter", "No Move & Attack" ],
+        "req_tech": [ 57 ]
+    },{
+        "name": "Hand Cannoneers",
+        "id": 39, "unit": 1, "class": "ran", "level": 3,
+        "move" : 7, "attack": 300, "defence": 225,
+        "range": 3, "sight": 7,
+        "spritebounds": [ 416, 64 ], 
+        "cost": [ 205, 90 ],
+        "abilities": [ "No Move & Attack" ],
+        "req_tech": [ 57 ]
+    },{
+        "name": "Champions",
+        "id": 40, "unit": 1, "class": "inf", "level": 3,
+        "move" : 7, "attack": 300, "defence": 300,
+        "range": 1, "sight": 7,
+        "spritebounds": [ 250, 85 ], 
+        "cost": [ 250, 85 ],
+        "req_tech": [ 43 ]
+    },{
+        "name": "Paladins",
+        "id": 41, "unit": 1, "class": "cav", "level": 3,
+        "move" : 7, "attack": 300, "defence": 300,
+        "range": 1, "sight": 7,
+        "spritebounds": [ 128, 80 ], 
+        "cost": [ 330, 80 ],
+        "abilities": [ "Plains Charge" ],
+        "req_tech": [ 44 ]
+    },{
+        "name": "Heavy Scorpions",
+        "id": 42, "unit": 1, "class": "sie", "level": 3,
+        "move" : 7, "attack": 400, "defence": 300,
+        "range": 3, "sight": 7,
+        "spritebounds": [ 320, 64 ], 
+        "cost": [ 95, 265 ],
+        "abilities": [ "Units Only", "No Counter", "No Move & Attack" ],
+        "req_tech": [ 55 ]
+    },{
+        "name": "Siege Rams",
+        "id": 43, "unit": 1, "class": "sie", "level": 3,
+        "move" : 7, "attack": 500, "defence": 375,
+        "range": 1, "sight": 7,
+        "spritebounds": [ 336, 64 ], 
+        "cost": [ 85, 245 ],
+        "abilities": [ "Buildings Only", "No Counter" ],
+        "req_tech": [ 55 ]
+    },{
+        "name": "Elite Monks",
+        "id": 44, "unit": 1, "class": "inf", "level": 3,
+        "move" : 9, "attack": 50, "defence": 200,
+        "range": 1, "sight": 7,
+        "spritebounds": [ 368, 64 ], 
+        "cost": [ 75, 220 ],
+        "abilities": [ "Heal", "Convert" ]
+    },{
+        "name": "Elite Knights Templar",
+        "id": 45, "unit": 1, "class": "cav", "level": 3,
+        "move" : 10, "attack": 250, "defence": 250,
+        "range": 1, "sight": 7,
+        "spritebounds": [ 304, 64 ], 
+        "cost": [ 300, 75 ],
+        "abilities": [ "Plains Charge", "Zeal" ]
+    },{
+        "name": "Elite Janissaries",
+        "id": 46, "unit": 1, "class": "ran", "level": 3,
+        "move" : 7, "attack": 300, "defence": 225,
+        "range": 3, "sight": 7,
+        "spritebounds": [ 432, 64 ], 
+        "cost": [ 205, 90 ],
+        "abilities": [ "No Move & Attack" ]
+    },{
+        "name": "Elite War Elephants",
+        "id": 47, "unit": 1, "class": "cav", "level": 3,
+        "move" : 7, "attack": 250, "defence": 300,
+        "range": 1, "sight": 7,
+        "spritebounds": [ 272, 64 ], 
+        "cost": [ 290, 75 ],
+        "abilities": [ "Causes Fear" ]
+    },{
+        "name": "Elite Chu Ko Nu",
+        "id": 48, "unit": 1, "class": "ran", "level": 3,
+        "move" : 7, "attack": 200, "defence": 200,
+        "range": 3, "sight": 7,
+        "spritebounds": [ 272, 64 ], 
+        "cost": [ 180, 75 ],
+        "abilities": [ "No Move & Attack", "Rapid Fire" ]
+    },{
+        "name": "Elite Throwing Axemen",
+        "id": 49, "unit": 1, "class": "inf", "level": 3,
+        "move" : 7, "attack": 275, "defence": 300,
+        "range": 1, "sight": 7,
+        "spritebounds": [ 256, 64 ], 
+        "cost": [ 295, 95 ],
+        "abilities": [ "Skirmish", "Woodsman" ]
     }
 ]
\ No newline at end of file
diff --git a/build/content/raw_ents.json b/build/content/raw_ents.json
index c9940c9..9d513ba 100644
--- a/build/content/raw_ents.json
+++ b/build/content/raw_ents.json
@@ -349,7 +349,7 @@ Unit name: Trebuchets
 Unit type: Siege
 Bonuses: 50% vs. Building
 Move: 7
-Attack: 370
+Attack: 375
 Defense: 350
 Sight: 7
 Range: 3
diff --git a/build/content/sprites.bmp b/build/content/sprites.bmp
index ec68561..0dda198 100644
--- a/build/content/sprites.bmp
+++ b/build/content/sprites.bmp
diff --git a/build/content/techs.json b/build/content/techs.json
index 37e066b..871b5e2 100644
--- a/build/content/techs.json
+++ b/build/content/techs.json
@@ -52,7 +52,6 @@
         "name": "Horse Collar", "id": 7, "level": 1,
         "cost": [ 95, 280 ], "req_id": 101,
         "bonus": {
-            "aff_all": 1,
             "prod": [ 0.15, 0 ]
         }
     },{
@@ -106,21 +105,18 @@
         "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 ]
         }
     },{
@@ -148,7 +144,6 @@
         "name": "Heavy Plow", "id": 20, "level": 2,
         "cost": [ 150, 450 ], "req_id": 101,
         "bonus": {
-            "aff_all": 1,
             "prod": [ 0.1, 0 ]
         }
     },{
@@ -223,7 +218,6 @@
         "name": "Banking", "id": 30, "level": 2,
         "cost": [ 200, 600 ], "req_id": 107,
         "bonus": {
-            "aff_all": 1,
             "trade": 1,
             "prod": [ 0, 0.05 ]
         }
@@ -269,7 +263,6 @@
         "name": "Crop Rotation", "id": 37, "level": 3,
         "cost": [ 250, 750 ], "req_id": 101,
         "bonus": {
-            "aff_all": 1,
             "prod": [ 0.1, 0 ]
         }
     },{
@@ -338,7 +331,6 @@
         "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 efe1996..937671d 100644
--- a/build/sdl_test.exe
+++ b/build/sdl_test.exe