diff --git a/mods/ca/bits/icbmsmoke.shp b/mods/ca/bits/icbmsmoke.shp new file mode 100644 index 0000000000..8a8bb5e5cc Binary files /dev/null and b/mods/ca/bits/icbmsmoke.shp differ diff --git a/mods/ca/bits/smokey2.shp b/mods/ca/bits/smokey2.shp index bd96b10e27..82645baef2 100644 Binary files a/mods/ca/bits/smokey2.shp and b/mods/ca/bits/smokey2.shp differ diff --git a/mods/ca/bits/smokey3.shp b/mods/ca/bits/smokey3.shp new file mode 100644 index 0000000000..562fead2b1 Binary files /dev/null and b/mods/ca/bits/smokey3.shp differ diff --git a/mods/ca/bits/thwkmgrey.shp b/mods/ca/bits/thwkmgrey.shp new file mode 100644 index 0000000000..621b1f5fdb Binary files /dev/null and b/mods/ca/bits/thwkmgrey.shp differ diff --git a/mods/ca/bits/thwktfullgrey.shp b/mods/ca/bits/thwktfullgrey.shp new file mode 100644 index 0000000000..8fc4642fba Binary files /dev/null and b/mods/ca/bits/thwktfullgrey.shp differ diff --git a/mods/ca/rules/civilian.yaml b/mods/ca/rules/civilian.yaml index e3ec199f80..0a2f430445 100644 --- a/mods/ca/rules/civilian.yaml +++ b/mods/ca/rules/civilian.yaml @@ -526,6 +526,72 @@ OILB: Condition: has-been-captured RequiresCondition: !is-neutral +OILR: + Inherits: ^TechBuilding + Inherits@2: ^Cloakable + Inherits@shape: ^3x2Shape + HitShape: + UseTargetableCellsOffsets: false + TargetableOffsets: 0,0,0, 840,0,0, 840,-1024,0, 420,768,0, -840,0,0, -840,-1024,0, -840,1024,0 + Selectable: + Priority: 0 + Bounds: 3072, 2048 + OwnerLostAction: + Action: ChangeOwner + Building: + Footprint: xxx xxx === + Dimensions: 3,3 + LocalCenterOffset: 0,-512,0 + Health: + HP: 80000 + RevealsShroud: + Range: 4c0 + CaptureManager: + Capturable: + Types: building + CapturableProgressBar: + CapturableProgressBlink: + InstantlyRepairable: + Tooltip: + Name: Oil Refinery + TooltipDescription@ally: + Description: Provides 10% unit discount. + ValidRelationships: Ally + TooltipDescription@other: + Description: Capture to receive additional funds. + ValidRelationships: Neutral, Enemy + Explodes: + Weapon: BarrelExplode + SpawnActorOnDeath: + Actor: OILB.Husk + OwnerType: InternalName + -Explodes: + AppearsOnMapPreview: + GrantConditionOnDamageState: + Condition: damaged + WithIdleOverlay@flare: + Sequence: flare + Offset: 2078,-480,0 + Palette: effect + RequiresCondition: !damaged + WithIdleOverlay@damaged-flare: + Sequence: damaged-flare + Offset: 2500,250,0 + Palette: effect + RequiresCondition: damaged + GrantConditionIfOwnerIsNeutral: + Condition: is-neutral + GivesCashOnCapture@defloration: + Amount: 300 + RequiresCondition: !has-been-captured + GivesCashOnCapture@subsequent: + Amount: 100 + RequiresCondition: has-been-captured + GrantDelayedCondition: + Delay: 1 + Condition: has-been-captured + RequiresCondition: !is-neutral + V20: Inherits: ^DesertCivBuilding Building: diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml index bd3796936f..4cfb78032b 100644 --- a/mods/ca/rules/vehicles.yaml +++ b/mods/ca/rules/vehicles.yaml @@ -5796,9 +5796,8 @@ V3: MinAirborneAltitude: 256 AirborneCondition: airborne LeavesTrailsCA: - Image: smokey2 - Palette: tseffect-ignore-lighting-alpha75 - MovingInterval: 3 + Image: smokey3 + MovingInterval: 2 Type: CenterPosition Offsets: -200, 0, 0 MissileSpawnerSlave: @@ -6862,7 +6861,7 @@ THWK: Inherits@SLOWCRUSH: ^SlowedByCrushing RenderSprites: Valued: - Cost: 1500 + Cost: 1700 Tooltip: Name: Tomahawk Launcher UpdatesPlayerStatistics: @@ -6877,13 +6876,13 @@ THWK: Strengths: • Strong vs Buildings, Defenses, Infantry, Light Armor Weaknesses: • Weak vs Heavy Armor\n• Cannot attack Aircraft\n• Has difficulty hitting moving targets\n• Cannot fire while moving Mobile: - Speed: 43 - PauseOnCondition: aiming || being-captured || empdisable || being-warped || driver-dead || notmobile + Speed: 44 + PauseOnCondition: launching || aiming || being-captured || empdisable || being-warped || driver-dead || notmobile BlockedCursor: move Health: - HP: 30000 + HP: 25000 Armor: - Type: Light + Type: Heavy RevealsShroud: MinRange: 4c0 Range: 5c0 @@ -6891,10 +6890,10 @@ THWK: RevealsShroud@GAPGEN: Range: 4c0 Turreted: - TurnSpeed: 3 + TurnSpeed: 4 RealignDelay: 0 Armament@TARGETTER: - Weapon: HonestJohnTargeting + Weapon: THLauncher AttackTurreted: TargetFrozenActors: True ForceFireIgnoresActors: True @@ -6909,8 +6908,7 @@ THWK: RespawnTicks: 249 LoadedCondition: loaded LaunchingCondition: launching - Exit: - SpawnOffset: 0,-128,0 + SpawnOffset: 0,256,128 WithSpawnerMasterPipsDecoration: Position: BottomLeft Margin: 4, 3 @@ -6945,20 +6943,21 @@ TH: Name: Tomahawk Missile Health: HP: 5000 - BallisticMissile: + CruiseMissile: LaunchAngle: 128 Speed: 165 + MaxAltitude: 2c511 + MaxTargetMovement: 21c0 LeavesTrailsCA: - Image: smokey2 - Palette: tseffect-ignore-lighting-alpha75 - MovingInterval: 3 + Image: icbmsmoke + MovingInterval: 2 Type: CenterPosition - Offsets: -200, 0, 0 + Offsets: -200, 0, -50 MissileSpawnerSlave: SpawnedExplodes: - Weapon: V3Weapon + Weapon: THWeapon EmptyWeapon: VisualExplodeHusk RequiresCondition: !airborne Explodes: - Weapon: V3ExplodeAirborne + Weapon: THExplodeAirborne RequiresCondition: airborne diff --git a/mods/ca/sequences/misc.yaml b/mods/ca/sequences/misc.yaml index d715d7c551..d7c58e43f2 100644 --- a/mods/ca/sequences/misc.yaml +++ b/mods/ca/sequences/misc.yaml @@ -815,7 +815,7 @@ v3: th: idle: - Filename: thwkm.shp + Filename: thwkmgrey.shp Facings: 32 ZOffset: 2046 @@ -993,10 +993,23 @@ smokey: smokey2: idle: Filename: smokey2.shp - tick: 200 Length: * ZOffset: 1023 +smokey3: + idle: + Filename: smokey3.shp + Length: * + Frames: 0, 1, 2, 4, 5, 6, 7, 8, 9, 6, 5, 6, 7, 8, 9, 10, 11, 12 + ZOffset: 1023 + +icbmsmoke: + idle: + Filename: icbmsmoke.shp + Length: * + Frames: 0, 1, 2, 4, 5, 6, 7, 8, 4, 6, 5, 6, 7, 8, 9, 10 + ZOffset: 1023 + firetrail: idle: Filename: fire4.shp diff --git a/mods/ca/sequences/vehicles.yaml b/mods/ca/sequences/vehicles.yaml index 6e0ac10fae..adda8853b8 100644 --- a/mods/ca/sequences/vehicles.yaml +++ b/mods/ca/sequences/vehicles.yaml @@ -2329,11 +2329,11 @@ thwk: Facings: 32 UseClassicFacings: True turret: - Filename: thwktfull.shp + Filename: thwktfullgrey.shp Facings: 32 UseClassicFacings: True turret1: - Filename: thwktfull.shp + Filename: thwktfullgrey.shp Facings: 32 UseClassicFacings: True turret0: diff --git a/mods/ca/weapons/explosions.yaml b/mods/ca/weapons/explosions.yaml index 16f6817add..b886ee7d45 100644 --- a/mods/ca/weapons/explosions.yaml +++ b/mods/ca/weapons/explosions.yaml @@ -236,6 +236,24 @@ V3ExplodeAirborne: Explosions: artillery_explosion ImpactSounds: kaboom15.aud +THExplodeAirborne: + Inherits: ^Explosion + Warhead@1Dam: SpreadDamage + Range: 0, 4c0, 5c0 + Falloff: 100, 100, 0 + Damage: 6750 + ValidTargets: Ground, Water, Trees + Versus: + None: 10 + Wood: 55 + Light: 30 + Heavy: 20 + Concrete: 100 + DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath + Warhead@2Eff: CreateEffect + Explosions: artillery_explosion + ImpactSounds: kaboom15.aud + BuildingExplode: Warhead@2Eff: CreateEffect Explosions: building, building_napalm, large_explosion, self_destruct, large_napalm diff --git a/mods/ca/weapons/missiles.yaml b/mods/ca/weapons/missiles.yaml index e40853caf8..c04ec61c90 100644 --- a/mods/ca/weapons/missiles.yaml +++ b/mods/ca/weapons/missiles.yaml @@ -1024,6 +1024,43 @@ V3Weapon: Explosions: large_splash ImpactSounds: splashl1.aud, splashl2.aud +THWeapon: + Inherits: ^AntiGroundMissile + -Report: + ValidTargets: Ground, Trees, Water + Warhead@1Dam: SpreadDamage + Spread: 341 + Damage: 3400 + Falloff: 1000, 448, 192, 50, 18, 7, 0 + ValidTargets: Ground, Water, Trees + Versus: + None: 90 + Wood: 100 + Light: 65 + Heavy: 25 + Concrete: 60 + DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath, FlakVestMitigated + Warhead@antiHeavySplash: SpreadDamage + Damage: 3400 + Spread: 448 + Falloff: 1000, 448, 192, 50, 18, 7, 0 + ValidTargets: Vehicle, Husk + Versus: + Heavy: 35 + None: 0 + Wood: 0 + Light: 5 + Concrete: 0 + Brick: 0 + DamageTypes: SmallExplosionDeath + Warhead@3Eff: CreateEffect + ImpactSounds: xplobig4.aud + Explosions: building, building2 + ValidTargets: Ground, Air, Ship, Trees, ICBM + Warhead@4EffWater: CreateEffect + Explosions: large_splash + ImpactSounds: splashl1.aud, splashl2.aud + KatyushaRockets: Inherits: ^AntiGroundMissile ReloadDelay: 240 @@ -2038,81 +2075,4 @@ RocketShells: Gravity: 0 CruiseAltitude: 2c0 Inaccuracy: 128 - AllowSnapping: true - -Tomahawk: - ReloadDelay: 130 - Range: 16c0 - MinRange: 3c0 - Report: rocket2.aud - Projectile: Bullet - Blockable: false - Shadow: true - Inaccuracy: 0c511 - Image: thwkm - Palette: temptd - TrailImage: smokey - TrailDelay: 3 - Speed: 210 - LaunchAngle: 37 - Warhead@1Dam: SpreadDamage - Spread: 512 - Damage: 600 - Falloff: 500, 368, 135, 50, 18, 7, 0 - Versus: - None: 100 - Wood: 100 - Concrete: 80 - Light: 70 - Heavy: 35 - Brick: 5 - DamageTypes: Prone50Percent, TriggerProne, FireDeath, FlakVestMitigatedMinor - Warhead@2Dam: SpreadDamage - Spread: 512 - Damage: 600 - Falloff: 500, 368, 135, 50, 18, 7, 0 - Delay: 3 - Versus: - None: 100 - Wood: 100 - Concrete: 80 - Light: 70 - Heavy: 35 - Brick: 5 - DamageTypes: Prone50Percent, TriggerProne, FireDeath, FlakVestMitigatedMinor - Warhead@3Dam: SpreadDamage - Spread: 512 - Damage: 600 - Falloff: 500, 368, 135, 50, 18, 7, 0 - Delay: 6 - Versus: - None: 100 - Wood: 100 - Concrete: 80 - Light: 70 - Heavy: 35 - Brick: 5 - DamageTypes: Prone50Percent, TriggerProne, FireDeath, FlakVestMitigatedMinor - Warhead@4Dam: SpreadDamage - Spread: 512 - Damage: 600 - Falloff: 500, 368, 135, 50, 18, 7, 0 - Delay: 9 - Versus: - None: 100 - Wood: 100 - Concrete: 80 - Light: 70 - Heavy: 35 - Brick: 5 - DamageTypes: Prone50Percent, TriggerProne, FireDeath, FlakVestMitigatedMinor - Warhead@2Smu: LeaveSmudge - SmudgeType: Scorch - Warhead@3Eff: CreateEffect - Explosions: large_napalm - ImpactSounds: firebl3.aud - Warhead@Flames: FireCluster - Weapon: BurnFx - RandomClusterCount: 5 - Dimensions: 3,3 - Footprint: xxx xxx xxx \ No newline at end of file + AllowSnapping: true \ No newline at end of file diff --git a/mods/ca/weapons/other.yaml b/mods/ca/weapons/other.yaml index 52cc05b139..a7e2ccc3b6 100644 --- a/mods/ca/weapons/other.yaml +++ b/mods/ca/weapons/other.yaml @@ -2032,6 +2032,24 @@ V3Launcher: Heavy: 0 Brick: 0 +THLauncher: + ReloadDelay: 250 + Range: 21c511 + MinRange: 6c0 + Report: tomahawk.aud + ValidTargets: Ground, Water + Projectile: InstantHit + Warhead@1Dam: TargetDamage + ValidTargets: Ground, Water + Damage: 50000 + Versus: + None: 0 + Wood: 0 + Concrete: 0 + Light: 0 + Heavy: 0 + Brick: 0 + ICBMLauncher: ReloadDelay: 275 Range: 25c0