Merge pull request #24 from RimWorldCCLTeam/development

v0.12.2 Update

.gitignore

@@ -7,6 +7,7 @@
 *.userprefs
 *.sln.docstates
 DLL_Project/Source-DLLs/*.dll
+DLL_Project/*.bat
 
 # Build results
 [Dd]ebug/

DLL_Project/Commands/ChangeColor.cs

@@ -35,10 +35,13 @@ public override SoundDef            CurActivateSound
             }
         }
 
-        public                              ChangeColor( CompColoredLight light )
+        public                              ChangeColor(
+            CompColoredLight light,
+            Texture2D designatorIcon
+        )
         {
             parentLight = light;
-            icon = Icon.NextButton;
+            icon = designatorIcon;
             defaultLabel = "CommandChangeColorLabel".Translate();
         }
 

DLL_Project/Commands/DefOrThingCompInRoom.cs

@@ -54,10 +54,15 @@ public override SoundDef            CurActivateSound
             }
         }
 
-        public                              DefOrThingCompInRoom ( Thing parent, Type RequiredType, string label )
+        public                              DefOrThingCompInRoom (
+            Thing parent,
+            Type RequiredType,
+            string label,
+            Texture2D designatorIcon
+        )
         {
             parentThing = parent;
-            icon = Icon.NextButton;
+            icon = designatorIcon;
 
             parentType = RequiredType;
 

DLL_Project/Commands/TouchingByDef.cs

@@ -48,10 +48,15 @@ public override SoundDef            CurActivateSound
             }
         }
 
-        public                              TouchingByDef( Thing parent, Action_OnThings LeftClick = null, Action_OnThings RightClick = null )
+        public                              TouchingByDef(
+            Thing parent,
+            Texture2D designatorIcon,
+            Action_OnThings LeftClick = null,
+            Action_OnThings RightClick = null
+        )
         {
             parentThing = parent;
-            icon = Icon.NextButton;
+            icon = designatorIcon;
 
             ClickLeft = LeftClick;
             ClickRight = RightClick;

DLL_Project/Commands/TouchingByLinker.cs

@@ -47,10 +47,15 @@ public override SoundDef            CurActivateSound
             }
         }
 
-        public                              TouchingByLinker( Thing parent, Action_OnThings LeftClick = null, Action_OnThings RightClick = null )
+        public                              TouchingByLinker(
+            Thing parent,
+            Texture2D designatorIcon,
+            Action_OnThings LeftClick = null,
+            Action_OnThings RightClick = null
+        )
         {
             parentThing = parent;
-            icon = Icon.NextButton;
+            icon = designatorIcon;
 
             ClickLeft = LeftClick;
             ClickRight = RightClick;

DLL_Project/Commands/TouchingByThingComp.cs

@@ -50,10 +50,17 @@ public override SoundDef            CurActivateSound
             }
         }
 
-        public                              TouchingByThingComp( Thing parent, Type RequiredType, string label, Action_OnThings LeftClick = null, Action_OnThings RightClick = null )
+        public                              TouchingByThingComp(
+            Thing parent,
+            Type RequiredType,
+            string label,
+            Texture2D designatorIcon,
+            Action_OnThings LeftClick = null,
+            Action_OnThings RightClick = null
+        )
         {
             parentThing = parent;
-            icon = Icon.NextButton;
+            icon = designatorIcon;
 
             parentType = RequiredType;
 

DLL_Project/CommunityCoreLibrary.csproj

@@ -122,8 +122,10 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <ItemGroup />
   <PropertyGroup>
+    <PostBuildEvent>call "$(ProjectDir)PostBuild.bat" $(ConfigurationName) "$(TargetPath)" $(SolutionDir)</PostBuildEvent>
   </PropertyGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="PostBuild.bat" />
+  </ItemGroup>
 </Project>

DLL_Project/Defs/ModHelperDef.cs

@@ -113,6 +113,13 @@ public bool                         IsValid
                             errors += "\n\tUnable to resolve designationCategoryDef \"" + data.designationCategoryDef + "\"";
                             isValid = false;
                         }
+                        if ( ( data.designatorNextTo != null )&&
+                            ( data.designatorNextTo.BaseType != typeof( Designator ) ) 
+                        )
+                        {
+                            errors += "\n\tUnable to resolve designatorNextTo \"" + data.designatorNextTo + "\"";
+                            isValid = false;
+                        }
                     }
                 }
 
@@ -287,9 +294,30 @@ public void                         InjectDesignators()
                 {
                     // Create the new designator
                     var designatorObject = (Designator) Activator.CreateInstance( data.designatorClass );
-
-                    // Inject the designator
-                    designationCategory.resolvedDesignators.Add(designatorObject);
+
+                    if( data.designatorNextTo == null )
+                    {
+                        // Inject the designator at the end
+                        designationCategory.resolvedDesignators.Add( designatorObject );
+                    }
+                    else
+                    {
+                        // Prefers to be beside a specific designator
+                        var designatorIndex = designationCategory.resolvedDesignators.FindIndex( d => (
+                            ( d.GetType() == data.designatorNextTo )
+                        ) );
+                        if( designatorIndex < 0 )
+                        {
+                            // Other designator doesn't exist (yet?)
+                            // Inject the designator at the end
+                            designationCategory.resolvedDesignators.Add( designatorObject );
+                        }
+                        else
+                        {
+                            // Inject beside desired designator
+                            designationCategory.resolvedDesignators.Insert( designatorIndex + 1, designatorObject );
+                        }
+                    }
                 }
             }
 

DLL_Project/PostBuild.bat

@@ -0,0 +1,36 @@
+REM DO NOT RECOMMIT THIS FILE!
+REM This is a local file copy after build.  Get it once and your .gitnore
+REM should handle it after that.  Make all your local copies at the end.
+
+REM Set this to your local RimWorld install path and CCL Assemblies directory
+Set InstalledCCLAssemblies="/badkarma/"
+
+if NOT EXIST %InstalledCCLAssemblies% (
+	echo Missing or invalid copy target:
+	echo %InstalledCCLAssemblies%
+	EXIT -1
+)
+
+echo Build Config: %1
+echo Build Target: %2
+echo Solution Path: %3
+echo CCL Install Path: %InstalledCCLAssemblies%
+
+echo Copy to RimWorld
+copy %2 %InstalledCCLAssemblies%
+
+if %1 == Debug (
+	echo Copy to Modders Resource
+	copy %2 "%3_Mod\Modders Resource\Community Core Library\Assemblies"
+) else (
+	echo Copy to User Release
+	copy %2 "%3_Mod\User Release\Community Core Library\Assemblies"
+)
+
+REM Add any other local copies here
+rem goto Finished
+
+rem echo Copy to ModPile
+rem copy %2 "C:\Utils\dev\Projects\ModPile\ModPile_ProjectDLL\Source-DLLs"
+
+:Finished

DLL_Project/StaticClasses/Icons.cs

@@ -8,10 +8,9 @@ public static class Icon
     {
 
         public static readonly Texture2D    GrowZone            = ContentFinder<Texture2D>.Get( "UI/Designators/ZoneCreate_Growing" );
-        public static readonly Texture2D    NextButton          = ContentFinder<Texture2D>.Get( "UI/Icons/Commands/NextButton" );
-        public static readonly Texture2D    RoomButton          = ContentFinder<Texture2D>.Get( "UI/Icons/Commands/RoomButton" );
-        public static readonly Texture2D    LinkedButton        = ContentFinder<Texture2D>.Get( "UI/Icons/Commands/LinkedButton" );
-        public static readonly Texture2D    GroupButton         = ContentFinder<Texture2D>.Get( "UI/Icons/Commands/GroupButton" );
+        public static readonly Texture2D    ShareSowTag         = ContentFinder<Texture2D>.Get( "UI/Icons/Commands/ShareSowTag" );
+        public static readonly Texture2D    ShareLightColor     = ContentFinder<Texture2D>.Get( "UI/Icons/Commands/ShareLightColor" );
+        public static readonly Texture2D    SelectLightColor    = ContentFinder<Texture2D>.Get( "UI/Icons/Commands/SelectLightColor" );
 
         public static readonly Texture2D    HelpMenuArrowUp     = ContentFinder<Texture2D>.Get( "UI/HelpMenu/ArrowDown" );
         public static readonly Texture2D    HelpMenuArrowDown   = ContentFinder<Texture2D>.Get( "UI/HelpMenu/ArrowUp" );

DLL_Project/Structures/DesignatorData.cs

@@ -12,5 +12,7 @@ public struct DesignatorData
 
         public string                       designationCategoryDef;
 
+        public Type                         designatorNextTo;
+
     }
 }

DLL_Project/ThingComps/CompColoredLight.cs

@@ -42,7 +42,10 @@ CompGlower                          CompGlower
         ChangeColor                 GizmoChangeColor {
             get{
                 if( _GizmoChangeColor == null )
-                    _GizmoChangeColor = new ChangeColor( this );
+                    _GizmoChangeColor = new ChangeColor(
+                        this,
+                        Icon.SelectLightColor
+                    );
                 return _GizmoChangeColor;
             }
         }
@@ -51,7 +54,12 @@ CompGlower                          CompGlower
         TouchingByLinker            GizmoTouchingByLinker {
             get {
                 if( _GizmoTouchingByLinker == null )
-                    _GizmoTouchingByLinker = new TouchingByLinker( parent, GroupColorChange, GroupColorChange );
+                    _GizmoTouchingByLinker = new TouchingByLinker(
+                        parent,
+                        Icon.ShareLightColor,
+                        GroupColorChange,
+                        GroupColorChange
+                    );
                 return _GizmoTouchingByLinker;
             }
         }
@@ -61,7 +69,12 @@ CompGlower                          CompGlower
             get {
                 if( _GizmoDefOrThingCompInRoom == null )
                 {
-                    _GizmoDefOrThingCompInRoom = new DefOrThingCompInRoom( parent, GetType(), "CommandChangeRoommateColorLabel".Translate() );
+                    _GizmoDefOrThingCompInRoom = new DefOrThingCompInRoom(
+                        parent,
+                        GetType(),
+                        "CommandChangeRoommateColorLabel".Translate(),
+                        Icon.ShareLightColor
+                    );
                     _GizmoDefOrThingCompInRoom.LabelByDef = Translator.Translate( "CommandChangeRoommateColorLClick", parent.def.label );
                     _GizmoDefOrThingCompInRoom.ClickByDef = GroupColorChange;
                     _GizmoDefOrThingCompInRoom.LabelByThingComp = "CommandChangeRoommateColorRClick".Translate();

DLL_Project/ThingComps/CompNeighbourlyGrower.cs

@@ -32,6 +32,7 @@ TouchingByThingComp                 GizmoTouchingByThingComp
                             parent,
                             GetType(),
                             "CommandChangeTouchingPlantLabel".Translate(),
+                            Icon.ShareSowTag,
                             GroupPlantChange,
                             GroupPlantChange
                         );
@@ -50,6 +51,7 @@ TouchingByLinker                    GizmoTouchingByLinker
                     _GizmoTouchingByLinker =
                         new TouchingByLinker(
                             parent,
+                            Icon.ShareSowTag,
                             GroupPlantChange,
                             GroupPlantChange
                         );
@@ -69,7 +71,8 @@ DefOrThingCompInRoom                GizmoDefOrThingCompInRoom
                         new DefOrThingCompInRoom(
                             parent,
                             GetType(),
-                            "CommandChangeRoommatePlantLabel".Translate()
+                            "CommandChangeRoommatePlantLabel".Translate(),
+                            Icon.ShareSowTag
                         );
                     _GizmoDefOrThingCompInRoom.LabelByDef = "CommandChangeRoommatePlantLClick".Translate( parent.def.label );
                     _GizmoDefOrThingCompInRoom.ClickByDef = GroupPlantChange;
@@ -127,20 +130,40 @@ void                                GroupPlantChange( List< Thing > things )
                 return;
             }
 #endif
-
+            // Get plant to grow
+            var plantDef = thisGrower.GetPlantDefToGrow();
+            if(
+                ( plantDef == null )||
+                ( plantDef.plant == null )||
+                ( plantDef.plant.sowTags.NullOrEmpty() )
+            )
+            {
+                // "Plant" doesn't contain the required information
+                Log.Error( "Community Core Library :: CompNeighbourlyGrower :: " + parent.def.defName + " unable to resolve to plant def to grow! - " + plantDef.defName );
+                return;
+            }
+
             // Now set their plant
             foreach( Thing g in things )
             {
                 // Should be a Building_PlantGrower
                 var grower = g as Building_PlantGrower;
 #if DEBUG
-                if( grower == null )
+                if(
+                    ( grower == null )||
+                    ( grower.def.building == null )||
+                    ( string.IsNullOrEmpty( grower.def.building.sowTag ) )
+                )
                 {
                     Log.Error( "Community Core Library :: CompNeighbourlyGrower :: " + g.def.defName + " unable to resolve to Building_PlantGrower!" );
                     return;
                 }
 #endif
-                grower.SetPlantDefToGrow( thisGrower.GetPlantDefToGrow() );
+                // Only set if the sow tags match
+                if( plantDef.plant.sowTags.Contains( grower.def.building.sowTag ) )
+                {
+                    grower.SetPlantDefToGrow( plantDef );
+                }
             }
         }
 

_Mod/Modders Resource/Community Core Library/About/About.xml

@@ -7,7 +7,7 @@
 
     <url>https://ludeon.com/forums/index.php?topic=14172.0</url>
 
-    <targetVersion>RimWorld Alpha 12</targetVersion>
+    <targetVersion>RimWorld Alpha 12d</targetVersion>
 
     <description>Provides a common core set of library functions for modders as well as making required core changes.\n\nThis must be loaded immediately after "Core" unless another mod explicitly tells you to load it between "Core" this mod.</description>
 

_Mod/Modders Resource/Def Descriptions/ModHelperDefs/ModHelperDef.xml

@@ -26,6 +26,9 @@
 
                 <designationCategoryDef>DesignationCategoryDef<designationCategoryDef>
                                         [required] Designation Category to inject designator into
+                <designatorNextTo>Designator</designatorNextTo>
+                                        [optional] Class name of Designator to inject beside (immediately after)
+
             </li>
         </Designators>
 

_Mod/User Release/Community Core Library/About/About.xml

@@ -7,7 +7,7 @@
 
     <url>https://ludeon.com/forums/index.php?topic=14172.0</url>
 
-    <targetVersion>RimWorld Alpha 12</targetVersion>
+    <targetVersion>RimWorld Alpha 12d</targetVersion>
 
     <description>Provides a common core set of library functions for modders as well as making required core changes.\n\nThis must be loaded immediately after "Core" unless another mod explicitly tells you to load it between "Core" this mod.</description>
 

_Mod/User Release/Community Core Library/Languages/Korean/Keyed/UI_Elements.xml

@@ -31,5 +31,4 @@
 
   <RefrigeratedStorage>냉장 보관</RefrigeratedStorage>
 
-
 </LanguageData>