Merge pull request #11641 from abcdefg30/particleDensity

Convert ParticleDensityFactor from a float to an int

OpenRA.Mods.Common/Traits/World/WeatherOverlay.cs

@@ -19,8 +19,8 @@ namespace OpenRA.Mods.Common.Traits
 	[Desc("Adds a particle-based overlay.")]
 	public class WeatherOverlayInfo : ITraitInfo, ILobbyCustomRulesIgnore
 	{
-		[Desc("Factor for particle density. As higher as more particles will get spawned.")]
+		[Desc("Average number of particles per 100x100 px square.")]
-		public readonly float ParticleDensityFactor = 0.0007625f;
+		public readonly int ParticleDensityFactor = 8;
 
 		[Desc("Should the level of the wind change over time, or just stick to the first value of WindLevels?")]
 		public readonly bool ChangingWindLevel = true;
@@ -111,7 +111,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		int CalculateParticleCount(int x, int y)
 		{
-			return (int)(x * y * info.ParticleDensityFactor);
+			return (int)(x * y * info.ParticleDensityFactor / 10000);
 		}
 
 		void SpawnParticles(int count, int rangeY, int spawnChancePercent)

OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs

@@ -256,6 +256,18 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					}
 				}
 
+				// ParticleDensityFactor was converted from a float to an int
+				if (engineVersion < 20160713 && node.Key == "WeatherOverlay")
+				{
+					var density = node.Value.Nodes.FirstOrDefault(n => n.Key == "ParticleDensityFactor");
+					if (density != null)
+					{
+						var value = float.Parse(density.Value.Value, CultureInfo.InvariantCulture);
+						value = (int)Math.Round(value * 10000, 0);
+						density.Value.Value = value.ToString();
+					}
+				}
+
 				UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
 

mods/cnc/maps/gdi06/rules.yaml

@@ -5,7 +5,6 @@ World:
 		BackgroundMusic: rain-ambient
 		StartingMusic: rain
 	WeatherOverlay:
-		ParticleDensityFactor: 0.0007625
 		ChangingWindLevel: true
 		WindLevels: -5, -3, -2, 0, 2, 3, 5
 		WindTick: 150, 550

mods/ra/maps/snow town/rules.yaml

@@ -1,6 +1,5 @@
 World:
 	WeatherOverlay:
-		ParticleDensityFactor: 0.0007625
 		ChangingWindLevel: true
 		WindLevels: -5, -3, -2, 0, 2, 3, 5
 		WindTick: 150, 550