Change names of lair and hive so that upgrading wont be so dumb

EvolutionRTS · Sep 9, 2019 · 40d7622 · 40d7622
1 parent 1406328
commit 40d7622
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/LuaRules/Configs/morph_defs.lua b/LuaRules/Configs/morph_defs.lua
@@ -1241,7 +1241,7 @@ Evolution]],
 
 	zhatch = 	{
 		{
-			into = 'zlair',
+			into = 'zhatch_up1',
 			time = timeToBuild_zlair,
 			cmdname = [[Lair
 Evolution]],
@@ -1252,7 +1252,7 @@ Evolution]],
 	},	
 	zlair = 	{
 		{
-			into = 'zhive',
+			into = 'zhatch_up2',
 			time = timeToBuild_zhive,
 			cmdname = [[Hive
 Evolution]],

diff --git a/LuaRules/Gadgets/ai/EvoRTS/taskqueues.lua b/LuaRules/Gadgets/ai/EvoRTS/taskqueues.lua
@@ -1027,7 +1027,7 @@ end
 ------------------------------------------------- ZAAAAAAAAAAAAAALS
 function GetZaalSpawners(tqb,ai,unit)
 	local list = {
-	UDN.zhatch.id, UDN.zlair.id, UDN.zhive.id
+	UDN.zhatch.id, UDN.zhatch_up1.id, UDN.zhatch_up2.id
 	}
 	local units = Spring.GetTeamUnitsByDefs(ai.id, list)
 	return #units
@@ -1163,9 +1163,9 @@ taskqueues = {
 	ebasefactory_up2 = HoverFactoryQueueUP2, 
 	ebasefactory_up3 = HoverFactoryQueueUP3,
 	zarm = ZaalArm,
-	zhive = ZaalHive3,
+	zhatch_up1 = ZaalHive3,
 	zhatch = ZaalHive1,
-	zlair = ZaalHive2,
+	zhatch_up2 = ZaalHive2,
 	zespire1 = ZaalEspire,
 	zespire4 = ZaalEspire,
 }

diff --git a/Units/zaal/buildings/zlair.lua → Units/zaal/buildings/zhatch_up1.lua b/Units/zaal/buildings/zlair.lua → Units/zaal/buildings/zhatch_up1.lua
@@ -1,7 +1,7 @@
 -- UNITDEF -- ZLAIR --
 --------------------------------------------------------------------------------
 
-unitName = [[zlair]]
+unitName = [[zhatch_up1]]
 
 --------------------------------------------------------------------------------
 

diff --git a/Units/zaal/buildings/zhive.lua → Units/zaal/buildings/zhatch_up2.lua b/Units/zaal/buildings/zhive.lua → Units/zaal/buildings/zhatch_up2.lua
@@ -1,7 +1,7 @@
 -- UNITDEF -- ZHIVE --
 --------------------------------------------------------------------------------
 
-unitName = [[zhive]]
+unitName = [[zhatch_up2]]
 
 --------------------------------------------------------------------------------