From 9e03024fe10a3cdd1778e59a2ed87af9075dff26 Mon Sep 17 00:00:00 2001 From: Dingo Date: Wed, 21 Dec 2016 10:52:00 +0200 Subject: [PATCH] A16 Release Adjusted many values. Removed some unnecessary things as well. Will update description on the forums/Workshop pages. HugsLib must be installed separately now for the mod to function. --- About/About.xml | 11 +- Assemblies/$HugsLib.dll | Bin 73216 -> 0 bytes Assemblies/RefactoredWorkPriorities.dll | Bin 8704 -> 8704 bytes Defs/UpdateFeatureDefs/UpdateFeatures.xml | 12 +- Defs/WorkGiverDefs/WorkGivers.xml | 308 +++--------------- Defs/WorkTypeDefs/WorkTypes.xml | 21 ++ .../Keyed/ChineseSimplified.xml | 15 +- Languages/English/Keyed/English.xml | 15 +- Source/Properties/AssemblyInfo.cs | 4 +- Source/RWPMenu.cs | 31 +- Source/RefactoredWorkPriorities.csproj | 10 +- Source/WorkGiver_HaulDeteriorating.cs | 29 +- Source/WorkGiver_HaulRottable.cs | 20 +- Source/WorkGiver_RescueDownedColonist.cs | 21 -- Source/WorkGiver_TendHumanColonist.cs | 15 - Source/WorkGiver_TendPrioritized.cs | 35 ++ 16 files changed, 159 insertions(+), 388 deletions(-) delete mode 100644 Assemblies/$HugsLib.dll create mode 100644 Defs/WorkTypeDefs/WorkTypes.xml delete mode 100644 Source/WorkGiver_RescueDownedColonist.cs delete mode 100644 Source/WorkGiver_TendHumanColonist.cs create mode 100644 Source/WorkGiver_TendPrioritized.cs diff --git a/About/About.xml b/About/About.xml index 57d797a..25ed59a 100644 --- a/About/About.xml +++ b/About/About.xml @@ -3,8 +3,13 @@ Refactored Work Priorities Dingo https://ludeon.com/forums/index.php?topic=26077 - 0.15.0 - Tweaks work order priorities to try and make pawn behaviour more intuitive and predictable. - + 0.16.0 + <size=24>Important:</size> +This mod requires <b>HugsLib</b>, it must be installed and loaded above this mod in the load order. + + + +Tweaks work priorities to try and make pawn behaviour more intuitive and predictable. + For the full list of changes please visit the Steam Workshop page or forum thread. \ No newline at end of file diff --git a/Assemblies/$HugsLib.dll b/Assemblies/$HugsLib.dll deleted file mode 100644 index 7042c9fe43e4c1950a1e5435cf813ff509f567ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73216 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 diff --git a/Assemblies/RefactoredWorkPriorities.dll b/Assemblies/RefactoredWorkPriorities.dll index 19cfa390916be5a4caee3dd49e262bbeaaa4f86f..ab922e55d5d6d8d5628fec3dfc4948b6ee975a81 100644 GIT binary patch literal 8704 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 literal 8704 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 diff --git a/Defs/UpdateFeatureDefs/UpdateFeatures.xml b/Defs/UpdateFeatureDefs/UpdateFeatures.xml index a576c7b..8cbefc1 100644 --- a/Defs/UpdateFeatureDefs/UpdateFeatures.xml +++ b/Defs/UpdateFeatureDefs/UpdateFeatures.xml @@ -8,15 +8,9 @@ - RWP_1_4_0 - 1.4.0 - RWP uses some custom priorities that do not exist in vanilla RimWorld to make colonists behave more logically.\n\nYou can toggle the use of these custom priorities and read more about them in the menu (via tooltips).\n\nTo access the mod's menu, go to Menu > Options > Mod Settings. - - - - RWP_1_4_1 - 1.4.1 - \n- All custom work orders are now individually togglable in the mod's menu.\n\n- Fixed Haul Rottables. Haulers will prioritise the fastest rotting items.\n\n- Fixed Haul Deterioratables. Haulers will prioritise the fastest deteriorating items.\n\nTo access the mod's menu, go to Mod Settings in RimWorld's Options menu. + RWP_2_16_0 + 2.16.0 + RWP uses custom priorities that do not exist in vanilla RimWorld.\n\nYou can toggle the use of these custom priorities and read more about them in the menu (via tooltips).\n\nTo access the mod's menu, go to <b>Mod Settings</b> (accessed through RimWorld's Options menu). \ No newline at end of file diff --git a/Defs/WorkGiverDefs/WorkGivers.xml b/Defs/WorkGiverDefs/WorkGivers.xml index 901f5ac..f47b098 100644 --- a/Defs/WorkGiverDefs/WorkGivers.xml +++ b/Defs/WorkGiverDefs/WorkGivers.xml @@ -4,144 +4,76 @@ - DoctorRescueHumanColonist - - RWP.WorkGiver_RescueDownedColonist - Doctor - rescue - rescuing - 90 - false - -
  • Manipulation
    • -     -     - - - DoctorTreatHumanColonist + DoctorTreat - RWP.WorkGiver_TendHumanColonist + RWP.WorkGiver_TendPrioritized Doctor treat treating
  • Manipulation
    •  - 65 + 70 true     - - + - RemoveRoofs - - WorkGiver_RemoveRoof - Construction - 200 - remove roof - removing roof - false - true - -
  • Manipulation
    • -     -     - - - BuildRoofs - - WorkGiver_BuildRoof - Construction - 190 - build roof - building roof - false - true - -
  • Manipulation
    • -     -     - - - ConstructFinishFrames - - WorkGiver_ConstructFinishFrames - Construction - 180 - construct - constructing + DoBillsMedicalMechanoidOperation + + WorkGiver_DoBill + Doctor + 1 + true + true + modify + modifying
  • Manipulation
    •  - true true     - - ConstructDeliverResourcesToFrames - - WorkGiver_ConstructDeliverResourcesToFrames - Construction - 170 - work on - working on - -
  • Manipulation
    • -     - true - true -     + - ConstructDeliverResourcesToBlueprints - - WorkGiver_ConstructDeliverResourcesToBlueprints - Construction - 110 - work on - working on + FixBrokenDownBuilding + + WorkGiver_FixBrokenDownBuilding + Repair + 100 + replace broken components in + replacing broken components in
  • Manipulation
    •  - true true     - Deconstruct - - WorkGiver_Deconstruct - Construction - 100 - deconstruct - deconstructing + Repair + + WorkGiver_Repair + Repair + 50 + repair + repairing
  • Manipulation
    •  + true     - - Uninstall - - WorkGiver_Uninstall - Construction - 95 - uninstall - uninstalling - -
  • Manipulation
    • -     -     + - ConstructRemoveFloors - - WorkGiver_ConstructRemoveFloor + RemoveRoofs + + WorkGiver_RemoveRoof Construction - 6 - remove floor - removing floor + 70 + remove roof + removing roof false true @@ -150,13 +82,13 @@ - ConstructSmoothFloors - - WorkGiver_ConstructSmoothFloor + BuildRoofs + + WorkGiver_BuildRoof Construction - 5 - smooth - smoothing + 60 + build roof + building roof false true @@ -166,89 +98,6 @@ - - Refuel - - WorkGiver_Refuel - Hauling - refuel - refueling - 400 - -
  • Manipulation
    • -     - true -     - - - RearmTraps - - WorkGiver_RearmTraps - Hauling - rearm - rearming - 300 - -
  • Manipulation
    • -     -     - - - Strip - - WorkGiver_Strip - Hauling - strip - stripping - 200 - -
  • Manipulation
    • -     -     - - - DoBillsCremate - - WorkGiver_DoBill - Hauling - 150 - -
  • ElectricCrematorium
    • -     - cremate - cremating at - -
  • Manipulation
    • -     - true -     - - - BuryCorpses - - WorkGiver_BuryCorpses - Hauling - bury - burying - 130 - -
  • Manipulation
    • -     -     - - - HaulCorpses - - WorkGiver_HaulCorpses - Hauling - haul - hauling - 120 - -
  • Manipulation
    • -     -     - HaulRottable @@ -256,7 +105,7 @@ Hauling haul hauling - 110 + 49
  • Manipulation
    •  @@ -269,76 +118,7 @@ Hauling haul hauling - 105 - -
  • Manipulation
    • -     -     - - - Open - - WorkGiver_Open - Hauling - open - opening - 100 - -
  • Manipulation
    • -     -     - - - TakeBeerOutOfFermentingBarrel - - WorkGiver_TakeBeerOutOfFermentingBarrel - Hauling - take beer - taking beer from - 90 - -
  • Manipulation
    • -     -     - - - FillFermentingBarrel - - WorkGiver_FillFermentingBarrel - Hauling - fill - filling - 80 - -
  • Manipulation
    • -     -     - - - DoBillsHaulCampfire - - WorkGiver_DoBill - Hauling - 50 - -
  • Campfire
    • -     - work at - working at - -
  • Manipulation
    • -     - true -     - - - HaulGeneral - - WorkGiver_HaulGeneral - Hauling - haul - hauling - 5 + 48
  • Manipulation
    •  diff --git a/Defs/WorkTypeDefs/WorkTypes.xml b/Defs/WorkTypeDefs/WorkTypes.xml new file mode 100644 index 0000000..9129d3e --- /dev/null +++ b/Defs/WorkTypeDefs/WorkTypes.xml @@ -0,0 +1,21 @@ + + + + + Repair + Repair + Repairer + Repairing + Fix damaged or broken-down buildings. + Repair + 925 + true + +
  • Construction
    • +     + +
  • ManualSkilled
    • +     +     + +     \ No newline at end of file diff --git a/Languages/ChineseSimplified/Keyed/ChineseSimplified.xml b/Languages/ChineseSimplified/Keyed/ChineseSimplified.xml index 767000f..1ebb4d2 100644 --- a/Languages/ChineseSimplified/Keyed/ChineseSimplified.xml +++ b/Languages/ChineseSimplified/Keyed/ChineseSimplified.xml @@ -1,16 +1,13 @@ - <b>[医生]</b> 优先营救居民 - 医生会优先营救居民然后是动物或者外来者。 + <b>[医生]</b> 优先治疗居民 + 医生会优先治疗居民然后是动物或者外来者。 - <b>[医生]</b> 优先治疗居民 - 医生会优先治疗居民然后是动物或者外来者。 + <b>[搬运工]</b> 优先搬运易腐烂的物品 + 搬运工会优先搬运易腐烂的物品（如玉米，食物，等等）然后是一般物品。 - <b>[搬运工]</b> 优先搬运易腐烂的物品 - 搬运工会优先搬运易腐烂的物品（如玉米，食物，等等）然后是一般物品。 - - <b>[搬运工]</b> 优先搬运易老化的物品 - 搬运工会优先搬运易老化的物品（如武器，木头，等等）然后是一般物品。 + <b>[搬运工]</b> 优先搬运易老化的物品 + 搬运工会优先搬运易老化的物品（如武器，木头，等等）然后是一般物品。 diff --git a/Languages/English/Keyed/English.xml b/Languages/English/Keyed/English.xml index a3c98f5..9260cee 100644 --- a/Languages/English/Keyed/English.xml +++ b/Languages/English/Keyed/English.xml @@ -1,16 +1,13 @@ - <b>[Doctor]</b> Prioritise rescuing colonists - Doctors will rescue allied colonists before rescuing animals or outsiders. + <b>[Doctor]</b> Prioritise treating colonists + Doctors will treat colonist injuries before treating animals or outsiders. - <b>[Doctor]</b> Prioritise treating colonists - Doctors will treat colonist injuries before treating animals or outsiders. + <b>[Haul]</b> Prioritise hauling rottables + Haulers will haul rottable items (corn, meals etc.) before generic things. - <b>[Haul]</b> Prioritise hauling rottables - Haulers will haul rottable items (corn, meals etc.) before generic things. - - <b>[Haul]</b> Prioritise hauling deterioratables - Haulers will haul items which deteriorate over time (weapons, wood etc.) before generic things. + <b>[Haul]</b> Prioritise hauling deterioratables + Haulers will haul items which deteriorate over time (weapons, wood etc.) before generic things. \ No newline at end of file diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs index ab0ecb3..c6b0049 100644 --- a/Source/Properties/AssemblyInfo.cs +++ b/Source/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.4.1.0")] -[assembly: AssemblyFileVersion("1.4.1.0")] +[assembly: AssemblyVersion("2.16.0.0")] +[assembly: AssemblyFileVersion("2.16.0.0")] diff --git a/Source/RWPMenu.cs b/Source/RWPMenu.cs index 0a2409f..d24efa6 100644 --- a/Source/RWPMenu.cs +++ b/Source/RWPMenu.cs @@ -1,18 +1,8 @@ using HugsLib; -using RimWorld; using Verse; namespace RWP { - [DefOf] - public static class RWPDefs - { - public static WorkGiverDef DoctorRescueHumanColonist; - public static WorkGiverDef DoctorTreatHumanColonist; - public static WorkGiverDef HaulRottable; - public static WorkGiverDef HaulDeteriorating; - } - public class RWPMenu : ModBase { public override string ModIdentifier @@ -25,27 +15,24 @@ public override string ModIdentifier public override void DefsLoaded() { - UpdateDefs(); + RWPDefs(); } public override void SettingsChanged() { - UpdateDefs(); + RWPDefs(); } - private void UpdateDefs() + private void RWPDefs() { - var doctorRescueColonist = Settings.GetHandle("DoctorRescueColonist", "setting_doctorRescueColonist_label".Translate(), "setting_doctorRescueColonist_desc".Translate(), true); - RWPDefs.DoctorRescueHumanColonist.scanThings = doctorRescueColonist.Value; - - var doctorTreatColonist = Settings.GetHandle("DoctorTreatColonist", "setting_doctorTreatColonist_label".Translate(), "setting_doctorTreatColonist_desc".Translate(), true); - RWPDefs.DoctorTreatHumanColonist.scanThings = doctorTreatColonist.Value; + var prioritizeTreatingColonists = Settings.GetHandle("RWP_Doctor_PrioritizeTreatingColonists", "RWP_setting_doctorTreatColonist_label".Translate(), "RWP_setting_doctorTreatColonist_desc".Translate(), true); + WorkGiver_TendPrioritized.TendColonistsFirst = prioritizeTreatingColonists.Value; - var haulRottables = Settings.GetHandle("HaulRottables", "setting_haulRottables_label".Translate(), "setting_haulRottables_desc".Translate(), true); - RWPDefs.HaulRottable.scanThings = haulRottables.Value; + var haulRottables = Settings.GetHandle("HaulRottables", "RWP_setting_haulRottables_label".Translate(), "RWP_setting_haulRottables_desc".Translate(), true); + WorkGiver_HaulRottable.PrioritizeRottable = haulRottables.Value; - var haulDeterioratables = Settings.GetHandle("HaulDeterioratables", "setting_haulDeterioratables_label".Translate(), "setting_haulDeterioratables_desc".Translate(), true); - RWPDefs.HaulDeteriorating.scanThings = haulDeterioratables.Value; + var haulDeterioratables = Settings.GetHandle("HaulDeterioratables", "RWP_setting_haulDeterioratables_label".Translate(), "RWP_setting_haulDeterioratables_desc".Translate(), true); + WorkGiver_HaulDeteriorating.PrioritizeDeteriorating = haulDeterioratables.Value; } } } \ No newline at end of file diff --git a/Source/RefactoredWorkPriorities.csproj b/Source/RefactoredWorkPriorities.csproj index d58859f..9fdc2c4 100644 --- a/Source/RefactoredWorkPriorities.csproj +++ b/Source/RefactoredWorkPriorities.csproj @@ -31,13 +31,14 @@ Off - - ..\..\$HugsLib.dll - C:\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin_Data\Managed\Assembly-CSharp.dll False + + C:\Program Files (x86)\Steam\steamapps\common\RimWorld\Mods\HugsLib\Assemblies\HugsLib.dll + False + @@ -54,8 +55,7 @@ - - + diff --git a/Source/WorkGiver_HaulDeteriorating.cs b/Source/WorkGiver_HaulDeteriorating.cs index ccb024e..d22c73b 100644 --- a/Source/WorkGiver_HaulDeteriorating.cs +++ b/Source/WorkGiver_HaulDeteriorating.cs @@ -2,44 +2,43 @@ using System.Collections.Generic; using System.Linq; using Verse; -using Verse.AI; namespace RWP { - public class WorkGiver_HaulDeteriorating : WorkGiver_Scanner + public class WorkGiver_HaulDeteriorating : WorkGiver_HaulGeneral { + public static bool PrioritizeDeteriorating = true; + public override bool Prioritized { get { - return true; + return PrioritizeDeteriorating; } } public override bool ShouldSkip(Pawn pawn) { - return ListerHaulables.ThingsPotentiallyNeedingHauling().Count == 0; + return !PrioritizeDeteriorating; } public override IEnumerable PotentialWorkThingsGlobal(Pawn pawn) //Lists all items with DeteriorationRate above 0 that aren't under a roof { - return ListerHaulables.ThingsPotentiallyNeedingHauling().Where(t => t.Position.GetRoof() == null && t.GetStatValue(StatDefOf.DeteriorationRate, true) > 0f); + return pawn.Map.listerHaulables.ThingsPotentiallyNeedingHauling().Where(t => GridsUtility.GetRoof(t.Position, t.Map) == null && t.GetStatValue(StatDefOf.DeteriorationRate, true) > 0f); } - public override Job JobOnThing(Pawn pawn, Thing t) + public override float GetPriority(Pawn pawn, TargetInfo t) { - if (!HaulAIUtility.PawnCanAutomaticallyHaulFast(pawn, t)) + Thing thing = t.Thing; + + float priority = (1f) / (thing.HitPoints / thing.GetStatValue(StatDefOf.DeteriorationRate, true)); + + if (thing.HitPoints <= (thing.MaxHitPoints / 5)) { - return null; + priority *= 0.1f; } - return HaulAIUtility.HaulToStorageJob(pawn, t); - } - - public override float GetPriority(Pawn pawn, TargetInfo t) - { - Thing thing = t.Thing; - return thing.GetStatValue(StatDefOf.DeteriorationRate, true); + return priority; } } } \ No newline at end of file diff --git a/Source/WorkGiver_HaulRottable.cs b/Source/WorkGiver_HaulRottable.cs index 8baaf99..a783b6d 100644 --- a/Source/WorkGiver_HaulRottable.cs +++ b/Source/WorkGiver_HaulRottable.cs @@ -2,44 +2,36 @@ using System.Collections.Generic; using System.Linq; using Verse; -using Verse.AI; namespace RWP { public class WorkGiver_HaulRottable : WorkGiver_Scanner { + public static bool PrioritizeRottable = true; + public override bool Prioritized { get { - return true; + return PrioritizeRottable; } } public override bool ShouldSkip(Pawn pawn) { - return ListerHaulables.ThingsPotentiallyNeedingHauling().Count == 0; + return !PrioritizeRottable; } public override IEnumerable PotentialWorkThingsGlobal(Pawn pawn) //Lists all items which need hauling and have CompProperties_Rottable { - return ListerHaulables.ThingsPotentiallyNeedingHauling().Where(t => t.def.comps.Exists(tc => tc.compClass == typeof(CompRottable))); - } - - public override Job JobOnThing(Pawn pawn, Thing t) - { - if (!HaulAIUtility.PawnCanAutomaticallyHaulFast(pawn, t)) - { - return null; - } - - return HaulAIUtility.HaulToStorageJob(pawn, t); + return pawn.Map.listerHaulables.ThingsPotentiallyNeedingHauling().Where(t => t.def.comps.Exists(tc => tc.compClass == typeof(CompRottable))); } public override float GetPriority(Pawn pawn, TargetInfo t) { Thing thing = t.Thing; var rottability = thing.def.GetCompProperties().daysToRotStart; + return (1f) / (rottability); } } diff --git a/Source/WorkGiver_RescueDownedColonist.cs b/Source/WorkGiver_RescueDownedColonist.cs deleted file mode 100644 index c687795..0000000 --- a/Source/WorkGiver_RescueDownedColonist.cs +++ /dev/null @@ -1,21 +0,0 @@ -using RimWorld; -using Verse; -using Verse.AI; - -namespace RWP -{ - public class WorkGiver_RescueDownedColonist : WorkGiver_RescueDowned - { - public override bool HasJobOnThing(Pawn pawn, Thing t) - { - Pawn pawn2 = t as Pawn; - if (pawn2 == null || !pawn2.Downed || pawn2.Faction != pawn.Faction || !pawn2.IsColonist || pawn2.InBed() || !pawn.CanReserve(pawn2, 1) || GenAI.EnemyIsNear(pawn2, 40f)) - { - return false; - } - - Thing thing = base.FindBed(pawn, pawn2); - return thing != null && pawn2.CanReserve(thing, 1); - } - } -} \ No newline at end of file diff --git a/Source/WorkGiver_TendHumanColonist.cs b/Source/WorkGiver_TendHumanColonist.cs deleted file mode 100644 index a5af821..0000000 --- a/Source/WorkGiver_TendHumanColonist.cs +++ /dev/null @@ -1,15 +0,0 @@ -using RimWorld; -using Verse; -using Verse.AI; - -namespace RWP -{ - public class WorkGiver_TendHumanColonist : WorkGiver_Tend - { - public override bool HasJobOnThing(Pawn pawn, Thing t) - { - Pawn pawn2 = t as Pawn; - return pawn2 != null && pawn2 != pawn && pawn2.IsColonist && pawn2.InBed() && pawn2.health.ShouldBeTendedNow && pawn.CanReserve(pawn2, 1); - } - } -} \ No newline at end of file diff --git a/Source/WorkGiver_TendPrioritized.cs b/Source/WorkGiver_TendPrioritized.cs new file mode 100644 index 0000000..eb7adca --- /dev/null +++ b/Source/WorkGiver_TendPrioritized.cs @@ -0,0 +1,35 @@ +using RimWorld; +using Verse; + +namespace RWP +{ + public class WorkGiver_TendPrioritized : WorkGiver_Tend + { + public static bool TendColonistsFirst = true; + + public override bool Prioritized + { + get + { + return TendColonistsFirst; + } + } + + public override float GetPriority(Pawn pawn, TargetInfo t) + { + Pawn pawn2 = t.Thing as Pawn; + + if (pawn2.IsColonist) + { + return 100f; + } + + else if (pawn2.Faction == Faction.OfPlayer) + { + return 50f; + } + + return 1f; + } + } +} \ No newline at end of file