A16 Update

notfood · Dec 13, 2016 · 4b12cc6 · 4b12cc6
1 parent e019d3e
commit 4b12cc6
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 60 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ModMetaData>
-	<name>Infused (local)</name>
+	<name>Infused</name>
 	<author>Latta &amp; NotFood</author>
         <url>https://ludeon.com/forums/index.php?topic=21884.0</url>
-	<targetVersion>0.15.0</targetVersion>
+	<targetVersion>0.16.0</targetVersion>
 	<description>Equipment enchantment
 
 Requires Community Core Library.

diff --git a/Defs/InfusionDefs/Prefixes.xml b/Defs/InfusionDefs/Prefixes.xml
@@ -636,7 +636,7 @@
         </value>
       </li>
       <li>
-        <key>BaseHealingQuality</key>
+        <key>HealingQuality</key>
         <value>
           <multiplier>1.03</multiplier>
         </value>
@@ -733,7 +733,7 @@
         </value>
       </li>
       <li>
-        <key>BaseHealingQuality</key>
+        <key>HealingQuality</key>
         <value>
           <multiplier>1.07</multiplier>
         </value>

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # RimWorld-Infused
 
-[![Version](https://img.shields.io/badge/Rimworld-A15-green.svg)]
+[![Version](https://img.shields.io/badge/Rimworld-A16-green.svg)]
 (http://rimworldgame.com/)
 [![License](https://img.shields.io/badge/license-Custom-blue.svg)]
 (https://ludeon.com/forums/index.php?topic=11171.msg111243#msg111243)

diff --git a/Source/Comp/CompInfusion.cs b/Source/Comp/CompInfusion.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Text;
 
+using UnityEngine;
 using RimWorld;
 using Verse;
 using Verse.Sound;
@@ -18,6 +19,9 @@ public class CompInfusion : ThingComp
 		private string prefixDefName, suffixDefName;
 		private Def prefix, suffix;
 
+		private string infusedLabel;
+		private Color infusedLabelColor;
+
 		public InfusionSet Infusions {
 			get { return new InfusionSet (prefix, suffix); }
 		}
@@ -26,6 +30,14 @@ public bool Infused {
 			get { return prefix != null || suffix != null; }
 		}
 
+		public string InfusedLabel {
+			get { return infusedLabel; }
+		}
+
+		public Color InfusedLabelColor {
+			get { return infusedLabelColor; }
+		}
+
 		public void InitializeInfusionPrefix(InfusionTier tier)
 		{
 			InitializeInfusion (InfusionType.Prefix, tier, out prefix);
@@ -70,7 +82,7 @@ private void throwMote()
 			Messages.Message( ResourceBank.StringInfusionMessage.Translate( msg ), MessageSound.Silent );
 			InfusionSound.PlayOneShotOnCamera();
 
-			MoteMaker.ThrowText( parent.Position.ToVector3Shifted(), ResourceBank.StringInfused,
+			MoteMaker.ThrowText( parent.Position.ToVector3Shifted(), this.parent.Map, ResourceBank.StringInfused,
 			                       GenInfusionColor.Legendary );
 
 			isNew = false;
@@ -81,6 +93,32 @@ public override void PostSpawnSetup()
 			base.PostSpawnSetup();
 
 			if (Infused) {
+				//When there is only suffix
+				if (suffix != null)
+				{
+					infusedLabelColor = suffix.tier.InfusionColor();
+				}
+				//When there is only prefix
+				else if (prefix != null)
+				{
+					infusedLabelColor = prefix.tier.InfusionColor();
+				}
+				//When there are both prefix and suffix
+				else
+				{
+					infusedLabelColor = MathUtility.Max(prefix.tier, suffix.tier).InfusionColor();
+				}
+
+				infusedLabel = "";
+				if (prefix != null)
+				{
+					infusedLabel += prefix.labelShort;
+					if (suffix != null)
+						infusedLabel += " ";
+				}
+				if (suffix != null)
+					infusedLabel += suffix.labelShort;
+
 				InfusionLabelManager.Register (this);
 
 				// We only throw notifications for newly spawned items.
@@ -116,9 +154,9 @@ public override void PostExposeData()
 #endif
 		}
 
-		public override void PostDeSpawn()
+		public override void PostDeSpawn (Map map)
 		{
-			base.PostDeSpawn();
+			base.PostDeSpawn (map);
 
 			if ( Infused )
 			{

diff --git a/Source/Infused.csproj b/Source/Infused.csproj
@@ -31,12 +31,12 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="UnityEngine">
-      <HintPath>..\..\..\..\..\Steam\steamapps\common\RimWorld\RimWorldLinux_Data\Managed\UnityEngine.dll</HintPath>
+    <Reference Include="Assembly-CSharp">
+      <HintPath>..\..\..\RimWorldLinux_Data\Managed\Assembly-CSharp.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\..\..\Steam\steamapps\common\RimWorld\RimWorldLinux_Data\Managed\Assembly-CSharp.dll</HintPath>
+    <Reference Include="UnityEngine">
+      <HintPath>..\..\..\RimWorldLinux_Data\Managed\UnityEngine.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>

diff --git a/Source/MapComponent/MapComponent_InfusionManager.cs b/Source/MapComponent/MapComponent_InfusionManager.cs
@@ -11,7 +11,7 @@ namespace Infused
 {
     public class MapComponent_InfusionManager : MapComponent
     {
-        public MapComponent_InfusionManager ()
+		public MapComponent_InfusionManager (Map map) : base(map)
         {
             // Clear old labels
             InfusionLabelManager.ReInit();
@@ -32,42 +32,11 @@ private static void Draw()
             foreach (var current in InfusionLabelManager.Drawee)
             {
 				// skip fogged
-				if (Find.FogGrid.IsFogged (current.parent.Position)) {
+				if (Find.VisibleMap.fogGrid.IsFogged (current.parent.Position)) {
 					continue;
 				}
 
-                var inf = current.Infusions;
-                var prefix = inf.prefix;
-                var suffix = inf.suffix;
-
-                Color color;
-                //When there is only suffix
-				if (suffix != null)
-                {
-                    color = suffix.tier.InfusionColor();
-                }
-                //When there is only prefix
-				else if (prefix != null)
-                {
-                    color = prefix.tier.InfusionColor();
-                }
-                //When there are both prefix and suffix
-                else
-                {
-                    color = MathUtility.Max(prefix.tier, suffix.tier).InfusionColor();
-                }
-                var result = new StringBuilder();
-				if (prefix != null)
-                {
-                    result.Append(prefix.labelShort);
-					if (suffix != null)
-                        result.Append(" ");
-                }
-				if (suffix != null)
-                    result.Append(suffix.labelShort);
-
-                GenWorldUI.DrawThingLabel(
-                  GenWorldUI.LabelDrawPosFor(current.parent, -0.66f), result.ToString(), color);
+				GenMapUI.DrawThingLabel( GenMapUI.LabelDrawPosFor(current.parent, -0.66f), current.InfusedLabel, current.InfusedLabelColor );
             }
         }
     }

diff --git a/Source/ModInitializers/MapComponentInjector.cs b/Source/ModInitializers/MapComponentInjector.cs
@@ -11,14 +11,14 @@ public class MapComponentInjector : MonoBehaviour
 
 		public void FixedUpdate()
 		{
-			if (Current.ProgramState != ProgramState.MapPlaying)
+			if (Current.ProgramState != ProgramState.Playing)
 			{
 				return;
 			}
 
-			if (Find.Map.components.FindAll(c => c.GetType() == infusionManager).Count == 0)
+			if (Find.VisibleMap.components.FindAll(c => c.GetType() == infusionManager).Count == 0)
 			{
-				Find.Map.components.Add((MapComponent) Activator.CreateInstance (infusionManager));
+				Find.VisibleMap.components.Add((MapComponent) Activator.CreateInstance (infusionManager, Find.VisibleMap));
 
 				Log.Message("Infused :: Added an infusion manager to the map.");
 			}

diff --git a/Source/ModInitializers/ModInjector.cs b/Source/ModInitializers/ModInjector.cs
@@ -9,7 +9,6 @@
 
 namespace Infused
 {
-	[StaticConstructorOnStartup]
 	public class ModInjector
 	{
 		public static bool hasRun;
@@ -20,20 +19,21 @@ public static void Inject()
 				return;
 			}
 
+			hasRun = true;
+
 			MethodInfo Rimworld_CompQuality_SetQuality = typeof(CompQuality).GetMethod ("SetQuality", BindingFlags.Instance | BindingFlags.Public);
 			MethodInfo Infused_CompQuality_SetQuality = typeof(ModDetour).GetMethod ("_SetQuality", BindingFlags.Static | BindingFlags.NonPublic);
 			if (!Detours.TryDetourFromTo (Rimworld_CompQuality_SetQuality, Infused_CompQuality_SetQuality)) {
 				Log.Error ("Infused :: Failed to Detour");
 
-				hasRun = true;
-
 				return;
 			}
 
-			// until CCL for A15 appears...
-			GameObject initializer = new GameObject("InfusionMapComponentInjector");
-			initializer.AddComponent<MapComponentInjector>();
-			UnityEngine.Object.DontDestroyOnLoad(initializer);
+			LongEventHandler.ExecuteWhenFinished (delegate {
+				GameObject initializer = new GameObject("InfusionMapComponentInjector");
+				UnityEngine.Object.DontDestroyOnLoad(initializer);
+				initializer.AddComponent<MapComponentInjector>();
+			});
 
 			var defs = (
 				from def in DefDatabase< ThingDef >.AllDefs
@@ -43,7 +43,7 @@ select def
 			);
 
 			var tabType = typeof(ITab_Infusion);
-			var tab = ITabManager.GetSharedInstance ( tabType );
+			var tab = InspectTabManager.GetSharedInstance ( tabType );
 			var compProperties = new CompProperties { compClass = typeof (CompInfusion) };
 
 			foreach(var def in defs) {
@@ -55,7 +55,7 @@ select def
 				if ( def.inspectorTabs == null || def.inspectorTabs.Count == 0 )
 				{
 					def.inspectorTabs = new List< Type >();
-					def.inspectorTabsResolved = new List< ITab >();
+					def.inspectorTabsResolved = new List< InspectTabBase >();
 				}
 
 				def.inspectorTabs.Add (tabType);
@@ -64,8 +64,6 @@ select def
 #if DEBUG
 			Log.Message ("Infused :: Injected");
 #endif
-
-			hasRun = true;
 		}
 
 	}