OPSTRANSPORT

Storage

Moose Development/Moose/Ops/OpsGroup.lua

@@ -8090,16 +8090,26 @@ function OPSGROUP:_CheckCargoTransport()
       for _,_cargo in pairs(self.cargoTZC.Cargos) do
         local cargo=_cargo --Ops.OpsGroup#OPSGROUP.CargoGroup
         
+        
+        if cargo.type==OPSTRANSPORT.CargoType.OPSTRANPORT then
+
           -- Check if anyone is still boarding.
-        if cargo.opsgroup:IsBoarding(self.groupname) then
+          if cargo.opsgroup and cargo.opsgroup:IsBoarding(self.groupname) then
             boarding=true
           end
   
           -- Check if we have any cargo to transport.
-        if cargo.opsgroup:IsLoaded(self.groupname) then
+          if cargo.opsgroup and cargo.opsgroup:IsLoaded(self.groupname) then
             gotcargo=true
           end
           
+        else
+        
+          --TODO: load storage
+          gotcargo=true
+          
+        end
+
       end
 
       -- Boarding finished ==> Transport cargo.
@@ -8142,6 +8152,8 @@ function OPSGROUP:_CheckCargoTransport()
       for _,_cargo in pairs(self.cargoTZC.Cargos) do
         local cargo=_cargo --Ops.OpsGroup#OPSGROUP.CargoGroup
         
+        if cargo.type==OPSTRANSPORT.CargoType.OPSGROUP then
+
           local carrierGroup=cargo.opsgroup:_GetMyCarrierGroup()
   
           -- Check that this group is
@@ -8150,6 +8162,10 @@ function OPSGROUP:_CheckCargoTransport()
             break
           end
           
+        else
+          --TODO: storage
+        end
+
       end
 
       -- Unloading finished ==> pickup next batch or call it a day.
@@ -8171,6 +8187,7 @@ function OPSGROUP:_CheckCargoTransport()
       local text=string.format("Carrier [%s]: %s --> %s", self.carrierStatus, pickupname, deployname)
       for _,_cargo in pairs(self.cargoTransport:GetCargos(self.cargoTZC)) do
         local cargo=_cargo --Ops.OpsGroup#OPSGROUP.CargoGroup
+        if cargo.type==OPSTRANSPORT.CargoType.OPSGROUP then
           local name=cargo.opsgroup:GetName()
           local gstatus=cargo.opsgroup:GetState()
           local cstatus=cargo.opsgroup.cargoStatus
@@ -8179,6 +8196,9 @@ function OPSGROUP:_CheckCargoTransport()
           local carrierGroupname=carriergroup and carriergroup.groupname or "none"
           local carrierElementname=carrierelement and carrierelement.name or "none"
           text=text..string.format("\n- %s (%.1f kg) [%s]: %s, carrier=%s (%s), delivered=%s", name, weight, gstatus, cstatus, carrierElementname, carrierGroupname, tostring(cargo.delivered))
+        else
+          --TODO: Storage
+        end
       end
       self:I(self.lid..text)
     end
@@ -8391,16 +8411,20 @@ function OPSGROUP:_CheckDelivered(CargoTransport)
   for _,_cargo in pairs(CargoTransport:GetCargos()) do
     local cargo=_cargo --Ops.OpsGroup#OPSGROUP.CargoGroup
 
-    if self:CanCargo(cargo.opsgroup) then
+    if self:CanCargo(cargo) then
 
       if cargo.delivered then
         -- This one is delivered.
-      elseif cargo.opsgroup==nil or cargo.opsgroup:IsDead() or cargo.opsgroup:IsStopped() then
+      elseif cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and cargo.opsgroup==nil then
+       
+      elseif cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and (cargo.opsgroup:IsDead() or cargo.opsgroup:IsStopped()) then
         -- This one is dead.
       else
         done=false --Someone is not done!
       end
       
+      --TODO: check if storage is delivered
+
     end
 
   end
@@ -8425,7 +8449,7 @@ function OPSGROUP:_CheckGoPickup(CargoTransport)
     for _,_cargo in pairs(CargoTransport:GetCargos()) do
       local cargo=_cargo --Ops.OpsGroup#OPSGROUP.CargoGroup
 
-      if self:CanCargo(cargo.opsgroup) then
+      if self:CanCargo(cargo) then
 
         if cargo.delivered then
           -- This one is delivered.
@@ -8754,7 +8778,7 @@ end
 --- Check if the group can *in principle* be carrier of a cargo group. This checks the max cargo capacity of the group but *not* how much cargo is already loaded (if any).
 -- **Note** that the cargo group *cannot* be split into units, i.e. the largest cargo bay of any element of the group must be able to load the whole cargo group in one piece.
 -- @param #OPSGROUP self
--- @param Ops.OpsGroup#OPSGROUP.CargoGroup CargoGroup Cargo group, which needs a carrier.
+-- @param Ops.OpsGroup#OPSGROUP.CargoGroup Cargo Cargo data, which needs a carrier.
 -- @return #boolean If `true`, there is an element of the group that can load the whole cargo group.
 function OPSGROUP:CanCargo(Cargo)
 
@@ -9120,13 +9144,14 @@ function OPSGROUP:onafterLoading(From, Event, To)
     local cargo=_cargo --Ops.OpsGroup#OPSGROUP.CargoGroup
     
     -- Check if this group can carry the cargo.
-    local canCargo=self:CanCargo(cargo.opsgroup)
+    local canCargo=self:CanCargo(cargo)
 
     -- Check if this group is currently acting as carrier.
-    local isCarrier=cargo.opsgroup:IsPickingup() or cargo.opsgroup:IsLoading() or cargo.opsgroup:IsTransporting() or cargo.opsgroup:IsUnloading()
+    local isCarrier=false
+    
     
     -- Check if cargo is not already cargo.
-    local isNotCargo=cargo.opsgroup:IsNotCargo(true)
+    local isNotCargo=true 
     
     -- Check if cargo is holding or loaded
     local isHolding=cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and (cargo.opsgroup:IsHolding() or cargo.opsgroup:IsLoaded()) or true
@@ -9159,6 +9184,9 @@ function OPSGROUP:onafterLoading(From, Event, To)
       else
         isAvail=false
       end
+    else
+      isCarrier=cargo.opsgroup:IsPickingup() or cargo.opsgroup:IsLoading() or cargo.opsgroup:IsTransporting() or cargo.opsgroup:IsUnloading()
+      isNotCargo=cargo.opsgroup:IsNotCargo(true)
     end
     
     local isDead=cargo.type==OPSTRANSPORT.CargoType.OPSGROUP and cargo.opsgroup:IsDead() or false
@@ -9206,7 +9234,16 @@ function OPSGROUP:onafterLoading(From, Event, To)
     if carrier then
       
       -- Order cargo group to board the carrier.
+      if cargo.type==OPSTRANSPORT.CargoType.OPSGROUP then
         cargo.opsgroup:Board(self, carrier)
+      else
+        env.info("FF loading storage!")
+        if type(cargo.storage.cargoType)=="number" then
+          cargo.storage.storageFrom:RemoveLiquid(cargo.storage.cargoType, cargo.storage.cargoAmount)
+        else
+          cargo.storage.storageFrom:RemoveItem(cargo.storage.cargoType, cargo.storage.cargoAmount)
+        end
+      end
 
     end
 
@@ -9544,6 +9581,8 @@ function OPSGROUP:onafterUnloading(From, Event, To)
   for _,_cargo in pairs(self.cargoTZC.Cargos) do
     local cargo=_cargo --#OPSGROUP.CargoGroup
     
+    if cargo.type==OPSTRANSPORT.CargoType.OPSGROUP then
+
       -- Check that cargo is loaded into this group.
       -- NOTE: Could be that the element carriing this cargo group is DEAD, which would mean that the cargo group is also DEAD.
       if cargo.opsgroup:IsLoaded(self.groupname) and not cargo.opsgroup:IsDead() then
@@ -9681,6 +9720,27 @@ function OPSGROUP:onafterUnloading(From, Event, To)
         -- Not loaded or dead
       end
       
+    else
+      
+      ---
+      -- STORAGE
+      ---
+      
+      if type(cargo.storage.cargoType)=="number" then
+        cargo.storage.storageTo:AddLiquid(cargo.storage.cargoType, cargo.storage.cargoAmount)
+        --cargo.storage.amountDelivered=cargo.storage.amountDelivered+
+      else
+        cargo.storage.storageTo:AddItem(cargo.storage.cargoType, cargo.storage.cargoAmount)
+      end
+      
+      -- Cargo was delivered (somehow).
+      cargo.delivered=true
+
+      -- Increase number of delivered cargos.
+      self.cargoTransport.Ndelivered=self.cargoTransport.Ndelivered+1
+      
+    end
+
   end -- loop over cargos
 
 end

Moose Development/Moose/Ops/OpsTransport.lua

@@ -218,6 +218,7 @@ OPSTRANSPORT.version="0.7.0"
 -- TODO list
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
+-- TODO: Storage.
 -- TODO: Trains.
 -- TODO: Stop transport.
 -- TODO: Improve pickup and transport paths.
@@ -1100,19 +1101,17 @@ end
 -- @return #table Cargo Ops groups. Can be and empty table `{}`.
 function OPSTRANSPORT:GetCargoOpsGroups(Delivered, Carrier, TransportZoneCombo)
 
-  local cargos=self:GetCargos(TransportZoneCombo)
+  local cargos=self:GetCargos(TransportZoneCombo, Carrier, Delivered)
 
   local opsgroups={}
   for _,_cargo in pairs(cargos) do
     local cargo=_cargo --Ops.OpsGroup#OPSGROUP.CargoGroup
-    if cargo.type=="OPSGROUP" and (Delivered==nil or cargo.delivered==Delivered)  then
+    if cargo.type=="OPSGROUP" then
       if cargo.opsgroup and not (cargo.opsgroup:IsDead() or cargo.opsgroup:IsStopped()) then
-        if Carrier==nil or Carrier:CanCargo(cargo.opsgroup) then
         table.insert(opsgroups, cargo.opsgroup)
       end
     end
   end
-  end
     
   return opsgroups
 end
@@ -1125,15 +1124,13 @@ end
 -- @return #table Cargo Ops groups. Can be and empty table `{}`.
 function OPSTRANSPORT:GetCargoStorages(Delivered, Carrier, TransportZoneCombo)
 
-  local cargos=self:GetCargos(TransportZoneCombo)
+  local cargos=self:GetCargos(TransportZoneCombo, Carrier, Delivered)
 
   local opsgroups={}
   for _,_cargo in pairs(cargos) do
     local cargo=_cargo --Ops.OpsGroup#OPSGROUP.CargoGroup
-    if cargo.type=="STORAGE" and (Delivered==nil or cargo.delivered==Delivered)  then
+    if cargo.type=="STORAGE" then
-      if Carrier==nil or Carrier:CanCargo(cargo.opsgroup) then
+      table.insert(opsgroups, cargo.storage)
-        table.insert(opsgroups, cargo.opsgroup)
-      end
     end
   end
     
@@ -1150,22 +1147,30 @@ end
 --- Get cargos.
 -- @param #OPSTRANSPORT self
 -- @param #OPSTRANSPORT.TransportZoneCombo TransportZoneCombo Transport zone combo.
+-- @param Ops.OpsGroup#OPSGROUP Carrier Specific carrier.
+-- @param #boolean Delivered Delivered status.
 -- @return #table Cargos.
-function OPSTRANSPORT:GetCargos(TransportZoneCombo)
+function OPSTRANSPORT:GetCargos(TransportZoneCombo, Carrier, Delivered)
   
+  local tczs=self.tzCombos
   if TransportZoneCombo then
-    return TransportZoneCombo.Cargos
+    tczs={TransportZoneCombo}
-  else
+  end
+
   local cargos={}
-    for _,_tzc in pairs(self.tzCombos) do
+  for _,_tcz in pairs(tczs) do
-      local tzc=_tzc --#OPSTRANSPORT.TransportZoneCombo
+    local tcz=_tcz --#OPSTRANSPORT.TransportZoneCombo
-      for _,cargo in pairs(tzc.Cargos) do
+    for _,_cargo in pairs(tcz.Cargos) do
+      local cargo=_cargo --Ops.OpsGroup#OPSGROUP.CargoGroup
+      if Delivered==nil or cargo.delivered==Delivered  then
+        if Carrier==nil or Carrier:CanCargo(cargo) then
           table.insert(cargos, cargo)
         end
       end
-    return cargos
+    end
   end
 
+  return cargos
 end
 
 --- Get total weight.
@@ -1732,6 +1737,8 @@ function OPSTRANSPORT:onafterStatusUpdate(From, Event, To)
           cargo.opsgroup:GetName(), cargo.opsgroup.cargoStatus:upper(), cargo.opsgroup:GetState(), cargo.opsgroup:GetWeightTotal(), name, cstate, tostring(cargo.delivered), tostring(cargo.opsgroup.cargoTransportUID))
         else
           --TODO: Storage
+          text=text..string.format("\n- delivered=%s [UID=%s]",
+          tostring(cargo.delivered), tostring(nil))
         end
       end
       
@@ -2260,7 +2267,9 @@ end
 function OPSTRANSPORT:_CountCargosInZone(Zone, Delivered, Carrier, TransportZoneCombo)
 
   -- Get cargo ops groups.
-  local cargos=self:GetCargoOpsGroups(Delivered, Carrier, TransportZoneCombo)
+  --local cargos=self:GetCargoOpsGroups(Delivered, Carrier, TransportZoneCombo)
+  
+  local cargos=self:GetCargos(TransportZoneCombo, Carrier, Delivered)
   
   --- Function to check if carrier is supposed to be disembarked to.
   local function iscarrier(_cargo)
@@ -2302,22 +2311,33 @@ function OPSTRANSPORT:_CountCargosInZone(Zone, Delivered, Carrier, TransportZone
   
   local N=0
   for _,_cargo in pairs(cargos) do
-    local cargo=_cargo --Ops.OpsGroup#OPSGROUP
+    local cargo=_cargo --Ops.OpsGroup#OPSGROUP.CargoGroup
+    
+    local isNotCargo=true
+    local isInZone=true
+    local isInUtero=true
+    
+    if cargo.type==OPSTRANSPORT.CargoType.OPSGROUP then
+      local opsgroup=cargo.opsgroup
 
       -- Is not cargo? 
-    local isNotCargo=cargo:IsNotCargo(true)
+      isNotCargo=opsgroup:IsNotCargo(true)
       if not isNotCargo then
-      isNotCargo=iscarrier(cargo)
+        isNotCargo=iscarrier(opsgroup)
       end    
   
       -- Is in zone?
-    local isInZone=cargo:IsInZone(Zone)
+      isInZone=opsgroup:IsInZone(Zone)
       
       -- Is in utero?
-    local isInUtero=cargo:IsInUtero()
+      isInUtero=opsgroup:IsInUtero()
 
       -- Debug info.
-    self:T(self.lid..string.format("Cargo=%s: notcargo=%s, iscarrier=%s inzone=%s, inutero=%s", cargo:GetName(), tostring(cargo:IsNotCargo(true)), tostring(iscarrier(cargo)), tostring(isInZone), tostring(isInUtero)))
+      self:T(self.lid..string.format("Cargo=%s: notcargo=%s, iscarrier=%s inzone=%s, inutero=%s", opsgroup:GetName(), tostring(opsgroup:IsNotCargo(true)), tostring(iscarrier(opsgroup)), tostring(isInZone), tostring(isInUtero)))
+
+      
+    end
+
 
     -- We look for groups that are not cargo, in the zone or in utero.
     if isNotCargo and (isInZone or isInUtero) then