From 0a1d469c6813a04b3b4e7528f53404cb1fd754d5 Mon Sep 17 00:00:00 2001 From: ttrebuchon Date: Sat, 3 Jun 2023 14:15:33 -0400 Subject: [PATCH 1/3] Fix Offset values being saved to the ZONE_UNIT class itself (#1947) --- Moose Development/Moose/Core/Zone.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Core/Zone.lua b/Moose Development/Moose/Core/Zone.lua index f38fe83c4..12391027c 100644 --- a/Moose Development/Moose/Core/Zone.lua +++ b/Moose Development/Moose/Core/Zone.lua @@ -1616,7 +1616,11 @@ function ZONE_UNIT:New( ZoneName, ZoneUNIT, Radius, Offset) if (Offset.dx or Offset.dy) and (Offset.rho or Offset.theta) then error("Cannot use (dx, dy) with (rho, theta)") end + end + local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneUNIT:GetVec2(), Radius, true ) ) + + if Offset then self.dy = Offset.dy or 0.0 self.dx = Offset.dx or 0.0 self.rho = Offset.rho or 0.0 @@ -1624,8 +1628,6 @@ function ZONE_UNIT:New( ZoneName, ZoneUNIT, Radius, Offset) self.relative_to_unit = Offset.relative_to_unit or false end - local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneUNIT:GetVec2(), Radius, true ) ) - self:F( { ZoneName, ZoneUNIT:GetVec2(), Radius } ) self.ZoneUNIT = ZoneUNIT From 6f02f23240c3a4f4feb0f9cd51914fb70ef60d43 Mon Sep 17 00:00:00 2001 From: Thomas <72444570+Applevangelist@users.noreply.github.com> Date: Tue, 6 Jun 2023 16:20:16 +0200 Subject: [PATCH 2/3] PlayerTask.lua (#1948) Small fix for one tts text --- Moose Development/Moose/Ops/PlayerTask.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/PlayerTask.lua b/Moose Development/Moose/Ops/PlayerTask.lua index 34471b41f..49cdedf27 100644 --- a/Moose Development/Moose/Ops/PlayerTask.lua +++ b/Moose Development/Moose/Ops/PlayerTask.lua @@ -3153,7 +3153,7 @@ function PLAYERTASKCONTROLLER:_ActiveTaskInfo(Group, Client, Task) --self:I(self.lid.." | ".. CoordText) end local ThreatLocaleTextTTS = self.gettext:GetEntry("THREATTEXTTTS",self.locale) - local ttstext = string.format(ThreatLocaleTextTTS,self.MenuName or self.Name,ttsplayername,ttstaskname,ThreatLevelText, targets, CoordText) + local ttstext = string.format(ThreatLocaleTextTTS,ttsplayername,self.MenuName or self.Name,ttstaskname,ThreatLevelText, targets, CoordText) -- POINTERTARGETLASINGTTS = ". Pointer over target and lasing." if task.Type == AUFTRAG.Type.PRECISIONBOMBING and self.precisionbombing then if self.LasingDrone.playertask.inreach and self.LasingDrone:IsLasing() then From 73ff2c576dd0da17d416a15325b8144a216183da Mon Sep 17 00:00:00 2001 From: ttrebuchon Date: Wed, 7 Jun 2023 11:26:20 -0400 Subject: [PATCH 3/3] Fix typo from TRANSPORT. to OPSTRANSPORT. (#1950) --- Moose Development/Moose/Ops/Commander.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/Commander.lua b/Moose Development/Moose/Ops/Commander.lua index 16cffed58..16b9d43e1 100644 --- a/Moose Development/Moose/Ops/Commander.lua +++ b/Moose Development/Moose/Ops/Commander.lua @@ -514,7 +514,7 @@ function COMMANDER:AddOpsTransport(Transport) Transport.commander=self - Transport.statusCommander=TRANSPORT.Status.PLANNED + Transport.statusCommander=OPSTRANSPORT.Status.PLANNED table.insert(self.transportqueue, Transport)