diff --git a/About/About.xml b/About/About.xml index e0873495..26ce4b0e 100644 --- a/About/About.xml +++ b/About/About.xml @@ -73,11 +73,11 @@ rimpy-custom: Fix for Russian translation InsanityPrelude: Add AllWork tag to Managing WorkTypeDef (#181) <size=24>Version</size> -This is version 4.33.649, for RimWorld 1.2.2753. +This is version 4.33.649, for RimWorld 1.3.3069. -
  • 1.2
  • +
  • 1.3
  • fluffy.colonymanager diff --git a/Assemblies/Fluffy_ColonyManager.dll b/Assemblies/Fluffy_ColonyManager.dll index 574ee701..6cc91b32 100644 Binary files a/Assemblies/Fluffy_ColonyManager.dll and b/Assemblies/Fluffy_ColonyManager.dll differ diff --git a/Source/Helpers/Mining/Dialog_MiningDebugOptions.cs b/Source/Helpers/Mining/Dialog_MiningDebugOptions.cs index 086e9184..46bacec3 100644 --- a/Source/Helpers/Mining/Dialog_MiningDebugOptions.cs +++ b/Source/Helpers/Mining/Dialog_MiningDebugOptions.cs @@ -23,7 +23,7 @@ protected override void DoListingItems() { foreach ( var thing in Find.CurrentMap.thingGrid.ThingsAt( UI.MouseCell() ).OfType() ) Messages.Message( job.IsValidMiningTarget( thing ).ToString(), MessageTypeDefOf.SilentInput ); - } ); + }, false ); DebugToolMap( "IsValidDeconstructionTarget", delegate @@ -31,26 +31,26 @@ protected override void DoListingItems() foreach ( var thing in Find.CurrentMap.thingGrid.ThingsAt( UI.MouseCell() ).OfType() ) Messages.Message( job.IsValidDeconstructionTarget( thing ).ToString(), MessageTypeDefOf.SilentInput ); - } ); + }, false ); DebugToolMap( "Faction", delegate { foreach ( var thing in Find.CurrentMap.thingGrid.ThingsAt( UI.MouseCell() ).OfType() ) Messages.Message( thing.Faction.ToStringSafe(), MessageTypeDefOf.SilentInput ); - } ); + }, false ); DebugToolMap( "AllowedBuilding", delegate { foreach ( var thing in Find.CurrentMap.thingGrid.ThingsAt( UI.MouseCell() ).OfType() ) Messages.Message( job.AllowedBuilding( thing.def ).ToString(), MessageTypeDefOf.SilentInput ); - } ); + }, false); DebugToolMap( "AllowedMineral", delegate { foreach ( var thing in Find.CurrentMap.thingGrid.ThingsAt( UI.MouseCell() ).OfType() ) Messages.Message( job.AllowedMineral( thing.def ).ToString(), MessageTypeDefOf.SilentInput ); - } ); + }, false); DebugToolMap( "IsRelevantDeconstructionTarget", delegate @@ -58,56 +58,56 @@ protected override void DoListingItems() foreach ( var thing in Find.CurrentMap.thingGrid.ThingsAt( UI.MouseCell() ).OfType() ) Messages.Message( job.IsRelevantDeconstructionTarget( thing ).ToString(), MessageTypeDefOf.SilentInput ); - } ); + }, false); DebugToolMap( "IsRelevantMiningTarget", delegate { foreach ( var thing in Find.CurrentMap.thingGrid.ThingsAt( UI.MouseCell() ).OfType() ) Messages.Message( job.IsRelevantMiningTarget( thing ).ToString(), MessageTypeDefOf.SilentInput ); - } ); + }, false); DebugToolMap( "IsInAllowedArea", delegate { foreach ( var thing in Find.CurrentMap.thingGrid.ThingsAt( UI.MouseCell() ).OfType() ) Messages.Message( job.IsInAllowedArea( thing ).ToString(), MessageTypeDefOf.SilentInput ); - } ); + }, false); DebugToolMap( "IsReachable", delegate { foreach ( var thing in Find.CurrentMap.thingGrid.ThingsAt( UI.MouseCell() ).OfType() ) Messages.Message( job.IsReachable( thing ).ToString(), MessageTypeDefOf.SilentInput ); - } ); + }, false); DebugToolMap( "IsRoomDivider", delegate { foreach ( var thing in Find.CurrentMap.thingGrid.ThingsAt( UI.MouseCell() ).OfType() ) Messages.Message( job.IsARoomDivider( thing ).ToString(), MessageTypeDefOf.SilentInput ); - } ); + }, false); DebugToolMap( "IsRoofSupport: basic", delegate { foreach ( var thing in Find.CurrentMap.thingGrid.ThingsAt( UI.MouseCell() ).OfType() ) Messages.Message( job.IsARoofSupport_Basic( thing ).ToString(), MessageTypeDefOf.SilentInput ); - } ); + }, false); ; DebugToolMap( "IsRoofSupport: advanced", delegate { foreach ( var thing in Find.CurrentMap.thingGrid.ThingsAt( UI.MouseCell() ).OfType() ) Messages.Message( job.IsARoofSupport_Advanced( thing ).ToString(), MessageTypeDefOf.SilentInput ); - } ); + }, false); DebugAction( "DrawSupportGrid", delegate { foreach ( var cell in job.manager.map.AllCells ) if ( job.IsARoofSupport_Basic( cell ) ) job.manager.map.debugDrawer.FlashCell( cell, DebugSolidColorMats.MaterialOf( Color.green ) ); - } ); + }, false); DebugAction( "GetBaseCenter", delegate { var cell = Utilities.GetBaseCenter( job.manager ); job.manager.map.debugDrawer.FlashCell( cell, DebugSolidColorMats.MaterialOf( Color.blue ) ); - } ); + }, false); DebugToolMap( "DrawPath", delegate { @@ -118,7 +118,7 @@ protected override void DoListingItems() TraverseMode.PassDoors, Danger.Some ) ); path.DrawPath( null ); path.ReleaseToPool(); - } + }, false ); } } diff --git a/Source/Helpers/UI/UIThingFilterSearchable.cs b/Source/Helpers/UI/UIThingFilterSearchable.cs index 7d69075a..90c28d93 100644 --- a/Source/Helpers/UI/UIThingFilterSearchable.cs +++ b/Source/Helpers/UI/UIThingFilterSearchable.cs @@ -81,7 +81,7 @@ public void DoThingFilterConfigWindow( Rect canvas, ref Vector2 scrollPosition, // main listing var listingRect = new Rect( 0f, curY, viewRect.width, 9999f ); - var listingTreeThingFilter = new Listing_TreeThingFilter( filter, parentFilter, null, null, null ); + var listingTreeThingFilter = new Listing_TreeThingFilter( filter, parentFilter, null, null, null, new RimWorld.QuickSearchFilter() ); listingTreeThingFilter.Begin( listingRect ); var node = ThingCategoryNodeDatabase.RootNode; if ( parentFilter != null ) @@ -91,7 +91,7 @@ public void DoThingFilterConfigWindow( Rect canvas, ref Vector2 scrollPosition, } // draw the actual thing - listingTreeThingFilter.DoCategoryChildren( node, 0, openMask, Find.CurrentMap, true ); + listingTreeThingFilter.ListCategoryChildren(node, openMask, Find.CurrentMap, new Rect(0f, curY+2f, viewRect.width-2f, 9999f));//DoCategoryChildren( node, 0, openMask, Find.CurrentMap, true ); listingTreeThingFilter.End(); // update height. diff --git a/Source/ManagerJobs/ManagerJob_Mining.cs b/Source/ManagerJobs/ManagerJob_Mining.cs index 7972394a..c8e568c7 100644 --- a/Source/ManagerJobs/ManagerJob_Mining.cs +++ b/Source/ManagerJobs/ManagerJob_Mining.cs @@ -441,7 +441,7 @@ public bool IsARoomDivider( Thing target ) .ToArray(); // check if there are more than two rooms in the surrounding cells. - var rooms = adjacent.Select( c => c.GetRoom( manager.map, RegionType.Normal ) ) + var rooms = adjacent.Select( c => c.GetRoom( manager.map) ) .Where( r => r != null ) .Distinct() .ToList(); diff --git a/Source/Triggers/Trigger_Threshold.cs b/Source/Triggers/Trigger_Threshold.cs index 9e5358ed..bf6cbd20 100644 --- a/Source/Triggers/Trigger_Threshold.cs +++ b/Source/Triggers/Trigger_Threshold.cs @@ -255,13 +255,13 @@ public override void DrawTriggerConfig( ref Vector2 cur, float width, float entr { var option = string.Empty; Action onClick = () => Find.WindowStack.TryRemove( typeof( MainTabWindow_Manager ), false ); - Action onHover = null; + Action onHover = null; if ( designation.target.HasThing ) { var thing = designation.target.Thing; option = designationLabelGetter?.Invoke( designation ) ?? thing.LabelCap; onClick += () => CameraJumper.TryJumpAndSelect( thing ); - onHover += () => CameraJumper.TryJump( thing ); + onHover += (c) => CameraJumper.TryJump( thing ); } else { @@ -271,7 +271,7 @@ public override void DrawTriggerConfig( ref Vector2 cur, float width, float entr // so I suppose it doesn't matter -- Fluffy. option = designationLabelGetter?.Invoke( designation ) ?? cell.GetTerrain( map ).LabelCap; onClick += () => CameraJumper.TryJump( cell, map ); - onHover += () => CameraJumper.TryJump( cell, map ); + onHover += (c) => CameraJumper.TryJump( cell, map ); } options.Add( new FloatMenuOption( option, onClick, MenuOptionPriority.Default, onHover ) ); diff --git a/Source/Windows/Window_TriggerThresholdDetails.cs b/Source/Windows/Window_TriggerThresholdDetails.cs index 119183e0..499a651a 100644 --- a/Source/Windows/Window_TriggerThresholdDetails.cs +++ b/Source/Windows/Window_TriggerThresholdDetails.cs @@ -81,4 +81,4 @@ public override void PreOpen() Input = Trigger.TargetCount.ToString(); } } -} \ No newline at end of file +} diff --git a/Source/packages.config b/Source/packages.config index 0ea9d1aa..e54c72b4 100644 --- a/Source/packages.config +++ b/Source/packages.config @@ -1,5 +1,5 @@  - - \ No newline at end of file + +