epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4616 from ScottNZ/transport

Browse Source 
Fix cargo loading/unloading
This commit is contained in:
Paul Chote
2014-02-13 23:31:16 +13:00
parent 2b674f71cd 98b158e370
commit 1ac4de9260
20 changed files with 196 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mods/cnc/rules/vehicles.yaml
View File

@@ -115,7 +115,6 @@ APC:
Types: Infantry
MaxWeight: 5
PipCount: 5
UnloadFacing: 220
LeavesHusk:
HuskActor: APC.Husk

2
mods/common/lua/actor.lua
View File

@@ -80,7 +80,7 @@ Actor.Hunt = function(actor)
end
Actor.UnloadCargo = function(actor, unloadAll)
actor:QueueActivity(OpenRA.New("UnloadCargo", { unloadAll }))
actor:QueueActivity(OpenRA.New("UnloadCargo", { actor, unloadAll }))
end
Actor.Harvest = function(actor)

1
mods/d2k/rules/aircraft.yaml
View File

@@ -27,7 +27,6 @@
Types: Vehicle
MaxWeight: 1
PipCount: 1
MaximumUnloadAltitude: 800
LeavesHusk:
HuskActor: CARRYALL.Husk

1
mods/ra/maps/Fort-Lonestar/map.yaml
View File

@@ -902,7 +902,6 @@ Rules:
Types: Infantry
MaxWeight: 5
PipCount: 5
UnloadFacing: 220
ARTY:
Inherits: ^Tank
Buildable:

3
mods/ra/rules/ships.yaml
View File

@@ -216,7 +216,8 @@ LST:
Speed: 113
RevealsShroud:
Range: 6
RenderUnit:
RenderLandingCraft:
OpenTerrainTypes: Clear, Rough, Road, Ore, Gems, Beach
Cargo:
Types: Infantry, Vehicle
MaxWeight: 5

2
mods/ra/rules/vehicles.yaml
View File

@@ -353,7 +353,6 @@ JEEP:
Types: Infantry
MaxWeight: 1
PipCount: 1
UnloadFacing: 220
APC:
Inherits: ^Tank
@@ -386,7 +385,6 @@ APC:
Types: Infantry
MaxWeight: 5
PipCount: 5
UnloadFacing: 220
MNLY.AP:
Inherits: ^Tank

3
mods/ra/sequences/aircraft.yaml
View File

@@ -66,8 +66,7 @@ tran:
Start: 32
Length: 4
unload: tran2
Start: 32
Length: 4
Start: 35
icon: tranicon
Start: 0

1
mods/ra/sequences/ships.yaml
View File

@@ -47,6 +47,7 @@ lst:
open:
Start: 1
Length: 4
Tick: 150
unload:
Start: 4
icon: lsticon

2
mods/ra/sequences/vehicles.yaml
View File

@@ -177,7 +177,7 @@ apc:
Start: 0
Length: 6
Facings: 8
close:
open:
Start: 32
Length: 3
unload:

6
mods/ts/rules/vehicles.yaml
View File

@@ -60,7 +60,6 @@ APC:
Types: Infantry
MaxWeight: 5
PipCount: 5
UnloadFacing: 220
RenderSprites:
RenderVoxels:
WithVoxelBody:
@@ -350,7 +349,6 @@ BUS:
Types: Infantry
MaxWeight: 20
PipCount: 5
UnloadFacing: 220
RenderSprites:
RenderVoxels:
WithVoxelBody:
@@ -378,7 +376,6 @@ PICK:
Types: Infantry
MaxWeight: 2
PipCount: 5
UnloadFacing: 220
RenderSprites:
RenderVoxels:
WithVoxelBody:
@@ -406,7 +403,6 @@ CAR:
Types: Infantry
MaxWeight: 4
PipCount: 5
UnloadFacing: 220
RenderSprites:
RenderVoxels:
WithVoxelBody:
@@ -459,7 +455,6 @@ WINI:
Types: Infantry
MaxWeight: 5
PipCount: 5
UnloadFacing: 220
RenderSprites:
RenderVoxels:
WithVoxelBody:
@@ -638,7 +633,6 @@ SAPC:
Types: Infantry
MaxWeight: 5
PipCount: 5
UnloadFacing: 220
RenderSprites:
RenderVoxels:
WithVoxelBody: