From 0d3500ee2f2149ae395f74d8a38fb3ffda822ab9 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 21 May 2016 16:40:53 +0200 Subject: [PATCH 1/6] Fix Component Tower weapon and muzzle offsets --- mods/ts/rules/gdi-support.yaml | 8 ++++---- mods/ts/sequences/structures.yaml | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/mods/ts/rules/gdi-support.yaml b/mods/ts/rules/gdi-support.yaml index ba087a18fe..a29af4c7d9 100644 --- a/mods/ts/rules/gdi-support.yaml +++ b/mods/ts/rules/gdi-support.yaml @@ -101,7 +101,7 @@ GACTWR: UpgradeTypes: tower.vulcan UpgradeMinEnabledLevel: 1 Weapon: VulcanTower - LocalOffset: 768,85,512 + LocalOffset: 416,85,960 MuzzleSequence: muzzle MuzzleSplitFacings: 8 Armament@VULCSECONDARY: @@ -109,19 +109,19 @@ GACTWR: UpgradeMinEnabledLevel: 1 Name: secondary Weapon: VulcanTower - LocalOffset: 768,-85,512 + LocalOffset: 416,-85,960 MuzzleSequence: muzzle MuzzleSplitFacings: 8 Armament@ROCKET: UpgradeTypes: tower.rocket UpgradeMinEnabledLevel: 1 Weapon: RPGTower - LocalOffset: 512,-128,512 + LocalOffset: 192,-65,1056 Armament@SAM: UpgradeTypes: tower.sam UpgradeMinEnabledLevel: 1 Weapon: RedEye2 - LocalOffset: 512,0,512 + LocalOffset: 384,0,1200 WithMuzzleOverlay: UpgradeTypes: tower.vulcan UpgradeMinEnabledLevel: 1 diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index 4585647479..cc806133a4 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -985,27 +985,35 @@ gactwr: Facings: 32 muzzle0: mgun-n Length: * + Offset: 0, 0 UseTilesetCode: false muzzle1: mgun-nw Length: * + Offset: 0, 0 UseTilesetCode: false muzzle2: mgun-w Length: * + Offset: 0, 0 UseTilesetCode: false muzzle3: mgun-sw Length: * + Offset: 0, 0 UseTilesetCode: false muzzle4: mgun-s Length: * + Offset: 0, 0 UseTilesetCode: false muzzle5: mgun-se Length: * + Offset: 0, 0 UseTilesetCode: false muzzle6: mgun-e Length: * + Offset: 0, 0 UseTilesetCode: false muzzle7: mgun-ne Length: * + Offset: 0, 0 UseTilesetCode: false emp-overlay: emp_fx01 Length: * From 805ffaa480fb68bc242b17cef809a1ad8ae57522 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 22 May 2016 01:58:55 +0200 Subject: [PATCH 2/6] Fix TS Temple of Nod art offset --- mods/ts/sequences/structures.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index cc806133a4..16f9e57825 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -469,7 +469,7 @@ natech: natmpl: Defaults: - Offset: 0, -24 + Offset: -15, -39 UseTilesetCode: true idle: ShadowStart: 3 From f419b00cc60aa10ad6a9f746639201f43db841ad Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 22 May 2016 02:19:53 +0200 Subject: [PATCH 3/6] Fix TS stealth tank firing offsets --- mods/ts/rules/nod-vehicles.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index 8d4ec54367..e9af85ff3a 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -344,7 +344,7 @@ STNK: UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage Armament: Weapon: Dragon - LocalOffset: 213,43,128, 213,-43,128 + LocalOffset: 213,43,298, 213,-43,298 AttackFrontal: Voice: Attack AutoTarget: From f29904d77afc179782697f6fbcc82bda4d69de1c Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 22 May 2016 02:20:19 +0200 Subject: [PATCH 4/6] Set firing offset and enable muzzle flash on TS Titan --- mods/ts/rules/gdi-vehicles.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml index eebeea85ef..6c86b32f3b 100644 --- a/mods/ts/rules/gdi-vehicles.yaml +++ b/mods/ts/rules/gdi-vehicles.yaml @@ -149,6 +149,7 @@ MMCH: Range: 8c0 BodyOrientation: QuantizedFacings: 32 + UseClassicPerspectiveFudge: False WithInfantryBody: Turreted: TurnSpeed: 5 @@ -158,11 +159,14 @@ MMCH: Recoils: no Armament: Weapon: 120mm - Recoil: 127 - RecoilRecovery: 26 + MuzzleSequence: muzzle + Recoil: 128 + RecoilRecovery: 32 + LocalOffset: 640, 192, 832 + WithMuzzleOverlay: RenderVoxels: WithVoxelBarrel: - LocalOffset: -128, 85, 256 + LocalOffset: -64, 64, 256 AutoTarget: Selectable: Bounds: 30, 42, 0, -8 From 8ee019a80a17d67e653f5632a40020f35ec722fe Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 28 May 2016 21:43:45 +0200 Subject: [PATCH 5/6] Fix Nod SAM Site sequence and armament offsets The turret sequence in particular was located too far to the left. --- mods/ts/rules/nod-support.yaml | 2 +- mods/ts/sequences/structures.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml index c034b8928c..f07d0754ef 100644 --- a/mods/ts/rules/nod-support.yaml +++ b/mods/ts/rules/nod-support.yaml @@ -156,7 +156,7 @@ NASAM: Recoils: no Armament: Weapon: RedEye2 - LocalOffset: 512,0,512 + LocalOffset: 384,0,576 Power: Amount: -30 SelectionDecorations: diff --git a/mods/ts/sequences/structures.yaml b/mods/ts/sequences/structures.yaml index 16f9e57825..1a0af9240d 100644 --- a/mods/ts/sequences/structures.yaml +++ b/mods/ts/sequences/structures.yaml @@ -838,7 +838,7 @@ nalasr: nasam: Defaults: - Offset: 0, -12 + Offset: 2, -12 UseTilesetCode: true idle: ShadowStart: 3 @@ -851,7 +851,7 @@ nasam: Tick: 400 turret: gtctwr_d Facings: 32 - Offset: -4, 0 + Offset: 0, 0 make: ntsammk Length: 8 ShadowStart: 8 From fcec4eb4b5129632e2f1c8905decd353223bc164 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 28 May 2016 22:15:16 +0200 Subject: [PATCH 6/6] Fixed InitialFacings of TS defenses to match original --- mods/ts/rules/gdi-support.yaml | 2 +- mods/ts/rules/nod-support.yaml | 10 +++++----- mods/ts/rules/nod-vehicles.yaml | 2 +- mods/ts/rules/shared-support.yaml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mods/ts/rules/gdi-support.yaml b/mods/ts/rules/gdi-support.yaml index a29af4c7d9..bfe111b303 100644 --- a/mods/ts/rules/gdi-support.yaml +++ b/mods/ts/rules/gdi-support.yaml @@ -74,7 +74,7 @@ GACTWR: UpgradeMinEnabledLevel: 1 Turreted: TurnSpeed: 10 - InitialFacing: 50 + InitialFacing: 224 AttackTurreted: UpgradeTypes: tower UpgradeMinEnabledLevel: 1 diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml index f07d0754ef..9ddc79e748 100644 --- a/mods/ts/rules/nod-support.yaml +++ b/mods/ts/rules/nod-support.yaml @@ -68,7 +68,7 @@ NALASR: Range: 3c0 Turreted: TurnSpeed: 10 - InitialFacing: 300 + InitialFacing: 224 Offset: 298,-171,288 AttackTurreted: Armament: @@ -150,7 +150,7 @@ NASAM: RangeCircleType: aa Turreted: TurnSpeed: 10 - InitialFacing: 50 + InitialFacing: 224 AttackTurreted: WithSpriteTurret: Recoils: no @@ -176,8 +176,8 @@ GAARTY: Range: 9c0 Turreted: TurnSpeed: 5 - InitialFacing: 128 - Offset: 0,0,171 + InitialFacing: 96 + Offset: 0,0,256 Armament: Weapon: 155mm LocalOffset: 811,0,0 @@ -187,7 +187,7 @@ GAARTY: RenderVoxels: LightAmbientColor: 0.4, 0.4, 0.4 WithVoxelBarrel: - LocalOffset: 0,0,-512 + LocalOffset: 0,0,-256 WithVoxelTurret: Transforms: IntoActor: art2 diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index e9af85ff3a..d9c04b2ceb 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -125,7 +125,7 @@ TTNK: Turreted: TurnSpeed: 6 Turret: deployed - InitialFacing: 128 + InitialFacing: 160 Offset: -20, -130, 180 WithVoxelBarrel: Armament: deployed diff --git a/mods/ts/rules/shared-support.yaml b/mods/ts/rules/shared-support.yaml index 1274600234..a11b01cb61 100644 --- a/mods/ts/rules/shared-support.yaml +++ b/mods/ts/rules/shared-support.yaml @@ -24,7 +24,7 @@ NAPULS: Range: 8c0 Turreted: TurnSpeed: 10 - InitialFacing: 300 + InitialFacing: 224 AttackTurreted: Armament: Weapon: EMPulseCannon