Final sweeping before release

Byte-Nova · Jun 7, 2024 · ced7f75 · ced7f75
1 parent c22ca1b
commit ced7f75
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/Source/Client/Managers/DeepScribeManager.cs b/Source/Client/Managers/DeepScribeManager.cs
@@ -1183,6 +1183,7 @@ private static void GetMapTerrain(MapData mapData, Map map)
                     IntVec3 vectorToCheck = new IntVec3(x, map.Size.y, z);
 
                     mapData.tileDefNames.Add(map.terrainGrid.TerrainAt(vectorToCheck).defName.ToString());
+                    mapData.tilePollutions.Add(map.pollutionGrid.IsPolluted(vectorToCheck));
 
                     if (map.roofGrid.RoofAt(vectorToCheck) == null) mapData.roofDefNames.Add("null");
                     else mapData.roofDefNames.Add(map.roofGrid.RoofAt(vectorToCheck).defName.ToString());
@@ -1271,6 +1272,7 @@ private static void SetMapTerrain(MapData mapData, Map map)
                             mapData.tileDefNames[index]);
 
                         map.terrainGrid.SetTerrain(vectorToCheck, terrainToUse);
+                        map.pollutionGrid.SetPolluted(vectorToCheck, mapData.tilePollutions[index]);
 
                     }
                     catch { Logger.Warning($"Failed to set terrain at {vectorToCheck}"); }

diff --git a/Source/Server/Managers/Actions/Online/OnlineMarketManager.cs b/Source/Server/Managers/Actions/Online/OnlineMarketManager.cs
@@ -70,10 +70,13 @@ private static void AddToMarket(ServerClient client, MarketData marketData)
         private static void RemoveFromMarket(ServerClient client, MarketData marketData) 
         {
             ItemData toGet = Master.marketFile.MarketStock[marketData.indexToManage];
+            int reservedQuantity = toGet.quantity;
             toGet.quantity = marketData.quantityToManage;
             marketData.transferThingBytes = new List<byte[]>() { Serializer.ConvertObjectToBytes(toGet) };
 
             ItemData itemData = Master.marketFile.MarketStock[marketData.indexToManage];
+            itemData.quantity = reservedQuantity;
+
             if (marketData.quantityToManage == 0) ResponseShortcutManager.SendIllegalPacket(client, "Tried to buy illegal quantity at market");
             else if (itemData.quantity > marketData.quantityToManage) itemData.quantity -= marketData.quantityToManage;
             else if (itemData.quantity == marketData.quantityToManage) Master.marketFile.MarketStock.RemoveAt(marketData.indexToManage);

diff --git a/Source/Shared/Misc/CommonValues.cs b/Source/Shared/Misc/CommonValues.cs
@@ -2,6 +2,6 @@ namespace Shared
 {
     public static class CommonValues
     {
-        public readonly static string executableVersion = "1.5.0";
+        public readonly static string executableVersion = "24.6.7.1";
     }
 }
diff --git a/Source/Shared/PacketData/MapData.cs b/Source/Shared/PacketData/MapData.cs
@@ -22,6 +22,7 @@ public class MapData
 
         public List<string> tileDefNames = new List<string>();
         public List<string> roofDefNames = new List<string>();
+        public List<bool> tilePollutions = new List<bool>();
 
         //Things