Add selection tiers as inheritable templates

This commit is contained in:
Ivaylo Draganov
2019-07-09 00:08:07 +03:00
committed by reaperrr
parent 088919fecc
commit 93e42b0b27
17 changed files with 137 additions and 96 deletions

View File

@@ -42,6 +42,7 @@
^TRUCK:
Inherits: ^CivilianVoxelVehicle
Inherits@selection: ^SelectableSupportUnit
Valued:
Cost: 500
Tooltip:
@@ -65,6 +66,7 @@ TRUCKB:
ICBM:
Inherits: ^CivilianVoxelCrusher
Inherits@selection: ^SelectableSupportUnit
Valued:
Cost: 1400
Tooltip:

View File

@@ -179,14 +179,6 @@
AttackMove:
AssaultMoveCondition: assault-move
^FlatSelectionMode:
Selectable:
PriorityModifiers: Ctrl
^LowPrioritySelectionMode:
Selectable:
PriorityModifiers: Ctrl, Alt
^2x1Shape:
HitShape:
Type: Rectangle
@@ -305,12 +297,11 @@
Inherits@1: ^ExistsInWorld
Inherits@2: ^SpriteActor
Inherits@3: ^Cloakable
Inherits@selection: ^SelectableBuilding
Huntable:
WithTextControlGroupDecoration:
SelectionDecorations:
Palette: pips
Selectable:
Priority: 3
Targetable:
TargetTypes: Ground, Building, C4
HitShape:
@@ -546,7 +537,7 @@
Inherits@3: ^SpriteActor
Inherits@4: ^Cloakable
Inherits@CRATESTATS: ^CrateStatModifiers
Inherits@SELECTION_MODE: ^FlatSelectionMode
Inherits@selection: ^SelectableCombatUnit
Huntable:
OwnerLostAction:
Action: Kill
@@ -751,7 +742,7 @@
Inherits@4: ^Cloakable
Inherits@5: ^DamagedByVeins
Inherits@CRATESTATS: ^CrateStatModifiers
Inherits@SELECTION_MODE: ^FlatSelectionMode
Inherits@selection: ^SelectableCombatUnit
Huntable:
OwnerLostAction:
Action: Kill
@@ -856,7 +847,7 @@
^Aircraft:
Inherits@2: ^ExistsInWorld
Inherits@3: ^Cloakable
Inherits@SELECTION_MODE: ^FlatSelectionMode
Inherits@selection: ^SelectableCombatUnit
Huntable:
OwnerLostAction:
Action: Kill
@@ -950,7 +941,7 @@
Inherits@1: ^ExistsInWorld
Inherits@2: ^SpriteActor
Inherits@3: ^HealsOnTiberium
Inherits@SELECTION_MODE: ^FlatSelectionMode
Inherits@selection: ^SelectableCombatUnit
Huntable:
DrawLineToTarget:
QueuedLineWidth: 2
@@ -1085,6 +1076,7 @@
^Defense:
Inherits: ^Building
Inherits@selection: ^SelectableCombatBuilding
-GivesBuildableArea:
RenderRangeCircle:
RenderDetectionCircle:
@@ -1104,7 +1096,7 @@
Inherits@1: ^EmpDisable
Inherits@2: ^ExistsInWorld
Inherits@3: ^Cloakable
Inherits@SELECTION_MODE: ^FlatSelectionMode
Inherits@selection: ^SelectableCombatUnit
Huntable:
RenderVoxels:
RenderSprites:
@@ -1330,3 +1322,26 @@
GrantCondition@IDISABLE:
RequiresCondition: lowpower || powerdown
Condition: disabled
^SelectableCombatUnit:
Selectable:
Priority: 10
PriorityModifiers: Ctrl
^SelectableSupportUnit:
Selectable:
Priority: 8
PriorityModifiers: Ctrl, Alt
^SelectableEconomicUnit:
Selectable:
Priority: 6
PriorityModifiers: Ctrl, Alt
^SelectableCombatBuilding:
Selectable:
Priority: 4
^SelectableBuilding:
Selectable:
Priority: 2

View File

@@ -343,6 +343,7 @@ REPAIR:
WEED:
Inherits: ^Tank
Inherits@VOXELS: ^VoxelActor
Inherits@selection: ^SelectableEconomicUnit
Valued:
Cost: 1400
Tooltip:

View File

@@ -40,7 +40,7 @@ E1:
ENGINEER:
Inherits: ^Soldier
Inherits@SELECTION_MODE: ^LowPrioritySelectionMode
Inherits@selection: ^SelectableSupportUnit
Valued:
Cost: 500
Tooltip:
@@ -72,8 +72,6 @@ ENGINEER:
FactionImages:
gdi: engineer.gdi
nod: engineer.nod
Selectable:
Priority: 5
FLAMEGUY:
Inherits@1: ^ExistsInWorld

View File

@@ -1,7 +1,7 @@
MCV:
Inherits: ^Tank
Inherits@VOXELS: ^VoxelActor
Inherits@SELECTION_MODE: ^LowPrioritySelectionMode
Inherits@selection: ^SelectableSupportUnit
Buildable:
Queue: Vehicle
BuildPaletteOrder: 160
@@ -12,7 +12,6 @@ MCV:
Tooltip:
Name: Mobile Construction Vehicle
Selectable:
Priority: 3
DecorationBounds: 42,42
Health:
HP: 100000
@@ -45,7 +44,7 @@ MCV:
HARV:
Inherits: ^Tank
Inherits@VOXELS: ^VoxelActor
Inherits@SELECTION_MODE: ^LowPrioritySelectionMode
Inherits@selection: ^SelectableEconomicUnit
Valued:
Cost: 1400
Tooltip:
@@ -56,7 +55,6 @@ HARV:
Prerequisites: ~factory, proc, ~techlevel.low
Description: Collects Tiberium for processing.\n Unarmed
Selectable:
Priority: 7
Bounds: 36,36
DecorationBounds: 36,36
Harvester:
@@ -106,6 +104,7 @@ HARV:
LPST:
Inherits: ^Tank
Inherits@VOXELS: ^VoxelActor
Inherits@selection: ^SelectableSupportUnit
-AppearsOnRadar:
Buildable:
Queue: Vehicle