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: MCVA:
Inherits: ^MCV Inherits: ^MCV
Buildable: Buildable:
Prerequisites: heavya,repair
Owner: atreides Owner: atreides
BuiltAt: heavya BuiltAt: heavya
Transforms: Transforms:

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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