From dd0ddd131e240fe435887394c300fbc4cdd6499a Mon Sep 17 00:00:00 2001
From: James Gillham <jrdgillham@gmail.com>
Date: Sun, 15 Nov 2020 20:37:20 +0000
Subject: [PATCH] technology renames.

---
 config.lua                                 |  2 +-
 map_gen/maps/1000x.lua                     |  2 +-
 map_gen/maps/rotten_apples.lua             | 28 +++++++++++-----------
 map_gen/maps/space_race/config.lua         |  2 +-
 map_gen/maps/space_race/market_handler.lua |  4 ++--
 map_gen/maps/space_race/market_items.lua   |  4 ++--
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/config.lua b/config.lua
index bea506cb..381334a3 100644
--- a/config.lua
+++ b/config.lua
@@ -423,7 +423,7 @@ global.config = {
         -- reduce delay for each level of the tech
         techs = {
             ['weapon-shooting-speed'] = {{turret_type = 'ammo-turret', amount = 60 * 26 / 6}},
-            ['laser-turret-speed'] = {{turret_type = 'electric-turret', amount = 60 * 12 / 7}},
+            ['laser-shooting-speed'] = {{turret_type = 'electric-turret', amount = 60 * 12 / 7}},
             ['refined-flammables'] = {{turret_type = 'fluid-turret', amount = 60 * 17 / 7}},
             ['artillery-shell-speed'] = {{turret_type = 'artillery-turret', amount = 60 * 2}}
         }
diff --git a/map_gen/maps/1000x.lua b/map_gen/maps/1000x.lua
index a326eae0..80316040 100644
--- a/map_gen/maps/1000x.lua
+++ b/map_gen/maps/1000x.lua
@@ -177,7 +177,7 @@ Event.on_init(
 
         -- Techs
         force.technologies['automation'].researched = true
-        force.technologies['turrets'].researched = true
+        force.technologies['gun-turret'].researched = true
         force.technologies['military'].researched = true
         force.technologies['logistics'].researched = true
         if config.redmew_qol.enabled and config.redmew_qol.loaders then
diff --git a/map_gen/maps/rotten_apples.lua b/map_gen/maps/rotten_apples.lua
index 17a23ce5..7374330e 100644
--- a/map_gen/maps/rotten_apples.lua
+++ b/map_gen/maps/rotten_apples.lua
@@ -60,9 +60,9 @@ local military_techs = {
     ['combat-robot-damage-4'] = true,
     ['combat-robot-damage-5'] = true,
     ['combat-robot-damage-6'] = true,
-    ['combat-robotics'] = true,
-    ['combat-robotics-2'] = true,
-    ['combat-robotics-3'] = true,
+    ['defender'] = true,
+    ['distractor'] = true,
+    ['destroyer'] = true,
     ['discharge-defense-equipment'] = true,
     ['energy-shield-equipment'] = true,
     ['energy-shield-mk2-equipment'] = true,
@@ -109,14 +109,14 @@ local military_techs = {
     ['laser-turret-damage-6'] = true,
     ['laser-turret-damage-7'] = true,
     ['laser-turret-damage-8'] = true,
-    ['laser-turret-speed-1'] = true,
-    ['laser-turret-speed-2'] = true,
-    ['laser-turret-speed-3'] = true,
-    ['laser-turret-speed-4'] = true,
-    ['laser-turret-speed-5'] = true,
-    ['laser-turret-speed-6'] = true,
-    ['laser-turret-speed-7'] = true,
-    ['laser-turrets'] = true,
+    ['laser-shooting-speed-1'] = true,
+    ['laser-shooting-speed-2'] = true,
+    ['laser-shooting-speed-3'] = true,
+    ['laser-shooting-speed-4'] = true,
+    ['laser-shooting-speed-5'] = true,
+    ['laser-shooting-speed-6'] = true,
+    ['laser-shooting-speed-7'] = true,
+    ['laser-turret'] = true,
     ['military'] = true,
     ['military-2'] = true,
     ['military-3'] = true,
@@ -154,9 +154,9 @@ local military_techs = {
     ['shotgun-shell-speed-4'] = true,
     ['shotgun-shell-speed-5'] = true,
     ['shotgun-shell-speed-6'] = true,
-    ['stone-walls'] = true,
-    ['tanks'] = true,
-    ['turrets'] = true,
+    ['stone-wall'] = true,
+    ['tank'] = true,
+    ['gun-turret'] = true,
     ['uranium-ammo'] = true
 }
 
diff --git a/map_gen/maps/space_race/config.lua b/map_gen/maps/space_race/config.lua
index f76b7996..b3fa8b0d 100644
--- a/map_gen/maps/space_race/config.lua
+++ b/map_gen/maps/space_race/config.lua
@@ -21,7 +21,7 @@ local Config = {
         ['military-2'] = {player = 6, entity = 24, unlocks = 'military'},
         ['military-3'] = {player = 12, entity = 48, unlocks = 'military-2'},
         ['military-4'] = {player = 24, entity = 96, unlocks = 'military-3'},
-        ['stone-walls'] = {player = 2, entity = 8, invert = true},
+        ['stone-wall'] = {player = 2, entity = 8, invert = true},
         ['heavy-armor'] = {player = 12, entity = 48, invert = true},
         ['artillery-shell-range-1'] = nil
     },
diff --git a/map_gen/maps/space_race/market_handler.lua b/map_gen/maps/space_race/market_handler.lua
index 56afc683..3fc1bd59 100644
--- a/map_gen/maps/space_race/market_handler.lua
+++ b/map_gen/maps/space_race/market_handler.lua
@@ -227,10 +227,10 @@ local function check_for_market_unlocks(force)
         end
     end
 
-    if force_USA.technologies.tanks.researched then
+    if force_USA.technologies.tank.researched then
         unlock_market_item(force_USA, 'tank')
     end
-    if force_USSR.technologies.tanks.researched then
+    if force_USSR.technologies.tank.researched then
         unlock_market_item(force_USSR, 'tank')
     end
 end
diff --git a/map_gen/maps/space_race/market_items.lua b/map_gen/maps/space_race/market_items.lua
index 9c542112..9873f82b 100644
--- a/map_gen/maps/space_race/market_items.lua
+++ b/map_gen/maps/space_race/market_items.lua
@@ -1,10 +1,10 @@
 return {
     {
-        name = 'stone-walls',
+        name = 'stone-wall',
         name_label = {'', 'Stone Walls research'},
         type = 'research',
         description = {'', 'Unlocks stone walls research'},
-        sprite = 'technology/stone-walls',
+        sprite = 'technology/stone-wall',
         stack_limit = 1,
         price = 50,
         disabled = true,