Fix for existing custom hand-positions with no rotation-info

emipa606 · Aug 29, 2024 · 4cd0807 · 4cd0807
1 parent 6a1d925
commit 4cd0807
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 19 deletions.
diff --git a/1.5/Assemblies/ShowMeYourHands.dll b/1.5/Assemblies/ShowMeYourHands.dll
diff --git a/About/About.xml b/About/About.xml
@@ -91,5 +91,5 @@ Since modding is just a hobby for me I expect no donations to keep modding. If y
 [/list]
 
 [url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2475965842][img]https://img.shields.io/github/v/release/emipa606/ShowMeYourHands?label=latest%20version&amp;style=plastic&amp;labelColor=0070cd&amp;color=white[/img][/url]</description>
-  <modVersion IgnoreIfNoMatchingField="True">1.5.8</modVersion>
+  <modVersion IgnoreIfNoMatchingField="True">1.5.9</modVersion>
 </ModMetaData>
diff --git a/About/Changelog.txt b/About/Changelog.txt
@@ -1,5 +1,8 @@
 # Changelog for ShowMeYourHands
 
+1.5.9 - Fix for existing custom hand-positions with no rotation-info
+
+
 1.5.8 - Added rotation support, default enabled when using [url=https://steamcommunity.com/sharedfiles/filedetails/?id=3302328100]Nice Hands Retexture[/url]
 Used DeepL to update translations for ChineseSimplified, French, German, Russian
 

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>ShowMeYourHands</identifier>
-  <version>1.5.8</version>
+  <version>1.5.9</version>
   <dependencies />
   <incompatibleWith />
   <loadBefore />

diff --git a/About/ModSync.xml b/About/ModSync.xml
@@ -2,7 +2,7 @@
 <ModSyncNinjaData>
   <ID>a5b440f3-8aa2-46ee-8a29-29561bb7087a</ID>
   <ModName>Show Me Your Hands</ModName>
-  <Version>1.5.8</Version>
+  <Version>1.5.9</Version>
   <SaveBreaking>False</SaveBreaking>
   <Host name="Github">
     <Owner>emipa606</Owner>

diff --git a/Languages/French/Keyed/Mod_Settings.xml b/Languages/French/Keyed/Mod_Settings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
   <!--The following translations were generated by https://www.deepl.com/-->
   <SMYH.settings>Paramètres</SMYH.settings>
@@ -64,4 +64,4 @@
   <SMYH.offhandrotation.label>Rotation hors main</SMYH.offhandrotation.label>
   <SMYH.degree>{0}°</SMYH.degree>
   <SMYH.rotate>Utilisez la molette de défilement pour faire tourner les aiguilles, maintenez la touche SHIFT enfoncée pour une rotation plus rapide.</SMYH.rotate>
-</LanguageData>
+</LanguageData>
diff --git a/Languages/German/Keyed/Mod_Settings.xml b/Languages/German/Keyed/Mod_Settings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
   <!--The following translations were generated by https://www.deepl.com/-->
   <SMYH.settings>Einstellungen</SMYH.settings>
@@ -64,4 +64,4 @@
   <SMYH.offhandrotation.label>Drehung aus der Hand</SMYH.offhandrotation.label>
   <SMYH.degree>{0}°</SMYH.degree>
   <SMYH.rotate>Verwenden Sie das Scrollrad, um die Zeiger zu drehen, halten Sie SHIFT für eine schnellere Drehung</SMYH.rotate>
-</LanguageData>
+</LanguageData>
diff --git a/Languages/Russian/Keyed/Mod_Settings.xml b/Languages/Russian/Keyed/Mod_Settings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LanguageData>
   <!--The following translations were generated by https://www.deepl.com/-->
   <SMYH.settings>Настройки</SMYH.settings>
@@ -64,4 +64,4 @@
   <SMYH.offhandrotation.label>Вращение без помощи рук</SMYH.offhandrotation.label>
   <SMYH.degree>{0}°</SMYH.degree>
   <SMYH.rotate>Используйте колесо прокрутки для поворота стрелок, удерживайте SHIFT для ускорения вращения.</SMYH.rotate>
-</LanguageData>
+</LanguageData>
diff --git a/Source/ShowMeYourHands/RimWorld_MainMenuDrawer_MainMenuOnGUI.cs b/Source/ShowMeYourHands/RimWorld_MainMenuDrawer_MainMenuOnGUI.cs
@@ -151,6 +151,9 @@ public static void FigureOutSpecific(ThingDef weapon)
                 compProps.MainHand = mainHand;
             }
         }
+
+        compProps.MainRotation = 0;
+        compProps.SecRotation = 0;
     }
 
     private static void FigureOutTheRest()
@@ -202,6 +205,8 @@ where weapon.IsWeapon && !weapon.destroyOnDrop &&
                 }
             }
 
+            compProps.MainRotation = 0;
+            compProps.SecRotation = 0;
             doneWeapons.Add(weapon);
         }
     }
@@ -249,17 +254,25 @@ private static void LoadFromSettings()
                         : Vector3.zero;
             }
 
-            if (ShowMeYourHandsMod.instance?.Settings?.ManualMainHandRotations.TryGetValue(keyValuePair.Key,
+            if (ShowMeYourHandsMod.instance?.Settings?.ManualMainHandRotations?.TryGetValue(keyValuePair.Key,
                     out var mainHandRotation) == true)
             {
                 compProps.MainRotation = mainHandRotation;
             }
+            else
+            {
+                compProps.MainRotation = 0;
+            }
 
-            if (ShowMeYourHandsMod.instance?.Settings?.ManualOffHandRotations.TryGetValue(keyValuePair.Key,
+            if (ShowMeYourHandsMod.instance?.Settings?.ManualOffHandRotations?.TryGetValue(keyValuePair.Key,
                     out var offHandRotation) == true)
             {
                 compProps.SecRotation = offHandRotation;
             }
+            else
+            {
+                compProps.SecRotation = 0;
+            }
 
             doneWeapons.Add(weapon);
         }

diff --git a/Source/ShowMeYourHands/ShowMeYourHands.csproj b/Source/ShowMeYourHands/ShowMeYourHands.csproj
@@ -6,7 +6,7 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <DebugType>None</DebugType>
     <LangVersion>latest</LangVersion>
-    <FileVersion>1.5.8</FileVersion>
+    <FileVersion>1.5.9</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Krafs.Rimworld.Ref">

diff --git a/Source/ShowMeYourHands/ShowMeYourHandsMod.cs b/Source/ShowMeYourHands/ShowMeYourHandsMod.cs
@@ -98,9 +98,23 @@ public ShowMeYourHandsMod(ModContentPack content)
         if (Settings.ManualMainHandPositions == null)
         {
             Settings.ManualMainHandPositions = new Dictionary<string, SaveableVector3>();
+        }
+
+        if (Settings.ManualOffHandPositions == null)
+        {
             Settings.ManualOffHandPositions = new Dictionary<string, SaveableVector3>();
         }
 
+        if (Settings.ManualMainHandRotations == null)
+        {
+            Settings.ManualMainHandRotations = new Dictionary<string, float>();
+        }
+
+        if (Settings.ManualOffHandRotations == null)
+        {
+            Settings.ManualOffHandRotations = new Dictionary<string, float>();
+        }
+
         currentVersion =
             VersionFromManifest.GetVersionFromModMetaData(content.ModMetaData);
     }

diff --git a/Source/ShowMeYourHands/WhandComp.cs b/Source/ShowMeYourHands/WhandComp.cs
@@ -1,10 +1,5 @@
-using UnityEngine;
-using Verse;
+using Verse;
 
 namespace ShowMeYourHands;
 
-public class WhandComp : ThingComp
-{
-    public Vector3 MHand;
-    public Vector3 SHand;
-}
+public class WhandComp : ThingComp;