Convert C&C turrets/weapons to world coordinates.

2013-03-29 18:26:39 +13:00
parent 6a4caab023
commit 67df893fc3
5 changed files with 44 additions and 35 deletions
--- a/mods/cnc/rules/aircraft.yaml
+++ b/mods/cnc/rules/aircraft.yaml
@@ -70,10 +70,10 @@ HELI:
 		Range: 8
 	Armament@PRIMARY:
 		Weapon: HeliAGGun
-		LegacyLocalOffset: -5,-3,0,2,0, 5,-3,0,2,0
+		LocalOffset: 128,-213,-85, 128,213,-85
 	Armament@SECONDARY:
 		Weapon: HeliAGGun
-		LegacyLocalOffset: -5,-3,0,2,0, 5,-3,0,2,0
+		LocalOffset: 128,-213,-85, 128,213,-85
 	AttackHeli:
 		FacingTolerance: 20
 	LimitedAmmo:
@@ -123,10 +123,10 @@ ORCA:
 		Range: 8
 	Armament@PRIMARY:
 		Weapon: OrcaAGMissiles
-		LegacyLocalOffset: -4,-10,0,5,0, 4,-10,0,5,0
+		LocalOffset: 427,-171,-213, 427,171,-213
 	Armament@SECONDARY:
 		Weapon: OrcaAAMissiles
-		LegacyLocalOffset: -4,-10,0,5,0, 4,-10,0,5,0
+		LocalOffset: 427,-171,-213, 427,171,-213
 	AttackHeli:
 		FacingTolerance: 20
 	LimitedAmmo:
--- a/mods/cnc/rules/infantry.yaml
+++ b/mods/cnc/rules/infantry.yaml
@@ -43,7 +43,7 @@ E2:
 		HP: 50
 	Armament:
 		Weapon: Grenade
-		LegacyLocalOffset: 0,0,0,-10,0
+		LocalOffset: 0,0,427
 		FireDelay: 15
 	AttackFrontal:
 	RenderInfantryProne:
@@ -74,7 +74,7 @@ E3:
 		HP: 45
 	Armament:
 		Weapon: Rockets
-		LegacyLocalOffset: 1,-6,0,-8,0
+		LocalOffset: 256,43,341
 		FireDelay: 5
 	AttackFrontal:
 	RenderInfantryProne:
@@ -102,7 +102,7 @@ E4:
 		HP: 90
 	Armament:
 		Weapon: Flamethrower
-		LegacyLocalOffset: 0,-2,2,-4,0
+		LocalOffset: 85,0,171
 		FireDelay: 3
 	AttackFrontal:
 	WithMuzzleFlash:
@@ -136,7 +136,7 @@ E5:
 		HP: 90
 	Armament:
 		Weapon: Chemspray
-		LegacyLocalOffset: 0,-2,2,-9,0
+		LocalOffset: 85,0,384
 		FireDelay: 3
 	AttackFrontal:
 	WithMuzzleFlash:
--- a/mods/cnc/rules/ships.yaml
+++ b/mods/cnc/rules/ships.yaml
@@ -18,10 +18,10 @@ BOAT:
 		Range: 7
 	Turreted:
 		ROT: 7
-		LocalOffset: 0,-15,0,-4
+		Offset: 640,0,171
 	Armament:
 		Weapon: BoatMissile
-		LegacyLocalOffset: -3,-5,0,0,0, 3,-5,0,0,0, 0,-5,0,0,0
+		LocalOffset: 213,-180,0, 213,128,0, 213,0,0
 	AttackTurreted:
 	RenderGunboat:
 	AutoTarget:
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -512,7 +512,7 @@ GUN:
 	RenderBuildingTurreted:
 	Armament:
 		Weapon: TurretGun
-		LegacyLocalOffset: 0,4,0,-2,0
+		LocalOffset: -71,0,85
 	AttackTurreted:
 	AutoTarget:
 	DebugRetiliateAgainstAggressor:
@@ -593,12 +593,14 @@ OBLI:
 		ChargeAudio: obelpowr.aud
 	Armament:
 		Weapon: Laser
-		LegacyLocalOffset: 0,0,-2,-17,0
+		LocalOffset: 0,0,725
 		FireDelay: 8
 	AttackTurreted:
 	Turreted:
 		ROT:255
 	AutoTarget:
+	RenderBuilding:
+		QuantizedFacings: 8
 	DebugRetiliateAgainstAggressor:
 	DebugNextAutoTargetScanTime:
 	-AutoTargetIgnore:
@@ -631,8 +633,10 @@ GTWR:
 		Range: 7
 	Armament:
 		Weapon: HighV
-		LegacyLocalOffset: 0,-6,0,-6,0
+		LocalOffset: 256,0,256
 	AttackTurreted:
+	RenderBuilding:
+		QuantizedFacings: 8
 	AutoTarget:
 	DebugRetiliateAgainstAggressor:
 	DebugNextAutoTargetScanTime:
@@ -670,13 +674,16 @@ ATWR:
 		Type: Heavy
 	RevealsShroud:
 		Range: 9
-	Armament:
-		Weapon: TowerMissle
-		LegacyLocalOffset: 7,-7,5,2,-25, -7,-7,5,2,25
-	AttackTurreted:
 	Turreted:
 		ROT:255
+	Armament:
+		Weapon: TowerMissle
+		LocalOffset: 299,299,-85, 299,-299,-85
+		LocalYaw: -100,100
+	AttackTurreted:
 	AutoTarget:
+	RenderBuilding:
+		QuantizedFacings: 8
 	DebugRetiliateAgainstAggressor:
 	DebugNextAutoTargetScanTime:
 	-AutoTargetIgnore:
--- a/mods/cnc/rules/vehicles.yaml
+++ b/mods/cnc/rules/vehicles.yaml
@@ -102,10 +102,10 @@ APC:
 		ROT: 10
 	Armament@PRIMARY:
 		Weapon: APCGun
-		LegacyLocalOffset: 2,-2,0,-7,0, -2,-2,0,-7,0
+		LocalOffset: 85,85,299, 85,-85,299
 	Armament@SECONDARY:
 		Weapon: APCGun.AA
-		LegacyLocalOffset: 2,-2,0,-7,0, -2,-2,0,-7,0
+		LocalOffset: 85,85,299, 85,-85,299
 	AttackTurreted:
 	WithMuzzleFlash:
 	RenderUnitTurreted:
@@ -143,7 +143,7 @@ ARTY:
 		Range: 9
 	Armament:
 		Weapon: ArtilleryShell
-		LegacyLocalOffset: 0,-7,0,-3,0
+		LocalOffset: 299, 0, 128
 	AttackFrontal:
 	RenderUnit:
 	Explodes:
@@ -177,7 +177,7 @@ FTNK:
 		Range: 5
 	Armament:
 		Weapon: BigFlamer
-		LegacyLocalOffset: 5,-5,3,2,0, -5,-5,3,2,0
+		LocalOffset: 213,213,-85, 213,-213,-85
 	AttackFrontal:
 	RenderUnit:
 	AutoTarget:
@@ -213,9 +213,10 @@ BGGY:
 		Range: 7
 	Turreted:
 		ROT: 10
-		LegacyOffset: 0,1,0,-3
+		Offset: -43,0,128
 	Armament:
 		Weapon: MachineGun
+		OffsetModel: World
 	AttackTurreted:
 	WithMuzzleFlash:
 	RenderUnitTurreted:
@@ -288,9 +289,10 @@ JEEP:
 		Range: 8
 	Turreted:
 		ROT: 10
-		LegacyOffset: 0,2,0,-4
+		Offset: -85,0,171
 	Armament:
 		Weapon: MachineGun
+		OffsetModel: World
 	AttackTurreted:
 	WithMuzzleFlash:
 	RenderUnitTurreted:
@@ -325,9 +327,9 @@ LTNK:
 		ROT: 5
 	Armament:
 		Weapon: 70mm
-		LegacyRecoil: 2
-		LegacyRecoilRecovery: 0.4
-		LegacyLocalOffset: 0,3,0,-2,0
+		Recoil: 85
+		RecoilRecovery: 17
+		LocalOffset: -128,0,85
 	AttackTurreted:
 	RenderUnitTurreted:
 	AutoTarget:
@@ -363,9 +365,9 @@ MTNK:
 		ROT: 5
 	Armament:
 		Weapon: 120mm
-		LegacyRecoil: 3
-		LegacyRecoilRecovery: 0.6
-		LegacyLocalOffset: 0,0,0,-1,0
+		Recoil: 128
+		RecoilRecovery: 26
+		LocalOffset: 0,0,43
 	AttackTurreted:
 	RenderUnitTurreted:
 	AutoTarget:
@@ -451,10 +453,10 @@ MSAM:
 		Range: 10
 	Turreted:
 		ROT: 255
-		LegacyOffset: 0,6,0,-3
+		Offset: -256,0,128
 	Armament:
 		Weapon: 227mm
-		LegacyLocalOffset: 3,-5,0,0,0, -3,-5,0,0,0
+		LocalOffset: 213,128,0, 213,-128,0
 	AttackFrontal:
 	RenderUnitTurretedAim:
 	AutoTarget:
@@ -485,14 +487,14 @@ MLRS:
 		Range: 10
 	Turreted:
 		ROT: 5
-		LegacyOffset: 0,3,0,-3
+		Offset: -128,0,128
 		AlignWhenIdle: true
 	Armament@PRIMARY:
 		Weapon: Patriot
-		LegacyLocalOffset: -4,0,0,0,0
+		LocalOffset: 0,-171,0
 	Armament@SECONDARY:
 		Weapon: Patriot
-		LegacyLocalOffset: 4,0,0,0,0
+		LocalOffset:0,171,0
 	AttackTurreted:
 	RenderUnitTurretedAim:
 	AutoTarget:
@@ -534,7 +536,7 @@ STNK:
 		UncloakSound: trans1.aud
 	Armament:
 		Weapon: 227mm.stnk
-		LegacyLocalOffset: 1,-5,0,-3,0, -1,-5,0,-3,0
+		LocalOffset: 213,43,128, 213,-43,128
 	AttackFrontal:
 	RenderUnit:
 	AutoTarget: