From 50b484df56a75e4587c718fc5700e5a833bd2052 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 18 Oct 2020 00:17:51 +0200
Subject: [PATCH] Fix RA/TD defense turrets facing issues

By using WithSpriteTurret instead of
WithEmbeddedTurretSpriteBody.
---
 mods/cnc/rules/structures.yaml     |  6 ++++--
 mods/cnc/sequences/structures.yaml |  5 +++--
 mods/ra/rules/structures.yaml      | 18 ++++++++++++------
 mods/ra/sequences/structures.yaml  | 25 ++++++++++++++-----------
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml
index 12e7bbcdae..93034520ae 100644
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -853,8 +853,10 @@ GUN:
 		TurnSpeed: 48
 		InitialFacing: 192
 		RealignDelay: -1
-	-WithSpriteBody:
-	WithEmbeddedTurretSpriteBody:
+		RequiresCondition: !build-incomplete
+	WithSpriteTurret:
+		RequiresCondition: !build-incomplete
+		Recoils: false
 	Armament:
 		Weapon: TurretGun
 		LocalOffset: 512,0,112
diff --git a/mods/cnc/sequences/structures.yaml b/mods/cnc/sequences/structures.yaml
index ec7811d77c..6b2717348b 100644
--- a/mods/cnc/sequences/structures.yaml
+++ b/mods/cnc/sequences/structures.yaml
@@ -435,14 +435,15 @@ wood:
 		Length: 16
 
 gun:
-	idle:
+	idle: gunmake # Empty first frame. We need WithSpriteBody for the make anim, and WSB needs at least a placeholder default sequence to work
+	turret:
 		Facings: 32
 		UseClassicFacings: True
 	recoil:
 		Start: 32
 		Facings: 32
 		UseClassicFacings: True
-	damaged-idle:
+	damaged-turret:
 		Start: 64
 		Facings: 32
 		UseClassicFacings: True
diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml
index 79bff4e00f..4b6acc705d 100644
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -604,8 +604,10 @@ AGUN:
 		TurnSpeed: 60
 		InitialFacing: 832
 		RealignDelay: -1
-	-WithSpriteBody:
-	WithEmbeddedTurretSpriteBody:
+		RequiresCondition: !build-incomplete
+	WithSpriteTurret:
+		RequiresCondition: !build-incomplete
+		Recoils: false
 	Armament:
 		Weapon: ZSU-23
 		LocalOffset: 520,100,450, 520,-150,450
@@ -819,8 +821,10 @@ GUN:
 		TurnSpeed: 48
 		InitialFacing: 192
 		RealignDelay: -1
-	-WithSpriteBody:
-	WithEmbeddedTurretSpriteBody:
+		RequiresCondition: !build-incomplete
+	WithSpriteTurret:
+		RequiresCondition: !build-incomplete
+		Recoils: false
 	Armament:
 		Weapon: TurretGun
 		LocalOffset: 512,0,112
@@ -919,8 +923,10 @@ SAM:
 		TurnSpeed: 120
 		InitialFacing: 0
 		RealignDelay: -1
-	-WithSpriteBody:
-	WithEmbeddedTurretSpriteBody:
+		RequiresCondition: !build-incomplete
+	WithSpriteTurret:
+		RequiresCondition: !build-incomplete
+		Recoils: false
 	Armament:
 		Weapon: Nike
 		LocalOffset: 0,0,320
diff --git a/mods/ra/sequences/structures.yaml b/mods/ra/sequences/structures.yaml
index 8305edb15f..4f5308d5d5 100644
--- a/mods/ra/sequences/structures.yaml
+++ b/mods/ra/sequences/structures.yaml
@@ -378,16 +378,17 @@ fix:
 	fake-icon: fixficon
 
 gun:
-	idle:
+	idle: gunmake # Empty first frame. We need WithSpriteBody for the make anim, and WSB needs at least a placeholder default sequence to work
+	make: gunmake
+		Length: *
+	turret:
 		Facings: 32
 		UseClassicFacings: True
 	recoil:
 		Start: 32
 		Facings: 32
 		UseClassicFacings: True
-	make: gunmake
-		Length: *
-	damaged-idle:
+	damaged-turret:
 		Start: 64
 		Facings: 32
 		UseClassicFacings: True
@@ -404,7 +405,11 @@ gun:
 	icon: gunicon
 
 agun:
-	idle:
+	idle: gunmake # Empty first frame (agunmake has no empty frames). We need WithSpriteBody for the make anim, and WSB needs at least a placeholder default sequence to work
+	make: agunmake
+		Length: *
+		Offset: 0,-13
+	turret:
 		Facings: 32
 		UseClassicFacings: True
 		Offset: 0,-13
@@ -413,10 +418,7 @@ agun:
 		Facings: 32
 		UseClassicFacings: True
 		Offset: 0,-13
-	make: agunmake
-		Length: *
-		Offset: 0,-13
-	damaged-idle:
+	damaged-turret:
 		Start: 64
 		Facings: 32
 		UseClassicFacings: True
@@ -435,11 +437,12 @@ agun:
 	icon: agunicon
 
 sam:
-	idle: sam2
+	idle: gunmake # Empty first frame (sammake has no empty frames). We need WithSpriteBody for the make anim, and WSB needs at least a placeholder default sequence to work
+	turret: sam2
 		Facings: 32
 		UseClassicFacings: True
 		Offset: -1,-2
-	damaged-idle: sam2
+	damaged-turret: sam2
 		Start: 34
 		Facings: 32
 		UseClassicFacings: True