v3.7 adds tutor window

pardeike · Aug 23, 2023 · b88629c · b88629c
1 parent e4d9b45
commit b88629c
Show file tree

Hide file tree

Showing 23 changed files with 51 additions and 265 deletions.
diff --git a/1.4/Assemblies/AchtungMod.dll b/1.4/Assemblies/AchtungMod.dll
diff --git a/1.4/Assemblies/ModFeatures.dll b/1.4/Assemblies/ModFeatures.dll
diff --git a/About/Manifest.xml b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>net.pardeike.rimworld.mod.achtung</identifier>
-  <version>3.6.1.0</version>
+  <version>3.7.0.0</version>
   <targetVersions>
     <li>1.0.0</li>
     <li>1.1.0</li>

diff --git a/About/Resources/01_Welcome.png → Features/01_Welcome.png b/About/Resources/01_Welcome.png → Features/01_Welcome.png
diff --git a/About/Resources/02_Forcing.mp4 → Features/02_Forcing.mp4 b/About/Resources/02_Forcing.mp4 → Features/02_Forcing.mp4
diff --git a/Features/03_MenuError.png b/Features/03_MenuError.png
diff --git a/About/Resources/03_Formations.mp4 → Features/04_Formations.mp4 b/About/Resources/03_Formations.mp4 → Features/04_Formations.mp4
diff --git a/About/Resources/04_Cooperation.mp4 → Features/05_Cooperation.mp4 b/About/Resources/04_Cooperation.mp4 → Features/05_Cooperation.mp4
diff --git a/About/Resources/05_ThreeModes.mp4 → Features/06_ThreeModes.mp4 b/About/Resources/05_ThreeModes.mp4 → Features/06_ThreeModes.mp4
diff --git a/Features/07_Settings.png b/Features/07_Settings.png
diff --git a/Features/08_Draftstatus.mp4 b/Features/08_Draftstatus.mp4
diff --git a/Features/09_Rescue.png b/Features/09_Rescue.png
diff --git a/Languages/Dutch/Keyed/Text.xml b/Languages/Dutch/Keyed/Text.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LanguageData>
 
-	<Topic_Welcome>Welkom bij Achtung!</Topic_Welcome>
-	<Topic_Forcing>Dwingen</Topic_Forcing>
-	<Topic_Formations>Formaties</Topic_Formations>
-	<Topic_Cooperation>Samenwerking</Topic_Cooperation>
-	<Topic_ThreeModes>Drie Modi</Topic_ThreeModes>
+	<Feature_Achtung_Welcome>Welkom bij Achtung!</Feature_Achtung_Welcome>
+	<Feature_Achtung_Forcing>Dwingen</Feature_Achtung_Forcing>
+	<Feature_Achtung_MenuError>Menufout</Feature_Achtung_MenuError>
+	<Feature_Achtung_Formations>Formaties</Feature_Achtung_Formations>
+	<Feature_Achtung_Cooperation>Samenwerking</Feature_Achtung_Cooperation>
+	<Feature_Achtung_ThreeModes>Drie Modi</Feature_Achtung_ThreeModes>
+	<Feature_Achtung_Settings>Instellingen</Feature_Achtung_Settings>
+	<Feature_Achtung_Draftstatus>Ontwerpstatus</Feature_Achtung_Draftstatus>
+	<Feature_Achtung_Rescue>Redding</Feature_Achtung_Rescue>
 
 	<PositioningEnabledTitle>Aangepaste muispositionering</PositioningEnabledTitle>
 	<PositioningEnabledExplained>Maakt gevechtspositionering mogelijk voor je muisklikken/slepen (zie onderstaande instellingen)</PositioningEnabledExplained>

diff --git a/Languages/English/Keyed/Text.xml b/Languages/English/Keyed/Text.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LanguageData>
 
-	<Topic_Welcome>Welcome to Achtung!</Topic_Welcome>
-	<Topic_Forcing>Forcing</Topic_Forcing>
-	<Topic_Formations>Formations</Topic_Formations>
-	<Topic_Cooperation>Cooperation</Topic_Cooperation>
-	<Topic_ThreeModes>Three Modes</Topic_ThreeModes>
+	<Feature_Achtung_Welcome>Welcome to Achtung!</Feature_Achtung_Welcome>
+	<Feature_Achtung_Forcing>Forcing</Feature_Achtung_Forcing>
+	<Feature_Achtung_MenuError>Menu Error</Feature_Achtung_MenuError>
+	<Feature_Achtung_Formations>Formations</Feature_Achtung_Formations>
+	<Feature_Achtung_Cooperation>Cooperation</Feature_Achtung_Cooperation>
+	<Feature_Achtung_ThreeModes>Three Modes</Feature_Achtung_ThreeModes>
+	<Feature_Achtung_Settings>Settings</Feature_Achtung_Settings>
+	<Feature_Achtung_Draftstatus>Draft Status</Feature_Achtung_Draftstatus>
+	<Feature_Achtung_Rescue>Rescue</Feature_Achtung_Rescue>
 
 	<PositioningEnabledTitle>Custom mouse positioning</PositioningEnabledTitle>
 	<PositioningEnabledExplained>Enables combat positioning for your mouse clicks/drags (see settings below)</PositioningEnabledExplained>

diff --git a/Languages/German/Keyed/Text.xml b/Languages/German/Keyed/Text.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LanguageData>
 
-	<Topic_Welcome>Willkommen zu Achtung!</Topic_Welcome>
-	<Topic_Forcing>Erzwingen</Topic_Forcing>
-	<Topic_Formations>Formationen</Topic_Formations>
-	<Topic_Cooperation>Zusammenarbeit</Topic_Cooperation>
-	<Topic_ThreeModes>Drei Modi</Topic_ThreeModes>
+	<Feature_Achtung_Welcome>Willkommen zu Achtung!</Feature_Achtung_Welcome>
+	<Feature_Achtung_Forcing>Erzwingen</Feature_Achtung_Forcing>
+	<Feature_Achtung_MenuError>Menüfehler</Feature_Achtung_MenuError>
+	<Feature_Achtung_Formations>Formationen</Feature_Achtung_Formations>
+	<Feature_Achtung_Cooperation>Zusammenarbeit</Feature_Achtung_Cooperation>
+	<Feature_Achtung_ThreeModes>Drei Modi</Feature_Achtung_ThreeModes>
+	<Feature_Achtung_Settings>Einstellungen</Feature_Achtung_Settings>
+	<Feature_Achtung_Draftstatus>Kampfstatus</Feature_Achtung_Draftstatus>
+	<Feature_Achtung_Rescue>Rettung</Feature_Achtung_Rescue>
 
 	<PositioningEnabledTitle>Benutzerdef. Positionierung via Maus</PositioningEnabledTitle>
 	<PositioningEnabledExplained>Aktiviert die Kampfpositionierung beim Klicken/Ziehen der Maus (siehe Einstellungen unten).</PositioningEnabledExplained>

diff --git a/Languages/Spanish/Keyed/Text.xml b/Languages/Spanish/Keyed/Text.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LanguageData>
 
-	<Topic_Welcome>¡Bienvenido a Achtung!</Topic_Welcome>
-	<Topic_Forcing>Forzar</Topic_Forcing>
-	<Topic_Formations>Formaciones</Topic_Formations>
-	<Topic_Cooperation>Cooperación</Topic_Cooperation>
-	<Topic_ThreeModes>Tres Modos</Topic_ThreeModes>
+	<Feature_Achtung_Welcome>¡Bienvenido a Achtung!</Feature_Achtung_Welcome>
+	<Feature_Achtung_Forcing>Forzar</Feature_Achtung_Forcing>
+	<Feature_Achtung_MenuError>Error de Menú</Feature_Achtung_MenuError>
+	<Feature_Achtung_Formations>Formaciones</Feature_Achtung_Formations>
+	<Feature_Achtung_Cooperation>Cooperación</Feature_Achtung_Cooperation>
+	<Feature_Achtung_ThreeModes>Tres Modos</Feature_Achtung_ThreeModes>
+	<Feature_Achtung_Settings>Configuración</Feature_Achtung_Settings>
+	<Feature_Achtung_Draftstatus>État de mobilisation</Feature_Achtung_Draftstatus>
+	<Feature_Achtung_Rescue>Rescate</Feature_Achtung_Rescue>
 
 	<PositioningEnabledTitle>Posicionamiento del ratón personalizado</PositioningEnabledTitle>
 	<PositioningEnabledExplained>Permite el posicionamiento en combate con un click o arrastre de tu ratón (ver preferencias abajo)</PositioningEnabledExplained>

diff --git a/Languages/Swedish/Keyed/Text.xml b/Languages/Swedish/Keyed/Text.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LanguageData>
 
-	<Topic_Welcome>Välkommen till Achtung!</Topic_Welcome>
-	<Topic_Forcing>Tvinga</Topic_Forcing>
-	<Topic_Formations>Formationer</Topic_Formations>
-	<Topic_Cooperation>Samarbete</Topic_Cooperation>
-	<Topic_ThreeModes>Tre Lägen</Topic_ThreeModes>
+	<Feature_Achtung_Welcome>Välkommen till Achtung!</Feature_Achtung_Welcome>
+	<Feature_Achtung_Forcing>Tvinga</Feature_Achtung_Forcing>
+	<Feature_Achtung_MenuError>Menyfel</Feature_Achtung_MenuError>
+	<Feature_Achtung_Formations>Formationer</Feature_Achtung_Formations>
+	<Feature_Achtung_Cooperation>Samarbete</Feature_Achtung_Cooperation>
+	<Feature_Achtung_ThreeModes>Tre Lägen</Feature_Achtung_ThreeModes>
+	<Feature_Achtung_Settings>Inställningar</Feature_Achtung_Settings>
+	<Feature_Achtung_Draftstatus>Wapenstatus</Feature_Achtung_Draftstatus>
+	<Feature_Achtung_Rescue>Räddning</Feature_Achtung_Rescue>
 
 	<PositioningEnabledTitle>Aktivera positioningen för kolonister</PositioningEnabledTitle>
 	<PositioningEnabledExplained>Aktiverar muskommandos för positioneringen av kolonister (se inställningar nere)</PositioningEnabledExplained>

diff --git a/Source/Achtung.csproj b/Source/Achtung.csproj
@@ -10,7 +10,7 @@
 		<OutputPath>..\1.4\Assemblies\</OutputPath>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-		<Version>3.6.1.0</Version>
+		<Version>3.7.0.0</Version>
 		<Copyright>© July, 2016</Copyright>
 		<Configurations>Release;Debug</Configurations>
 	</PropertyGroup>
@@ -57,6 +57,7 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
+		<PackageReference Include="ModFeatures" Version="1.0.0" />
 		<PackageReference Include="RimWorld.MultiplayerAPI" Version="0.4.0" />
 		<PackageReference Include="TaskPubliciser" Version="1.0.3" />
 	</ItemGroup>
@@ -91,7 +92,7 @@
 		<!--<PostBuildEvent>
 			mkdir -p /Users/ap/Library/Application\ Support/Steam/steamapps/common/RimWorld/RimWorldMac.app/Mods/Achtung
 			pushd ../..
-			cp -rf 1.1 1.2 1.3 1.4 About Assemblies Languages Patches Resources Textures LoadFolders.xml /Users/ap/Library/Application\ Support/Steam/steamapps/common/RimWorld/RimWorldMac.app/Mods/Achtung/
+			cp -rf 1.1 1.2 1.3 1.4 About Assemblies Features Languages Patches Resources Textures LoadFolders.xml /Users/ap/Library/Application\ Support/Steam/steamapps/common/RimWorld/RimWorldMac.app/Mods/Achtung/
 			popd
 			pushd /Users/ap/Library/Application\ Support/Steam/steamapps/common/RimWorld/RimWorldMac.app/Mods
 			rm -f Achtung.zip
@@ -106,7 +107,7 @@
 			ModBuilder XMLPut -file "$(SolutionDir)About\Manifest.xml" -xpath /Manifest/version -value "{{$(MSBuildProjectName)-version}}"
 			)
 			if defined INSTALL_MOD (
-			"%INSTALL_MOD%" "$(Configuration)" "$(SolutionDir)" "$(MSBuildProjectName)" "1.1 1.2 1.3 1.4 About Assemblies Languages Patches Resources Textures" "LoadFolders.xml"
+			"%INSTALL_MOD%" "$(Configuration)" "$(SolutionDir)" "$(MSBuildProjectName)" "1.1 1.2 1.3 1.4 About Assemblies Features Languages Patches Resources Textures" "LoadFolders.xml"
 			)
 		</PostBuildEvent>
 		<Company>Brrainz</Company>

diff --git a/Source/Dialog_ModFeatures.cs b/Source/Dialog_ModFeatures.cs