weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-13 17:31:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Applevangelist
2026-01-03 17:26:37 +01:00
parent bf155a0beb 2d930ff2dd
commit ca540bfd90
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Functional/Scoring.lua
+5 -1
View File
@@ -2212,7 +2212,11 @@ function SCORING:ScoreCSV( PlayerName, TargetPlayerName, ScoreType, ScoreTimes,
local data = self:ReportScoreAllSummary("",true) local data = self:ReportScoreAllSummary("",true)
local text = "-- Playername;;Score;;Penalty\n" local text = "-- Playername;;Score;;Penalty\n"
for _playername,_data in pairs(data or {}) do 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 end
UTILS.SaveToFile(path,filename,text) UTILS.SaveToFile(path,filename,text)
end end
Moose Development/Moose/Functional/Warehouse.lua
+2 -2
View File
@@ -8597,8 +8597,8 @@ function WAREHOUSE:_DeleteStockItem(stockitem)
local item=self.stock[i] --#WAREHOUSE.Assetitem local item=self.stock[i] --#WAREHOUSE.Assetitem
if item.uid==stockitem.uid then if item.uid==stockitem.uid then
table.remove(self.stock,i) table.remove(self.stock,i)
-- remove also from warehouse DB -- 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 --_WAREHOUSEDB.Assets[stockitem.uid]=nil
break break
end end
end end