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

Removed Group usage from _AddPlayerFromUnit

Browse Source 
Due to bug 1.5 in DCS world
This commit is contained in:
svenvandevelde 2016-02-19 19:56:11 +01:00
parent b8148a7950
commit 84b79b0a75
2 changed files with 37 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
Moose/Database.lua
View File

@ -305,50 +305,43 @@ trace.f( self.ClassName, UnitData )
if UnitData:isExist() then if UnitData:isExist() then
local UnitName = UnitData:getName() local UnitName = UnitData:getName()
local GroupData = UnitData:getGroup() local PlayerName = UnitData:getPlayerName()
if GroupData and GroupData:isExist() then trace.i(self.ClassName, "Player : " .. PlayerName .. " Unit : " .. UnitName )
local GroupName = GroupData:getName()
local PlayerName = UnitData:getPlayerName()
trace.i(self.ClassName, "Player : " .. PlayerName .. " Unit : " .. UnitName .. " Group : " .. GroupName ) if self.Players[PlayerName] == nil then -- I believe this is the place where a Player gets a life in a mission when he enters a unit ...
self.Players[PlayerName] = {}
if self.Players[PlayerName] == nil then -- I believe this is the place where a Player gets a life in a mission when he enters a unit ... self.Players[PlayerName].Hit = {}
self.Players[PlayerName] = {} self.Players[PlayerName].Kill = {}
self.Players[PlayerName].Hit = {} self.Players[PlayerName].Mission = {}
self.Players[PlayerName].Kill = {}
self.Players[PlayerName].Mission = {} -- for CategoryID, CategoryName in pairs( DATABASECategory ) do
-- self.Players[PlayerName].Hit[CategoryID] = {}
-- for CategoryID, CategoryName in pairs( DATABASECategory ) do -- self.Players[PlayerName].Kill[CategoryID] = {}
-- self.Players[PlayerName].Hit[CategoryID] = {} -- end
-- self.Players[PlayerName].Kill[CategoryID] = {} self.Players[PlayerName].HitPlayers = {}
-- end self.Players[PlayerName].HitUnits = {}
self.Players[PlayerName].HitPlayers = {} self.Players[PlayerName].Penalty = 0
self.Players[PlayerName].HitUnits = {} self.Players[PlayerName].PenaltyCoalition = 0
self.Players[PlayerName].Penalty = 0
self.Players[PlayerName].PenaltyCoalition = 0
end
if not self.Players[PlayerName].UnitCoalition then
self.Players[PlayerName].UnitCoalition = Unit.getGroup(UnitData):getCoalition()
else
if self.Players[PlayerName].UnitCoalition ~= Unit.getGroup(UnitData):getCoalition() then
self.Players[PlayerName].Penalty = self.Players[PlayerName].Penalty + 50
self.Players[PlayerName].PenaltyCoalition = self.Players[PlayerName].PenaltyCoalition + 1
MESSAGE:New( "Player '" .. PlayerName .. "' changed coalition from " .. DATABASECoalition[self.Players[PlayerName].UnitCoalition] .. " to " .. DATABASECoalition[Unit.getGroup(UnitData):getCoalition()] ..
"(changed " .. self.Players[PlayerName].PenaltyCoalition .. " times the coalition). 50 Penalty points added.",
"Game Status: Penalty", 20, "/PENALTYCOALITION" .. PlayerName ):ToAll()
self:ScoreAdd( PlayerName, "COALITION_PENALTY", 1, -50, self.Players[PlayerName].UnitName, DATABASECoalition[self.Players[PlayerName].UnitCoalition], DATABASECategory[self.Players[PlayerName].UnitCategory], self.Players[PlayerName].UnitType,
UnitName, DATABASECategory[Unit.getGroup(UnitData):getCoalition()], DATABASECategory[Unit.getGroup(UnitData):getCategory()], UnitData:getTypeName() )
end
end
self.Players[PlayerName].UnitName = UnitName
self.Players[PlayerName].GroupName = GroupName
self.Players[PlayerName].UnitCoalition = Unit.getGroup(UnitData):getCoalition()
self.Players[PlayerName].UnitCategory = Unit.getGroup(UnitData):getCategory()
self.Players[PlayerName].UnitType = UnitData:getTypeName()
end end
if not self.Players[PlayerName].UnitCoalition then
self.Players[PlayerName].UnitCoalition = Unit:getCoalition()
else
if self.Players[PlayerName].UnitCoalition ~= Unit.getGroup(UnitData):getCoalition() then
self.Players[PlayerName].Penalty = self.Players[PlayerName].Penalty + 50
self.Players[PlayerName].PenaltyCoalition = self.Players[PlayerName].PenaltyCoalition + 1
MESSAGE:New( "Player '" .. PlayerName .. "' changed coalition from " .. DATABASECoalition[self.Players[PlayerName].UnitCoalition] .. " to " .. DATABASECoalition[Unit.getGroup(UnitData):getCoalition()] ..
"(changed " .. self.Players[PlayerName].PenaltyCoalition .. " times the coalition). 50 Penalty points added.",
"Game Status: Penalty", 20, "/PENALTYCOALITION" .. PlayerName ):ToAll()
self:ScoreAdd( PlayerName, "COALITION_PENALTY", 1, -50, self.Players[PlayerName].UnitName, DATABASECoalition[self.Players[PlayerName].UnitCoalition], DATABASECategory[self.Players[PlayerName].UnitCategory], self.Players[PlayerName].UnitType,
UnitName, DATABASECategory[Unit.getGroup(UnitData):getCoalition()], DATABASECategory[Unit.getGroup(UnitData):getCategory()], UnitData:getTypeName() )
end
end
self.Players[PlayerName].UnitName = UnitName
self.Players[PlayerName].UnitCoalition = Unit:getCoalition()
self.Players[PlayerName].UnitCategory = Unit:getCategory()
self.Players[PlayerName].UnitType = UnitData:getTypeName()
end end
end end
@ -427,8 +420,8 @@ trace.f( self.ClassName, { event } )
InitGroupName = Unit.getGroup(event.initiator):getName() InitGroupName = Unit.getGroup(event.initiator):getName()
InitPlayerName = event.initiator:getPlayerName() InitPlayerName = event.initiator:getPlayerName()
InitCoalition = Unit.getGroup(event.initiator):getCoalition() InitCoalition = Unit:getCoalition()
InitCategory = Unit.getGroup(event.initiator):getCategory() InitCategory = Unit:getCategory()
InitType = event.initiator:getTypeName() InitType = event.initiator:getTypeName()
InitUnitCoalition = DATABASECoalition[InitCoalition] InitUnitCoalition = DATABASECoalition[InitCoalition]

1
Moose/Group.lua
View File

@ -78,6 +78,7 @@ trace.f( self.ClassName, { self.GroupName, Point, Radius } )
return self return self
end end
function GROUP:_GetController() function GROUP:_GetController()
return self._Group:getController() return self._Group:getController()