From 40c15635b22311d6def5393a7f58a07dc8764143 Mon Sep 17 00:00:00 2001
From: GoogleFrog <googl3frog@gmail.com>
Date: Mon, 17 Apr 2017 20:47:07 +1000
Subject: [PATCH] Made DDM guns not get stuck in each other.

---
 Objects3d/DDM.s3o   | Bin 86090 -> 86156 bytes
 scripts/cordoom.lua |  23 +++++++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Objects3d/DDM.s3o b/Objects3d/DDM.s3o
index 5afd9c5945b3d9ab7db04c57b10dc38827b9de2e..e67fe73e9070fb10714858867ffdc3e260f55516 100644
GIT binary patch
delta 123
zcmX@LfVF2K>jWLak^n}A8X(SKU|?VZ;+&1PNherYfUKC!OHNd^`vd_cK_CW7gE`oV
p1_p)+P9Uk|#Js%xJjcvj2F;5M49ip*875gVGROr?*9c%#0szR*7AXJ#

delta 57
zcmeBK$a-o4>jWJ^qX0$*D<IBbU|?VZVy%s~NhesDfh@VrOHNd^b7@{=U|6Qg$S}!j
JdR73V5&)f*4u1du

diff --git a/scripts/cordoom.lua b/scripts/cordoom.lua
index 6ab08209b8..97259cfe9b 100644
--- a/scripts/cordoom.lua
+++ b/scripts/cordoom.lua
@@ -8,6 +8,7 @@ local shell_2 = piece "Shell_2"
 
 -- guns
 
+local cannonAim = piece "cannonAim"
 local cannonbase = piece "CannonBase"
 local cannon = piece "Cannon"
 local flare1 = piece "flare1"
@@ -22,6 +23,7 @@ local spGetUnitRulesParam 	= Spring.GetUnitRulesParam
 local smokePiece = { shell_1, shell_2, cannonbase, heatray }
 
 --variables
+local queryPiece = cannonAim
 local heat = false
 local on = false
 --signals
@@ -168,22 +170,29 @@ function Close()
 	Spring.SetUnitArmored(unitID,true)
 end
 
-function script.Activate ()
+function script.Activate()
 	StartThread(Open)
 end
 
-function script.Deactivate ()
+function script.Deactivate()
 	on = false
 	StartThread(Close)
 end
 
 function script.Create()
+	on = true
 	StartThread(SmokeUnit, smokePiece)
 end
 
-local aimFromSet = {cannonbase, heatraybase}
+local aimFromSet = {cannonAim, heatraybase}
+
+local function AimingDone()
+	queryPiece = flare1
+	Sleep(500)
+	queryPiece = cannonAim
+end
 
-function script.AimFromWeapon(num) 
+function script.AimFromWeapon(num)
 	return aimFromSet[num] 
 end
 
@@ -201,7 +210,9 @@ function script.AimWeapon(num, heading, pitch)
 		Turn(cannonbase, x_axis, -pitch, mainPitch) 
 		WaitForTurn (shellbase, y_axis)
 		WaitForTurn (cannonbase, x_axis)
-
+		
+		StartThread(AimingDone)
+		
 		return (spGetUnitRulesParam(unitID, "lowpower") == 0)	--checks for sufficient energy in grid
 	elseif num == 2 then
 		Signal(aim2)
@@ -219,7 +230,7 @@ end
 
 function script.QueryWeapon(num)
 	if num == 1 then
-		return flare1
+		return queryPiece
 	elseif num == 2 then
 		if heat then 
 			return flare2