Merge branch 'bleed' of https://github.com/psydev/OpenRA into bleed

This commit is contained in:
psydev
2013-04-15 16:09:23 -07:00
7 changed files with 10 additions and 16 deletions

View File

@@ -76,7 +76,6 @@ STARPORTA:
MCVA:
Inherits: ^MCV
Buildable:
Prerequisites: heavya,repair
Owner: atreides
BuiltAt: heavya
Transforms:

View File

@@ -81,7 +81,6 @@ PALACEH:
MCVH:
Inherits: ^MCV
Buildable:
Prerequisites: heavyh,repair
Owner: harkonnen
BuiltAt: heavyh
Transforms:
@@ -149,7 +148,6 @@ COMBATH:
Tooltip:
Icon: combathicon
Buildable:
Prerequisites: heavyh
Owner: harkonnen
BuiltAt: heavyh
Mobile:
@@ -259,4 +257,4 @@ SARDAUKAR:
Weapon: Vulcan
Armament@SECONDARY:
Weapon: Slung
AttackFrontal:
AttackFrontal:

View File

@@ -75,7 +75,6 @@ PALACEO:
MCVO:
Inherits: ^MCV
Buildable:
Prerequisites: heavyo,repair
Owner: ordos
BuiltAt: heavyo
Transforms:
@@ -99,7 +98,6 @@ COMBATO:
Tooltip:
Icon: combatoicon
Buildable:
Prerequisites: heavyo
Owner: ordos
BuiltAt: heavyo
RevealsShroud:
@@ -133,7 +131,6 @@ COMBATO.starport:
TRIKEO:
Inherits: ^TRIKE
Buildable:
Prerequisites: lighto
Owner: ordos
BuiltAt: lighto
Valued:
@@ -160,7 +157,6 @@ TRIKEO:
# Inherits: ^TRIKE
# Buildable:
# Queue: Starport
# Prerequisites: lighto
# Owner: ordos
# BuiltAt: starporto
# RenderUnit:
@@ -254,4 +250,4 @@ SABOTEUR:
-DebugRetiliateAgainstAggressor:
-DebugNextAutoTargetScanTime:
AttackMove:
JustMove: true
JustMove: true

View File

@@ -390,7 +390,7 @@ GUNTOWER:
Armor:
Type: Concrete
RevealsShroud:
Range: 7
Range: 8
RenderRangeCircle:
-RenderBuilding:
-AutoTargetIgnore:
@@ -447,7 +447,7 @@ ROCKETTOWER:
Armor:
Type: Concrete
RevealsShroud:
Range: 9
Range: 10
RenderRangeCircle:
-RenderBuilding:
-AutoTargetIgnore:
@@ -494,7 +494,7 @@ REPAIR:
Name: Repair Pad
Description: Repairs vehicles\n Allows construction of MCVs
Building:
Power: -25
Power: -10
Footprint: =x= =x= ===
Dimensions: 3,3
Health:

View File

@@ -22,7 +22,7 @@ Player:
BlockedAudio: NoRoom
ClassicProductionQueue@Starport:
Type: Starport
BuildSpeedModified: .2
BuildSpeedModifier: .2
LowPowerSlowdown: 2
BlockedAudio: NoRoom
QueuedAudio: OrderPlaced

View File

@@ -1,6 +1,7 @@
^MCV:
Inherits: ^Vehicle
Buildable:
Prerequisites: Heavy,repair
Queue: Armor
BuildPaletteOrder: 110
Hotkey: m
@@ -18,7 +19,7 @@
Armor:
Type: Light
Mobile:
Speed: 6
Speed: 7
Crushes: crate, infantry
RevealsShroud:
Range: 8
@@ -75,7 +76,7 @@ HARVESTER:
Armor:
Type: Heavy
Mobile:
Speed: 6
Speed: 7
Crushes: crate, infantry
RenderUnit:
Image: HARVESTER

View File

@@ -13,7 +13,7 @@ LMG:
Versus:
Wood: 40%
Light: 30%
Heavy: 15%
Heavy: 20%
Concrete: 20%
Explosion: piffs
InfDeath: 2