Convert cnc-classic turrets/weapons to world coordinates.

2013-03-29 18:38:24 +13:00
parent 67df893fc3
commit b9793635c8
6 changed files with 45 additions and 37 deletions
--- a/mods/cnc-classic/rules/aircraft.yaml
+++ b/mods/cnc-classic/rules/aircraft.yaml
@@ -65,7 +65,7 @@ HELI:
 		Range: 8
 	Armament:
 		Weapon: HeliAGGun
-		LegacyLocalOffset: -5,-3,0,2,0, 5,-3,0,2,0
+		LocalOffset: 128,-213,-85, 128,213,-85
 	AttackHeli:
 		FacingTolerance: 20
 	LimitedAmmo:
@@ -107,7 +107,7 @@ ORCA:
 		Range: 8
 	Armament:
 		Weapon: OrcaAGMissiles
-		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-classic/rules/defaults.yaml
+++ b/mods/cnc-classic/rules/defaults.yaml
@@ -117,7 +117,6 @@
 	Buildable:
 		Queue: Infantry
 	TakeCover:
-		LegacyOffset: 0,-2,0,4
 	RenderInfantryProne:
 	AttackMove:
 	Passenger:
--- a/mods/cnc-classic/rules/infantry.yaml
+++ b/mods/cnc-classic/rules/infantry.yaml
@@ -41,7 +41,7 @@ E2:
 		HP: 50
 	Armament:
 		Weapon: Grenade
-		LegacyLocalOffset: 0,0,0,-10,0
+		LocalOffset: 0,0,427
 		FireDelay: 15
 	AttackFrontal:
 	RenderInfantryProne:
@@ -81,7 +81,7 @@ E3:
 	# range value is 1 in C&C, but OpenRA renders vision slightly differently
 	Armament:
 		Weapon: Rockets
-		LegacyLocalOffset: 1,-6,0,-8,0
+		LocalOffset: 256,43,341
 		FireDelay: 5
 	AttackFrontal:
 	RenderInfantryProne:
@@ -107,7 +107,7 @@ E4:
 		HP: 70
 	Armament:
 		Weapon: Flamethrower
-		LegacyLocalOffset: 0,-2,2,-4,0
+		LocalOffset: 85,0,171
 		FireDelay: 3
 	AttackFrontal:
 	WithMuzzleFlash:
@@ -140,7 +140,7 @@ E5:
 		HP: 70
 	Armament:
 		Weapon: Chemspray
-		LegacyLocalOffset: 0,-2,2,-9
+		LocalOffset: 85,0,384
 		FireDelay: 3
 	AttackFrontal:
 	WithMuzzleFlash:
--- a/mods/cnc-classic/rules/ships.yaml
+++ b/mods/cnc-classic/rules/ships.yaml
@@ -18,10 +18,10 @@ BOAT:
 		Range: 7
 	Turreted:
 		ROT: 7
-		LegacyOffset: 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-classic/rules/structures.yaml
+++ b/mods/cnc-classic/rules/structures.yaml
@@ -556,11 +556,12 @@ OBLI:
 	# (Range of Obelisk laser is 7.5)
 	RenderBuildingCharge:
 		ChargeAudio: obelpowr.aud
+		QuantizedFacings: 8
 	Turreted:
 		ROT:255
-		LegacyOffset: 0,0,-2,-17
 	Armament:
 		Weapon: Laser
+		LocalOffset: 0,0,725
 		FireDelay: 8
 	AttackTurreted:
 	AutoTarget:
@@ -666,7 +667,7 @@ GUN:
 	RenderBuildingTurreted:
 	Armament:
 		Weapon: TurretGun
-		LegacyLocalOffset: 0,4,0,-2,0
+		LocalOffset: -71,0,85
 	AttackTurreted:
 	AutoTarget:
 	-AutoTargetIgnore:
@@ -741,9 +742,11 @@ GTWR:
 	# RevealShroud range was set to equal 1 + its weapon range (due to possible rendering issues with shroud for OpenRA)
 	Armament:
 		Weapon: HighV
-		LegacyLocalOffset: 0,-6,0,0,0
+		LocalOffset: 256,0,256
 	AttackTurreted:
 	AutoTarget:
+	RenderBuilding:
+		QuantizedFacings: 8
 	-AutoTargetIgnore:
 	DetectCloaked:
 		Range: 3
@@ -752,7 +755,6 @@ GTWR:
 	WithMuzzleFlash:
 	Turreted:
 		ROT:255
-		LegacyOffset: 0,0,0,-6

 ATWR:
 	Inherits: ^Building
@@ -783,12 +785,14 @@ ATWR:
 	# RevealShroud range was set to equal its weapon range +1 (due to possible rendering issues with shroud for OpenRA)
 	Turreted:
 		ROT:255
-		LegacyOffset: 0,0,5,2
 	Armament:
 		Weapon: TowerMissle
-		LegacyLocalOffset: 7,-7,0,0,-25, -7,-7,0,0,25
+		LocalOffset: 299,299,-85, 299,-299,-85
+		LocalYaw: -100,100
 	AttackTurreted:
 	AutoTarget:
+	RenderBuilding:
+		QuantizedFacings: 8
 	-AutoTargetIgnore:
 	DetectCloaked:
 		Range: 4
--- a/mods/cnc-classic/rules/vehicles.yaml
+++ b/mods/cnc-classic/rules/vehicles.yaml
@@ -99,9 +99,10 @@ JEEP:
 	# In practice, it seems that OpenRA renders vision range differently. Will set at +2 from C&C Gold values for now to properly emulate.
 	Turreted:
 		ROT: 10
-		LegacyOffset: 0,2,0,-4
+		Offset: -85,0,171
 	Armament:
 		Weapon: MachineGun
+		OffsetModel: World
 	AttackTurreted:
 	WithMuzzleFlash:
 	RenderUnitTurreted:
@@ -134,6 +135,7 @@ APC:
 		ROT: 10
 	Armament:
 		Weapon: MachineGun
+		OffsetModel: World
 	AttackTurreted:
 	WithMuzzleFlash:
 	RenderUnitTurreted:
@@ -169,9 +171,10 @@ BGGY:
 	# In practice, it seems that OpenRA renders vision range differently. Will set at +2 from C&C Gold values for now to properly emulate.
 	Turreted:
 		ROT: 10
-		LegacyOffset: 0,1,0,-3
+		Offset: -43,0,128
 	Armament:
 		Weapon: MachineGun
+		OffsetModel: World
 	AttackTurreted:
 	WithMuzzleFlash:
 	RenderUnitTurreted:
@@ -202,7 +205,8 @@ BIKE:
 	# In practice, it seems that OpenRA renders vision range differently. Will set at +2 from C&C Gold values for now to properly emulate.
 	Armament:
 		Weapon: BikeRockets
-		LegacyLocalOffset: -4,0,0,-2,25, 4,0,0,-2,-25
+		LocalOffset: -128, -170, 170, -128, 170, 170
+		LocalYaw: 100, -100
 	AttackFrontal:
 	RenderUnit:
 	AutoTarget:
@@ -232,7 +236,7 @@ ARTY:
 	# In practice, it seems that OpenRA renders vision range differently. Will set at +2 from C&C Gold values for now to properly emulate.
 	Armament:
 		Weapon: ArtilleryShell
-		LegacyLocalOffset: 0,-7,0,-3,0
+		LocalOffset: 299, 0, 128
 	AttackFrontal:
 	RenderUnit:
 	AutoTarget:
@@ -265,7 +269,7 @@ FTNK:
 	# In practice, it seems that OpenRA renders vision range differently. Will set at +2 from C&C Gold values for now to properly emulate.
 	Armament:
 		Weapon: BigFlamer
-		LegacyLocalOffset: 2,-5,3,2,0, -2,-5,3,2,0
+		LocalOffset: 213,213,-85, 213,-213,-85
 	AttackFrontal:
 	RenderUnit:
 	AutoTarget:
@@ -300,9 +304,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:
@@ -334,9 +338,9 @@ MTNK:
 	Armament:
 	#	Weapon: 120mm
 		Weapon: 105mm
-		LegacyRecoil: 3
-		LegacyRecoilRecovery: 0.6
-		LegacyLocalOffset: 0,0,0,-1,0
+		Recoil: 128
+		RecoilRecovery: 26
+		LocalOffset: 0,0,43
 	AttackTurreted:
 	RenderUnitTurreted:
 	AutoTarget:
@@ -370,13 +374,14 @@ HTNK:
 		ROT: 2
 	Armament@PRIMARY:
 		Weapon: 120mmDual
-		LegacyLocalOffset: -5,-5,0,-10,0, 5,-5,0,-10,0
-		LegacyRecoil: 4
-		LegacyRecoilRecovery: 1
+		LocalOffset: 800, 180, 340, 800, -180, 340
+		Recoil: 170
+		RecoilRecovery: 42
 	Armament@SECONDARY:
 		Weapon: MammothMissiles
-		LegacyLocalOffset: -9,2,0,0,25, 9,2,0,0,-25
-		LegacyRecoil: 1
+		LocalOffset: -85, 384, 340, -85, -384, 340
+		LocalYaw: -100, 100
+		Recoil: 42
 	AttackTurreted:
 	RenderUnitTurreted:
 	AutoTarget:
@@ -412,10 +417,10 @@ MSAM:
 	# In practice, it seems that OpenRA renders vision range differently. Will set at +2 from C&C Gold values for now to properly emulate.
 	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:
@@ -446,14 +451,14 @@ MLRS:
 	# In practice, it seems that OpenRA renders vision range differently. Will set at +2 from C&C Gold values for now to properly emulate.
 	Turreted:
 		ROT: 5
-		LegacyOffset: 0,3,0,-3
+		Offset: -128,0,128
 	#	AlignWhenIdle: true
 	Armament@PRIMARY:
 		Weapon: HonestJohn
-		LegacyLocalOffset: -4,0,0,0,0
+		LocalOffset: 0,-171,0
 	Armament@SECONDARY:
 		Weapon: HonestJohn
-		LegacyLocalOffset: 4,0,0,0,0
+		LocalOffset:0,171,0
 	AttackFrontal:
 	RenderUnitTurretedAim:
 	AutoTarget:
@@ -490,7 +495,7 @@ STNK:
 		UncloakSound: appear1.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: