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 #259 from FlightControl-Master/master-scoring

Browse Source 
BIGFIX: Scoring Coalition change Fratricide
This commit is contained in:
Sven Van de Velde
2017-03-02 12:30:21 +01:00
committed by GitHub
parent 7f3a2fa8e1 3789bf79c2
commit f3d5b17548
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Moose Development/Moose/Functional/Scoring.lua
View File

@@ -560,7 +560,7 @@ function SCORING:_AddPlayerFromUnit( UnitData )
2 2
):ToAll() ):ToAll()
self:ScoreCSV( PlayerName, "COALITION_PENALTY", 1, -50, self.Players[PlayerName].UnitName, _SCORINGCoalition[self.Players[PlayerName].UnitCoalition], _SCORINGCategory[self.Players[PlayerName].UnitCategory], self.Players[PlayerName].UnitType, self:ScoreCSV( PlayerName, "COALITION_PENALTY", 1, -50, self.Players[PlayerName].UnitName, _SCORINGCoalition[self.Players[PlayerName].UnitCoalition], _SCORINGCategory[self.Players[PlayerName].UnitCategory], self.Players[PlayerName].UnitType,
UnitName, _SCORINGCoalition[UnitCoalition], _SCORINGCategory[UnitCategory], UnitData:getTypeName() ) UnitName, _SCORINGCoalition[UnitCoalition], _SCORINGCategory[UnitCategory], UnitData:GetTypeName() )
end end
end end
self.Players[PlayerName].UnitName = UnitName self.Players[PlayerName].UnitName = UnitName
@@ -579,8 +579,7 @@ function SCORING:_AddPlayerFromUnit( UnitData )
end end
if self.Players[PlayerName].Penalty > self.Fratricide then if self.Players[PlayerName].Penalty > self.Fratricide then
local ClientGroup = GROUP:NewFromDCSUnit( UnitData ) UnitData:Destroy()
ClientGroup:Destroy()
MESSAGE:New( "Player '" .. PlayerName .. "' committed FRATRICIDE, he will be COURT MARTIALED and is DISMISSED from this mission!", MESSAGE:New( "Player '" .. PlayerName .. "' committed FRATRICIDE, he will be COURT MARTIALED and is DISMISSED from this mission!",
10 10
):ToAll() ):ToAll()

7
Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
View File

@@ -1,5 +1,5 @@
env.info( '*** MOOSE STATIC INCLUDE START *** ' ) env.info( '*** MOOSE STATIC INCLUDE START *** ' )
env.info( 'Moose Generation Timestamp: 20170302_0916' ) env.info( 'Moose Generation Timestamp: 20170302_1226' )
local base = _G local base = _G
Include = {} Include = {}
@@ -18419,7 +18419,7 @@ function SCORING:_AddPlayerFromUnit( UnitData )
2 2
):ToAll() ):ToAll()
self:ScoreCSV( PlayerName, "COALITION_PENALTY", 1, -50, self.Players[PlayerName].UnitName, _SCORINGCoalition[self.Players[PlayerName].UnitCoalition], _SCORINGCategory[self.Players[PlayerName].UnitCategory], self.Players[PlayerName].UnitType, self:ScoreCSV( PlayerName, "COALITION_PENALTY", 1, -50, self.Players[PlayerName].UnitName, _SCORINGCoalition[self.Players[PlayerName].UnitCoalition], _SCORINGCategory[self.Players[PlayerName].UnitCategory], self.Players[PlayerName].UnitType,
UnitName, _SCORINGCoalition[UnitCoalition], _SCORINGCategory[UnitCategory], UnitData:getTypeName() ) UnitName, _SCORINGCoalition[UnitCoalition], _SCORINGCategory[UnitCategory], UnitData:GetTypeName() )
end end
end end
self.Players[PlayerName].UnitName = UnitName self.Players[PlayerName].UnitName = UnitName
@@ -18438,8 +18438,7 @@ function SCORING:_AddPlayerFromUnit( UnitData )
end end
if self.Players[PlayerName].Penalty > self.Fratricide then if self.Players[PlayerName].Penalty > self.Fratricide then
local ClientGroup = GROUP:NewFromDCSUnit( UnitData ) UnitData:Destroy()
ClientGroup:Destroy()
MESSAGE:New( "Player '" .. PlayerName .. "' committed FRATRICIDE, he will be COURT MARTIALED and is DISMISSED from this mission!", MESSAGE:New( "Player '" .. PlayerName .. "' committed FRATRICIDE, he will be COURT MARTIALED and is DISMISSED from this mission!",
10 10
):ToAll() ):ToAll()

7
Moose Mission Setup/Moose.lua
View File

@@ -1,5 +1,5 @@
env.info( '*** MOOSE STATIC INCLUDE START *** ' ) env.info( '*** MOOSE STATIC INCLUDE START *** ' )
env.info( 'Moose Generation Timestamp: 20170302_0916' ) env.info( 'Moose Generation Timestamp: 20170302_1226' )
local base = _G local base = _G
Include = {} Include = {}
@@ -18419,7 +18419,7 @@ function SCORING:_AddPlayerFromUnit( UnitData )
2 2
):ToAll() ):ToAll()
self:ScoreCSV( PlayerName, "COALITION_PENALTY", 1, -50, self.Players[PlayerName].UnitName, _SCORINGCoalition[self.Players[PlayerName].UnitCoalition], _SCORINGCategory[self.Players[PlayerName].UnitCategory], self.Players[PlayerName].UnitType, self:ScoreCSV( PlayerName, "COALITION_PENALTY", 1, -50, self.Players[PlayerName].UnitName, _SCORINGCoalition[self.Players[PlayerName].UnitCoalition], _SCORINGCategory[self.Players[PlayerName].UnitCategory], self.Players[PlayerName].UnitType,
UnitName, _SCORINGCoalition[UnitCoalition], _SCORINGCategory[UnitCategory], UnitData:getTypeName() ) UnitName, _SCORINGCoalition[UnitCoalition], _SCORINGCategory[UnitCategory], UnitData:GetTypeName() )
end end
end end
self.Players[PlayerName].UnitName = UnitName self.Players[PlayerName].UnitName = UnitName
@@ -18438,8 +18438,7 @@ function SCORING:_AddPlayerFromUnit( UnitData )
end end
if self.Players[PlayerName].Penalty > self.Fratricide then if self.Players[PlayerName].Penalty > self.Fratricide then
local ClientGroup = GROUP:NewFromDCSUnit( UnitData ) UnitData:Destroy()
ClientGroup:Destroy()
MESSAGE:New( "Player '" .. PlayerName .. "' committed FRATRICIDE, he will be COURT MARTIALED and is DISMISSED from this mission!", MESSAGE:New( "Player '" .. PlayerName .. "' committed FRATRICIDE, he will be COURT MARTIALED and is DISMISSED from this mission!",
10 10
):ToAll() ):ToAll()