fixed gizmo issue + fixed being able to dual wield two handeds + fixe…

…d options not serializing + fixed assembly references
rheirman · Feb 29, 2020 · bf73924 · bf73924
1 parent 4bde2fc
commit bf73924
Show file tree

Hide file tree

Showing 107 changed files with 6,777 additions and 7,682 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 *.vs
 Source/DualWield.vs/*
 Source/DualWield/obj/*
+1.1/Source/DualWield/obj/*
diff --git a/1.1/Assemblies/0Harmony.dll b/1.1/Assemblies/0Harmony.dll
diff --git a/1.1/Assemblies/DualWield.dll b/1.1/Assemblies/DualWield.dll
diff --git a/1.1/Assemblies/Unity.TextMeshPro.dll b/1.1/Assemblies/Unity.TextMeshPro.dll
diff --git a/1.1/Assemblies/UnityEngine.AIModule.dll b/1.1/Assemblies/UnityEngine.AIModule.dll
diff --git a/1.1/Assemblies/UnityEngine.ARModule.dll b/1.1/Assemblies/UnityEngine.ARModule.dll
diff --git a/1.1/Assemblies/UnityEngine.AccessibilityModule.dll b/1.1/Assemblies/UnityEngine.AccessibilityModule.dll
diff --git a/1.1/Assemblies/UnityEngine.AndroidJNIModule.dll b/1.1/Assemblies/UnityEngine.AndroidJNIModule.dll
diff --git a/1.1/Assemblies/UnityEngine.AnimationModule.dll b/1.1/Assemblies/UnityEngine.AnimationModule.dll
diff --git a/1.1/Assemblies/UnityEngine.AssetBundleModule.dll b/1.1/Assemblies/UnityEngine.AssetBundleModule.dll
diff --git a/1.1/Assemblies/UnityEngine.AudioModule.dll b/1.1/Assemblies/UnityEngine.AudioModule.dll
diff --git a/1.1/Assemblies/UnityEngine.ClothModule.dll b/1.1/Assemblies/UnityEngine.ClothModule.dll
diff --git a/1.1/Assemblies/UnityEngine.ClusterInputModule.dll b/1.1/Assemblies/UnityEngine.ClusterInputModule.dll
diff --git a/1.1/Assemblies/UnityEngine.ClusterRendererModule.dll b/1.1/Assemblies/UnityEngine.ClusterRendererModule.dll
diff --git a/1.1/Assemblies/UnityEngine.CoreModule.dll b/1.1/Assemblies/UnityEngine.CoreModule.dll
diff --git a/1.1/Assemblies/UnityEngine.CrashReportingModule.dll b/1.1/Assemblies/UnityEngine.CrashReportingModule.dll
diff --git a/1.1/Assemblies/UnityEngine.DSPGraphModule.dll b/1.1/Assemblies/UnityEngine.DSPGraphModule.dll
diff --git a/1.1/Assemblies/UnityEngine.DirectorModule.dll b/1.1/Assemblies/UnityEngine.DirectorModule.dll
diff --git a/1.1/Assemblies/UnityEngine.FileSystemHttpModule.dll b/1.1/Assemblies/UnityEngine.FileSystemHttpModule.dll
diff --git a/1.1/Assemblies/UnityEngine.GameCenterModule.dll b/1.1/Assemblies/UnityEngine.GameCenterModule.dll
diff --git a/1.1/Assemblies/UnityEngine.GridModule.dll b/1.1/Assemblies/UnityEngine.GridModule.dll
diff --git a/1.1/Assemblies/UnityEngine.HotReloadModule.dll b/1.1/Assemblies/UnityEngine.HotReloadModule.dll
diff --git a/1.1/Assemblies/UnityEngine.IMGUIModule.dll b/1.1/Assemblies/UnityEngine.IMGUIModule.dll
diff --git a/1.1/Assemblies/UnityEngine.ImageConversionModule.dll b/1.1/Assemblies/UnityEngine.ImageConversionModule.dll
diff --git a/1.1/Assemblies/UnityEngine.InputLegacyModule.dll b/1.1/Assemblies/UnityEngine.InputLegacyModule.dll
diff --git a/1.1/Assemblies/UnityEngine.InputModule.dll b/1.1/Assemblies/UnityEngine.InputModule.dll
diff --git a/1.1/Assemblies/UnityEngine.JSONSerializeModule.dll b/1.1/Assemblies/UnityEngine.JSONSerializeModule.dll
diff --git a/1.1/Assemblies/UnityEngine.LocalizationModule.dll b/1.1/Assemblies/UnityEngine.LocalizationModule.dll
diff --git a/1.1/Assemblies/UnityEngine.ParticleSystemModule.dll b/1.1/Assemblies/UnityEngine.ParticleSystemModule.dll
diff --git a/1.1/Assemblies/UnityEngine.PerformanceReportingModule.dll b/1.1/Assemblies/UnityEngine.PerformanceReportingModule.dll
diff --git a/1.1/Assemblies/UnityEngine.Physics2DModule.dll b/1.1/Assemblies/UnityEngine.Physics2DModule.dll
diff --git a/1.1/Assemblies/UnityEngine.PhysicsModule.dll b/1.1/Assemblies/UnityEngine.PhysicsModule.dll
diff --git a/1.1/Assemblies/UnityEngine.ProfilerModule.dll b/1.1/Assemblies/UnityEngine.ProfilerModule.dll
diff --git a/1.1/Assemblies/UnityEngine.ScreenCaptureModule.dll b/1.1/Assemblies/UnityEngine.ScreenCaptureModule.dll
diff --git a/1.1/Assemblies/UnityEngine.SharedInternalsModule.dll b/1.1/Assemblies/UnityEngine.SharedInternalsModule.dll
diff --git a/1.1/Assemblies/UnityEngine.SpriteMaskModule.dll b/1.1/Assemblies/UnityEngine.SpriteMaskModule.dll
diff --git a/1.1/Assemblies/UnityEngine.SpriteShapeModule.dll b/1.1/Assemblies/UnityEngine.SpriteShapeModule.dll
diff --git a/1.1/Assemblies/UnityEngine.StreamingModule.dll b/1.1/Assemblies/UnityEngine.StreamingModule.dll
diff --git a/1.1/Assemblies/UnityEngine.SubstanceModule.dll b/1.1/Assemblies/UnityEngine.SubstanceModule.dll
diff --git a/1.1/Assemblies/UnityEngine.TLSModule.dll b/1.1/Assemblies/UnityEngine.TLSModule.dll
diff --git a/1.1/Assemblies/UnityEngine.TerrainModule.dll b/1.1/Assemblies/UnityEngine.TerrainModule.dll
diff --git a/1.1/Assemblies/UnityEngine.TerrainPhysicsModule.dll b/1.1/Assemblies/UnityEngine.TerrainPhysicsModule.dll
diff --git a/1.1/Assemblies/UnityEngine.TextCoreModule.dll b/1.1/Assemblies/UnityEngine.TextCoreModule.dll
diff --git a/1.1/Assemblies/UnityEngine.TextRenderingModule.dll b/1.1/Assemblies/UnityEngine.TextRenderingModule.dll
diff --git a/1.1/Assemblies/UnityEngine.TilemapModule.dll b/1.1/Assemblies/UnityEngine.TilemapModule.dll
diff --git a/1.1/Assemblies/UnityEngine.UI.dll b/1.1/Assemblies/UnityEngine.UI.dll
diff --git a/1.1/Assemblies/UnityEngine.UIElementsModule.dll b/1.1/Assemblies/UnityEngine.UIElementsModule.dll
diff --git a/1.1/Assemblies/UnityEngine.UIModule.dll b/1.1/Assemblies/UnityEngine.UIModule.dll
diff --git a/1.1/Assemblies/UnityEngine.UNETModule.dll b/1.1/Assemblies/UnityEngine.UNETModule.dll
diff --git a/1.1/Assemblies/UnityEngine.UmbraModule.dll b/1.1/Assemblies/UnityEngine.UmbraModule.dll
diff --git a/1.1/Assemblies/UnityEngine.UnityAnalyticsModule.dll b/1.1/Assemblies/UnityEngine.UnityAnalyticsModule.dll
diff --git a/1.1/Assemblies/UnityEngine.UnityConnectModule.dll b/1.1/Assemblies/UnityEngine.UnityConnectModule.dll
diff --git a/1.1/Assemblies/UnityEngine.UnityTestProtocolModule.dll b/1.1/Assemblies/UnityEngine.UnityTestProtocolModule.dll
diff --git a/1.1/Assemblies/UnityEngine.UnityWebRequestAssetBundleModule.dll b/1.1/Assemblies/UnityEngine.UnityWebRequestAssetBundleModule.dll
diff --git a/1.1/Assemblies/UnityEngine.UnityWebRequestAudioModule.dll b/1.1/Assemblies/UnityEngine.UnityWebRequestAudioModule.dll
diff --git a/1.1/Assemblies/UnityEngine.UnityWebRequestModule.dll b/1.1/Assemblies/UnityEngine.UnityWebRequestModule.dll
diff --git a/1.1/Assemblies/UnityEngine.UnityWebRequestTextureModule.dll b/1.1/Assemblies/UnityEngine.UnityWebRequestTextureModule.dll
diff --git a/1.1/Assemblies/UnityEngine.UnityWebRequestWWWModule.dll b/1.1/Assemblies/UnityEngine.UnityWebRequestWWWModule.dll
diff --git a/1.1/Assemblies/UnityEngine.VFXModule.dll b/1.1/Assemblies/UnityEngine.VFXModule.dll
diff --git a/1.1/Assemblies/UnityEngine.VRModule.dll b/1.1/Assemblies/UnityEngine.VRModule.dll
diff --git a/1.1/Assemblies/UnityEngine.VehiclesModule.dll b/1.1/Assemblies/UnityEngine.VehiclesModule.dll
diff --git a/1.1/Assemblies/UnityEngine.VideoModule.dll b/1.1/Assemblies/UnityEngine.VideoModule.dll
diff --git a/1.1/Assemblies/UnityEngine.WindModule.dll b/1.1/Assemblies/UnityEngine.WindModule.dll
diff --git a/1.1/Assemblies/UnityEngine.XRModule.dll b/1.1/Assemblies/UnityEngine.XRModule.dll
diff --git a/1.1/Assemblies/UnityEngine.dll b/1.1/Assemblies/UnityEngine.dll
diff --git a/1.1/Source/DualWield/Base.cs b/1.1/Source/DualWield/Base.cs
@@ -16,7 +16,7 @@ public class Base : ModBase
     {
         public static Base Instance { get; private set; }
         ExtendedDataStorage _extendedDataStorage;
-        public override string ModIdentifier => "DualWield";
+        public override string ModIdentifier => "Roolo.DualWield";
 
         internal static SettingHandle<bool> settingsGroup_Drawing;
         internal static SettingHandle<bool> settingsGroup_DualWield;
@@ -301,15 +301,15 @@ where isWeapon(td)
 
         public override void MapComponentsInitializing(Map map)
         {
-            _extendedDataStorage = UtilityWorldObjectManager.GetUtilityWorldObject<ExtendedDataStorage>();
+            _extendedDataStorage = Find.World.GetComponent<ExtendedDataStorage>();
             base.MapComponentsInitializing(map);
         }
         public override void WorldLoaded()
         {
             //Failsafe if other mods prevent the store from being loaded during MapComponentsInitializing
             if (_extendedDataStorage == null)
             {
-                _extendedDataStorage = UtilityWorldObjectManager.GetUtilityWorldObject<ExtendedDataStorage>();
+                _extendedDataStorage = Find.World.GetComponent<ExtendedDataStorage>();
             }
             base.WorldLoaded();
         }

diff --git a/1.1/Source/DualWield/Command_DualWield.cs b/1.1/Source/DualWield/Command_DualWield.cs
@@ -29,7 +29,6 @@ public override float GetWidth(float maxWidth)
 
         public override GizmoResult GizmoOnGUI(Vector2 topLeft, float maxWidth)
         {
-            Log.Message("GizmoOnGUI");
             GizmoResult res = base.GizmoOnGUI(topLeft, maxWidth);
             GUI.color = offHandThing.DrawColor;
             Material material = (!this.disabled) ? null : TexUI.GrayscaleGUI;

diff --git a/1.1/Source/DualWield/DualWield.csproj b/1.1/Source/DualWield/DualWield.csproj
diff --git a/1.1/Source/DualWield/Harmony/Pawn_EquipmentTracker.cs b/1.1/Source/DualWield/Harmony/Pawn_EquipmentTracker.cs
@@ -70,12 +70,25 @@ static bool Prefix(Pawn_EquipmentTracker __instance, ThingWithComps eq)
             {
                 if (eq.def.IsTwoHand() && offHandEquipped)
                 {
+                    DropOffHand(__instance, eq, offHand);
                     string herHis = __instance.pawn.story.bodyType == BodyTypeDefOf.Male ? "DW_HerHis_Male".Translate() : "DW_HerHis_Female".Translate();
                     Messages.Message("DW_Message_UnequippedOffHand".Translate(new object[] { __instance.pawn.Name.ToStringShort, herHis }), new LookTargets(__instance.pawn), MessageTypeDefOf.CautionInput);
                 }
                 return true;
             }
         }
+
+        private static void DropOffHand(Pawn_EquipmentTracker __instance, ThingWithComps eq, ThingWithComps offHand)
+        {
+            if (__instance.TryDropEquipment(offHand, out ThingWithComps resultingEq, __instance.pawn.Position))
+            {
+                resultingEq?.SetForbidden(value: false);
+            }
+            else
+            {
+                Log.Error(__instance.pawn + " couldn't make room for equipment " + eq);
+            }
+        }
     }
 
 }
diff --git a/1.1/Source/DualWield/Harmony/VerbTracker.cs b/1.1/Source/DualWield/Harmony/VerbTracker.cs
@@ -6,28 +6,57 @@
 using System.Reflection;
 using System.Reflection.Emit;
 using System.Text;
+using UnityEngine;
 using Verse;
 
 namespace DualWield.Harmony
 {
+
     [HarmonyPatch(typeof(VerbTracker), "CreateVerbTargetCommand")]
     public class VerbTracker_CreateVerbTargetCommand
     {
-        static bool Prefix(VerbTracker __instance, Thing ownerThing, Verb verb, ref Command_VerbTarget __result) {
+        static void Postfix(VerbTracker __instance, Thing ownerThing, ref Verb verb, ref Command_VerbTarget __result) {
             if (ownerThing is ThingWithComps twc && twc.ParentHolder is Pawn_EquipmentTracker peqt)
             {
                 CompEquippable ce = __instance.directOwner as CompEquippable;
+
                 if (peqt.pawn.equipment.TryGetOffHandEquipment(out ThingWithComps offHandEquip))
                 {
                     if (offHandEquip != twc)
                     {
                         __result = CreateDualWieldCommand(ownerThing, offHandEquip, verb);
-                        return false;
                     }
                 }
             }
-            return true;
         }
+        private static Command_VerbTarget CreateVerbTargetCommand(VerbTracker __instance, Thing ownerThing, Verb verb)
+        {
+
+            Command_VerbTarget command_VerbTarget = new Command_VerbTarget();
+            command_VerbTarget.defaultDesc = ownerThing.LabelCap + ": " + ownerThing.def.description.CapitalizeFirst();
+            command_VerbTarget.icon = ownerThing.def.uiIcon;
+            command_VerbTarget.iconAngle = ownerThing.def.uiIconAngle;
+            command_VerbTarget.iconOffset = ownerThing.def.uiIconOffset;
+            command_VerbTarget.tutorTag = "VerbTarget";
+            command_VerbTarget.verb = verb;
+            if (verb.caster.Faction != Faction.OfPlayer)
+            {
+                command_VerbTarget.Disable("CannotOrderNonControlled".Translate());
+            }
+            else if (verb.CasterIsPawn)
+            {
+                if (verb.CasterPawn.WorkTagIsDisabled(WorkTags.Violent))
+                {
+                    command_VerbTarget.Disable("IsIncapableOfViolence".Translate(verb.CasterPawn.LabelShort, verb.CasterPawn));
+                }
+                else if (!verb.CasterPawn.drafter.Drafted)
+                {
+                    command_VerbTarget.Disable("IsNotDrafted".Translate(verb.CasterPawn.LabelShort, verb.CasterPawn));
+                }
+            }
+            return command_VerbTarget;
+        }
+
 
         private static Command_VerbTarget CreateDualWieldCommand(Thing ownerThing, Thing offHandThing, Verb verb)
         {
@@ -74,7 +103,10 @@ private static IEnumerable<Command> RemoveCommandForOffHand(IEnumerable<Command>
 
                     if (verb.EquipmentSource is ThingWithComps twc && twc.ParentHolder is Pawn_EquipmentTracker peqt)
                     {
-                        if (peqt.pawn.equipment.TryGetOffHandEquipment(out ThingWithComps offHandEquip) && offHandEquip == twc)
+                        bool offhandIsPrimary = false;
+                        //Remove offhand gizmo when dual wielding
+                        //Don't remove offhand gizmo when offhand weapon is the only weapon being carried by the pawn
+                        if (peqt.pawn.equipment.TryGetOffHandEquipment(out ThingWithComps offHandEquip) && offHandEquip == twc && offHandEquip != peqt.Primary)
                         {
                             continue;
                         }

diff --git a/1.1/Source/DualWield/Settings/DictRecordHandler.cs b/1.1/Source/DualWield/Settings/DictRecordHandler.cs
@@ -16,12 +16,7 @@ public class DictRecordHandler : SettingHandleConvertible
         public Dictionary<String, Record> inner = new Dictionary<String, Record>();
         public Dictionary<String, Record> InnerList { get { return inner; } set { inner = value; } }
         private XmlSerializer serializer = new XmlSerializer(typeof(Record));
-        XmlSerializerNamespaces ns = new XmlSerializerNamespaces();
 
-        public DictRecordHandler()
-        {
-            ns.Add("", "");
-        }
         public override void FromString(string settingValue)
         {
             inner = new Dictionary<String, Record>();
@@ -57,14 +52,27 @@ public override string ToString()
                     childXml = xmlDoc.CreateElement(XmlConvert.EncodeName(child.Key));
                     //Log.Warning("Couldn't create Dual Wield settings for: " + child.Key + ", because this defname isn't suitable for XML storage");
                 }
-                StringWriter writer = new StringWriter();
-                serializer.Serialize(writer, child.Value, ns);
-                childXml.InnerXml = writer.ToString();
+                childXml.InnerXml = SerializeToString(child.Value);
                 root.AppendChild(childXml);
             }
-
             return xmlDoc.OuterXml;
         }
+        // To Clean XML
+        private string SerializeToString<T>(T value)
+        {
+            var emptyNamespaces = new XmlSerializerNamespaces(new[] { XmlQualifiedName.Empty });
+            var serializer = new XmlSerializer(value.GetType());
+            var settings = new XmlWriterSettings();
+            settings.Indent = true;
+            settings.OmitXmlDeclaration = true;
+
+            using (var stream = new StringWriter())
+            using (var writer = XmlWriter.Create(stream, settings))
+            {
+                serializer.Serialize(writer, value, emptyNamespaces);
+                return stream.ToString();
+            }
+        }
     }
 
 }
diff --git a/1.1/Source/DualWield/Storage/ExtendedDataStorage.cs b/1.1/Source/DualWield/Storage/ExtendedDataStorage.cs
@@ -1,4 +1,5 @@
 using HugsLib.Utils;
+using RimWorld.Planet;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,7 +11,7 @@ namespace DualWield.Storage
     /**
      * Storage used to extend existing Rimworld objects with additional data. Caution should be taken when assigning the IDs. 
      **/
-    public class ExtendedDataStorage : UtilityWorldObject, IExposable
+    public class ExtendedDataStorage : WorldComponent, IExposable
     {
         private Dictionary<int, IExposable> _store =
             new Dictionary<int, IExposable>();
@@ -21,6 +22,9 @@ public class ExtendedDataStorage : UtilityWorldObject, IExposable
         internal int lastEmergencySignalDelay = 0;
         internal int lastEmergencySignalCooldown = 0;
 
+        public ExtendedDataStorage(World world) : base(world)
+        {
+        }
         public override void ExposeData()
         {
             base.ExposeData();

diff --git a/1.1/Source/DualWield/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/1.1/Source/DualWield/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/1.1/Source/DualWield/obj/Debug/DualWield.csproj.FileListAbsolute.txt b/1.1/Source/DualWield/obj/Debug/DualWield.csproj.FileListAbsolute.txt
@@ -2,3 +2,6 @@ C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\DualWield\Source\Dua
 C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\DualWield\Source\DualWield\obj\Debug\DualWield.csproj.CoreCompileInputs.cache
 C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\DualWield\1.1\Assemblies\DualWield.dll
 C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\DualWield\Source\DualWield\obj\Debug\DualWield.dll
+C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\DualWield\1.1\Source\DualWield\obj\Debug\DualWield.csprojAssemblyReference.cache
+C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\DualWield\1.1\Source\DualWield\obj\Debug\DualWield.dll
+C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\DualWield\1.1\Source\DualWield\obj\Debug\DualWield.csproj.CopyComplete
diff --git a/1.1/Source/DualWield/obj/Debug/DualWield.dll b/1.1/Source/DualWield/obj/Debug/DualWield.dll
diff --git a/1.1/Source/DualWield/packages.config b/1.1/Source/DualWield/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Lib.Harmony" version="2.0.0.5" targetFramework="net472" />
+  <package id="Lib.Harmony" version="2.0.0.7" targetFramework="net472" />
+  <package id="UnlimitedHugs.Rimworld.HugsLib" version="7.0.1" targetFramework="net472" />
 </packages>
diff --git a/1.1/Source/DualWield/packages/Lib.Harmony.2.0.0.5/Lib.Harmony.2.0.0.5.nupkg b/1.1/Source/DualWield/packages/Lib.Harmony.2.0.0.5/Lib.Harmony.2.0.0.5.nupkg
diff --git a/1.1/Source/DualWield/packages/Lib.Harmony.2.0.0.5/lib/net35/0Harmony.dll b/1.1/Source/DualWield/packages/Lib.Harmony.2.0.0.5/lib/net35/0Harmony.dll
diff --git a/1.1/Source/DualWield/packages/Lib.Harmony.2.0.0.5/lib/net45/0Harmony.dll b/1.1/Source/DualWield/packages/Lib.Harmony.2.0.0.5/lib/net45/0Harmony.dll
diff --git a/1.1/Source/DualWield/packages/Lib.Harmony.2.0.0.5/lib/net472/0Harmony.dll b/1.1/Source/DualWield/packages/Lib.Harmony.2.0.0.5/lib/net472/0Harmony.dll
diff --git a/1.1/Source/DualWield/packages/Lib.Harmony.2.0.0.5/lib/net48/0Harmony.dll b/1.1/Source/DualWield/packages/Lib.Harmony.2.0.0.5/lib/net48/0Harmony.dll