Merge remote-tracking branch 'scott/bleed'

Conflicts:
	OpenRA.Mods.RA/Missions/Allies01Script.cs
This commit is contained in:
Chris Forbes
2012-06-25 08:45:16 +12:00
4 changed files with 288 additions and 225 deletions

Binary file not shown.

View File

@@ -305,6 +305,27 @@ C2:
ProximityCaptor:
Types:CivilianInfantry
EINSTEIN:
Inherits: ^Infantry
Selectable:
Voice: EinsteinVoice
Bounds: 12,17,0,-9
Valued:
Cost: 10
Tooltip:
Name: Prof. Einstein
Health:
HP: 25
Mobile:
Speed: 5
RevealsShroud:
Range: 2
-AutoTarget:
AttackMove:
JustMove: true
ProximityCaptor:
Types:CivilianInfantry
SHOK:
Inherits: ^Infantry
Buildable:

View File

@@ -1877,6 +1877,45 @@ c2:
Length: 6
Facings: 8
einstein:
stand:
Start: 0
Facings: 8
panic-run:
Start: 8
Length: 6
Facings: 8
panic-stand:
Start: 8
Length: 6
Facings: 8
run:
Start: 56
Length: 6
Facings: 8
die1:
Start: 115
Length: 8
die2:
Start: 123
Length: 8
die3:
Start: 135
Length: 12
die4:
Start: 147
Length: 17
die5:
Start: 123
Length: 8
die6: electro
Start: 0
Length: *
die-crushed: corpse1
Start: 0
Length: 6
Tick: 1600
parabomb:
open:
Start: 0