Fix beacon capture

Fix some scav unit names
EvolutionRTS · May 13, 2020 · bfe1edc · bfe1edc
1 parent 85648f9
commit bfe1edc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/LuaRules/Gadgets/scavengers/Modules/reinforcements_module.lua b/LuaRules/Gadgets/scavengers/Modules/reinforcements_module.lua
@@ -163,7 +163,7 @@ function SpawnDefencesAfterCapture(unitID, teamID)
 
 	local r = grouptier[math_random(1,#grouptier)]
 	local r2 = grouptiersea[math_random(1,#grouptiersea)]
-	Spring.CreateUnit("scavengerdroppodfriendly", posx-128, posy, posz-128, math_random(0,3),teamID)
+	Spring.CreateUnit("scavengerdroppodfriendly_scav", posx-128, posy, posz-128, math_random(0,3),teamID)
 	local posy = Spring.GetGroundHeight(posx-128, posz-128)
 	if posy > 0 then
 		QueueSpawn(r..scavconfig.unitnamesuffix, posx-128, posy, posz-128, math_random(0,3),teamID, n+90)
@@ -173,7 +173,7 @@ function SpawnDefencesAfterCapture(unitID, teamID)
 
 	local r = grouptier[math_random(1,#grouptier)]
 	local r2 = grouptiersea[math_random(1,#grouptiersea)]
-	Spring.CreateUnit("scavengerdroppodfriendly", posx+128, posy, posz+128, math_random(0,3),teamID)
+	Spring.CreateUnit("scavengerdroppodfriendly_scav", posx+128, posy, posz+128, math_random(0,3),teamID)
 	local posy = Spring.GetGroundHeight(posx+128, posz+128)
 	if posy > 0 then
 		QueueSpawn(r..scavconfig.unitnamesuffix, posx+128, posy, posz+128, math_random(0,3),teamID, n+90)
@@ -183,7 +183,7 @@ function SpawnDefencesAfterCapture(unitID, teamID)
 
 	local r = grouptier[math_random(1,#grouptier)]
 	local r2 = grouptiersea[math_random(1,#grouptiersea)]
-	Spring.CreateUnit("scavengerdroppodfriendly", posx-128, posy, posz+128, math_random(0,3),teamID)
+	Spring.CreateUnit("scavengerdroppodfriendly_scav", posx-128, posy, posz+128, math_random(0,3),teamID)
 	local posy = Spring.GetGroundHeight(posx-128, posz+128)
 	if posy > 0 then
 		QueueSpawn(r..scavconfig.unitnamesuffix, posx-128, posy, posz+128, math_random(0,3),teamID, n+90)
@@ -193,7 +193,7 @@ function SpawnDefencesAfterCapture(unitID, teamID)
 
 	local r = grouptier[math_random(1,#grouptier)]
 	local r2 = grouptiersea[math_random(1,#grouptiersea)]
-	Spring.CreateUnit("scavengerdroppodfriendly", posx+128, posy, posz-128, math_random(0,3),teamID)
+	Spring.CreateUnit("scavengerdroppodfriendly_scav", posx+128, posy, posz-128, math_random(0,3),teamID)
 	local posy = Spring.GetGroundHeight(posx+128, posz-128)
 	if posy > 0 then
 		QueueSpawn(r..scavconfig.unitnamesuffix, posx+128, posy, posz-128, math_random(0,3),teamID, n+90)
@@ -349,7 +349,7 @@ function spawnPlayerReinforcements(n)
 							else
 								QueueSpawn(groupunit1..scavconfig.unitnamesuffix, posx, posy, posz, math_random(0,3),teamID, n+100)
 							end
-							Spring.CreateUnit("scavengerdroppodfriendly", posx, posy, posz, math_random(0,3),teamID)
+							Spring.CreateUnit("scavengerdroppodfriendly_scav", posx, posy, posz, math_random(0,3),teamID)
 						end
 						groupsize = nil
 						groupunit1 = nil

diff --git a/Objects3D/scavs/scavbeacondroppod.s3o b/Objects3D/scavs/scavbeacondroppod.s3o
diff --git a/Units/other/Scavengers/scavengerdroppod_scav.lua b/Units/other/Scavengers/scavengerdroppod_scav.lua
@@ -44,7 +44,7 @@ return {
 		turninplace = true,
 		turninplaceanglelimit = 90,
 		turnrate = 0,
-		unitname = "scavengerdroppod",
+		unitname = "scavengerdroppod_scav",
 		upright = false,
 		waterline = 0,
 		workertime = 1500,

diff --git a/Units/other/Scavengers/scavengerdroppodbeacon_scav.lua b/Units/other/Scavengers/scavengerdroppodbeacon_scav.lua
@@ -47,7 +47,7 @@ return {
 		turninplace = true,
 		turninplaceanglelimit = 90,
 		turnrate = 0,
-		unitname = "scavengerbeacon",
+		unitname = "scavengerbeacon_scav",
 		upright = false,
 		waterline = 0,
 		workertime = 1500,

diff --git a/...r/Scavengers/scavengerdroppodfriendly.lua → ...vengers/scavengerdroppodfriendly_scav.lua b/...r/Scavengers/scavengerdroppodfriendly.lua → ...vengers/scavengerdroppodfriendly_scav.lua
@@ -1,5 +1,5 @@
 return {
-	scavengerdroppodfriendly = {
+	scavengerdroppodfriendly_scav = {
 		acceleration = 0,
 		activatewhenbuilt = true,
 		autoheal = 1.8,
@@ -42,7 +42,7 @@ return {
 		turninplace = true,
 		turninplaceanglelimit = 90,
 		turnrate = 0,
-		unitname = "scavengerfriendlydroppod",
+		unitname = "scavengerfriendlydroppod_scav",
 		upright = false,
 		waterline = 0,
 		workertime = 1500,