Improve visibility of building placement preview.

This commit is contained in:
Paul Chote
2019-05-18 09:02:35 +00:00
committed by reaperrr
parent cdad07d172
commit 3f9e4a313f
19 changed files with 79 additions and 17 deletions

View File

@@ -33,10 +33,10 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool OverridePaletteIsPlayerPalette = true; public readonly bool OverridePaletteIsPlayerPalette = true;
[Desc("Footprint types to draw underneath the actor preview.")] [Desc("Footprint types to draw underneath the actor preview.")]
public readonly PlaceBuildingCellType FootprintUnderPreview = PlaceBuildingCellType.None; public readonly PlaceBuildingCellType FootprintUnderPreview = PlaceBuildingCellType.Valid | PlaceBuildingCellType.LineBuild;
[Desc("Footprint types to draw above the actor preview.")] [Desc("Footprint types to draw above the actor preview.")]
public readonly PlaceBuildingCellType FootprintOverPreview = PlaceBuildingCellType.Valid | PlaceBuildingCellType.LineBuild | PlaceBuildingCellType.Invalid; public readonly PlaceBuildingCellType FootprintOverPreview = PlaceBuildingCellType.Invalid;
protected override IPlaceBuildingPreview CreatePreview(WorldRenderer wr, ActorInfo ai, TypeDictionary init) protected override IPlaceBuildingPreview CreatePreview(WorldRenderer wr, ActorInfo ai, TypeDictionary init)
{ {

View File

@@ -33,10 +33,10 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool SequencePaletteIsPlayerPalette = true; public readonly bool SequencePaletteIsPlayerPalette = true;
[Desc("Footprint types to draw underneath the actor preview.")] [Desc("Footprint types to draw underneath the actor preview.")]
public readonly PlaceBuildingCellType FootprintUnderPreview = PlaceBuildingCellType.None; public readonly PlaceBuildingCellType FootprintUnderPreview = PlaceBuildingCellType.Valid | PlaceBuildingCellType.LineBuild;
[Desc("Footprint types to draw above the actor preview.")] [Desc("Footprint types to draw above the actor preview.")]
public readonly PlaceBuildingCellType FootprintOverPreview = PlaceBuildingCellType.Valid | PlaceBuildingCellType.LineBuild | PlaceBuildingCellType.Invalid; public readonly PlaceBuildingCellType FootprintOverPreview = PlaceBuildingCellType.Invalid;
protected override IPlaceBuildingPreview CreatePreview(WorldRenderer wr, ActorInfo ai, TypeDictionary init) protected override IPlaceBuildingPreview CreatePreview(WorldRenderer wr, ActorInfo ai, TypeDictionary init)
{ {

View File

@@ -1,5 +1,6 @@
^Palettes: ^Palettes:
-PlayerColorPalette: -PlayerColorPalette:
-PaletteFromPlayerPaletteWithAlpha@placebuilding:
IndexedPlayerPalette: IndexedPlayerPalette:
BasePalette: terrain BasePalette: terrain
RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
@@ -15,6 +16,10 @@
GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191 GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114 Nod: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114
Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198 Neutral: 192, 164, 132, 155, 133, 197, 112, 12, 163, 132, 155, 133, 134, 197, 154, 198
PaletteFromPlayerPaletteWithAlpha@Placebuilding:
BaseName: placebuilding
Alpha: 0.65
BasePalette: player
^Vehicle: ^Vehicle:
RenderSprites: RenderSprites:

View File

@@ -700,6 +700,7 @@
Dimensions: 1,1 Dimensions: 1,1
Footprint: x Footprint: x
ActorPreviewPlaceBuildingPreview: ActorPreviewPlaceBuildingPreview:
OverridePalette: placebuilding
SoundOnDamageTransition: SoundOnDamageTransition:
DamagedSounds: xplos.aud DamagedSounds: xplos.aud
DestroyedSounds: crumble.aud DestroyedSounds: crumble.aud

View File

@@ -123,3 +123,7 @@
RotationPaletteEffect@water: RotationPaletteEffect@water:
ExcludePalettes: effect, chrome ExcludePalettes: effect, chrome
RotationBase: 32 RotationBase: 32
PaletteFromPlayerPaletteWithAlpha@placebuilding:
BaseName: placebuilding
Alpha: 0.65
BasePalette: player

View File

@@ -507,6 +507,10 @@ WEAP:
Power: Power:
Amount: -40 Amount: -40
ProvidesPrerequisite@buildingname: ProvidesPrerequisite@buildingname:
-ActorPreviewPlaceBuildingPreview:
SequencePlaceBuildingPreview:
Sequence: place
SequencePalette: placebuilding
HPAD: HPAD:
Inherits: ^BaseBuilding Inherits: ^BaseBuilding
@@ -909,6 +913,10 @@ SAM:
Amount: -20 Amount: -20
BodyOrientation: BodyOrientation:
UseClassicFacingFudge: True UseClassicFacingFudge: True
-ActorPreviewPlaceBuildingPreview:
SequencePlaceBuildingPreview:
Sequence: place
SequencePalette: placebuilding
OBLI: OBLI:
Inherits: ^Defense Inherits: ^Defense

View File

@@ -166,6 +166,8 @@ weap:
Start: 10 Start: 10
Length: 10 Length: 10
ZOffset: -1024 ZOffset: -1024
place: weapmake
Start: 19
make: weapmake make: weapmake
Length: * Length: *
Tick: 80 Tick: 80
@@ -496,6 +498,8 @@ sam:
dead: dead:
Start: 128 Start: 128
Tick: 800 Tick: 800
place:
Start: 0
make: sammake make: sammake
Length: 20 Length: 20
Tick: 30 Tick: 30

View File

@@ -2,6 +2,7 @@
-PlayerColorPalette: -PlayerColorPalette:
-PaletteFromPlayerPaletteWithAlpha@deviatorgas: -PaletteFromPlayerPaletteWithAlpha@deviatorgas:
-PaletteFromPlayerPaletteWithAlpha@cloak: -PaletteFromPlayerPaletteWithAlpha@cloak:
-PaletteFromPlayerPaletteWithAlpha@placebuilding:
IndexedPlayerPalette: IndexedPlayerPalette:
BasePalette: d2k BasePalette: d2k
BaseName: player BaseName: player
@@ -25,3 +26,7 @@
BaseName: cloak BaseName: cloak
BasePalette: player BasePalette: player
Alpha: 0.55 Alpha: 0.55
PaletteFromPlayerPaletteWithAlpha@Placebuilding:
BaseName: placebuilding
BasePalette: player
Alpha: 0.65

View File

@@ -386,6 +386,7 @@
TerrainTypes: Rock, Concrete TerrainTypes: Rock, Concrete
BuildSounds: BUILD1.WAV BuildSounds: BUILD1.WAV
ActorPreviewPlaceBuildingPreview: ActorPreviewPlaceBuildingPreview:
OverridePalette: placebuilding
RequiresBuildableArea: RequiresBuildableArea:
AreaTypes: building AreaTypes: building
Adjacent: 3 Adjacent: 3

View File

@@ -84,3 +84,7 @@
BaseName: cloak BaseName: cloak
BasePalette: player BasePalette: player
Alpha: 0.55 Alpha: 0.55
PaletteFromPlayerPaletteWithAlpha@placebuilding:
BaseName: placebuilding
BasePalette: player
Alpha: 0.65

View File

@@ -1,6 +1,7 @@
^Palettes: ^Palettes:
-PlayerColorPalette: -PlayerColorPalette:
-PaletteFromPlayerPaletteWithAlpha@cloak: -PaletteFromPlayerPaletteWithAlpha@cloak:
-PaletteFromPlayerPaletteWithAlpha@placebuilding:
IndexedPlayerPalette: IndexedPlayerPalette:
BasePalette: player BasePalette: player
BaseName: player BaseName: player
@@ -22,3 +23,7 @@
BaseName: cloak BaseName: cloak
BasePalette: player BasePalette: player
Alpha: 0.55 Alpha: 0.55
PaletteFromPlayerPaletteWithAlpha@Placebuilding:
BaseName: placebuilding
BasePalette: player
Alpha: 0.65

View File

@@ -647,6 +647,7 @@
BuildSounds: placbldg.aud, build5.aud BuildSounds: placbldg.aud, build5.aud
UndeploySounds: cashturn.aud UndeploySounds: cashturn.aud
ActorPreviewPlaceBuildingPreview: ActorPreviewPlaceBuildingPreview:
OverridePalette: placebuilding
RequiresBuildableArea: RequiresBuildableArea:
AreaTypes: building AreaTypes: building
SoundOnDamageTransition: SoundOnDamageTransition:

View File

@@ -154,6 +154,10 @@ WEAF:
HP: 150000 HP: 150000
Armor: Armor:
Type: Wood Type: Wood
-ActorPreviewPlaceBuildingPreview:
SequencePlaceBuildingPreview:
Sequence: place
SequencePalette: placebuilding
DOMF: DOMF:
Inherits: ^FakeBuilding Inherits: ^FakeBuilding

View File

@@ -119,3 +119,7 @@
ChronoshiftPaletteEffect: ChronoshiftPaletteEffect:
FlashPaletteEffect@NUKE: FlashPaletteEffect@NUKE:
Type: Nuke Type: Nuke
PaletteFromPlayerPaletteWithAlpha@placebuilding:
BaseName: placebuilding
BasePalette: player
Alpha: 0.65

View File

@@ -1073,6 +1073,10 @@ WEAP:
ReferencePoint: Top ReferencePoint: Top
ZOffset: 256 ZOffset: 256
RequiresCondition: primary RequiresCondition: primary
-ActorPreviewPlaceBuildingPreview:
SequencePlaceBuildingPreview:
Sequence: place
SequencePalette: placebuilding
FACT: FACT:
Inherits: ^Building Inherits: ^Building
@@ -1243,6 +1247,10 @@ PROC:
Type: Rectangle Type: Rectangle
TopLeft: -1536, 598 TopLeft: -1536, 598
BottomRight: -512, 1280 BottomRight: -512, 1280
-ActorPreviewPlaceBuildingPreview:
SequencePlaceBuildingPreview:
Sequence: idle
SequencePalette: placebuilding
SILO: SILO:
Inherits: ^Building Inherits: ^Building

View File

@@ -255,6 +255,8 @@ weap:
idle: idle:
damaged-idle: damaged-idle:
Start: 1 Start: 1
place: weapmake
Start: 14
make: weapmake make: weapmake
Length: * Length: *
build-top: weap3 build-top: weap3

View File

@@ -318,8 +318,11 @@
TerrainTypes: Clear, Rough, Road, DirtRoad, Green, Sand, Pavement TerrainTypes: Clear, Rough, Road, DirtRoad, Green, Sand, Pavement
UndeploySounds: cashturn.aud UndeploySounds: cashturn.aud
ActorPreviewPlaceBuildingPreview: ActorPreviewPlaceBuildingPreview:
Palette: placebuilding Palette: placefootprint
LineBuildSegmentPalette: placelinesegment LineBuildSegmentPalette: placelinesegment
OverridePalette: placebuilding
FootprintUnderPreview: Valid, LineBuild, Invalid
FootprintOverPreview: None
RequiresBuildableArea: RequiresBuildableArea:
AreaTypes: building AreaTypes: building
Adjacent: 4 Adjacent: 4
@@ -470,7 +473,7 @@
TerrainTypes: Clear, Rough, Road, DirtRoad, Green, Sand, Pavement TerrainTypes: Clear, Rough, Road, DirtRoad, Green, Sand, Pavement
UndeploySounds: cashturn.aud UndeploySounds: cashturn.aud
FootprintPlaceBuildingPreview: FootprintPlaceBuildingPreview:
Palette: placebuilding Palette: placefootprint
LineBuildSegmentPalette: placelinesegment LineBuildSegmentPalette: placelinesegment
RequiresBuildableArea: RequiresBuildableArea:
AreaTypes: building AreaTypes: building
@@ -520,8 +523,7 @@
BuildSounds: place2.aud BuildSounds: place2.aud
UndeploySounds: cashturn.aud UndeploySounds: cashturn.aud
FootprintPlaceBuildingPreview: FootprintPlaceBuildingPreview:
Palette: placebuilding Palette: placefootprint
LineBuildSegmentPalette: placelinesegment
KillsSelf: KillsSelf:
RemoveInstead: true RemoveInstead: true
RenderSprites: RenderSprites:

View File

@@ -123,14 +123,6 @@
G: 0 G: 0
B: 0 B: 0
A: 180 A: 180
PaletteFromPaletteWithAlpha@placebuilding:
Name: placebuilding
BasePalette: ra
Alpha: 0.75
PaletteFromPaletteWithAlpha@placelinesegment:
Name: placelinesegment
BasePalette: ra
Alpha: 0.4
TSShroudPalette@shroud: TSShroudPalette@shroud:
Name: shroud Name: shroud
VoxelNormalsPalette@normals: VoxelNormalsPalette@normals:
@@ -149,6 +141,18 @@
PlayerColorPalette: PlayerColorPalette:
BasePalette: player BasePalette: player
RemapIndex: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 RemapIndex: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
PaletteFromPaletteWithAlpha@placebuilding:
Name: placefootprint
BasePalette: ra
Alpha: 0.7
PaletteFromPaletteWithAlpha@placelinesegment:
Name: placelinesegment
BasePalette: ra
Alpha: 0.5
PaletteFromPlayerPaletteWithAlpha@placebuilding:
BaseName: placebuilding
BasePalette: player
Alpha: 0.55
PaletteFromPlayerPaletteWithAlpha@cloak: PaletteFromPlayerPaletteWithAlpha@cloak:
BaseName: cloak BaseName: cloak
BasePalette: player BasePalette: player

View File

@@ -376,5 +376,5 @@ EditorWorld:
EditorActorLayer: EditorActorLayer:
EditorResourceLayer: EditorResourceLayer:
EditorSelectionLayer: EditorSelectionLayer:
Palette: placebuilding Palette: placefootprint
LoadWidgetAtGameStart: LoadWidgetAtGameStart: