From a7806deb76bb7192a7b2c112919c591953cc08f7 Mon Sep 17 00:00:00 2001 From: ttrebuchon Date: Wed, 14 Jun 2023 12:41:05 -0400 Subject: [PATCH 1/2] Recruit assets using resource Nmin and Nmax, rather than Nmax and Nmax. --- Moose Development/Moose/Ops/Chief.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/Chief.lua b/Moose Development/Moose/Ops/Chief.lua index 6acc20fca..91e32af71 100644 --- a/Moose Development/Moose/Ops/Chief.lua +++ b/Moose Development/Moose/Ops/Chief.lua @@ -2969,7 +2969,7 @@ function CHIEF:RecruitAssetsForZone(StratZone, Resource) -- Shortcuts. local MissionType=Resource.MissionType - local NassetsMin=Resource.Nmax + local NassetsMin=Resource.Nmin local NassetsMax=Resource.Nmax local Categories=Resource.Categories local Attributes=Resource.Attributes From aec3eee3a583775e8a677eed8d7e855e42df30d7 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 15 Jun 2023 14:50:11 +0200 Subject: [PATCH 2/2] #NET * Slight improvements --- Moose Development/Moose/Wrapper/Net.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Moose Development/Moose/Wrapper/Net.lua b/Moose Development/Moose/Wrapper/Net.lua index d8e36cbf3..f42c1c1ee 100644 --- a/Moose Development/Moose/Wrapper/Net.lua +++ b/Moose Development/Moose/Wrapper/Net.lua @@ -5,7 +5,7 @@ -- === -- -- ### Author: **Applevangelist** --- # Last Update Apr 2023 +-- # Last Update June 2023 -- -- === -- @@ -42,7 +42,7 @@ do -- @field #NET NET = { ClassName = "NET", - Version = "0.1.1", + Version = "0.1.2", BlockTime = 600, BlockedPilots = {}, BlockedUCIDs = {}, @@ -90,7 +90,7 @@ function NET:New() -- @param #string From State. -- @param #string Event Trigger. -- @param #string To State. - -- @param Wrapper.Unit#UNIT Client Unit Object. + -- @param Wrapper.Client#CLIENT Client Object. -- @param #string Name Name of joining Pilot. -- @return #NET self @@ -220,7 +220,8 @@ function NET:_EventHandler(EventData) side = PlayerSide, slot = PlayerSlot, } - self:__PlayerJoined(1,data.IniUnit,name) + local client = CLIENT:FindByPlayerName(name) or data.IniUnit + self:__PlayerJoined(1,client,name) return self end end @@ -771,7 +772,7 @@ end -- @param #string To -- @return #NET self function NET:onafterStatus(From,Event,To) - self:I({From,Event,To}) + self:T({From,Event,To}) local function HouseHold(tavolo) local TNow = timer.getTime() @@ -799,7 +800,7 @@ end -- @param #string To -- @return #NET self function NET:onafterRun(From,Event,To) - self:I({From,Event,To}) + self:T({From,Event,To}) self:HandleEvent(EVENTS.PlayerEnterUnit,self._EventHandler) self:HandleEvent(EVENTS.PlayerEnterAircraft,self._EventHandler) self:HandleEvent(EVENTS.PlayerLeaveUnit,self._EventHandler) @@ -807,7 +808,7 @@ function NET:onafterRun(From,Event,To) self:HandleEvent(EVENTS.Ejection,self._EventHandler) self:HandleEvent(EVENTS.Crash,self._EventHandler) self:HandleEvent(EVENTS.SelfKillPilot,self._EventHandler) - self:__Status(-30) + self:__Status(-10) end --- Stop the event functions