Shift Actor.Health onto a trait.

Known regressions:
 - cnc only
 - health bar colors
 - can't repair buildings
This commit is contained in:
Paul Chote
2010-07-30 00:01:59 +12:00
parent 1e08dc6301
commit 6fba888d45
56 changed files with 530 additions and 303 deletions

View File

@@ -145,6 +145,7 @@ V33:
BARB:
Inherits: ^Wall
Building:
Health:
HP: 100
Armor: none
Valued:
@@ -152,6 +153,7 @@ BARB:
WOOD:
Inherits: ^Wall
Building:
Health:
HP: 100
Armor: none
Valued:

View File

@@ -58,6 +58,7 @@
^Infantry:
Category: Infantry
Unit:
Health:
Armor: none
RevealsShroud:
Range: 4
@@ -119,10 +120,11 @@
^CivBuilding:
Inherits: ^Building
Building:
Repairable: false
Health:
HP: 400
Armor: wood
Building:
Repairable: false
Valued:
Description: Civilian Building
@@ -186,6 +188,7 @@
Unit:
ROT: 0
Speed: 0
Health:
HP: 140
Armor: Heavy
Husk:
@@ -201,11 +204,12 @@
Targetable:
TargetTypes: Ground, Water
BelowUnits:
Health:
HP: 1000
Building:
DamagedSound: xplos.aud
DestroyedSound: xplobig4.aud
Footprint: ______ ______ ______ ______
Dimensions: 6,4
HP: 1000
RadarColorFromTerrain:
Terrain: Road

View File

@@ -10,8 +10,9 @@ E1:
Selectable:
Bounds: 12,17,0,-6
Unit:
HP: 50
Speed: 4
Health:
HP: 50
AttackBase:
PrimaryWeapon: M16
TakeCover:
@@ -29,8 +30,9 @@ E2:
Selectable:
Bounds: 12,17,0,-6
Unit:
HP: 50
Speed: 4
Health:
HP: 50
AttackBase:
PrimaryWeapon: Grenade
PrimaryOffset: 0,0,0,-10
@@ -49,8 +51,9 @@ E3:
Selectable:
Bounds: 12,17,0,-6
Unit:
HP: 45
Speed: 3
Health:
HP: 45
AttackBase:
PrimaryWeapon: Rockets
PrimaryOffset: 0,0,0,-10
@@ -70,8 +73,9 @@ E4:
Selectable:
Bounds: 12,17,0,-6
Unit:
HP: 90
Speed: 4
Health:
HP: 90
AttackBase:
PrimaryWeapon: Flamethrower
PrimaryOffset: 0,0,0,-5
@@ -94,8 +98,9 @@ E5:
Selectable:
Bounds: 12,17,0,-6
Unit:
HP: 90
Speed: 4
Health:
HP: 90
AttackBase:
PrimaryWeapon: Chemspray
PrimaryOffset: 0,0,0,-5
@@ -118,8 +123,9 @@ E6:
Selectable:
Bounds: 12,17,0,-6
Unit:
HP: 25
Speed: 4
Health:
HP: 25
TakeCover:
Passenger:
ColorOfCargoPip: Yellow
@@ -141,8 +147,9 @@ RMBO:
Bounds: 12,17,0,-6
Voice: CommandoVoice
Unit:
HP: 200
Speed: 5
Health:
HP: 200
RevealsShroud:
Range: 5
AttackBase:
@@ -160,8 +167,9 @@ C1:
Cost: 70
Description: Technician
Unit:
HP: 20
Speed: 4
Health:
HP: 20
RevealsShroud:
Range: 2
AttackBase:
@@ -176,8 +184,9 @@ C2:
Cost: 70
Description: Technician
Unit:
HP: 20
Speed: 4
Health:
HP: 20
RevealsShroud:
Range: 2
AttackBase:
@@ -192,8 +201,9 @@ C3:
Cost: 70
Description: Technician
Unit:
HP: 20
Speed: 4
Health:
HP: 20
RevealsShroud:
Range: 2
AttackBase:
@@ -208,8 +218,9 @@ C4:
Cost: 70
Description: Technician
Unit:
HP: 20
Speed: 4
Health:
HP: 20
RevealsShroud:
Range: 2
AttackBase:
@@ -224,8 +235,9 @@ C5:
Cost: 70
Description: Technician
Unit:
HP: 20
Speed: 4
Health:
HP: 20
RevealsShroud:
Range: 2
AttackBase:
@@ -240,8 +252,9 @@ C6:
Cost: 70
Description: Technician
Unit:
HP: 20
Speed: 4
Health:
HP: 20
RevealsShroud:
Range: 2
AttackBase:
@@ -256,8 +269,9 @@ C7:
Cost: 70
Description: Technician
Unit:
HP: 20
Speed: 4
Health:
HP: 20
RevealsShroud:
Range: 2
AttackBase:
@@ -271,8 +285,9 @@ C8:
Cost: 70
Description: Technician
Unit:
HP: 20
Speed: 4
Health:
HP: 20
RevealsShroud:
Range: 2
AttackBase:
@@ -287,8 +302,9 @@ C9:
Cost: 70
Description: Technician
Unit:
HP: 20
Speed: 4
Health:
HP: 20
RevealsShroud:
Range: 2
AttackBase:
@@ -303,8 +319,9 @@ C10:
Cost: 70
Description: Technician
Unit:
HP: 20
Speed: 4
Health:
HP: 20
RevealsShroud:
Range: 2
AttackBase:

View File

@@ -8,6 +8,7 @@ FACT:
Footprint: xxx xxx xxx
Dimensions: 3,3
Capturable: true
Health:
HP: 800
Armor: wood
RevealsShroud:
@@ -31,6 +32,7 @@ NUKE:
Footprint: x_ xx
Dimensions: 2,2
Capturable: true
Health:
HP: 400
Armor: wood
RevealsShroud:
@@ -52,6 +54,7 @@ PROC.proxy:
Footprint: ___xx xxxxx xxx__ xxx__
Dimensions: 5,4
Capturable: true
Health:
HP: 900
Armor: wood
RevealsShroud:
@@ -70,6 +73,7 @@ PROC:
Footprint: ___ xxx ===
Dimensions: 3,3
Capturable: true
Health:
HP: 900
Armor: wood
RevealsShroud:
@@ -112,6 +116,7 @@ SILO:
Footprint: xx
Dimensions: 2,1
Capturable: true
Health:
HP: 300
Armor: wood
RevealsShroud:
@@ -140,6 +145,7 @@ PYLE:
Footprint: xx xx
Dimensions: 2,2
Capturable: true
Health:
HP: 800
Armor: wood
RevealsShroud:
@@ -165,6 +171,7 @@ HAND:
Footprint: __ xx xx
Dimensions: 2,3
Capturable: true
Health:
HP: 800
Armor: wood
RevealsShroud:
@@ -190,6 +197,7 @@ AFLD:
Footprint: xxxx xxxx
Dimensions: 4,2
Capturable: true
Health:
HP: 1000
Armor: heavy
RevealsShroud:
@@ -216,6 +224,7 @@ WEAP:
Footprint: ___ xxx ===
Dimensions: 3,3
Capturable: true
Health:
HP: 400
Armor: light
RevealsShroud:
@@ -243,6 +252,7 @@ HQ:
Footprint: __ xx
Dimensions: 2,2
Capturable: true
Health:
HP: 1000
Armor: wood
RevealsShroud:
@@ -267,6 +277,7 @@ NUK2:
Footprint: xx xx
Dimensions: 2,2
Capturable: true
Health:
HP: 600
Armor: wood
RevealsShroud:
@@ -288,6 +299,7 @@ FIX:
Footprint: _x_ xxx _x_
Dimensions: 3,3
Capturable: true
Health:
HP: 800
Armor: wood
RevealsShroud:
@@ -312,6 +324,7 @@ HPAD:
Footprint: xx xx
Dimensions: 2,2
Capturable: true
Health:
HP: 800
Armor: wood
RevealsShroud:
@@ -343,6 +356,7 @@ EYE:
Footprint: __ xx
Dimensions: 2,2
Capturable: true
Health:
HP: 1000
Armor: wood
RevealsShroud:
@@ -369,6 +383,7 @@ TMPL:
Footprint: ___ xxx xxx
Dimensions: 3,3
Capturable: false
Health:
HP: 2000
Armor: light
RevealsShroud:
@@ -393,6 +408,7 @@ OBLI:
Power: -150
Footprint: _ x
Dimensions: 1,2
Health:
HP: 400
Armor: light
RevealsShroud:
@@ -419,7 +435,7 @@ CYCL:
Cost: 25
Description: Chain Link Barrier
LongDesc: Stops infantry and blocks enemy fire.\nCan be crushed by tanks.
Building:
Health:
HP: 300
Armor: none
RenderBuildingWall:
@@ -436,7 +452,7 @@ SBAG:
Cost: 25
Description: Sandbag Barrier
LongDesc: Stops infantry and blocks enemy fire.\nCan be crushed by tanks.
Building:
Health:
HP: 250
Armor: none
@@ -451,7 +467,7 @@ BRIK:
Cost: 100
Description: Concrete Barrier
LongDesc: Stop units and blocks enemy fire.
Building:
Health:
HP: 1000
Armor: heavy
RenderBuildingWall:
@@ -472,6 +488,7 @@ GUN:
LongDesc: Anti-Armor base defense.\n Strong vs Tanks\n Weak vs Infantry, Aircraft
Building:
Power: -20
Health:
HP: 400
Armor: heavy
RevealsShroud:
@@ -501,6 +518,7 @@ SAM:
Power: -20
Footprint: xx
Dimensions: 2,1
Health:
HP: 400
Armor: heavy
RevealsShroud:
@@ -528,6 +546,7 @@ GTWR:
LongDesc: Basic defensive structure.\n Strong vs Infantry, Light Vehicles\n Weak vs Tanks, Aircraft
Building:
Power: -10
Health:
HP: 400
Armor: wood
RevealsShroud:
@@ -552,6 +571,7 @@ ATWR:
LongDesc: Anti-armor defensive structure.\n Strong vs Light Vehicles, Tanks\n Weak vs Infantry
Building:
Power: -20
Health:
HP: 600
Armor: light
RevealsShroud:

View File

@@ -158,6 +158,5 @@ CRATE:
SelectionShares: 5
Effect: hide-map
Unit:
HP: 1
RenderUnit:
BelowUnits:

View File

@@ -1,5 +1,5 @@
SPLIT2:
Inherits: ^Building
Inherits: ^Tree
RenderBuilding:
Palette: terrain
SeedsResource:
@@ -11,7 +11,7 @@ SPLIT2:
Terrain: Ore
SPLIT3:
Inherits: ^Building
Inherits: ^Tree
RenderBuilding:
Palette: terrain
SeedsResource:

View File

@@ -11,9 +11,10 @@ MCV:
Selectable:
Priority: 3
Unit:
Speed: 6
Health:
HP: 600
Armor: light
Speed: 6
RevealsShroud:
Range: 4
TransformsOnDeploy:
@@ -43,9 +44,10 @@ HARV:
PipColor: Green
Capacity: 28
Unit:
Speed: 6
Health:
HP: 600
Armor: light
Speed: 6
RevealsShroud:
Range: 4
RenderUnit:
@@ -61,10 +63,11 @@ APC:
Description: Armored Personnel Carrier
LongDesc: Tough infantry transport.\n Strong vs Infantry, Light Vehicles\n Weak vs Tanks, Aircraft
Unit:
HP: 200
Armor: heavy
ROT: 5
Speed: 15
Health:
HP: 200
Armor: heavy
RevealsShroud:
Range: 5
AttackBase:
@@ -90,10 +93,11 @@ ARTY:
Description: Artillery
LongDesc: Long-range artillery.\n Strong vs Infantry, Buildings\n Weak vs Tanks, Aircraft
Unit:
HP: 75
Armor: light
ROT: 2
Speed: 6
Health:
HP: 75
Armor: light
RevealsShroud:
Range: 6
AttackBase:
@@ -113,10 +117,11 @@ FTNK:
Description: Flame Tank
LongDesc: Heavily armored flame-throwing vehicle.\n Strong vs Infantry, Buildings\n Weak vs Aircraft
Unit:
HP: 300
Armor: heavy
ROT: 5
Speed: 9
Health:
HP: 300
Armor: heavy
RevealsShroud:
Range: 4
AttackBase:
@@ -137,10 +142,11 @@ BGGY:
Description: Nod Buggy
LongDesc: Fast scout & anti-infantry vehicle.\n Strong vs Infantry\n Weak vs Tanks, Aircraft
Unit:
HP: 140
Armor: light
ROT: 10
Speed: 18
Health:
HP: 140
Armor: light
RevealsShroud:
Range: 5
Turreted:
@@ -163,10 +169,11 @@ BIKE:
Description: Recon Bike
LongDesc: Fast scout vehicle, armed with \nrockets.\n Strong vs Vehicles, Aircraft\n Weak vs Infantry
Unit:
HP: 160
Armor: none
ROT: 10
Speed: 20
Health:
HP: 160
Armor: none
RevealsShroud:
Range: 7
AttackBase:
@@ -190,10 +197,11 @@ JEEP:
Description: Hum-Vee
LongDesc: Fast scout & anti-infantry vehicle.\n Strong vs Infantry\n Weak vs Tanks, Aircraft
Unit:
HP: 150
Armor: light
ROT: 10
Speed: 15
Health:
HP: 150
Armor: light
RevealsShroud:
Range: 7
Turreted:
@@ -216,9 +224,10 @@ LTNK:
Description: Light Tank
LongDesc: Light Tank, good for scouting.\n Strong vs Light Vehicles\n Weak vs Tanks, Aircraft
Unit:
Speed: 9
Health:
HP: 300
Armor: Heavy
Speed: 9
RevealsShroud:
Range: 4
Turreted:
@@ -245,9 +254,10 @@ MTNK:
Description: Medium Tank
LongDesc: General-Purpose GDI Tank.\n Strong vs Tanks, Light Vehicles\n Weak vs Infantry, Aircraft
Unit:
Speed: 9
Health:
HP: 400
Armor: heavy
Speed: 9
RevealsShroud:
Range: 5
Turreted:
@@ -274,9 +284,10 @@ HTNK:
Description: Mammoth Tank
LongDesc: Heavily armored GDI Tank.\n Strong vs Everything
Unit:
Speed: 3
Health:
HP: 600
Armor: heavy
Speed: 3
RevealsShroud:
Range: 6
Turreted:
@@ -309,9 +320,10 @@ MSAM:
Description: Rocket Launcher
LongDesc: Long range artillery.\n Strong vs Infantry, Buildings\n Weak vs Tanks, Aircraft
Unit:
Speed: 6
Health:
HP: 120
Armor: light
Speed: 6
RevealsShroud:
Range: 6
Turreted:
@@ -337,9 +349,10 @@ MLRS:
Description: SSM Launcher
LongDesc: Long range artillery.\n Strong vs Infantry, Aircraft\n Weak vs Tanks, Aircraft
Unit:
Speed: 6
Health:
HP: 120
Armor: light
Speed: 6
RevealsShroud:
Range: 10
Turreted:
@@ -361,9 +374,10 @@ STNK:
Description: Stealth Tank
LongDesc: Missile tank that can bend light around \nitself to become invisible\n Strong vs Infantry, Aircraft\n Weak vs Tanks
Unit:
Speed: 15
Health:
HP: 110
Armor: light
Speed: 15
RevealsShroud:
Range: 4
Cloak:
@@ -388,11 +402,12 @@ TRAN:
Description: Chinook Transport
LongDesc: Fast Infantry Transport Helicopter.\n Unarmed
Unit:
HP: 90
Armor: light
InitialFacing: 20
ROT: 5
Speed: 15
Health:
HP: 90
Armor: light
RevealsShroud:
Range: 8
RenderUnitRotor:
@@ -415,11 +430,12 @@ HELI:
Description: Apache Longbow
LongDesc: Helicopter Gunship with AG Missiles.\n Strong vs Buildings, Tanks\n Weak vs Infantry
Unit:
HP: 125
Armor: heavy
InitialFacing: 20
ROT: 4
Speed: 20
Health:
HP: 125
Armor: heavy
RevealsShroud:
Range: 8
AttackBase:
@@ -443,11 +459,12 @@ ORCA:
Description: Orca
LongDesc: Helicopter Gunship with AG Missiles.\n Strong vs Buildings, Tanks\n Weak vs Infantry
Unit:
HP: 125
Armor: heavy
InitialFacing: 20
ROT: 4
Speed: 20
Health:
HP: 125
Armor: heavy
RevealsShroud:
Range: 8
AttackBase:
@@ -463,10 +480,11 @@ C17:
LZRange: 1
Inherits: ^Plane
Unit:
HP: 25
Armor: light
ROT: 5
Speed: 25
Health:
HP: 25
Armor: light
Plane:
RenderUnit:
WithShadow:
@@ -480,10 +498,11 @@ C17:
A10:
Inherits: ^Plane
Unit:
HP: 60
Armor: light
ROT: 4
Speed: 25
Health:
HP: 60
Armor: light
Plane:
RenderUnit:
WithShadow: