From 2b8e5175debce55d9c1c9b6ca5504a25c1ce19fc Mon Sep 17 00:00:00 2001
From: penev92 <penev92@gmail.com>
Date: Fri, 30 Dec 2022 00:31:52 +0200
Subject: [PATCH] Updated the example mod

---
 .../OpenRA.Mods.Example.csproj                |  61 +++++++-----------
 .../Widgets/Logic/TemplateMenuLogic.cs        |   2 +-
 mods/example/english.yaml                     |   2 -
 mods/example/languages/en.ftl                 |   2 +
 mods/example/maps/blank-map/map.bin           | Bin 142 -> 142 bytes
 mods/example/maps/blank-map/map.yaml          |   3 +
 mods/example/mod.yaml                         |  19 ++++--
 mods/example/rules.yaml                       |   1 +
 8 files changed, 44 insertions(+), 46 deletions(-)
 delete mode 100644 mods/example/english.yaml
 create mode 100644 mods/example/languages/en.ftl

diff --git a/OpenRA.Mods.Example/OpenRA.Mods.Example.csproj b/OpenRA.Mods.Example/OpenRA.Mods.Example.csproj
index d5d87f9..d4c15b2 100644
--- a/OpenRA.Mods.Example/OpenRA.Mods.Example.csproj
+++ b/OpenRA.Mods.Example/OpenRA.Mods.Example.csproj
@@ -1,40 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>true</Optimize>
-    <LangVersion>7.3</LangVersion>
-    <DebugSymbols>true</DebugSymbols>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <OutputPath>../engine/bin</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <CodeAnalysisRuleSet>../engine/OpenRA.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- Work around an issue where Rider does not detect files in the project root using the default glob -->
-    <Compile Include="**/*.cs" Exclude="$(DefaultItemExcludes)" />
-  </ItemGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="../engine/OpenRA.Game/OpenRA.Game.csproj">
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="../engine/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj">
-      <Private>False</Private>
-    </ProjectReference>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
-    <AdditionalFiles Include="../engine/stylecop.json" />
-  </ItemGroup>
-  <Target Name="DisableAnalyzers" BeforeTargets="CoreCompile" Condition="'$(Configuration)'=='Release'">
-    <!-- Disable code style analysis on Release builds to improve compile-time performance -->
-    <ItemGroup Condition="'$(Configuration)'=='Release'">
-      <Analyzer Remove="@(Analyzer)" />
-    </ItemGroup>
-  </Target>
+
+	<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>
+
+	<ItemGroup>
+		<None Include="$(EngineRootPath)/AUTHORS">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
+
 </Project>
diff --git a/OpenRA.Mods.Example/Widgets/Logic/TemplateMenuLogic.cs b/OpenRA.Mods.Example/Widgets/Logic/TemplateMenuLogic.cs
index 51b93f7..bcec95e 100644
--- a/OpenRA.Mods.Example/Widgets/Logic/TemplateMenuLogic.cs
+++ b/OpenRA.Mods.Example/Widgets/Logic/TemplateMenuLogic.cs
@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Example.Widgets.Logic
 	public class TemplateMenuLogic : ChromeLogic
 	{
 		[ObjectCreator.UseCtor]
-		public TemplateMenuLogic(Widget widget, World world, ModData modData)
+		public TemplateMenuLogic(Widget widget)
 		{
 			widget.Get<ButtonWidget>("QUIT_BUTTON").OnClick = Game.Exit;
 		}
diff --git a/mods/example/english.yaml b/mods/example/english.yaml
deleted file mode 100644
index 7dee16a..0000000
--- a/mods/example/english.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-english:
-	english: English
diff --git a/mods/example/languages/en.ftl b/mods/example/languages/en.ftl
new file mode 100644
index 0000000..a3238b6
--- /dev/null
+++ b/mods/example/languages/en.ftl
@@ -0,0 +1,2 @@
+# Game speeds:
+Normal = Normal
diff --git a/mods/example/maps/blank-map/map.bin b/mods/example/maps/blank-map/map.bin
index 8d718ac90aaaf2b79880b9295a75ca64ffbaa129..83e75677cd7802a9b04b441a363a655d57803152 100644
GIT binary patch
literal 142
ZcmZQ#Wng6xWPpGeAoZVm2x=+`6aeR58DRhb

literal 142
vcmZQ#Wng6xWPpGeAoU*$;`-0PgCx%SpMeF8Ad30HQk+N%poTzAC4m9}`+ymo

diff --git a/mods/example/maps/blank-map/map.yaml b/mods/example/maps/blank-map/map.yaml
index 54e2a58..d6e8a49 100644
--- a/mods/example/maps/blank-map/map.yaml
+++ b/mods/example/maps/blank-map/map.yaml
@@ -22,5 +22,8 @@ Players:
 		OwnsWorld: True
 		NonCombatant: True
 		Faction: example
+	PlayerReference@Multi0:
+		Name: Multi0
+		Playable: True
 
 Actors:
diff --git a/mods/example/mod.yaml b/mods/example/mod.yaml
index 12a5eb8..f7ca605 100644
--- a/mods/example/mod.yaml
+++ b/mods/example/mod.yaml
@@ -37,7 +37,8 @@ Notifications:
 	example|audio/notifications.yaml
 
 Translations:
-	example|english.yaml
+	common|languages/en.ftl
+	example|languages/en.ftl
 
 Hotkeys:
 	common|hotkeys/game.yaml
@@ -66,12 +67,20 @@ MapGrid:
 
 SpriteFormats: ShpTS
 
+SoundFormats: Wav
+
+TerrainFormat: DefaultTerrain
+
 SpriteSequenceFormat: DefaultSpriteSequence
 
 ModelSequenceFormat: PlaceholderModelSequence
 
+DefaultOrderGenerator: UnitOrderGenerator
+
 GameSpeeds:
-	default:
-		Name: Normal
-		Timestep: 40
-		OrderLatency: 3
+	DefaultSpeed: default
+	Speeds:
+		default:
+			Name: Normal
+			Timestep: 40
+			OrderLatency: 3
diff --git a/mods/example/rules.yaml b/mods/example/rules.yaml
index f122dd9..0d4664a 100644
--- a/mods/example/rules.yaml
+++ b/mods/example/rules.yaml
@@ -16,6 +16,7 @@ World:
 		CursorPalette: true
 		ShadowIndex:
 	Selection:
+	ControlGroups:
 
 DummyActor:
 	BodyOrientation: