FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1262 from FlightControl-Master/#1258-WAREHOUSE-onafterChangeCountry(From,-Event,-To,-Country)

Browse Source 
#1258 warehouse onafter change country(from, event, to, country)
This commit is contained in:
Frank 2020-02-09 19:41:01 +01:00 committed by GitHub
commit 0da0b025b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -222,3 +222,7 @@ _gsdata_/
.gitignore .gitignore
Moose Test Missions/MOOSE_Test_Template.miz Moose Test Missions/MOOSE_Test_Template.miz
Moose Development/Moose/.vscode/launch.json Moose Development/Moose/.vscode/launch.json
MooseCodeWS.code-workspace
.gitignore
.gitignore
/.gitignore

8
Moose Development/Moose/Functional/Warehouse.lua
View File

@ -4894,8 +4894,14 @@ function WAREHOUSE:onafterChangeCountry(From, Event, To, Country)
self.queue={} self.queue={}
-- Airbase could have been captured before and already belongs to the new coalition. -- Airbase could have been captured before and already belongs to the new coalition.
-- Check if Warehouse has a arbiase atthached
local airbasecoaltion
if self.airbase ~= nil then
local airbase=AIRBASE:FindByName(self.airbasename) local airbase=AIRBASE:FindByName(self.airbasename)
local airbasecoaltion=airbase:GetCoalition() airbasecoaltion=airbase:GetCoalition()
else -- Warehouse has no airbase attached so just keep whatever, self.airbase will still be nil since CoalitionNew will not be nil if Warehouse have a airbse attacjed.
airbasecoaltion = nil
end
if CoalitionNew==airbasecoaltion then if CoalitionNew==airbasecoaltion then
-- Airbase already owned by the coalition that captured the warehouse. Airbase can be used by this warehouse. -- Airbase already owned by the coalition that captured the warehouse. Airbase can be used by this warehouse.