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

InitialAltitude is now part of CenterPositition in Lua, too

Browse Source 
followup of #4371
This commit is contained in:
Matthias Mailänder
2013-12-28 18:38:23 +01:00
parent d87810a29c
commit da8341e336
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mods/common/lua/reinforcements.lua
View File

@@ -2,8 +2,8 @@ Reinforcements = { }
Reinforcements.Insert = function(owner, transportName, passengerNames, enterPath, exitPath) Reinforcements.Insert = function(owner, transportName, passengerNames, enterPath, exitPath)
local facing = { Map.GetFacing(CPos.op_Subtraction(enterPath[2], enterPath[1]), 0), "Int32" } local facing = { Map.GetFacing(CPos.op_Subtraction(enterPath[2], enterPath[1]), 0), "Int32" }
local altitude = { Rules.InitialAltitude(transportName), "Int32" } local center = WPos.op_Addition(enterPath[1].CenterPosition, WVec.New(0, 0, Rules.InitialAltitude(transportName)))
local transport = Actor.Create(transportName, { Owner = owner, Location = enterPath[1], Facing = facing, Altitude = altitude }) local transport = Actor.Create(transportName, { Owner = owner, Location = enterPath[1], CenterPosition = center, Facing = facing })
local cargo = Actor.Trait(transport, "Cargo") local cargo = Actor.Trait(transport, "Cargo")
local passengers = { } local passengers = { }
@@ -24,8 +24,8 @@ end
Reinforcements.Extract = function(owner, transportName, passengerNames, enterPath, exitPath) Reinforcements.Extract = function(owner, transportName, passengerNames, enterPath, exitPath)
local facing = { Map.GetFacing(CPos.op_Subtraction(enterPath[2], enterPath[1]), 0), "Int32" } local facing = { Map.GetFacing(CPos.op_Subtraction(enterPath[2], enterPath[1]), 0), "Int32" }
local altitude = { Rules.InitialAltitude(transportName), "Int32" } local center = WPos.op_Addition(enterPath[1].CenterPosition, WVec.New(0, 0, Rules.InitialAltitude(transportName)))
local transport = Actor.Create(transportName, { Owner = owner, Location = enterPath[1], Facing = facing, Altitude = altitude }) local transport = Actor.Create(transportName, { Owner = owner, Location = enterPath[1], CenterPosition = center, Facing = facing })
local cargo = Actor.Trait(transport, "Cargo") local cargo = Actor.Trait(transport, "Cargo")
Utils.Do(Utils.Skip(enterPath, 1), function(l) Actor.ScriptedMove(transport, l) end) Utils.Do(Utils.Skip(enterPath, 1), function(l) Actor.ScriptedMove(transport, l) end)

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

@@ -15,7 +15,7 @@ end
Rules.InitialAltitude = function(actorType) Rules.InitialAltitude = function(actorType)
local ai = Rules.TraitInfoOrDefault(actorType, "AircraftInfo") local ai = Rules.TraitInfoOrDefault(actorType, "AircraftInfo")
if ai ~= nil then if ai ~= nil then
return ai.CruiseAltitude return ai.CruiseAltitude.Range
end end
return 0 return 0
end end