epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13080 from reaperrr/fix-ts-effectlighting

Browse Source 
Make TS explosions + muzzle flashes unaffected by global lighting
This commit is contained in:
Paul Chote
2017-04-17 21:14:44 +01:00
committed by GitHub
parent 2548e62e31 882b5da20d
commit c6d8957307
12 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mods/ts/rules/civilian-vehicles.yaml
View File

@@ -24,6 +24,7 @@
Weapon: 120mmx Weapon: 120mmx
LocalOffset: 500,60,360, 500,-85,360 LocalOffset: 500,60,360, 500,-85,360
MuzzleSequence: muzzle MuzzleSequence: muzzle
MuzzlePalette: effect-ignore-lighting
Armament@SECONDARY: Armament@SECONDARY:
Weapon: MammothTusk Weapon: MammothTusk
LocalOffset: 0,200,410, 0,-200,410 LocalOffset: 0,200,410, 0,-200,410

2
mods/ts/rules/gdi-support.yaml
View File

@@ -95,6 +95,7 @@ GACTWR:
Weapon: VulcanTower Weapon: VulcanTower
LocalOffset: 416,85,960 LocalOffset: 416,85,960
MuzzleSequence: muzzle MuzzleSequence: muzzle
MuzzlePalette: effect-ignore-lighting
MuzzleSplitFacings: 8 MuzzleSplitFacings: 8
Armament@VULCSECONDARY: Armament@VULCSECONDARY:
RequiresCondition: tower.vulcan RequiresCondition: tower.vulcan
@@ -102,6 +103,7 @@ GACTWR:
Weapon: VulcanTower Weapon: VulcanTower
LocalOffset: 416,-85,960 LocalOffset: 416,-85,960
MuzzleSequence: muzzle MuzzleSequence: muzzle
MuzzlePalette: effect-ignore-lighting
MuzzleSplitFacings: 8 MuzzleSplitFacings: 8
Armament@ROCKET: Armament@ROCKET:
RequiresCondition: tower.rocket RequiresCondition: tower.rocket

1
mods/ts/rules/gdi-vehicles.yaml
View File

@@ -185,6 +185,7 @@ MMCH:
Armament: Armament:
Weapon: 120mm Weapon: 120mm
MuzzleSequence: muzzle MuzzleSequence: muzzle
MuzzlePalette: effect-ignore-lighting
Recoil: 128 Recoil: 128
RecoilRecovery: 32 RecoilRecovery: 32
LocalOffset: 640, 192, 832 LocalOffset: 640, 192, 832

1
mods/ts/rules/nod-support.yaml
View File

@@ -207,6 +207,7 @@ GAARTY:
Weapon: 155mm Weapon: 155mm
LocalOffset: 811,0,0 LocalOffset: 811,0,0
MuzzleSequence: muzzle MuzzleSequence: muzzle
MuzzlePalette: effect-ignore-lighting
BodyOrientation: BodyOrientation:
QuantizedFacings: 32 QuantizedFacings: 32
RenderVoxels: RenderVoxels:

5
mods/ts/rules/nod-vehicles.yaml
View File

@@ -26,6 +26,7 @@ BGGY:
Weapon: RaiderCannon Weapon: RaiderCannon
LocalOffset: 0,-43,384, 0,43,384 LocalOffset: 0,-43,384, 0,43,384
MuzzleSequence: muzzle MuzzleSequence: muzzle
MuzzlePalette: effect-ignore-lighting
MuzzleSplitFacings: 8 MuzzleSplitFacings: 8
AttackFrontal: AttackFrontal:
Voice: Attack Voice: Attack
@@ -102,11 +103,13 @@ TTNK:
LocalOffset: 288,0,256 LocalOffset: 288,0,256
RequiresCondition: !rank-elite RequiresCondition: !rank-elite
MuzzleSequence: muzzle MuzzleSequence: muzzle
MuzzlePalette: effect-ignore-lighting
Armament@ELITE: Armament@ELITE:
Weapon: 120mmx Weapon: 120mmx
LocalOffset: 288,0,256 LocalOffset: 288,0,256
RequiresCondition: rank-elite RequiresCondition: rank-elite
MuzzleSequence: muzzle MuzzleSequence: muzzle
MuzzlePalette: effect-ignore-lighting
WithMuzzleOverlay: WithMuzzleOverlay:
RevealsShroud: RevealsShroud:
RequiresCondition: !inside-tunnel RequiresCondition: !inside-tunnel
@@ -154,6 +157,7 @@ TTNK:
LocalOffset: 384,0,256 LocalOffset: 384,0,256
RequiresCondition: !rank-elite RequiresCondition: !rank-elite
MuzzleSequence: muzzle MuzzleSequence: muzzle
MuzzlePalette: effect-ignore-lighting
Armament@deployedElite: Armament@deployedElite:
Name: deployed Name: deployed
Turret: deployed Turret: deployed
@@ -161,6 +165,7 @@ TTNK:
LocalOffset: 384,0,256 LocalOffset: 384,0,256
RequiresCondition: rank-elite RequiresCondition: rank-elite
MuzzleSequence: muzzle MuzzleSequence: muzzle
MuzzlePalette: effect-ignore-lighting
Armor@deployed: Armor@deployed:
Type: Concrete Type: Concrete
RequiresCondition: deployed RequiresCondition: deployed

17
mods/ts/rules/palettes.yaml
View File

@@ -41,6 +41,9 @@
PaletteFromFile@effect: PaletteFromFile@effect:
Name: effect Name: effect
Filename: anim.pal Filename: anim.pal
PaletteFromFile@effect-nolite:
Name: effect-ignore-lighting
Filename: anim.pal
PaletteFromPaletteWithAlpha@effectalpha25: PaletteFromPaletteWithAlpha@effectalpha25:
Name: effectalpha25 Name: effectalpha25
Alpha: 0.25 Alpha: 0.25
@@ -53,6 +56,18 @@
Name: effectalpha75 Name: effectalpha75
Alpha: 0.75 Alpha: 0.75
BasePalette: effect BasePalette: effect
PaletteFromPaletteWithAlpha@effect-nolite-alpha25:
Name: effect-ignore-lighting-alpha25
Alpha: 0.25
BasePalette: effect-ignore-lighting
PaletteFromPaletteWithAlpha@effect-nolite-alpha50:
Name: effect-ignore-lighting-alpha50
Alpha: 0.5
BasePalette: effect-ignore-lighting
PaletteFromPaletteWithAlpha@effect-nolite-alpha75:
Name: effect-ignore-lighting-alpha75
Alpha: 0.75
BasePalette: effect-ignore-lighting
PaletteFromFile@sidebar: PaletteFromFile@sidebar:
Name: sidebar Name: sidebar
Filename: sidebar-nod|sidebar.pal Filename: sidebar-nod|sidebar.pal
@@ -127,3 +142,5 @@
Alpha: 0.55 Alpha: 0.55
PlayerHighlightPalette: PlayerHighlightPalette:
MenuPaletteEffect: MenuPaletteEffect:
GlobalLightingPaletteEffect:
ExcludePalettes: cursor, chrome, colorpicker, fog, shroud, alpha, effect-ignore-lighting, effect-ignore-lighting-alpha25, effect-ignore-lighting-alpha50, effect-ignore-lighting-alpha75

2
mods/ts/weapons/ballisticweapons.yaml
View File

@@ -21,7 +21,7 @@
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect Warhead@2Eff: CreateEffect
Explosions: medium_clsn Explosions: medium_clsn
ExplosionPalette: effectalpha75 ExplosionPalette: effect-ignore-lighting-alpha75
ImpactSounds: expnew14.aud ImpactSounds: expnew14.aud
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect

2
mods/ts/weapons/energyweapons.yaml
View File

@@ -105,7 +105,7 @@ SonicZap:
ValidTargets: Ground ValidTargets: Ground
Warhead@2Eff: CreateEffect Warhead@2Eff: CreateEffect
Explosions: large_explosion Explosions: large_explosion
ExplosionPalette: effectalpha75 ExplosionPalette: effect-ignore-lighting-alpha75
ImpactSounds: expnew12.aud ImpactSounds: expnew12.aud
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect

6
mods/ts/weapons/explosions.yaml
View File

@@ -11,7 +11,7 @@
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect Warhead@2Eff: CreateEffect
Explosions: large_twlt Explosions: large_twlt
ExplosionPalette: effectalpha75 ExplosionPalette: effect-ignore-lighting-alpha75
ImpactSounds: expnew09.aud ImpactSounds: expnew09.aud
Warhead@4Smu: LeaveSmudge Warhead@4Smu: LeaveSmudge
SmudgeType: MediumCrater SmudgeType: MediumCrater
@@ -34,7 +34,7 @@ UnitExplodeSmall:
BuildingExplosions: BuildingExplosions:
Warhead@1Eff: CreateEffect Warhead@1Eff: CreateEffect
Explosions: building, large_bang, large_brnl, verylarge_clsn, large_tumu Explosions: building, large_bang, large_brnl, verylarge_clsn, large_tumu
ExplosionPalette: effectalpha75 ExplosionPalette: effect-ignore-lighting-alpha75
Warhead@2Smu: LeaveSmudge Warhead@2Smu: LeaveSmudge
SmudgeType: MediumCrater SmudgeType: MediumCrater
@@ -61,5 +61,5 @@ Demolish:
DamageTypes: DefaultDeath DamageTypes: DefaultDeath
Warhead@2Eff: CreateEffect Warhead@2Eff: CreateEffect
Explosions: large_twlt Explosions: large_twlt
ExplosionPalette: effectalpha75 ExplosionPalette: effect-ignore-lighting-alpha75
ImpactSounds: expnew09.aud ImpactSounds: expnew09.aud

1
mods/ts/weapons/missiles.yaml
View File

@@ -35,6 +35,7 @@
DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
Warhead@2Eff: CreateEffect Warhead@2Eff: CreateEffect
Explosions: small_clsn Explosions: small_clsn
ExplosionPalette: effect-ignore-lighting-alpha75
ImpactSounds: expnew12.aud ImpactSounds: expnew12.aud
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect

4
mods/ts/weapons/otherweapons.yaml
View File

@@ -47,7 +47,7 @@ Bomb:
DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
Warhead@2Eff: CreateEffect Warhead@2Eff: CreateEffect
Explosions: large_explosion Explosions: large_explosion
ExplosionPalette: effectalpha75 ExplosionPalette: effect-ignore-lighting-alpha75
ImpactSounds: expnew09.aud ImpactSounds: expnew09.aud
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
@@ -130,7 +130,7 @@ Veins:
DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
Warhead@2Eff: CreateEffect Warhead@2Eff: CreateEffect
Explosions: tiny_twlt Explosions: tiny_twlt
ExplosionPalette: effectalpha75 ExplosionPalette: effect-ignore-lighting-alpha75
InvalidImpactTypes: Water InvalidImpactTypes: Water
Warhead@3EffWater: CreateEffect Warhead@3EffWater: CreateEffect
Explosions: small_watersplash Explosions: small_watersplash

14
mods/ts/weapons/superweapons.yaml
View File

@@ -77,23 +77,23 @@ IonCannon:
Delay: 3 Delay: 3
Warhead@4Effect: CreateEffect Warhead@4Effect: CreateEffect
Explosions: ionbeam Explosions: ionbeam
ExplosionPalette: effectalpha75 ExplosionPalette: effect-ignore-lighting-alpha75
ImpactSounds: ion1.aud ImpactSounds: ion1.aud
Warhead@5Effect: CreateEffect Warhead@5Effect: CreateEffect
Explosions: ionbeam2 Explosions: ionbeam2
ExplosionPalette: effectalpha75 ExplosionPalette: effect-ignore-lighting-alpha75
Warhead@6Effect: CreateEffect Warhead@6Effect: CreateEffect
Explosions: ionbeam3 Explosions: ionbeam3
ExplosionPalette: effectalpha75 ExplosionPalette: effect-ignore-lighting-alpha75
Warhead@7Effect: CreateEffect Warhead@7Effect: CreateEffect
Explosions: ionbeam4 Explosions: ionbeam4
ExplosionPalette: effectalpha75 ExplosionPalette: effect-ignore-lighting-alpha75
Warhead@8Effect: CreateEffect Warhead@8Effect: CreateEffect
Explosions: ionbeam5 Explosions: ionbeam5
ExplosionPalette: effectalpha75 ExplosionPalette: effect-ignore-lighting-alpha75
Warhead@9Effect: CreateEffect Warhead@9Effect: CreateEffect
Explosions: ionbeam6 Explosions: ionbeam6
ExplosionPalette: effectalpha75 ExplosionPalette: effect-ignore-lighting-alpha75
EMPulseCannon: EMPulseCannon:
ReloadDelay: 100 ReloadDelay: 100
@@ -107,6 +107,7 @@ EMPulseCannon:
Image: pulsball Image: pulsball
Warhead@1Eff: CreateEffect Warhead@1Eff: CreateEffect
Explosions: pulse_explosion Explosions: pulse_explosion
ExplosionPalette: effect-ignore-lighting-alpha75
Warhead@emp: GrantExternalCondition Warhead@emp: GrantExternalCondition
Range: 4c0 Range: 4c0
Duration: 250 Duration: 250
@@ -124,6 +125,7 @@ ClusterMissile:
DamageTypes: Prone50Percent, TriggerProne, FireDeath DamageTypes: Prone50Percent, TriggerProne, FireDeath
Warhead@SoundEffect0: CreateEffect Warhead@SoundEffect0: CreateEffect
Explosions: large_explosion Explosions: large_explosion
ExplosionPalette: effect-ignore-lighting-alpha75
ImpactSounds: expnew19.aud ImpactSounds: expnew19.aud
Warhead@ResourceDestruction0: DestroyResource Warhead@ResourceDestruction0: DestroyResource
Size: 1 Size: 1