Thresher no longer gets stuck on itself.

 * Reigned in colvol.
 * Moved aim positions down the barrel except when firing. This stops it from switching targets when it decides it can shoot around corners.
 * Moved aim position to the centre when undeployed, just for safety.
The collision volume also moves up and down.

Fixes #5785. Fixes #5772.

Author: GoogleFrog

Objects3d/corflak.s3o

@@ -14,6 +14,12 @@ local function DoUpdate(unitID)
 	local data = unitData[unitID]
 	local nearbyHeight = data.baseHeight
 	local nearbyLowHeight = data.baseHeight
+	if not nearbyHeight then
+		data.defaultAim[2] = data.aimOffetOverride
+		GG.OverrideMidAndAimPos(unitID, data.defaultMid, data.defaultAim)
+		return
+	end
+	
 	for i = -1, 1, 1 do
 		for j = -1, 1, 1 do
 			if i ~= 0 or j ~= 0 then
@@ -23,6 +29,7 @@ local function DoUpdate(unitID)
 			end
 		end
 	end
+	
 	local newAimHeight = nearbyHeight - data.baseHeight + data.cliffPeek
 	if data.aimOffetOverride then
 		data.defaultAim[2] = data.aimOffetOverride
@@ -74,6 +81,17 @@ function GG.Script_SetupAimPosTerraform(unitID, floatOnWater, defaultMid, defaul
 	StartThread(UpdateAimPos, unitID)
 end
 
+function GG.Script_SetupOffsetData(unitID, unitDefID)
+	local ud = UnitDefs[unitDefID]
+	local midTable = ud.model
+	local data = {
+		defaultAim = {midTable.midx, midTable.midy + (aimOff or 0), midTable.midz},
+		defaultMid = {midTable.midx, midTable.midy + (midOff or 0), midTable.midz},
+	}
+	unitData[unitID] = data
+	return data.defaultAim[2]
+end
+
 function GG.Script_OffsetAimAndColVol(unitID, newAimOffetOverride, colVolOffset)
 	unitData[unitID].aimOffetOverride = newAimOffetOverride
 	GG.OffsetColVol(unitID, colVolOffset)

scripts/aimPosTerraform.lua

@@ -16,14 +16,22 @@ include "pieceControl.lua"
 
 local stuns = {false, false, false}
 local disarmed = false
+local deployed = false
+local FLARE_OFFSET = -32
+local DEPLOY_OFFSET = 18
+local BASE_OFFSET = -4
+local BASE_AIM = 32
 
 local StopTurn = GG.PieceControl.StopTurn
 
 function script.Create()
+	GG.Script_SetupOffsetData(unitID, unitDefID, 50)
 	if not GG.Script.onWater(unitID) then
 		Hide(floatbase)
 	end
 	StartThread(GG.Script.SmokeUnit, unitID, {guns})
+	Move(flare[1], z_axis, FLARE_OFFSET)
+	Move(flare[2], z_axis, FLARE_OFFSET)
 end
 
 local function RestoreAfterDelay()
@@ -33,9 +41,14 @@ local function RestoreAfterDelay()
 	Turn (a2, x_axis, 0, math.rad(60))
 	Turn (a3, x_axis, 0, math.rad(50))
 	Turn (a4, x_axis, 0, math.rad(10))
+	Sleep(1500)
+	if deployed then
+		deployed = false
+		GG.Script_OffsetAimAndColVol(unitID, BASE_AIM, BASE_OFFSET)
+	end
 end
 
-local function StunThread ()
+local function StunThread()
 	Signal (SIG_AIM)
 	SetSignalMask(SIG_AIM)
 	disarmed = true
@@ -48,31 +61,28 @@ local function StunThread ()
 	StopTurn (a4, x_axis)
 end
 
-local function UnstunThread ()
+local function UnstunThread()
 	disarmed = false
 	RestoreAfterDelay()
 end
 
-function Stunned (stun_type)
+function Stunned(stun_type)
 	stuns[stun_type] = true
 	StartThread (StunThread)
 end
-function Unstunned (stun_type)
+function Unstunned(stun_type)
 	stuns[stun_type] = false
 	if not stuns[1] and not stuns[2] and not stuns[3] then
 		StartThread (UnstunThread)
 	end
 end
 
 function script.AimWeapon(num, heading, pitch)
-
 	Signal (SIG_AIM)
 	SetSignalMask (SIG_AIM)
-
 	while disarmed do
 		Sleep(34)
 	end
-
 	local slowMult = (Spring.GetUnitRulesParam(unitID,"baseSpeedMult") or 1)
 
 	Turn (a1, x_axis, math.rad(-45),    math.rad(200)*slowMult)
@@ -85,7 +95,10 @@ function script.AimWeapon(num, heading, pitch)
 
 	WaitForTurn (turret, y_axis)
 	WaitForTurn (guns, x_axis)
-
+	if not deployed then
+		deployed = true
+		GG.Script_OffsetAimAndColVol(unitID, BASE_AIM + DEPLOY_OFFSET*0.8, BASE_OFFSET + DEPLOY_OFFSET)
+	end
 	StartThread(RestoreAfterDelay)
 	return true
 end
@@ -94,19 +107,28 @@ function script.AimFromWeapon()
 	return trueaim
 end
 
+function script.BlockShot(num)
+	Move(flare[gun_to_use], z_axis, 0)
+	return false
+end
+
 function script.QueryWeapon()
+	if not deployed then
+		return trueaim
+	end
 	return flare[gun_to_use]
 end
 
 function script.FireWeapon()
 	Move(barrel[gun_to_use], z_axis, -15)
 	EmitSfx(flare[gun_to_use], 1024)
 	Move(barrel[gun_to_use], z_axis, 0, 40)
+	Move(flare[gun_to_use], z_axis, FLARE_OFFSET)
 	gun_to_use = 3 - gun_to_use
 end
 
 local explodables = {barrel[1], barrel[2], a2, a4, turret}
-function script.Killed (recentDamage, maxHealth)
+function script.Killed(recentDamage, maxHealth)
 	local severity = recentDamage / maxHealth
 	local brutal = (severity > 0.5)
 	local effect = SFX.FALL + (brutal and (SFX.SMOKE + SFX.FIRE) or 0)

scripts/turretaaflak.lua

@@ -8,15 +8,16 @@ return { turretaaflak = {
   buildingGroundDecalType       = [[turretaaflak_aoplane.dds]],
   buildPic                      = [[turretaaflak.png]],
   category                      = [[FLOAT]],
-  collisionVolumeOffsets        = [[0 11 -4]],
-  collisionVolumeScales         = [[50 86 50]],
-  collisionVolumeType            = [[CylY]],
+  collisionVolumeOffsets        = [[0 -4 0]],
+  collisionVolumeScales         = [[50 80 50]],
+  collisionVolumeType            = [[ellipsoid]],
   corpse                        = [[DEAD]],
 
   customParams                  = {
     aim_lookahead      = 120,
-    aimposoffset       = [[0 16 0]],
+    aimposoffset       = [[0 12 0]],
     bait_level_default = 0,
+    dynamic_colvol     = [[1]],
   },
 
   explodeAs                     = [[MEDIUM_BUILDINGEX]],