From 03ba7524b2ec8fd365546cc64f7f2230510c1dc9 Mon Sep 17 00:00:00 2001 From: "Mr.Alien" <124381209+MrAlien753@users.noreply.github.com> Date: Mon, 6 Feb 2023 08:15:45 +0100 Subject: [PATCH 1/3] Comment out code for scoring hits (#1911) --- Moose Development/Moose/Functional/Scoring.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/Functional/Scoring.lua b/Moose Development/Moose/Functional/Scoring.lua index 92fe5f16a..3dda306a3 100644 --- a/Moose Development/Moose/Functional/Scoring.lua +++ b/Moose Development/Moose/Functional/Scoring.lua @@ -1054,8 +1054,10 @@ function SCORING:_EventOnHit( Event ) end self:ScoreCSV( InitPlayerName, TargetPlayerName, "HIT_PENALTY", 1, -10, InitUnitName, InitUnitCoalition, InitUnitCategory, InitUnitType, TargetUnitName, TargetUnitCoalition, TargetUnitCategory, TargetUnitType ) else - Player.Score = Player.Score + 1 - PlayerHit.Score = PlayerHit.Score + 1 + -- Hitting a target multiple times before destoying it should not result in a higger score + -- Multiple hits is typically a results of bombs/missles missing their target but still inflict some spash damage + -- Player.Score = Player.Score + 1 + -- PlayerHit.Score = PlayerHit.Score + 1 PlayerHit.ScoreHit = PlayerHit.ScoreHit + 1 if TargetPlayerName ~= nil then -- It is a player hitting another player ... MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. InitPlayerName .. "' hit enemy player '" .. TargetPlayerName .. "' " .. TargetUnitCategory .. " ( " .. TargetType .. " ) " .. PlayerHit.ScoreHit .. " times. " .. @@ -1155,8 +1157,10 @@ function SCORING:_EventOnHit( Event ) :ToCoalitionIf( Event.WeaponCoalition, self:IfMessagesHit() and self:IfMessagesToCoalition() ) self:ScoreCSV( Event.WeaponPlayerName, TargetPlayerName, "HIT_PENALTY", 1, -10, Event.WeaponName, Event.WeaponCoalition, Event.WeaponCategory, Event.WeaponTypeName, TargetUnitName, TargetUnitCoalition, TargetUnitCategory, TargetUnitType ) else - Player.Score = Player.Score + 1 - PlayerHit.Score = PlayerHit.Score + 1 + -- Hitting a target multiple times before destoying it should not result in a higger score + -- Multiple hits is typically a results of bombs/missles missing their target but still inflict some spash damage + -- Player.Score = Player.Score + 1 + -- PlayerHit.Score = PlayerHit.Score + 1 PlayerHit.ScoreHit = PlayerHit.ScoreHit + 1 MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. Event.WeaponPlayerName .. "' hit enemy target " .. TargetUnitCategory .. " ( " .. TargetType .. " ) " .. "Score: " .. PlayerHit.Score .. ". Score Total:" .. Player.Score - Player.Penalty, From 184f93168b48c28afe4c33190f08558c0521d53b Mon Sep 17 00:00:00 2001 From: dogjutsu <49013203+dogjutsu@users.noreply.github.com> Date: Sun, 5 Feb 2023 23:16:14 -0800 Subject: [PATCH 2/3] MSRS_BACKEND_DCSGRPC bug fix (#1916) * Add another DCS-gRPC example for MSRS docu (ATIS) * Fixes MSRS_BACKEND_DCSGRPC bad _GetLatLongAlt call --- Moose Development/Moose/Sound/SRS.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index 66a480d9e..66e942b90 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -1255,7 +1255,7 @@ MSRS_BACKEND_DCSGRPC.Functions._DCSgRPCtts = function (self, Text, Plaintext, Fr options.srsClientName = Label or self.Label options.position = {} if self.coordinate then - options.position.lat, options.position.lat, options.position.alt = self._GetLatLongAlt(self.coordinate) + options.position.lat, options.position.lat, options.position.alt = self:_GetLatLongAlt(self.coordinate) end options.position.lat = options.position.lat or 0.0 From 5b044cc036d64b0db97de845b6f1748744a71ae3 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Tue, 7 Feb 2023 07:28:00 +0100 Subject: [PATCH 3/3] Update CSAR.lua (#1917) --- Moose Development/Moose/Ops/CSAR.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Ops/CSAR.lua b/Moose Development/Moose/Ops/CSAR.lua index 0f64b56cc..060a6213e 100644 --- a/Moose Development/Moose/Ops/CSAR.lua +++ b/Moose Development/Moose/Ops/CSAR.lua @@ -2750,12 +2750,12 @@ function CSAR:onafterLoad(From, Event, To, path, filename) vec3.z = tonumber(dataset[4]) local point = COORDINATE:NewFromVec3(vec3) - local coalition = dataset[5] - local country = dataset[6] + local coalition = tonumber(dataset[5]) + local country = tonumber(dataset[6]) local description = dataset[7] local typeName = dataset[8] local unitName = dataset[9] - local freq = dataset[10] + local freq = tonumber(dataset[10]) self:_AddCsar(coalition, country, point, typeName, unitName, playerName, freq, nil, description, nil) end