updated translations + removed log messages

rheirman · Feb 28, 2018 · de39902 · de39902
1 parent 8331d26
commit de39902
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/Assemblies/GiddyUpCaravan.dll b/Assemblies/GiddyUpCaravan.dll
diff --git a/Languages/English/Keyed/GiddyUpCaravan_Keys.xml b/Languages/English/Keyed/GiddyUpCaravan_Keys.xml
@@ -21,10 +21,10 @@ This bonus is not applied when all colonists are riding.</GU_Car_incompleteCarav
 <GU_Car_NonWildWeight_Description>The chance a mount used by a friendly NPC pawn is one not found in the wild. 
  Chances are normalized to 100% if the sum is not 100</GU_Car_NonWildWeight_Description>
 
- <GU_Car_Designator_GU_DropAnimal_NPC_Clear_Label>Clear NPC mount drop point</GU_Car_Designator_GU_DropAnimal_NPC_Clear_Label>
- <GU_Car_Designator_GU_DropAnimal_NPC_Clear_Description>Clear designated NPC mount points</GU_Car_Designator_GU_DropAnimal_NPC_Clear_Description>
- <GU_Car_Designator_GU_DropAnimal_NPC_Expand_Label>Place NPC mount point</GU_Car_Designator_GU_DropAnimal_NPC_Expand_Label>
- <GU_Car_Designator_GU_DropAnimal_NPC_Expand_Description>Place drop off points for NPC mounts. When traders or visitors arrive, they will temporarily leave their mounts at the drop off point closest to the place they gather. Mounts will stay near the drop off point until their rider returns. When a drop off point is designated in a room, this room will function as a stable, keeping the animals inside. </GU_Car_Designator_GU_DropAnimal_NPC_Expand_Description>
+ <GU_Car_Designator_GU_DropAnimal_NPC_Clear_Label>Clear NPC mount spot</GU_Car_Designator_GU_DropAnimal_NPC_Clear_Label>
+ <GU_Car_Designator_GU_DropAnimal_NPC_Clear_Description>Clear designated NPC mount spots</GU_Car_Designator_GU_DropAnimal_NPC_Clear_Description>
+ <GU_Car_Designator_GU_DropAnimal_NPC_Expand_Label>Place NPC mount spot</GU_Car_Designator_GU_DropAnimal_NPC_Expand_Label>
+ <GU_Car_Designator_GU_DropAnimal_NPC_Expand_Description>Place drop off spots for NPC mounts. When traders or visitors arrive, they will temporarily leave their mounts at the NPC mount spot closest to the place they gather. Mounts will stay near the drop off point until their rider returns. </GU_Car_Designator_GU_DropAnimal_NPC_Expand_Description>
  <!-- note for translators: The following items need to be really short to fit -->
  <GU_Car_No_Rider>No rider</GU_Car_No_Rider>
  <GU_Car_Set_Rider>Set rider</GU_Car_Set_Rider>

diff --git a/Source/Giddy-up-Caravan/Harmony/Pawn_JobTracker.cs b/Source/Giddy-up-Caravan/Harmony/Pawn_JobTracker.cs
@@ -32,7 +32,7 @@ static void Postfix(Pawn_JobTracker __instance, ref ThinkResult __result)
                     if (__result.SourceNode is JobGiver_Wander)
                     {
 
-                        //JobGiver_Wander jgWander = (JobGiver_Wander)__result.SourceNode;
+                        JobGiver_Wander jgWander = (JobGiver_Wander)__result.SourceNode;
                         Traverse.Create(__result.SourceNode).Field("wanderRadius").SetValue(5f);
                     }
 
@@ -41,7 +41,7 @@ static void Postfix(Pawn_JobTracker __instance, ref ThinkResult __result)
             }
 
 
-            if (pawn.IsColonistPlayerControlled || pawn.RaceProps.Animal)
+            if (pawn.IsColonistPlayerControlled || pawn.RaceProps.Animal || pawn.Faction.HostileTo(Faction.OfPlayer))
             {            
                 return;
             }
@@ -77,16 +77,10 @@ static void Postfix(Pawn_JobTracker __instance, ref ThinkResult __result)
                 return;
             }
 
-
-            Log.Message("curLordToil: " + pawn.GetLord().CurLordToil.ToString() + ", pawn name: " + pawn.Name);
-            Log.Message("lordJob: " + pawn.GetLord().LordJob + ", pawn name: " + pawn.Name);
-            Log.Message("lord.CurLordToil.GetType().Name" + lord.CurLordToil.GetType().Name);
-
             if (lord.CurLordToil is LordToil_ExitMapAndEscortCarriers || lord.CurLordToil is LordToil_Travel || lord.CurLordToil is LordToil_ExitMap || lord.CurLordToil is LordToil_ExitMapTraderFighting)
             {
                 if (PawnData.owning != null && PawnData.mount == null && !PawnData.owning.Downed && PawnData.owning.Spawned && !pawn.IsBurning() && !pawn.Downed)
                 {
-                    Log.Message("Pawn " + pawn.Name + " should mount animal!");
                     mountAnimal(__instance, pawn, PawnData, ref __result);
 
                 }