diff --git a/mods/sp/languages/rules/en.ftl b/mods/sp/languages/rules/en.ftl index cdac22264..99c15b3be 100644 --- a/mods/sp/languages/rules/en.ftl +++ b/mods/sp/languages/rules/en.ftl @@ -2559,6 +2559,9 @@ colossus-desc = Heavy duty alien. - Crush class: crushable only by Epics - Does not receive damage from tiberium fields and all radiations + Upgrades: + - Vinifera Catalysts + mastermind-name = Mastermind mastermind-desc = The commando unit of Scrin born with the ability to mind control everyone and everything. diff --git a/mods/sp/rules/creeps.yaml b/mods/sp/rules/creeps.yaml index 44be833b9..607d7cee5 100644 --- a/mods/sp/rules/creeps.yaml +++ b/mods/sp/rules/creeps.yaml @@ -499,6 +499,8 @@ JFISH: RequiresCondition: attack DamagedByTintedCells@Colossus: RequiresCondition: attack + DamagedByTintedCells@ColossusBlue: + RequiresCondition: attack DamagedByTintedCells@Default: Damage: -30 ExplodesAlsoTransported@VisceroidDefault: diff --git a/mods/sp/rules/defaults.yaml b/mods/sp/rules/defaults.yaml index 051e23c7e..811125228 100644 --- a/mods/sp/rules/defaults.yaml +++ b/mods/sp/rules/defaults.yaml @@ -1017,11 +1017,17 @@ DamageInterval: 25 LayerName: OrangeRadiation DamagedByTintedCells@Colossus: - Damage: 60 + Damage: 30 DamageTypes: EnergyDeath DamageLevel: 5 DamageInterval: 25 LayerName: ColossusRadiation + DamagedByTintedCells@ColossusBlue: + Damage: 60 + DamageTypes: EnergyDeath + DamageLevel: 5 + DamageInterval: 25 + LayerName: ColossusBlueRadiation ^AffectedByAPAmmunition: ActorStatValues: @@ -2136,6 +2142,8 @@ RequiresCondition: WebDisable || empdisable DamagedByTintedCells@Colossus: RequiresCondition: WebDisable || empdisable + DamagedByTintedCells@ColossusBlue: + RequiresCondition: WebDisable || empdisable RA2Chronoshiftable: -TerrainsAndDeathTypes: @@ -2469,6 +2477,8 @@ RequiresCondition: empdisable DamagedByTintedCells@Colossus: RequiresCondition: empdisable + DamagedByTintedCells@ColossusBlue: + RequiresCondition: empdisable RA2Chronoshiftable: -TerrainsAndDeathTypes: diff --git a/mods/sp/rules/environment/world.yaml b/mods/sp/rules/environment/world.yaml index 7e8f41fff..9c9f1b342 100644 --- a/mods/sp/rules/environment/world.yaml +++ b/mods/sp/rules/environment/world.yaml @@ -248,24 +248,29 @@ World: Darkest: 16 Brightest: 256 TintedCellsLayer@BlueRadiation: - Color: 220099 Name: BlueRadiation + Color: 220099 UpdateDelay: 75 FadeoutDelay: 150 Darkest: 16 Brightest: 256 TintedCellsLayer@OrangeRadiation: - Color: EFFF00 Name: OrangeRadiation + Color: EFFF00 UpdateDelay: 25 FadeoutDelay: 150 Darkest: 8 TintedCellsLayer@ColossusRadiation: + Name: ColossusRadiation + FadeoutDelay: 25 + Darkest: 16 + Brightest: 128 + TintedCellsLayer@ColossusBlueRadiation: + Name: ColossusBlueRadiation Color: 220099 FadeoutDelay: 25 Darkest: 16 Brightest: 128 - Name: ColossusRadiation WeaponTriggerCells@catalyst: Name: catalystLayer #ShowDebugOverlay: true diff --git a/mods/sp/rules/infantry.yaml b/mods/sp/rules/infantry.yaml index 52c47a18d..a9a8d2725 100644 --- a/mods/sp/rules/infantry.yaml +++ b/mods/sp/rules/infantry.yaml @@ -1981,6 +1981,7 @@ COLOSSI: Inherits: ^ScrinSoldier Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMoveWithBerserkable Inherits@EXPERIENCE: ^GainsExperience + Inherits@VINIFERA: ^AffectedByViniferaCatalysts Inherits@AImicroManagable: ^AImicroManagable Buildable: Queue: Infantry.Shared, Infantry.Scrin @@ -2006,6 +2007,7 @@ COLOSSI: Passenger: RequireForceMoveCondition: !undeployed -DamagedByTintedCells@Colossus: + -DamagedByTintedCells@ColossusBlue: SpawnActorOnDeath@conversion: Actor: chusk SpawnActorOnDeath@conversionUpg: @@ -2050,7 +2052,12 @@ COLOSSI: SparkWeapon: ColossiBlast Amount: 1 Interval: 10 - RequiresCondition: deployed && !WebDisable + RequiresCondition: deployed && !vinifera_catalysts && !WebDisable + SpawnSparks@deploy-blue: + SparkWeapon: ColossiBlastBlue + Amount: 1 + Interval: 10 + RequiresCondition: deployed && vinifera_catalysts && !WebDisable WithIdleOverlay@deploy: Sequence: colossideploy Palette: scrinenergystuffs @@ -2724,6 +2731,8 @@ MOTH: RequiresCondition: deployed || WebDisable || empdisable DamagedByTintedCells@Colossus: RequiresCondition: deployed || WebDisable || empdisable + DamagedByTintedCells@ColossusBlue: + RequiresCondition: deployed || WebDisable || empdisable Armament@1: Weapon: LurkerProj PauseOnCondition: WebDisable || empdisable || !deployed diff --git a/mods/sp/rules/vehicles.yaml b/mods/sp/rules/vehicles.yaml index 17da898b9..f594d921c 100644 --- a/mods/sp/rules/vehicles.yaml +++ b/mods/sp/rules/vehicles.yaml @@ -3033,6 +3033,8 @@ LIMPED: RequiresCondition: deployed || empdisable DamagedByTintedCells@Colossus: RequiresCondition: deployed || empdisable + DamagedByTintedCells@ColossusBlue: + RequiresCondition: deployed || empdisable -ChangesHealth@veinholedrain: -ExternalCondition@veinholedrain: -WithIdleOverlay@veinholedrain: diff --git a/mods/sp/weapons/scrweapons.yaml b/mods/sp/weapons/scrweapons.yaml index 86da679e9..59259b4e7 100644 --- a/mods/sp/weapons/scrweapons.yaml +++ b/mods/sp/weapons/scrweapons.yaml @@ -102,6 +102,11 @@ ColossiBlast: LayerName: ColossusRadiation AirThreshold: 8c0 +ColossiBlastBlue: + Inherits: ColossiBlast + Warhead@8Radio: CreateTintedCells + LayerName: ColossusBlueRadiation + FloatTesla: ReloadDelay: 75 Range: 7c0