Merge pull request #3063 from pchote/repairable-bridges

Repairable bridges, closes #2619
This commit is contained in:
Matthias Mailänder
2013-04-15 05:49:56 -07:00
41 changed files with 704 additions and 200 deletions

View File

@@ -145,6 +145,12 @@ BRIDGE1:
Building:
Footprint: ____ ____ ____ ____
Dimensions: 4,4
FreeActor@north:
Actor: bridgehut
SpawnOffset: 2,0
FreeActor@south:
Actor: bridgehut
SpawnOffset: 0,2
BRIDGE2:
Inherits: ^Bridge
@@ -154,6 +160,12 @@ BRIDGE2:
Building:
Footprint: _____ _____ _____ _____ _____
Dimensions: 5,5
FreeActor@north:
Actor: bridgehut
SpawnOffset: 0,0
FreeActor@south:
Actor: bridgehut
SpawnOffset: 2,2
BRIDGE3:
Inherits: ^Bridge
@@ -163,6 +175,12 @@ BRIDGE3:
Building:
Footprint: ______ ______ ______ ______ ______
Dimensions: 6,5
FreeActor@north:
Actor: bridgehut
SpawnOffset: 3,0
FreeActor@south:
Actor: bridgehut
SpawnOffset: 1,2
BRIDGE4:
Inherits: ^Bridge
@@ -172,6 +190,23 @@ BRIDGE4:
Building:
Footprint: ______ ______ ______ ______
Dimensions: 6,4
FreeActor@north:
Actor: bridgehut
SpawnOffset: 1,0
FreeActor@south:
Actor: bridgehut
SpawnOffset: 3,2
BRIDGEHUT:
Building:
Footprint: __ __
Dimensions: 2,2
Selectable:
Selectable: false
Bounds: 48,48
BridgeHut:
TargetableBuilding:
TargetTypes: BridgeHut
C1:
Inherits: ^CivInfantry

View File

@@ -208,7 +208,7 @@
Selectable:
Priority: 3
TargetableBuilding:
TargetTypes: Ground
TargetTypes: Ground, C4
Armor:
Type: Wood
RepairableBuilding:
@@ -399,6 +399,3 @@
SoundOnDamageTransition:
DamagedSound: xplos.aud
DestroyedSound: xplobig4.aud
Building:
Footprint: ______ ______ ______ ______
Dimensions: 6,4

View File

@@ -182,6 +182,7 @@ E6:
Passenger:
PipType: Yellow
EngineerRepair:
RepairsBridges:
Captures:
CaptureTypes: building, husk
-AutoTarget:

View File

@@ -302,6 +302,12 @@ BRIDGE1:
Building:
Footprint: ____ ____ ____ ____
Dimensions: 4,4
FreeActor@north:
Actor: bridgehut
SpawnOffset: 2,0
FreeActor@south:
Actor: bridgehut
SpawnOffset: 0,2
BRIDGE2:
Inherits: ^Bridge
@@ -311,6 +317,12 @@ BRIDGE2:
Building:
Footprint: _____ _____ _____ _____ _____
Dimensions: 5,5
FreeActor@north:
Actor: bridgehut
SpawnOffset: 0,0
FreeActor@south:
Actor: bridgehut
SpawnOffset: 2,2
BRIDGE3:
Inherits: ^Bridge
@@ -320,6 +332,12 @@ BRIDGE3:
Building:
Footprint: ______ ______ ______ ______ ______
Dimensions: 6,5
FreeActor@north:
Actor: bridgehut
SpawnOffset: 3,0
FreeActor@south:
Actor: bridgehut
SpawnOffset: 1,2
BRIDGE4:
Inherits: ^Bridge
@@ -329,6 +347,23 @@ BRIDGE4:
Building:
Footprint: ______ ______ ______ ______
Dimensions: 6,4
FreeActor@north:
Actor: bridgehut
SpawnOffset: 1,0
FreeActor@south:
Actor: bridgehut
SpawnOffset: 3,2
BRIDGEHUT:
Building:
Footprint: __ __
Dimensions: 2,2
Selectable:
Selectable: false
Bounds: 48,48
BridgeHut:
TargetableBuilding:
TargetTypes: BridgeHut
C1:
Inherits: ^CivInfantry

View File

@@ -225,7 +225,7 @@
Selectable:
Priority: 3
TargetableBuilding:
TargetTypes: Ground
TargetTypes: Ground, C4
Armor:
Type: Wood
RepairableBuilding:
@@ -267,7 +267,6 @@
Sellable:
Capturable:
CapturableBar:
C4Demolishable:
DebugMuzzlePositions:
^CivBuilding:
@@ -339,7 +338,7 @@
Adjacent: 7
TerrainTypes: Clear,Road
TargetableBuilding:
TargetTypes: Ground
TargetTypes: Ground, C4
Wall:
CrushClasses: wall
CrushSound: sandbag2.aud
@@ -356,7 +355,6 @@
RelativeToTopLeft: yes
AutoTargetIgnore:
Sellable:
C4Demolishable:
^Tree:
Tooltip:
@@ -419,10 +417,7 @@
TargetTypes: Ground, Water
BelowUnits:
Health:
# HP: 500
HP: 500
SoundOnDamageTransition:
DamagedSound: xplos.aud
DestroyedSound: xplobig4.aud
Building:
Footprint: ______ ______ ______ ______
Dimensions: 6,4

View File

@@ -166,6 +166,7 @@ E6:
Passenger:
PipType: Yellow
EngineerRepair:
RepairsBridges:
Captures:
CaptureTypes: building, husk
-AutoTarget:

View File

@@ -215,7 +215,7 @@
Selectable:
Priority: 2
TargetableBuilding:
TargetTypes: Ground
TargetTypes: Ground, C4
Building:
Dimensions: 1,1
Footprint: x
@@ -263,6 +263,5 @@
Types:Building
Sellable:
GivesBounty:
C4Demolishable:
DebugMuzzlePositions:
Bib:

View File

@@ -353,7 +353,7 @@ WALL:
#Selectable:
# Priority: 1
TargetableBuilding:
TargetTypes: Ground
TargetTypes: Ground, C4
RenderBuildingWall:
HasMakeAnimation: false
#GivesExperience:

View File

@@ -232,6 +232,9 @@ BR1:
DamagedTemplate: 236
DestroyedTemplate: 237
SouthOffset: 0,2
FreeActor:
Actor: bridgehut
SpawnOffset: 2,0
BR2:
Inherits: ^Bridge
@@ -240,6 +243,9 @@ BR2:
DamagedTemplate: 239
DestroyedTemplate: 240
NorthOffset: 3,0
FreeActor:
Actor: bridgehut
SpawnOffset: 1,1
BR3:
Inherits: ^Bridge
@@ -264,6 +270,12 @@ BRIDGE1:
Building:
Footprint: _____ _____ _____
Dimensions: 5,3
FreeActor@north:
Actor: bridgehut
SpawnOffset: 2,-1
FreeActor@south:
Actor: bridgehut
SpawnOffset: 0,1
BRIDGE2:
Inherits: ^Bridge
@@ -273,4 +285,21 @@ BRIDGE2:
DestroyedTemplate: 134
Building:
Footprint: _____ _____
Dimensions: 5,2
Dimensions: 5,2
FreeActor@north:
Actor: bridgehut
SpawnOffset: 0,-1
FreeActor@south:
Actor: bridgehut
SpawnOffset: 2,1
BRIDGEHUT:
Building:
Footprint: __ __
Dimensions: 2,2
Selectable:
Selectable: false
Bounds: 48,48
BridgeHut:
TargetableBuilding:
TargetTypes: BridgeHut

View File

@@ -83,7 +83,7 @@
Selectable:
Voice: GenericVoice
TargetableUnit:
TargetTypes: Ground
TargetTypes: Ground, Disguise
RenderInfantry:
AutoTarget:
AttackMove:
@@ -164,7 +164,7 @@
Selectable:
Priority: 3
TargetableBuilding:
TargetTypes: Ground
TargetTypes: Ground, C4, DemoTruck
Building:
Dimensions: 1,1
Footprint: x
@@ -210,7 +210,7 @@
Selectable:
Priority: 1
TargetableBuilding:
TargetTypes: Ground
TargetTypes: Ground, C4, DemoTruck
RenderBuildingWall:
HasMakeAnimation: false
Palette: terrain

View File

@@ -162,6 +162,7 @@ E6:
Passenger:
PipType: Yellow
EngineerRepair:
RepairsBridges:
Captures:
Sabotage: yes
TakeCover:

View File

@@ -246,7 +246,8 @@ BARL:
AutoTargetIgnore:
Armor:
Type: Light
-C4Demolishable:
TargetableBuilding:
TargetTypes: Ground, DemoTruck
BRL3:
Inherits: ^TechBuilding
@@ -261,7 +262,8 @@ BRL3:
AutoTargetIgnore:
Armor:
Type: Light
-C4Demolishable:
TargetableBuilding:
TargetTypes: Ground, DemoTruck
MISS:
Inherits: ^TechBuilding
@@ -320,6 +322,9 @@ BR1:
DamagedTemplate: 236
DestroyedTemplate: 237
SouthOffset: 0,2
FreeActor:
Actor: bridgehut
SpawnOffset: 2,0
BR2:
Inherits: ^Bridge
@@ -328,6 +333,9 @@ BR2:
DamagedTemplate: 239
DestroyedTemplate: 240
NorthOffset: 3,0
FreeActor:
Actor: bridgehut
SpawnOffset: 1,1
BR3:
Inherits: ^Bridge
@@ -352,6 +360,12 @@ BRIDGE1:
Building:
Footprint: _____ _____ _____
Dimensions: 5,3
FreeActor@north:
Actor: bridgehut
SpawnOffset: 2,-1
FreeActor@south:
Actor: bridgehut
SpawnOffset: 0,1
BRIDGE2:
Inherits: ^Bridge
@@ -362,6 +376,12 @@ BRIDGE2:
Building:
Footprint: _____ _____
Dimensions: 5,2
FreeActor@north:
Actor: bridgehut
SpawnOffset: 0,-1
FreeActor@south:
Actor: bridgehut
SpawnOffset: 2,1
SBRIDGE1:
Inherits: ^SVBridge
@@ -372,6 +392,13 @@ SBRIDGE1:
Building:
Footprint: ___ ___
Dimensions: 3,2
FreeActor@north:
Actor: bridgehut.small
SpawnOffset: 1,0
FreeActor@south:
Actor: bridgehut.small
SpawnOffset: 1,1
SBRIDGE2:
Inherits: ^SHBridge
Bridge:
@@ -381,6 +408,13 @@ SBRIDGE2:
Building:
Footprint: __ __ __
Dimensions: 2,3
FreeActor@west:
Actor: bridgehut.small
SpawnOffset: 0,1
FreeActor@east:
Actor: bridgehut.small
SpawnOffset: 1,1
SBRIDGE3:
Inherits: ^STDBridge
Bridge:
@@ -390,6 +424,13 @@ SBRIDGE3:
Building:
Footprint: ____ ____
Dimensions: 4,2
FreeActor@north:
Actor: bridgehut
SpawnOffset: 2,-1
FreeActor@south:
Actor: bridgehut
SpawnOffset: 0,1
SBRIDGE4:
Inherits: ^STDBridge
Bridge:
@@ -399,6 +440,34 @@ SBRIDGE4:
Building:
Footprint: ____ ____
Dimensions: 4,2
FreeActor@north:
Actor: bridgehut
SpawnOffset: 0,-1
FreeActor@south:
Actor: bridgehut
SpawnOffset: 2,1
BRIDGEHUT:
Building:
Footprint: __ __
Dimensions: 2,2
Selectable:
Selectable: false
Bounds: 48,48
BridgeHut:
TargetableBuilding:
TargetTypes: BridgeHut
BRIDGEHUT.small:
Building:
Footprint: _
Dimensions: 1,1
Selectable:
Selectable: false
Bounds: 24,24
BridgeHut:
TargetableBuilding:
TargetTypes: BridgeHut
#Desert Terrain Expansion
V20:

View File

@@ -96,7 +96,7 @@
Selectable:
Voice: GenericVoice
TargetableUnit:
TargetTypes: Ground
TargetTypes: Ground, Disguise
RenderInfantry:
AutoTarget:
DebugRetiliateAgainstAggressor:
@@ -196,7 +196,7 @@
Selectable:
Priority: 3
TargetableBuilding:
TargetTypes: Ground
TargetTypes: Ground, C4, DemoTruck
Building:
Dimensions: 1,1
Footprint: x
@@ -227,7 +227,6 @@
AcceptsSupplies:
GivesBounty:
UpdatesPlayerStatistics:
C4Demolishable:
DebugMuzzlePositions:
^Wall:
@@ -249,7 +248,7 @@
Selectable:
Priority: 1
TargetableBuilding:
TargetTypes: Ground
TargetTypes: Ground, C4, DemoTruck
RenderBuildingWall:
HasMakeAnimation: false
Palette: terrain
@@ -262,7 +261,6 @@
Types:Wall
Sellable:
UpdatesPlayerStatistics:
C4Demolishable:
^TechBuilding:
Inherits: ^Building

View File

@@ -167,6 +167,7 @@ E6:
Passenger:
PipType: Yellow
EngineerRepair:
RepairsBridges:
Captures:
TakeCover:
-AutoTarget: