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

Merge pull request #8176 from pchote/fix-palette-alpha

Browse Source 
Load textures using premultiplied alpha.
This commit is contained in:
Oliver Brakmann
2015-05-24 13:15:54 +02:00
parent 88d448bf40 80a54fe4fe
commit c6c9863681
24 changed files with 230 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mods/d2k/rules/palettes.yaml
View File

@@ -49,16 +49,19 @@
G: 0
B: 0
A: 180
PaletteFromPaletteWithAlpha@effect75alpha:
Name: effect75alpha
BasePalette: effect
Alpha: 0.75
PaletteFromPaletteWithAlpha@effect50alpha:
Name: effect50alpha
BasePalette: effect
Alpha: 0.5
PaletteFromScaledPalette@starportlights:
Name: starportlights
BasePalette: d2k
AllowModifiers: false
Offset: -64
PaletteFromScaledPalette@repairlights:
Name: repairlights
BasePalette: d2k
AllowModifiers: false
Offset: -128
PaletteFromR8@shroud:
Name: shroud
Filename: DATA.R8
@@ -72,5 +75,10 @@
PlayerColorPalette:
BasePalette: d2k
RemapIndex: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
PaletteFromPlayerPaletteWithAlpha@deviatorgas:
BaseName: deviatorgas
BasePalette: player
Alpha: 0.68
Premultiply: false
PlayerHighlightPalette:

2
mods/d2k/rules/structures.yaml
View File

@@ -664,7 +664,7 @@ repair:
atreides: repair.atreides
ordos: repair.ordos
WithRepairOverlay:
Palette: repairlights
Palette: effect75alpha
Power:
Amount: -10
ProvidesPrerequisite@buildingname:

1
mods/d2k/rules/vehicles.yaml
View File

@@ -81,6 +81,7 @@ harvester:
LeavesHusk:
HuskActor: Harvester.Husk
WithHarvestAnimation:
Palette: effect50alpha
AttractsWorms:
Intensity: 700

9
mods/d2k/sequences/misc.yaml
View File

@@ -52,7 +52,7 @@ explosion:
deviator: DATA.R8
Start: 3512
Length: 23
BlendMode: SoftAdditive
BlendMode: Alpha
Tick: 80
corpse: DATA.R8
Start: 430
@@ -71,37 +71,30 @@ small_trail:
Start: 3735
Length: 4
Tick: 80
BlendMode: SoftAdditive
small_trail2:
idle: DATA.R8
Start: 3540
Length: 4
Tick: 80
BlendMode: SoftAdditive
bazooka_trail:
idle: DATA.R8
Start: 3381
Length: 4
Tick: 80
BlendMode: Translucency
Alpha: 0.75
bazooka_trail2:
idle: DATA.R8
Start: 3544
Length: 4
Tick: 80
BlendMode: Translucency
Alpha: 0.75
deviator_trail:
idle: DATA.R8
Start: 3535
Length: 5
Tick: 80
BlendMode: SoftAdditive
laserfire:
idle: DATA.R8

6
mods/d2k/sequences/structures.yaml
View File

@@ -122,14 +122,12 @@ repair.atreides:
Length: 14
Offset: -48,48
ZOffset: -1c511
BlendMode: Additive
damaged-active: DATA.R8
Start: 4746
Length: 14
Tick: 60
Offset: -48,48
ZOffset: -1c511
BlendMode: Additive
icon: DATA.R8
Start: 4096
Offset: -30,-24
@@ -157,14 +155,12 @@ repair.harkonnen:
Length: 14
Offset: -48,48
ZOffset: -1c511
BlendMode: Additive
damaged-active: DATA.R8
Start: 4746
Length: 14
Tick: 60
Offset: -48,48
ZOffset: -1c511
BlendMode: Additive
icon: DATA.R8
Start: 4097
Offset: -30,-24
@@ -192,14 +188,12 @@ repair.ordos:
Length: 14
Offset: -48,48
ZOffset: -1c511
BlendMode: Additive
damaged-active: DATA.R8
Start: 4746
Length: 14
Tick: 60
Offset: -48,48
ZOffset: -1c511
BlendMode: Additive
icon: DATA.R8
Start: 4098
Offset: -30,-24

1
mods/d2k/sequences/vehicles.yaml
View File

@@ -23,7 +23,6 @@ harvester:
Tick: 80
ZOffset: 1
BlendMode: Multiply
Alpha: 0.5
dock: DATA.R8
Start: 3370
Length: 10

6
mods/d2k/weapons.yaml
View File

@@ -33,6 +33,7 @@ Bazooka:
Image: RPG
RateOfTurn: 5
Trail: bazooka_trail
TrailPalette: effect75alpha
TrailInterval: 1
RangeLimit: 35
Warhead@1Dam: SpreadDamage
@@ -186,6 +187,7 @@ QuadRockets:
Image: RPG
RateOfTurn: 10
Trail: bazooka_trail2
TrailPalette: effect75alpha
TrailInterval: 1
Speed: 256
RangeLimit: 40
@@ -380,7 +382,7 @@ NerveGasMissile:
Inaccuracy: 1c96
Image: MISSILE
Trail: deviator_trail
TrailPalette: player
TrailPalette: deviatorgas
TrailUsePlayerPalette: true
TrailInterval: 1
Warhead@1Dam: SpreadDamage
@@ -395,7 +397,7 @@ NerveGasMissile:
SmudgeType: SandCrater, RockCrater
Warhead@3Eff: CreateEffect
Explosion: deviator
ExplosionPalette: player
ExplosionPalette: deviatorgas
UsePlayerPalette: true
ImpactSound: EXPLSML2.WAV
Warhead@4OwnerChange: ChangeOwner