From d396ca1684e3d67ccd5a164b56d0ef663f49d1b6 Mon Sep 17 00:00:00 2001 From: FlightControl Date: Sat, 24 Jun 2017 15:21:59 +0200 Subject: [PATCH] Target progress accounting for players --- Moose Development/Moose/Actions/Act_Account.lua | 4 ++-- Moose Development/Moose/Functional/Scoring.lua | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Moose Development/Moose/Actions/Act_Account.lua b/Moose Development/Moose/Actions/Act_Account.lua index 28aae7424..8b3785dd2 100644 --- a/Moose Development/Moose/Actions/Act_Account.lua +++ b/Moose Development/Moose/Actions/Act_Account.lua @@ -215,9 +215,9 @@ do -- ACT_ACCOUNT_DEADS local PlayerName = ProcessClient:GetPlayerName() local PlayerHit = self.PlayerHits and self.PlayerHits[EventData.IniUnitName] if PlayerHit == PlayerName then - self:Player() + self:Player( EventData ) else - self:Other() + self:Other( EventData ) end end end diff --git a/Moose Development/Moose/Functional/Scoring.lua b/Moose Development/Moose/Functional/Scoring.lua index 23c27e91a..2457d711f 100644 --- a/Moose Development/Moose/Functional/Scoring.lua +++ b/Moose Development/Moose/Functional/Scoring.lua @@ -694,9 +694,7 @@ function SCORING:_AddMissionTaskScore( Mission, PlayerUnit, Text, Score ) PlayerData.Score = self.Players[PlayerName].Score + Score PlayerData.Mission[MissionName].ScoreTask = self.Players[PlayerName].Mission[MissionName].ScoreTask + Score - MESSAGE:New( "Player '" .. PlayerName .. "' has " .. Text .. " in Mission '" .. MissionName .. "'. " .. - Score .. " task score!", - 30 ):ToAll() + MESSAGE:New( MissionName .. " : " .. Text .. " Score: " .. Score, 30 ):ToAll() self:ScoreCSV( PlayerName, "", "TASK_" .. MissionName:gsub( ' ', '_' ), 1, Score, PlayerUnit:GetName() ) end