Engine update.

MustaphaTR · Nov 5, 2023 · 698a5d2 · 698a5d2
1 parent 21911dd
commit 698a5d2
Show file tree

Hide file tree

Showing 45 changed files with 660 additions and 1,296 deletions.
diff --git a/OpenRA.Mods.SS.sln b/OpenRA.Mods.SS.sln
@@ -1,36 +1,36 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.SS", "OpenRA.Mods.SS\OpenRA.Mods.SS.csproj", "{4E5B38F7-4E99-4C92-BB39-9100CC7F3829}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Game", "engine\OpenRA.Game\OpenRA.Game.csproj", "{0DFB103F-2962-400F-8C6D-E2C28CCBA633}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.Common", "engine\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj", "{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-		Release-x86|Any CPU = Release-x86|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4E5B38F7-4E99-4C92-BB39-9100CC7F3829}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E5B38F7-4E99-4C92-BB39-9100CC7F3829}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E5B38F7-4E99-4C92-BB39-9100CC7F3829}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4E5B38F7-4E99-4C92-BB39-9100CC7F3829}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4E5B38F7-4E99-4C92-BB39-9100CC7F3829}.Release-x86|Any CPU.ActiveCfg = Release|Any CPU
-		{4E5B38F7-4E99-4C92-BB39-9100CC7F3829}.Release-x86|Any CPU.Build.0 = Release|Any CPU
-		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release-x86|Any CPU.ActiveCfg = Release-x86|Any CPU
-		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release-x86|Any CPU.Build.0 = Release-x86|Any CPU
-		{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release-x86|Any CPU.ActiveCfg = Release|Any CPU
-		{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release-x86|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.SS", "OpenRA.Mods.SS\OpenRA.Mods.SS.csproj", "{4E5B38F7-4E99-4C92-BB39-9100CC7F3829}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Game", "engine\OpenRA.Game\OpenRA.Game.csproj", "{0DFB103F-2962-400F-8C6D-E2C28CCBA633}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.Common", "engine\OpenRA.Mods.Common\OpenRA.Mods.Common.csproj", "{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		Release-x86|Any CPU = Release-x86|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4E5B38F7-4E99-4C92-BB39-9100CC7F3829}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E5B38F7-4E99-4C92-BB39-9100CC7F3829}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E5B38F7-4E99-4C92-BB39-9100CC7F3829}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E5B38F7-4E99-4C92-BB39-9100CC7F3829}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E5B38F7-4E99-4C92-BB39-9100CC7F3829}.Release-x86|Any CPU.ActiveCfg = Release|Any CPU
+		{4E5B38F7-4E99-4C92-BB39-9100CC7F3829}.Release-x86|Any CPU.Build.0 = Release|Any CPU
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release-x86|Any CPU.ActiveCfg = Release-x86|Any CPU
+		{0DFB103F-2962-400F-8C6D-E2C28CCBA633}.Release-x86|Any CPU.Build.0 = Release-x86|Any CPU
+		{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release-x86|Any CPU.ActiveCfg = Release|Any CPU
+		{FE6C8CC0-2F07-442A-B29F-17617B3B7FC6}.Release-x86|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/OpenRA.Mods.SS/OpenRA.Mods.SS.csproj b/OpenRA.Mods.SS/OpenRA.Mods.SS.csproj
@@ -1,14 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <EngineRootPath>../engine</EngineRootPath>
-  </PropertyGroup>
-  <Import Project="$(EngineRootPath)/Directory.Build.props" />
-  <ItemGroup>
-    <ProjectReference Include="$(EngineRootPath)/OpenRA.Game/OpenRA.Game.csproj">
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="$(EngineRootPath)/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj">
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <EngineRootPath>../engine</EngineRootPath>
+  </PropertyGroup>
+  <Import Project="$(EngineRootPath)/Directory.Build.props" />
+  <ItemGroup>
+    <ProjectReference Include="$(EngineRootPath)/OpenRA.Game/OpenRA.Game.csproj">
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="$(EngineRootPath)/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj">
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
diff --git a/OpenRA.Mods.SS/Scripting/Properties/FlagProperties.cs b/OpenRA.Mods.SS/Scripting/Properties/FlagProperties.cs
@@ -14,34 +14,34 @@
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.SS.Scripting
-{
-    [ScriptPropertyGroup("General")]
-    public class CarriesFlagProperties : ScriptActorProperties, Requires<CarriesFlagInfo>
-    {
-        readonly CarriesFlag carriesFlag;
-        readonly Actor actor;
-
-        public CarriesFlagProperties(ScriptContext context, Actor actor)
-            : base(context, actor)
-        {
-            this.actor = actor;
-            carriesFlag = actor.Trait<CarriesFlag>();
-        }
-
-        [Desc("Returns the flag actor is carrying.")]
-        public Actor Flag
-        {
-            get { return carriesFlag.Flag; }
-        }
-
-        [Desc("Drops the Flag actor is carrying and returns to the dropped Flag.")]
-        public Actor DropFlag()
-        {
-            var flag = carriesFlag.Flag;
-            if (flag != null)
-                carriesFlag.DropFlag(actor);
-
-            return flag;
-        }
+{
+    [ScriptPropertyGroup("General")]
+    public class CarriesFlagProperties : ScriptActorProperties, Requires<CarriesFlagInfo>
+    {
+        readonly CarriesFlag carriesFlag;
+        readonly Actor actor;
+
+        public CarriesFlagProperties(ScriptContext context, Actor actor)
+            : base(context, actor)
+        {
+            this.actor = actor;
+            carriesFlag = actor.Trait<CarriesFlag>();
+        }
+
+        [Desc("Returns the flag actor is carrying.")]
+        public Actor Flag
+        {
+            get { return carriesFlag.Flag; }
+        }
+
+        [Desc("Drops the Flag actor is carrying and returns to the dropped Flag.")]
+        public Actor DropFlag()
+        {
+            var flag = carriesFlag.Flag;
+            if (flag != null)
+                carriesFlag.DropFlag(actor);
+
+            return flag;
+        }
     }
 }
diff --git a/OpenRA.Mods.SS/Scripting/Properties/IdleAircraftProperties.cs b/OpenRA.Mods.SS/Scripting/Properties/IdleAircraftProperties.cs
@@ -6,26 +6,26 @@
  * as published by the Free Software Foundation, either version 3 of
  * the License, or (at your option) any later version. For more
  * information, see COPYING.
- */
+ */
 #endregion
 
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Scripting;
 
 namespace OpenRA.Mods.SS.Scripting
-{
-	[ScriptPropertyGroup("Movement")]
-	public class IdleAircraftProperties : ScriptActorProperties
-	{
-		readonly Actor actor;
-
-		public IdleAircraftProperties(ScriptContext context, Actor actor)
-			: base(context, actor)
-		{
-			this.actor = actor;
-		}
-
-		[Desc("Returns true if actor's current activity is FlyIdle.")]
-		public bool IsIdleAircraft { get { return actor.CurrentActivity is FlyIdle; } }
+{
+	[ScriptPropertyGroup("Movement")]
+	public class IdleAircraftProperties : ScriptActorProperties
+	{
+		readonly Actor actor;
+
+		public IdleAircraftProperties(ScriptContext context, Actor actor)
+			: base(context, actor)
+		{
+			this.actor = actor;
+		}
+
+		[Desc("Returns true if actor's current activity is FlyIdle.")]
+		public bool IsIdleAircraft { get { return actor.CurrentActivity is FlyIdle; } }
 	}
 }
diff --git a/OpenRA.Mods.SS/Scripting/Properties/SSSpawnProperties.cs b/OpenRA.Mods.SS/Scripting/Properties/SSSpawnProperties.cs
@@ -13,77 +13,77 @@
 using OpenRA.Scripting;
 
 namespace OpenRA.Mods.SS.Scripting
-{
-	[ScriptPropertyGroup("General")]
-	public class SSSpawnProperties : ScriptPlayerProperties
-	{
-		readonly SpawnSSUnit spawnSSUnit;
-		readonly Player player;
-
-		public SSSpawnProperties(ScriptContext context, Player player)
-			: base(context, player)
-		{
-			this.player = player;
-			spawnSSUnit = player.World.WorldActor.TraitOrDefault<SpawnSSUnit>();
-		}
-
-		[Desc("Returns the player's spawn position in CPos.")]
-		public CPos SpawnCellPosition
-		{
-			get { return spawnSSUnit.PlayerSpawnPoints[player]; }
-			set { spawnSSUnit.PlayerSpawnPoints[player] = value; }
-		}
-
-		[Desc("Returns the player's spawn position in WPos.")]
-		public WPos SpawnWorldPosition
-		{
-			get { return player.World.Map.CenterOfCell(spawnSSUnit.PlayerSpawnPoints[player]); }
-		}
-
-		[Desc("Returns to the leader of the team player is in.")]
-		public Player TeamLeader
-		{
-			get { return spawnSSUnit.TeamLeaders[player]; }
-		}
-
-		[Desc("Returns to value of Team Spawns lobby option.")]
-		public bool TeamSpawns
-		{
-			get { return spawnSSUnit.TeamSpawns; }
-		}
-
-		[Desc("Returns to value of Quick Class Change lobby option.")]
-		public bool QuickClassChange
-		{
-			get { return spawnSSUnit.QuickClassChange; }
-		}
-
-		[Desc("Returns to or sets the player's class.")]
-		public string Class
-		{
-			get { return spawnSSUnit.Classes[player]; }
-			set { spawnSSUnit.Classes[player] = value; }
+{
+	[ScriptPropertyGroup("General")]
+	public class SSSpawnProperties : ScriptPlayerProperties
+	{
+		readonly SpawnSSUnit spawnSSUnit;
+		readonly Player player;
+
+		public SSSpawnProperties(ScriptContext context, Player player)
+			: base(context, player)
+		{
+			this.player = player;
+			spawnSSUnit = player.World.WorldActor.TraitOrDefault<SpawnSSUnit>();
+		}
+
+		[Desc("Returns the player's spawn position in CPos.")]
+		public CPos SpawnCellPosition
+		{
+			get { return spawnSSUnit.PlayerSpawnPoints[player]; }
+			set { spawnSSUnit.PlayerSpawnPoints[player] = value; }
+		}
+
+		[Desc("Returns the player's spawn position in WPos.")]
+		public WPos SpawnWorldPosition
+		{
+			get { return player.World.Map.CenterOfCell(spawnSSUnit.PlayerSpawnPoints[player]); }
+		}
+
+		[Desc("Returns to the leader of the team player is in.")]
+		public Player TeamLeader
+		{
+			get { return spawnSSUnit.TeamLeaders[player]; }
+		}
+
+		[Desc("Returns to value of Team Spawns lobby option.")]
+		public bool TeamSpawns
+		{
+			get { return spawnSSUnit.TeamSpawns; }
 		}
-
-		[Desc("Returns to or sets the player's unit.")]
-		public Actor Unit
-		{
-			get { return spawnSSUnit.Units[player]; }
-			set { spawnSSUnit.Units[player] = value; }
+
+		[Desc("Returns to value of Quick Class Change lobby option.")]
+		public bool QuickClassChange
+		{
+			get { return spawnSSUnit.QuickClassChange; }
+		}
+
+		[Desc("Returns to or sets the player's class.")]
+		public string Class
+		{
+			get { return spawnSSUnit.Classes[player]; }
+			set { spawnSSUnit.Classes[player] = value; }
+		}
+
+		[Desc("Returns to or sets the player's unit.")]
+		public Actor Unit
+		{
+			get { return spawnSSUnit.Units[player]; }
+			set { spawnSSUnit.Units[player] = value; }
+		}
+
+		[Desc("Returns to or sets if player is allowed to change its class at all.")]
+		public bool ClassChanging
+		{
+			get { return spawnSSUnit.ClassChanging; }
+			set { spawnSSUnit.ClassChanging = value; }
+		}
+
+		[Desc("Returns to or sets if player is currently allowed to change its class.")]
+		public bool ClassChangingPaused
+		{
+			get { return spawnSSUnit.ClassChangingPaused; }
+			set { spawnSSUnit.ClassChangingPaused = value; }
 		}
-
-		[Desc("Returns to or sets if player is allowed to change its class at all.")]
-		public bool ClassChanging
-		{
-			get { return spawnSSUnit.ClassChanging; }
-			set { spawnSSUnit.ClassChanging = value; }
-		}
-
-		[Desc("Returns to or sets if player is currently allowed to change its class.")]
-		public bool ClassChangingPaused
-		{
-			get { return spawnSSUnit.ClassChangingPaused; }
-			set { spawnSSUnit.ClassChangingPaused = value; }
-		}
 	}
 }