Merge remote-tracking branch 'origin/master' into develop

Moose Development/Moose/Functional/Scoring.lua

@@ -2212,7 +2212,11 @@ function SCORING:ScoreCSV( PlayerName, TargetPlayerName, ScoreType, ScoreTimes,
     local data = self:ReportScoreAllSummary("",true)
     local text = "-- Playername;;Score;;Penalty\n"
     for _playername,_data in pairs(data or {}) do
-      text = text..string.format("%s;;%d;;%d\n")
+      -- ReportTable[PlayerName] = {["Score"]=PlayerScore,["Penalty"]=PlayerPenalty}
+      local Playername = _playername or "Ghost"
+      local Score = _data.Score or 0
+      local Penalty = _data.Penalty or 0
+      text = text..string.format("%s;;%d;;%d\n",Playername,Score,Penalty)
     end
     UTILS.SaveToFile(path,filename,text)
   end

Moose Development/Moose/Functional/Warehouse.lua

@@ -8597,8 +8597,8 @@ function WAREHOUSE:_DeleteStockItem(stockitem)
     local item=self.stock[i] --#WAREHOUSE.Assetitem
     if item.uid==stockitem.uid then
       table.remove(self.stock,i)
-      -- remove also from warehouse DB
-      _WAREHOUSEDB.Assets[stockitem.uid]=nil
+      -- remove also from warehouse DB (not good! causes an error if the asset needs to be added to a requesting wherehouse)
+      --_WAREHOUSEDB.Assets[stockitem.uid]=nil
       break
     end
   end