Add B.O.X. unit

Allow BOX to spawn drones Remove drone spawning ability from all other units Remove all energy core reclamation from all units except O.R.B.
EvolutionRTS · Feb 14, 2017 · c747793 · c747793
1 parent c857ae5
commit c747793
Show file tree

Hide file tree

Showing 90 changed files with 138 additions and 172 deletions.
diff --git a/Features/All Worlds/ammobox.lua b/Features/All Worlds/ammobox.lua
@@ -2,9 +2,9 @@ local objectname= "ammobox"
 local featureDef	=	{
 	name			= "ammobox",
 	description				=[[Energy Core
-	• Can be reclaimed for 5 Metal and 5 Energy by moving an Overseer or an ORB in range
+	• Can be reclaimed for 5 Metal and 5 Energy by moving an O.R.B. in range
 	
-	• Can be converted to MidKnight Gunship Drone by moving an Engineer in range
+	• Can be converted to MidKnight Gunship Drone by moving a B.O.X. in range
 ]],
 	object				="ammobox2.s3o",
 	footprintx				=1,

diff --git a/Gamedata/alldefs_post.lua b/Gamedata/alldefs_post.lua
@@ -103,14 +103,18 @@ function UnitDef_Post(name, uDef)
 
 	local sqrt = math.sqrt
 
-	if (not uDef.mincloakdistance) then
+	if uDef.cancloak == true then
 		local fx = uDef.footprintx and tonumber(uDef.footprintx) or 1
 		local fz = uDef.footprintz and tonumber(uDef.footprintz) or 1
 		local radius = 8 * sqrt((fx * fx) + (fz * fz))
-		uDef.mincloakdistance = (radius + 48)
+		if uDef.customparams and uDef.customparams.decloakradiusmodifier then
+			uDef.mincloakdistance = (radius * uDef.customparams.decloakradiusmodifier)
+		else
+			uDef.mincloakdistance = (radius * 6)
+		end
+		
 	end
 
-
 	--------------------------------------------------------------------------------
 	--------------------------------------------------------------------------------
 	-- Spring Kludge Removal

diff --git a/Gamedata/unitdefs_pre.lua b/Gamedata/unitdefs_pre.lua
@@ -20,6 +20,7 @@ Shared.buildList = {
 	[[esilo]],
 	[[emine]],
 	[[eorb]],
+	[[ebox]],
 }
 
 if Spring.GetModOptions ~= nil then

diff --git a/LuaRules/Gadgets/game_boxcollector.lua b/LuaRules/Gadgets/game_boxcollector.lua
@@ -69,7 +69,7 @@ if (gadgetHandler:IsSyncedCode()) then
 				local x,y,z = Spring.GetFeaturePosition(box)
 				local unitsInRange = Spring.GetUnitsInSphere(x,y,z, 500)--at x , y , z with radius 200
 				for _,unit in ipairs(unitsInRange) do
-					if UnitDefs[Spring.GetUnitDefID(unit)].customParams.cancollect and select(5, Spring.GetUnitHealth(unit)) == 1 then
+					if UnitDefs[Spring.GetUnitDefID(unit)].customParams.energycorecollect and select(5, Spring.GetUnitHealth(unit)) == 1 then
 						--local remM, maxM, remE, maxE, left = Spring.GetFeatureResources(box)   --- [1] is metal, [3] is energy
 						Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "m", 5)
 						Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "e", 5) 
@@ -80,16 +80,16 @@ if (gadgetHandler:IsSyncedCode()) then
 						BoxesOnMap[box] = nil
 					break
 					end
-					if UnitDefs[Spring.GetUnitDefID(unit)].customParams.dronespawner and select(5, Spring.GetUnitHealth(unit)) == 1 then
+					if UnitDefs[Spring.GetUnitDefID(unit)].customParams.energycoredronespawner and select(5, Spring.GetUnitHealth(unit)) == 1 then
 						Spring.CreateUnit("edrone", x, y, z, 0, Spring.GetUnitTeam(unit))
 						Spring.DestroyFeature(box)
 						local fx, fy, fz = Spring.GetFeaturePosition(box)
-						Spring.PlaySoundFile("sounds/dronespawner.wav", 1, fx, fy, fz)
+						Spring.PlaySoundFile("sounds/energycoredronespawner.wav", 1, fx, fy, fz)
 						SpawnCEG("sparkleorangeplus1drone", fx, fy, fz)
 						BoxesOnMap[box] = nil
 					break
 					end
-				   -- if (UnitDefs[Spring.GetUnitDefID(unit)].customParams.amphibdronespawner) then
+				   -- if (UnitDefs[Spring.GetUnitDefID(unit)].customParams.amphibenergycoredronespawner) then
 					  -- Spring.CreateUnit("eamphibdrone", x, y, z, 0, Spring.GetUnitTeam(unit))
 					  -- Spring.DestroyFeature(box)
 					  -- local fx, fy, fz = Spring.GetFeaturePosition(box)
@@ -106,7 +106,7 @@ if (gadgetHandler:IsSyncedCode()) then
 				local eggx,eggy,eggz = Spring.GetFeaturePosition(chickenEgg)
 				local unitsInRange = Spring.GetUnitsInSphere(eggx,eggy,eggz, 500)--at x , y , z with radius 200
 				for _,unit in ipairs(unitsInRange) do
-					if UnitDefs[Spring.GetUnitDefID(unit)].customParams.cancollect and select(5, Spring.GetUnitHealth(unit)) == 1 then
+					if UnitDefs[Spring.GetUnitDefID(unit)].customParams.energycorecollect and select(5, Spring.GetUnitHealth(unit)) == 1 then
 						--local remM, maxM, remE, maxE, left = Spring.GetFeatureResources(chickenEgg)   --- [1] is metal, [3] is energy
 						Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "m", 5)
 						Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "e", 5) 
@@ -125,7 +125,7 @@ if (gadgetHandler:IsSyncedCode()) then
 				local eggx,eggy,eggz = Spring.GetFeaturePosition(chickenEggB)
 				local unitsInRange = Spring.GetUnitsInSphere(eggx,eggy,eggz, 500)--at x , y , z with radius 200
 				for _,unit in ipairs(unitsInRange) do
-					if UnitDefs[Spring.GetUnitDefID(unit)].customParams.cancollect and select(5, Spring.GetUnitHealth(unit)) == 1 then
+					if UnitDefs[Spring.GetUnitDefID(unit)].customParams.energycorecollect and select(5, Spring.GetUnitHealth(unit)) == 1 then
 						--local remM, maxM, remE, maxE, left = Spring.GetFeatureResources(chickenEggB)   --- [1] is metal, [3] is energy
 						Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "m", 5)
 						Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "e", 5) 
@@ -144,7 +144,7 @@ if (gadgetHandler:IsSyncedCode()) then
 				local eggx,eggy,eggz = Spring.GetFeaturePosition(chickenEggC)
 				local unitsInRange = Spring.GetUnitsInSphere(eggx,eggy,eggz, 500)--at x , y , z with radius 200
 				for _,unit in ipairs(unitsInRange) do
-					if UnitDefs[Spring.GetUnitDefID(unit)].customParams.cancollect and select(5, Spring.GetUnitHealth(unit)) == 1 then
+					if UnitDefs[Spring.GetUnitDefID(unit)].customParams.energycorecollect and select(5, Spring.GetUnitHealth(unit)) == 1 then
 						--local remM, maxM, remE, maxE, left = Spring.GetFeatureResources(chickenEggC)   --- [1] is metal, [3] is energy
 						Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "m", 5)
 						Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "e", 5) 
@@ -163,7 +163,7 @@ if (gadgetHandler:IsSyncedCode()) then
 				local eggx,eggy,eggz = Spring.GetFeaturePosition(chickenEggD)
 				local unitsInRange = Spring.GetUnitsInSphere(eggx,eggy,eggz, 500)--at x , y , z with radius 200
 				for _,unit in ipairs(unitsInRange) do
-					if UnitDefs[Spring.GetUnitDefID(unit)].customParams.cancollect and select(5, Spring.GetUnitHealth(unit)) == 1 then
+					if UnitDefs[Spring.GetUnitDefID(unit)].customParams.energycorecollect and select(5, Spring.GetUnitHealth(unit)) == 1 then
 						--local remM, maxM, remE, maxE, left = Spring.GetFeatureResources(chickenEggD)   --- [1] is metal, [3] is energy
 						Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "m", 5)
 						Spring.AddTeamResource(Spring.GetUnitTeam(unit) , "e", 5) 

diff --git a/LuaUI/Widgets_Evo/unit_customrings.lua b/LuaUI/Widgets_Evo/unit_customrings.lua
@@ -27,55 +27,58 @@ end
 local ringsDefs = {
     [UnitDefNames.ecommander.id] = {
         { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1000 },
-        { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
+        --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
     },
     [UnitDefNames.ecommandercloak.id] = {
         { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1000 },
-        { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
+        --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
     },
     [UnitDefNames.ecommandershield.id] = {
         { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1000 },
-        { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
+        --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
     },
 	[UnitDefNames.ecommanderbuild.id] = {
         { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1500 },
-        { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
+        --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
     },
 	[UnitDefNames.ecommanderbattle.id] = {
         { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1000 },
-        { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
+        --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
     },
 	[UnitDefNames.ecommanderfactory.id] = {
         { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1000 },
-        { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
+        --{ 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 },
         { color = {0.5,0,1,0.2}, lineWidth = 5, radius = 500 },
 		{ color = {0,1,0,0.6}, lineWidth = 10, radius = 1000 },
+    },
+	[UnitDefNames.ebox.id] = {
+        { color = {0.5,0,1,0.2}, lineWidth = 5, radius = 500 },
     },
 	[UnitDefNames.eengineer5.id] = {
         { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 800 },
-        { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
+        --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
     },
 	[UnitDefNames.eamphibengineer.id] = {
         { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 800 },
-        { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
+        --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
     },
 	[UnitDefNames.eallterrengineer.id] = {
         { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 800 },
-        { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
+        --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
     },
 	[UnitDefNames.eairengineer.id] = {
         { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 600 },
     },
 	[UnitDefNames.ehbotengineer.id] = {
         { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 800 },
-        { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
+        --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
 	},
 	[UnitDefNames.ehbotengineer_turret.id] = {
         { color = {1, 0.5, 0, 0.8}, lineWidth = 2, radius = 1200 },
-        { color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
+        --{ color = {0.5, 0, 1, 0.2}, lineWidth = 5, radius = 500 },
 		{ color = {0,1,0,0.6}, lineWidth = 10, radius = 1000 },		
 	},
 }

diff --git a/Scripts/ebox_lus.lua b/Scripts/ebox_lus.lua
@@ -8,6 +8,7 @@ terrainType = "terrainType"
 function script.Create()
 	StartThread(common.SmokeUnit, {base, turret, barrel1})
 	building = false
+	Move(base, y_axis, 5, 200)
 end
 
 common = include("headers/common_includes_lus.lua")
@@ -25,21 +26,6 @@ function thrust()
 	common.DirtTrail()
 end	
 
-local nanoPoints = {'forwarddome', 'reardome'}
-
-Spring.SetUnitNanoPieces(unitID, nanoPoints)
-
-function script.StartBuilding(heading, pitch)
-    -- TODO: This is where you would add your unpack / point towards animation
-    SetUnitValue(COB.INBUILDSTANCE, true)
-	building = true
-end
-function script.StopBuilding()
-    -- TODO: This is where you would add your pack-up animation
-    SetUnitValue(COB.INBUILDSTANCE, false)
-	building = false
-end
-
 function script.Killed()
 		Explode(forwarddome, SFX.EXPLODE_ON_HIT)
 		Explode(reardome, SFX.EXPLODE_ON_HIT)

diff --git a/Units/AIUnits/ecommanderai.lua b/Units/AIUnits/ecommanderai.lua
@@ -29,7 +29,7 @@ local unitDef                    = {
 	canBeAssisted                = true,
 	CanCapture                   = true,
 	CanRepair			         = true,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,
@@ -148,7 +148,7 @@ There can only be one!]],
 		supply_granted            = supplyGiven,
 		ProvideTech               = powerprovided,
 		death_sounds             = "generic",
-		cancollect               = "1",
+
 		armortype                = armortype,
 		nofriendlyfire	         = "1",
 		normaltex               = "unittextures/lego2skin_explorernormal.dds", 

diff --git a/Units/arm/armflash.lua b/Units/arm/armflash.lua
@@ -18,7 +18,6 @@ local unitDef                  = {
 	builder                    = false,
 	buildTime                  = 5,
 	canAttack                  = true,
-	cancollect                 = "1",
 	canGuard                   = true,
 	canMove                    = true,
 	canPatrol                  = true,

diff --git a/Units/chicken/queen.lua b/Units/chicken/queen.lua
@@ -14,7 +14,7 @@ local unitDef                    = {
 	builder                      = false,
 	buildTime                    = 5,
 	canAttack                    = true,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,

diff --git a/Units/eair/eairengineer.lua b/Units/eair/eairengineer.lua
@@ -113,7 +113,6 @@ local unitDef                    = {
 		area_mex_def			 = "emetalextractor",
 		--    needed_cover       = 2,
 		death_sounds             = "generic",
-		--    airdronespawner    = "1",
 		armortype                = armortype,
 --		supply_cost              = supply,
 		normaltex               = "unittextures/lego2skin_explorernormal.dds", 

diff --git a/Units/eair/upgraded/eairengineer_t2.lua b/Units/eair/upgraded/eairengineer_t2.lua
@@ -114,7 +114,6 @@ local unitDef                    = {
 		area_mex_def			 = "emetalextractor",
 		--    needed_cover       = 2,
 		death_sounds             = "generic",
-		--    airdronespawner    = "1",
 		armortype                = armortype,
 --		supply_cost              = supply,
 		normaltex               = "unittextures/lego2skin_explorernormal.dds", 

diff --git a/Units/eallterrain/eallterraa.lua b/Units/eallterrain/eallterraa.lua
@@ -19,7 +19,7 @@ local unitDef                    = {
 	builder                      = false,
 	buildTime                    = 5,
 	canAttack                    = true,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,

diff --git a/Units/eallterrain/eallterranarchid.lua b/Units/eallterrain/eallterranarchid.lua
@@ -42,7 +42,7 @@ local unitDef                    = {
 	builder                      = false,
 	buildTime                    = 5,
 	canAttack                    = true,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,

diff --git a/Units/eallterrain/eallterrassault.lua b/Units/eallterrain/eallterrassault.lua
@@ -35,7 +35,7 @@ local unitDef                    = {
 	builder                      = false,
 	buildTime                    = 5,
 	canAttack                    = true,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,

diff --git a/Units/eallterrain/eallterrengineer.lua b/Units/eallterrain/eallterrengineer.lua
@@ -33,7 +33,7 @@ local unitDef                    = {
 	CanCapture                   = false,
 	CanRepair			         = true,
 	canRestore					 = false,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,
@@ -123,7 +123,6 @@ local unitDef                    = {
 		canbetransported 		 = "true",
 		needed_cover             = 1,
 		death_sounds             = "generic",
-		dronespawner             = "1",
 		armortype                = armortype,
 --		supply_cost              = supply,
 		normaltex               = "unittextures/con_legonormal.png", 

diff --git a/Units/eallterrain/eallterrheavy.lua b/Units/eallterrain/eallterrheavy.lua
@@ -35,7 +35,7 @@ local unitDef                    = {
 	builder                      = false,
 	buildTime                    = 5,
 	canAttack                    = true,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,

diff --git a/Units/eallterrain/eallterrlight.lua b/Units/eallterrain/eallterrlight.lua
@@ -35,7 +35,7 @@ local unitDef                    = {
 	builder                      = false,
 	buildTime                    = 5,
 	canAttack                    = true,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,

diff --git a/Units/eallterrain/eallterrmed.lua b/Units/eallterrain/eallterrmed.lua
@@ -35,7 +35,7 @@ local unitDef                    = {
 	builder                      = false,
 	buildTime                    = 5,
 	canAttack                    = true,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,

diff --git a/Units/eallterrain/eallterrriot.lua b/Units/eallterrain/eallterrriot.lua
@@ -43,7 +43,7 @@ local unitDef                    = {
 	builder                      = false,
 	buildTime                    = 5,
 	canAttack                    = true,
-	cancollect                   = "1",
+
 	--  canDgun			         = true,
 	canGuard                     = true,
 	canMove                      = true,

diff --git a/Units/eallterrain/eallterrshield.lua b/Units/eallterrain/eallterrshield.lua
@@ -32,7 +32,7 @@ local unitDef                    = {
 	builder                      = false,
 	buildTime                    = 5,
 	canAttack                    = false,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,

diff --git a/Units/eallterrain/upgraded/eallterranarchid_t2.lua b/Units/eallterrain/upgraded/eallterranarchid_t2.lua
@@ -42,7 +42,7 @@ local unitDef                    = {
 	builder                      = false,
 	buildTime                    = 5,
 	canAttack                    = true,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,

diff --git a/Units/eallterrain/upgraded/eallterrassault_t2.lua b/Units/eallterrain/upgraded/eallterrassault_t2.lua
@@ -35,7 +35,7 @@ local unitDef                    = {
 	builder                      = false,
 	buildTime                    = 5,
 	canAttack                    = true,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,

diff --git a/Units/eallterrain/upgraded/eallterrengineer_t2.lua b/Units/eallterrain/upgraded/eallterrengineer_t2.lua
@@ -33,7 +33,7 @@ local unitDef                    = {
 	CanCapture                   = false,
 	CanRepair			         = true,
 	canRestore					 = false,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,
@@ -123,7 +123,6 @@ local unitDef                    = {
 		canbetransported 		 = "true",
 		needed_cover             = 1,
 		death_sounds             = "generic",
-		dronespawner             = "1",
 		armortype                = armortype,
 --		supply_cost              = supply,
 		normaltex               = "unittextures/con_legonormal.png", 

diff --git a/Units/eallterrain/upgraded/eallterrheavy_t2.lua b/Units/eallterrain/upgraded/eallterrheavy_t2.lua
@@ -35,7 +35,7 @@ local unitDef                    = {
 	builder                      = false,
 	buildTime                    = 5,
 	canAttack                    = true,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,

diff --git a/Units/eallterrain/upgraded/eallterrlight_t2.lua b/Units/eallterrain/upgraded/eallterrlight_t2.lua
@@ -35,7 +35,7 @@ local unitDef                    = {
 	builder                      = false,
 	buildTime                    = 5,
 	canAttack                    = true,
-	cancollect                   = "1",
+
 	canGuard                     = true,
 	canMove                      = true,
 	canPatrol                    = true,