Add up to mk3 mexes with meaningful outputs

Add T3 units to all mobile build lists
Fix healer overseer not working properly and improper ring on base overseer

Gamedata/morph_defs.lua

@@ -86,6 +86,12 @@ local timeToBuild_euwturret = energyCost_euwturret * 0.10
 local energyCost_emetalextractor_up1 = 600
 local timeToBuild_emetalextractor_up1 = energyCost_emetalextractor_up1 * 0.10
 
+local energyCost_emetalextractor_up2 = 1200
+local timeToBuild_emetalextractor_up2 = energyCost_emetalextractor_up2 * 0.10
+
+local energyCost_emetalextractor_up3 = 1800
+local timeToBuild_emetalextractor_up3 = energyCost_emetalextractor_up3 * 0.10
+
 local energyCost_zmex_up1 = 1200
 local timeToBuild_zmex_up1 = energyCost_zmex_up1 * 0.10
 
@@ -186,7 +192,6 @@ Overseer]],
 			energy = energyCost_ecommanderhealer,
 			metal = 0,
 			text = 'Evolve into Healer Overseer: Overseer has a very strong AOE heal in it\'s immediate vicinity.',
-			require = [[tech2]],
 		},
 		{
 			into = 'ecommandershield',
@@ -223,7 +228,6 @@ Overseer]],
 			energy = energyCost_ecommanderbattle,
 			metal = 0,
 			text = 'Evolve into Battle Overseer: Upgraded machinegun that does heavy damage to Light units and Buildings. No longer grants supply.',
-			require = [[tech1]],
 		},
 	},
 
@@ -236,7 +240,6 @@ Overseer]],
 			energy = energyCost_ecommanderhealer,
 			metal = 0,
 			text = 'Evolve into Healer Overseer: Overseer has a very strong AOE heal in it\'s immediate vicinity.',
-			require = [[tech2]],
 		},
 		{
 			into = 'ecommandercloak',
@@ -273,7 +276,6 @@ Overseer]],
 			energy = energyCost_ecommanderbattle,
 			metal = 0,
 			text = 'Evolve into Battle Overseer: Upgraded machinegun that does heavy damage to Light units and Buildings. No longer grants supply.',
-			require = [[tech1]],
 		},
 	},
 
@@ -286,7 +288,6 @@ Overseer]],
 			energy = energyCost_ecommanderhealer,
 			metal = 0,
 			text = 'Evolve into Healer Overseer: Overseer has a very strong AOE heal in it\'s immediate vicinity.',
-			require = [[tech2]],
 		},
 		{
 			into = 'ecommandercloak',
@@ -323,7 +324,6 @@ Overseer]],
 			energy = energyCost_ecommanderbattle,
 			metal = 0,
 			text = 'Evolve into Battle Overseer: Upgraded machinegun that does heavy damage to Light units and Buildings. No longer grants supply.',
-			require = [[tech1]],
 		},
 	},
 
@@ -336,7 +336,6 @@ Overseer]],
 			energy = energyCost_ecommanderhealer,
 			metal = 0,
 			text = 'Evolve into Healer Overseer: Overseer has a very strong AOE heal in it\'s immediate vicinity.',
-			require = [[tech2]],
 		},
 		{
 			into = 'ecommandercloak',
@@ -373,7 +372,6 @@ Overseer]],
 			energy = energyCost_ecommanderbattle,
 			metal = 0,
 			text = 'Evolve into Battle Overseer: Upgraded machinegun that does heavy damage to Light units and Buildings. No longer grants supply.',
-			require = [[tech1]],
 		},
 	},
 	ecommanderbattle = {
@@ -388,14 +386,13 @@ Overseer]],
 			require = [[tech3]],
 		},
 	    {
-		into = 'ecommanderhealer',
-		time = timeToBuild_ecommanderhealer,
-		cmdname = [[Healer 
+			into = 'ecommanderhealer',
+			time = timeToBuild_ecommanderhealer,
+			cmdname = [[Healer 
 Overseer]],
 			energy = energyCost_ecommanderhealer,
 			metal = 0,
 			text = 'Evolve into Healer Overseer: Overseer has a very strong AOE heal in it\'s immediate vicinity.',
-			require = [[tech2]],
 		},
 		{
 			into = 'ecommandercloak',
@@ -434,6 +431,65 @@ Overseer]],
 			text = 'Evolve into Factory Overseer: Gains the ability to build all raider, riot, and MBTs anywhere, gains 8x buildpower.',
 		},
 	},
+
+	ecommanderhealer = {
+	    {
+			into = 'ecommandermeteor',
+			time = timeToBuild_ecommandermeteor,
+			cmdname = [[Meteor 
+Overseer]],
+			energy = energyCost_ecommandermeteor,
+			metal = 0,
+			text = 'Evolve into Meteor Overseer: Overseer can call down devastating meteor showers.',
+			require = [[tech3]],
+		},
+	    {
+		into = 'ecommanderbattle',
+			time = timeToBuild_ecommanderbattle,
+			cmdname = [[Battle
+Overseer]],
+			energy = energyCost_ecommanderbattle,
+			metal = 0,
+			text = 'Evolve into Battle Overseer: Upgraded machinegun that does heavy damage to Light units and Buildings. No longer grants supply.',
+			require = [[tech2]],
+		{
+			into = 'ecommandercloak',
+			time = timeToBuild_ecommandercloak,
+			cmdname = [[Cloaking 
+Overseer]],
+			energy = energyCost_ecommandercloak,
+			metal = 0,
+			text = 'Evolve into Cloaking Overseer: Gains a large cloaking field which also cloaks the Overseer.',
+		},
+		{
+			into = 'ecommandershield',
+			time = timeToBuild_ecommandershield,
+			cmdname = [[Shield
+Overseer]],
+			energy = energyCost_ecommandershield,
+			metal = 0,
+			text = 'Evolve into Shielded Overseer: Gains a large shield which recharges quickly.',
+		},
+		{
+			into = 'ecommanderbuild',
+			time = timeToBuild_ecommanderbuild,
+			cmdname = [[Builder
+Overseer]],
+			energy = energyCost_ecommanderbuild,
+			metal = 0,
+			text = 'Evolve into Builder Overseer: Gains 16x buildpower.',
+		},
+		{
+			into = 'ecommanderfactory',
+			time = timeToBuild_ecommanderfactory,
+			cmdname = [[Factory
+Overseer]],
+			energy = energyCost_ecommanderfactory,
+			metal = 0,
+			text = 'Evolve into Factory Overseer: Gains the ability to build all raider, riot, and MBTs anywhere, gains 8x buildpower.',
+		},
+	},
+
 	ecommandermeteor = {
 			{
 			into = 'ecommanderbattle',
@@ -443,7 +499,6 @@ Overseer]],
 			energy = energyCost_ecommanderbattle,
 			metal = 0,
 			text = 'Evolve into Battle Overseer: Upgraded machinegun that does heavy damage to Light units and Buildings. No longer grants supply.',
-			require = [[tech1]],
 		},
 	},
 
@@ -468,16 +523,40 @@ Overseer]],
 --Economy
 	emetalextractor = 	{
 		{
-			into = 'emetalextractor_up3',
+			into = 'emetalextractor_up1',
 			--require = 'etech2',
 			time = timeToBuild_emetalextractor_up1,
 			cmdname = [[Evolve 2x Income]],
 			energy = energyCost_emetalextractor_up1,
 			metal = 0,
 			text = [[x2 Metal Extraction rate]],
+			require = [[tech1]],
+		},
+	},
+	emetalextractor_up1 = 	{
+		{
+			into = 'emetalextractor_up2',
+			--require = 'etech2',
+			time = timeToBuild_emetalextractor_up1,
+			cmdname = [[Evolve 4x Income]],
+			energy = energyCost_emetalextractor_up1,
+			metal = 0,
+			text = [[x4 Metal Extraction rate]],
 			require = [[tech2]],
 		},
 	},
+	emetalextractor_up2 = 	{
+		{
+			into = 'emetalextractor_up3',
+			--require = 'etech2',
+			time = timeToBuild_emetalextractor_up1,
+			cmdname = [[Evolve 8x Income]],
+			energy = energyCost_emetalextractor_up1,
+			metal = 0,
+			text = [[x8 Metal Extraction rate]],
+			require = [[tech3]],
+		},
+	},
 	zmex = 	{
 		{
 			into = 'zmex_up3',

Gamedata/unitdefs_pre.lua

@@ -25,11 +25,21 @@ Shared.buildList = {
 	[[ebox]],
 	[[ehbotengineer]],
 	[[eorb]],
+	[[eamphibleveler]],
+	[[ehbotkarganneth]],
+	[[eallterranarchid]],
+	[[elacerator]],
+	[[ekrow]],
 	-- [[ecommander]],
 }
 
 Shared.eorb = {
 	[[ehbotengineer]],
+	[[eamphibleveler]],
+	[[ehbotkarganneth]],
+	[[eallterranarchid]],
+	[[elacerator]],
+	[[ekrow]],
 }
 
 Shared.buildListeCommanderFactory = {
@@ -57,6 +67,11 @@ Shared.buildListeCommanderFactory = {
 	[[efighter]],
 	[[egunship2]],
 	[[ebomber]],
+	[[eamphibleveler]],
+	[[ehbotkarganneth]],
+	[[eallterranarchid]],
+	[[elacerator]],
+	[[ekrow]],
 }
 
 Shared.buildListZaal = {
@@ -147,6 +162,11 @@ local factory = {
 	[[efighter]],
 	[[egunship2]],
 	[[ebomber]],
+	[[eamphibleveler]],
+	[[ehbotkarganneth]],
+	[[eallterranarchid]],
+	[[elacerator]],
+	[[ekrow]],
 }
 
 Shared.buildListFactory = {}
@@ -381,3 +401,15 @@ Shared.buildListHbotFactory_up3 = {
 		[[ehbotrocko_up3]],
 		[[ehbotkarganneth_up3]],
 }
+
+-----------------------------
+-----------------------------
+--Buildlists for T3/Experimentals
+
+Shared.buildListT3 = {
+		[[eamphibleveler]],
+		[[ehbotkarganneth]],
+		[[eallterranarchid]],
+		[[elacerator]],
+		[[ekrow]],
+}

LuaUI/Widgets_Evo/unit_customrings.lua

@@ -27,7 +27,7 @@ end
 local ringsDefs = {
     [UnitDefNames.ecommander.id] = {
        -- { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1000 },
-		{ color = {0,1,0,0.6}, lineWidth = 5, radius = 300, divs = 64 },
+		--{ color = {0,1,0,0.6}, lineWidth = 5, radius = 300, divs = 64 },
         --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
     },
     [UnitDefNames.ecommandercloak.id] = {
@@ -49,6 +49,11 @@ local ringsDefs = {
 	[UnitDefNames.ecommanderfactory.id] = {
         --{ color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 250 },
         --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
+    },
+	[UnitDefNames.ecommanderhealer.id] = {
+       -- { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1000 },
+		{ color = {0,1,0,0.6}, lineWidth = 5, radius = 1000, divs = 128 },
+        --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
     },
 	[UnitDefNames.eorb.id] = {
         --{ color = {1,0.5,0,0.8}, lineWidth = 2, radius = 800 },

Units/ebuilding/emetalextractor_up1.lua

@@ -5,16 +5,16 @@ unitName = [[emetalextractor_up1]]
 
 --------------------------------------------------------------------------------
 
-metalMultiplier = 1.33
+metalMultiplier = 2
 
-buildCostMetal = 100
+buildCostMetal = 150
 energyUse = 2
 
 primaryCEG = "custom:fusionreactionnuclear-2color"
 
 humanName = [[Metal Extractor Mk II]]
 
-objectName = [[emetalextractor2.s3o]]
+objectName = [[emetalextractor2_up1.s3o]]
 script = [[emetalextractor.cob]]
 
 tech = [[tech1]]

Units/ebuilding/emetalextractor_up2.lua

@@ -5,16 +5,16 @@ unitName = [[emetalextractor_up2]]
 
 --------------------------------------------------------------------------------
 
-metalMultiplier = 1.66
+metalMultiplier = 4
 
-buildCostMetal = 200
+buildCostMetal = 300
 energyUse = 5
 
 primaryCEG = "custom:fusionreactionnuclear-3color"
 
 humanName = [[Metal Extractor Mk III]]
 
-objectName = [[emetalextractor2.s3o]]
+objectName = [[emetalextractor2_up2.s3o]]
 script = [[emetalextractor.cob]]
 
 tech = [[tech2]]

Units/ebuilding/emetalextractor_up3.lua

@@ -5,16 +5,16 @@ unitName = [[emetalextractor_up3]]
 
 --------------------------------------------------------------------------------
 
-metalMultiplier = 2
+metalMultiplier = 8
 
-buildCostMetal = 300
+buildCostMetal = 600
 energyUse = 10
 
 primaryCEG = "custom:fusionreactionnuclear-4color"
 
 humanName = [[Metal Extractor Mk IV]]
 
-objectName = [[emetalextractor2.s3o]]
+objectName = [[emetalextractor2_up3.s3o]]
 script = [[emetalextractor.cob]]
 
 tech = [[tech3]]

modinfo.lua

@@ -13,7 +13,7 @@ return {
 	name='Evolution RTS -',
 	description='EvoRTS',
 	shortname='EvoRTS',
-	version='v17.00',
+	version='dev',
 	mutator='Official',
 	game='Evolution RTS',
 	shortGame='EvoRTS',