fix 'ew job'

turns out this one is kindof a vanilla bug; https://discordapp.com/channels/684960023020961812/686141574500843521/713487645019340802 fixes fluffy-mods#169
lockmatrix · May 22, 2020 · 12c8939 · 12c8939
1 parent c1d3709
commit 12c8939
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 15 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -72,7 +72,7 @@ maarxx:    Various fixes and improvements
 rimpy-custom:    Fix for Russian translation
 
 &lt;size=24&gt;Version&lt;/size&gt;
-This is version 4.30.607, for RimWorld 1.1.2624.
+This is version 4.30.612, for RimWorld 1.1.2624.
 
 </description>
   <supportedVersions>

diff --git a/Assemblies/Fluffy_ColonyManager.dll b/Assemblies/Fluffy_ColonyManager.dll
diff --git a/Languages/English/Keyed/Manager_Keyed.xml b/Languages/English/Keyed/Manager_Keyed.xml
@@ -55,7 +55,7 @@
   <FME.Power>Power</FME.Power>
   <FME.NotResearched>Power management has not been researched</FME.NotResearched>
   <FME.NoPoweredStation>No managing station has power</FME.NoPoweredStation>
-  
+
   <!-- Overview Tab -->
   <FM.Overview>Overview</FM.Overview>
   <FM.NoJobs>No jobs set.</FM.NoJobs>
@@ -67,7 +67,7 @@
   <FM.UnsuspendJobTooltip>Job has been suspended.\n\nClick to unsuspend.</FM.UnsuspendJobTooltip>
   <FM.SuspendJobTooltip>Click to suspend this job.</FM.SuspendJobTooltip>
   <FM.PluralSuffix>s</FM.PluralSuffix>
-  
+
   <!--Import/Export Tab-->
   <FM.ImportExport>Import &amp; Export</FM.ImportExport>
   <FM.CurrentJobs>Current Jobs:</FM.CurrentJobs>
@@ -118,7 +118,7 @@
   <FMF.JobType.ClearArea.Tip>Clearing areas to keep wind turbines running smoothly, and deny enemies any possible cover in the killing fields</FMF.JobType.ClearArea.Tip>
   <FMF.JobType.Logging>Wood logging</FMF.JobType.Logging>
   <FMF.JobType.Logging.Tip>Chop trees for wood</FMF.JobType.Logging.Tip>
-  
+
   <FMF.Clear>Clear {0}</FMF.Clear>
   <FMF.TurbineArea>wind turbines</FMF.TurbineArea>
 
@@ -133,7 +133,6 @@
   <FMF.BlocksWind>Blocks wind</FMF.BlocksWind>
   <FMF.BlocksWind.Tip>Select all plants that block wind</FMF.BlocksWind.Tip>
 
-
   <!-- Foraging (Gathering) tab -->
   <FMG.Foraging>Foraging</FMG.Foraging>
   <FMG.NewForagingJob>New job</FMG.NewForagingJob>
@@ -190,8 +189,8 @@
   <FML.MilkHeader>Progress till next milking</FML.MilkHeader>
   <FML.WoolHeader>Progress till next shearing</FML.WoolHeader>
   <FML.Yields>Expected yield: {0} x{1}</FML.Yields>
-	<FML.UnassignTraining>Unassign training</FML.UnassignTraining>
-	<FML.UnassignTraining.Tip>Unassign training targets for animals</FML.UnassignTraining.Tip>
+  <FML.UnassignTraining>Unassign training</FML.UnassignTraining>
+  <FML.UnassignTraining.Tip>Unassign training targets for animals</FML.UnassignTraining.Tip>
   <FML.TrainYoung>Train young animals</FML.TrainYoung>
   <FML.SendToSlaughterArea>Restrict animals marked for slaughter</FML.SendToSlaughterArea>
   <FML.SendToSlaughterArea.Tip>Restrict animals designated for slaughtering to a specific area</FML.SendToSlaughterArea.Tip>
@@ -231,7 +230,8 @@
   <FM.Livestock.FollowTraining.Tip>Make animals marked for training try to follow their trainer.</FM.Livestock.FollowTraining.Tip>
   <FM.Livestock.MasterTraining>Assign trainer(s)</FM.Livestock.MasterTraining>
   <FM.Livestock.MasterTraining.Tip>Assign animals marked for training to a specific master (trainer), or to all trainers. May overwrite user settings when enabled.</FM.Livestock.MasterTraining.Tip>
-  <FM.Livestock.Master>{0} ({1})</FM.Livestock.Master> <!-- 0; pawn name, 1; skill level -->
+  <FM.Livestock.Master>{0} ({1})</FM.Livestock.Master>
+  <!-- 0; pawn name, 1; skill level -->
 
   <!-- MasterMode enum -->
   <FM.Livestock.MasterMode.Default>Manual</FM.Livestock.MasterMode.Default>
@@ -248,4 +248,13 @@
   <Fluffy.ColonyManager.CannotManage.NoJobs>no jobs set</Fluffy.ColonyManager.CannotManage.NoJobs>
   <Fluffy.ColonyManager.CannotManage.NoActiveJobs>all jobs are done</Fluffy.ColonyManager.CannotManage.NoActiveJobs>
 
+  <!-- History chapter labels -->
+  <Fluffy.ColonyManager.HistoryStock>stock</Fluffy.ColonyManager.HistoryStock>
+  <Fluffy.ColonyManager.HistoryDesignated>designated</Fluffy.ColonyManager.HistoryDesignated>
+  <Fluffy.ColonyManager.HistoryCorpses>corpses</Fluffy.ColonyManager.HistoryCorpses>
+  <Fluffy.ColonyManager.HistoryChunks>chunks</Fluffy.ColonyManager.HistoryChunks>
+  <Fluffy.ColonyManager.HistoryProduction>production</Fluffy.ColonyManager.HistoryProduction>
+  <Fluffy.ColonyManager.HistoryConsumption>consumption</Fluffy.ColonyManager.HistoryConsumption>
+  <Fluffy.ColonyManager.HistoryBatteries>batteries</Fluffy.ColonyManager.HistoryBatteries>
+
 </LanguageData>
diff --git a/Readme.md b/Readme.md
@@ -79,4 +79,4 @@ Show your appreciation by buying me a coffee (or contribute towards a nice singl
 [![I Have a Black Dog](https://i.ibb.co/ss59Rwy/New-Project-2.png)](https://www.youtube.com/watch?v=XiCrniLQGYc)
 
 # Version
-This is version 4.30.607, for RimWorld 1.1.2624.
+This is version 4.30.612, for RimWorld 1.1.2624.
diff --git a/Source/ManagerTabs/ManagerTab_Foraging.cs b/Source/ManagerTabs/ManagerTab_Foraging.cs
@@ -149,12 +149,12 @@ public void DoLeftRow( Rect rect )
             if ( i % 2 == 1 ) Widgets.DrawAltRect( newRect );
 
             Text.Anchor = TextAnchor.MiddleCenter;
-            Widgets.Label( newRect, "<" + "FMG.NewForagingJob".Translate() + ">" );
+            Widgets.Label( newRect, "<" + "FMG.NewForagingJob".Translate().Resolve() + ">" );
             Text.Anchor = TextAnchor.UpperLeft;
 
             if ( Widgets.ButtonInvisible( newRect ) ) Selected = new ManagerJob_Foraging( manager );
 
-            TooltipHandler.TipRegion( newRect, "FMG.NewForagingJobTooltip".Translate() );
+            TooltipHandler.TipRegion( newRect, "FMG.NewForagingJobTooltip".Translate().Resolve() );
 
             cur.y += LargeListEntryHeight;
 

diff --git a/Source/ManagerTabs/ManagerTab_Forestry.cs b/Source/ManagerTabs/ManagerTab_Forestry.cs
@@ -155,7 +155,7 @@ public void DoLeftRow( Rect rect )
             if ( i % 2 == 1 ) Widgets.DrawAltRect( newRect );
 
             Text.Anchor = TextAnchor.MiddleCenter;
-            Widgets.Label( newRect, "<" + "FMF.NewForestryJob".Translate() + ">" );
+            Widgets.Label( newRect, "<" + "FMF.NewForestryJob".Translate().Resolve() + ">" );
             Text.Anchor = TextAnchor.UpperLeft;
 
             if ( Widgets.ButtonInvisible( newRect ) ) Selected = new ManagerJob_Forestry( manager );

diff --git a/Source/ManagerTabs/ManagerTab_Hunting.cs b/Source/ManagerTabs/ManagerTab_Hunting.cs
@@ -154,7 +154,7 @@ public void DoJobList( Rect rect )
             if ( i++ % 2 == 1 ) Widgets.DrawAltRect( newRect );
 
             Text.Anchor = TextAnchor.MiddleCenter;
-            Widgets.Label( newRect, "<" + "FMH.NewHuntingJob".Translate() + ">" );
+            Widgets.Label( newRect, "<" + "FMH.NewHuntingJob".Translate().Resolve() + ">" );
             Text.Anchor = TextAnchor.UpperLeft;
 
             if ( Widgets.ButtonInvisible( newRect ) ) Selected = new ManagerJob_Hunting( manager );

diff --git a/Source/ManagerTabs/ManagerTab_Mining.cs b/Source/ManagerTabs/ManagerTab_Mining.cs
@@ -393,7 +393,7 @@ private void DoJobList( Rect rect )
             if ( i++ % 2 == 1 ) Widgets.DrawAltRect( newRect );
 
             Text.Anchor = TextAnchor.MiddleCenter;
-            Widgets.Label( newRect, "<" + "FM.Mining.NewJob".Translate() + ">" );
+            Widgets.Label( newRect, "<" + "FM.Mining.NewJob".Translate().Resolve() + ">" );
             Text.Anchor = TextAnchor.UpperLeft;
 
             if ( Widgets.ButtonInvisible( newRect ) ) Selected = new ManagerJob_Mining( manager );

diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -39,4 +39,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyVersion("4.0.0")]
-[assembly: AssemblyFileVersion("4.30.607")]
+[assembly: AssemblyFileVersion("4.30.612")]