Skip to content

Commit

Permalink
Merge pull request #3933 from ProTriforcer/mod-updates
Browse files Browse the repository at this point in the history
Mod updates
  • Loading branch information
TheLoneTec authored Sep 7, 2024
2 parents 388e43c + 90297a2 commit c1dd2f6
Show file tree
Hide file tree
Showing 223 changed files with 536 additions and 2,511 deletions.
Binary file not shown.
Binary file not shown.
27 changes: 27 additions & 0 deletions Mods/Better Pyromania/1.5/Patches/Core_Caravans.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>

<!-- add comps field to Caravan WorldObjectDef if it doesn't exist -->
<Operation Class="PatchOperationConditional">
<xpath>Defs/WorldObjectDef[defName="Caravan"]/comps</xpath>
<nomatch Class="PatchOperationAdd">
<xpath>Defs/WorldObjectDef[defName="Caravan"]</xpath>
<value>
<comps />
</value>
</nomatch>
</Operation>

<!-- add pyromaniac caravan handler comp to Caravan WorldObjectDef -->
<Operation Class="PatchOperationAdd">
<xpath>Defs/WorldObjectDef[defName="Caravan"]/comps</xpath>
<value>
<li Class="BetterPyromania.WorldObjectCompProperties_Pyromania">
<fuelCount>20</fuelCount>
<cooldown>30000</cooldown>
<needThreshold>0.5</needThreshold>
</li>
</value>
</Operation>

</Patch>
47 changes: 47 additions & 0 deletions Mods/Better Pyromania/1.5/Patches/Core_Traits.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>

<!-- Modify trait description -->
<Operation Class="PatchOperationReplace">
<xpath>Defs/TraitDef[defName="Pyromaniac"]/degreeDatas/li/description</xpath>
<value>
<description>{PAWN_nameDef} loves to start and watch fires. {PAWN_pronoun} get stressed and anxious if not allowed to do so for an extended period of time, but will be happier if allowed to do so. {PAWN_pronoun} also enjoys using incendiary weapons and will only go on fire-starting sprees when having a mental break.</description>
</value>
</Operation>

<!-- Reduce pyromaniac-has-incendiary-weapon thought -->
<!-- vanilla was reduced to 2, no longer necessary -->

<!-- Remove disabled firefighting -->
<Operation Class="PatchOperationConditional">
<xpath>Defs/TraitDef[defName="Pyromaniac"]/disabledWorkTags</xpath>
<match Class="PatchOperationRemove">
<xpath>Defs/TraitDef[defName="Pyromaniac"]/disabledWorkTags</xpath>
</match>
</Operation>

<!-- Remove random breaks -->
<Operation Class="PatchOperationConditional">
<xpath>Defs/TraitDef[defName="Pyromaniac"]/degreeDatas/li/randomMentalState</xpath>
<match Class="PatchOperationRemove">
<xpath>Defs/TraitDef[defName="Pyromaniac"]/degreeDatas/li/randomMentalState</xpath>
</match>
</Operation>

<!-- Remove random break MTB curve -->
<Operation Class="PatchOperationConditional">
<xpath>Defs/TraitDef[defName="Pyromaniac"]/degreeDatas/li/randomMentalStateMtbDaysMoodCurve</xpath>
<match Class="PatchOperationRemove">
<xpath>Defs/TraitDef[defName="Pyromaniac"]/degreeDatas/li/randomMentalStateMtbDaysMoodCurve</xpath>
</match>
</Operation>

<!-- Remove market value penalty -->
<Operation Class="PatchOperationConditional">
<xpath>Defs/TraitDef[defName="Pyromaniac"]/degreeDatas/li/marketValueFactorOffset</xpath>
<match Class="PatchOperationRemove">
<xpath>Defs/TraitDef[defName="Pyromaniac"]/degreeDatas/li/marketValueFactorOffset</xpath>
</match>
</Operation>

</Patch>
4 changes: 2 additions & 2 deletions Mods/Better Pyromania/About/About.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<name>Better Pyromania</name>
<author>Aelanna</author>
<packageId>Aelanna.BetterPyromania</packageId>
<modVersion IgnoreIfNoMatchingField="True">1.4.0</modVersion>
<supportedVersions>
<li>1.3</li>
<li>1.4</li>
<li>1.5</li>
</supportedVersions>
<loadAfter>
<li>neceros.badcanbegood</li>
Expand Down
2 changes: 1 addition & 1 deletion Mods/Better Pyromania/About/Manifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest>
<identifier>BetterPyromania</identifier>
<version>1.3.0.0</version>
<version>1.4.0.0</version>
<suggests>
<li>EccentricTech_Core</li>
<li>ARimReborn_Core</li>
Expand Down
10 changes: 3 additions & 7 deletions Mods/Better Pyromania/LoadFolders.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<loadFolders>
<v1.3>
<v1.5>
<li>/</li>
<li>1.3</li>
</v1.3>
<v1.4>
<li>/</li>
<li>1.4</li>
</v1.4>
<li>1.5</li>
</v1.5>
</loadFolders>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<ModMetaData>
<name>Better Relationship Value</name>
<name>Better Relationship Value (Continued)</name>
<supportedVersions>
<li>1.3</li><!-- 待测试 -->
<li>1.4</li>
<li>1.5</li>
</supportedVersions>
<author>Alfie Brrok</author>
<description>
Expand All @@ -14,7 +13,7 @@

改变派系关系值计算方式,现在维护派系关系变得更加重要。你不会因一次恶行就和某派系敌对,同时也不能赠送一些垃圾就和某派系轻易交好。
</description>
<packageId>Alfie.BetterRelationshipValue</packageId>
<packageId>Alfie.BetterRelationshipValueContinued</packageId>
<modDependencies>
<li>
<packageId>brrainz.harmony</packageId>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3273313674
File renamed without changes.
1 change: 0 additions & 1 deletion Mods/Better Relationship Value/About/PublishedFileId.txt

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>
<Operation Class="PatchOperationReplace">
<xpath>Defs/WorkGiverDef[defName="CleanFilth"]/giverClass</xpath>
<value>
<giverClass>CleaningPriority.WorkGiver_CleanFilthPrioritized</giverClass>
</value>
</Operation>
</Patch>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>
<Operation Class="PatchOperationReplace">
<xpath>Defs/WorkGiverDef[defName="CleanFilth"]/giverClass</xpath>
<value>
<giverClass>CleaningPriority.WorkGiver_CleanFilthPrioritized</giverClass>
</value>
</Operation>
</Patch>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>
<Operation Class="PatchOperationReplace">
<xpath>Defs/WorkGiverDef[defName="CleanFilth"]/giverClass</xpath>
<value>
<giverClass>CleaningPriority.WorkGiver_CleanFilthPrioritized</giverClass>
</value>
</Operation>
</Patch>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>
<Operation Class="PatchOperationReplace">
<xpath>Defs/WorkGiverDef[defName="CleanFilth"]/giverClass</xpath>
<value>
<giverClass>CleaningPriority.WorkGiver_CleanFilthPrioritized</giverClass>
</value>
</Operation>
</Patch>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>
<Operation Class="PatchOperationReplace">
<xpath>Defs/WorkGiverDef[defName="CleanFilth"]/giverClass</xpath>
<value>
<giverClass>CleaningPriority.WorkGiver_CleanFilthPrioritized</giverClass>
</value>
</Operation>
</Patch>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Patch>
<Operation Class="PatchOperationReplace">
<xpath>Defs/WorkGiverDef[defName="CleanFilth"]/giverClass</xpath>
<value>
<giverClass>CleaningPriority.WorkGiver_CleanFilthPrioritized</giverClass>
</value>
</Operation>
</Patch>
92 changes: 92 additions & 0 deletions Mods/Cleaning Priority (Continued)/About/About.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>
<ModMetaData>
<name>Cleaning Priority (Continued)</name>
<packageId>Mlie.CleaningPriority</packageId>
<author>Mlie</author>
<url>https://github.com/emipa606/CleaningPriority</url>
<supportedVersions>
<li>1.0</li>
<li>1.1</li>
<li>1.2</li>
<li>1.3</li>
<li>1.4</li>
<li>1.5</li>
</supportedVersions>
<modDependencies>
<li>
<packageId>brrainz.harmony</packageId>
<displayName>Harmony</displayName>
<steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
<downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
</li>
</modDependencies>
<loadAfter>
<li>brrainz.harmony</li>
</loadAfter>
<description>[img]https://i.imgur.com/buuPQel.png[/img]
Update of ChippedChaps mod
https://steamcommunity.com/sharedfiles/filedetails/?id=1543157124

- Added Russian Translation, by Vladimir Saenko
- Added correct reservation of filth so pawns dont clean the same filth
- Pawns that is not allowed in a higher priority cleaning zone should now clean filth in lower priority zones instead of not cleaning at all

[img]https://i.imgur.com/pufA0kM.png[/img]

[table]
[tr]
[td][url=https://dsc.gg/mlie][img]https://i.imgur.com/zdzzBrc.png[/img][/url][/td]
[td][url=https://github.com/emipa606/CleaningPriority][img]https://i.imgur.com/kTkpTOE.png[/img][/url][/td]
[/tr]
[tr]
[td][img]https://i.imgur.com/WjDSfUn.png[/img][/td]
[td][img]https://i.imgur.com/h5VwTNL.png[/img][/td]
[/tr]
[/table]

[img]https://i.imgur.com/Z4GOv8H.png[/img]

[b]Legacy 1.0 Version[/b]
For now, please use the updated version by Mlie here:
https://steamcommunity.com/sharedfiles/filedetails/?id=2018316486
I plan to only make my own version if I add any new features - I'm grateful for any unofficial maintenance and I will only supersede unofficial updates until there is a good reason to do so.

[h1]Allows you to prioritize areas over others for cleaning.[/h1]

[b]Unstable Test Release - If you find bugs, say something.[/b]

[b]If you are concerned about errors after updating to the most recent version, please read the change notes.[/b]

[h1]Main Features[/h1]
[b]Priority Cleaning:[/b] You can make colonists clean filth in an important area before cleaning another lower priority areas that you can assign. If you make an allowed area covering your hospital and set it to the highest priority (using the menu you can open by clicking the broom icon on the bottom right of your screen) colonists will clean the hospital first before cleaning anything else.

[b]Arbitrary Priorities:[/b] You can pick any area to put on the priority list. You can even remove the home area and add in another custom area and your colonists will stop cleaning the home area and instead clean according to your set priority list.

[b]Works fine if you don't care about priority:[/b] The first cleaning area by default will be the home area, so if you don't touch the priority list at all when playing on a map, colonists will clean like usual.

[b]Additional Notes:[/b]
There is bit of delay between the current cleaning area updating and new filth being spawned. This is because, like vanilla, colonists won't clean new dirt (must be 600 ticks after the filth has last thickened).

No original game methods have been detoured and the vanilla tracking of filth in the home area still works, so if any mods use this they should be fine. This mod may be incompatible with other cleaning mods. If you're not sure, try using them together and see if it works!

The mod will always force you to have at least one cleaning area. If you delete your last cleaning area the Home area will be added to the priority list.

As this is the first version, expect bugs. However, don't be too scared, they probably won't corrupt your save and if you uninstall you will get a few errors that can be eliminated by overwriting your savegame. Your colonists will go back to cleaning the home area.

[b]If you like/don't like this mod, please remember to rate![/b]


[img]https://i.imgur.com/PwoNOj4.png[/img]
[list]
[*] See if the the error persists if you just have this mod and its requirements active.
[*] If not, try adding your other mods until it happens again.
[*] Post your error-log using [url=https://steamcommunity.com/workshop/filedetails/?id=818773962]HugsLib[/url] or the standalone [url=https://steamcommunity.com/sharedfiles/filedetails/?id=2873415404]Uploader[/url] and command Ctrl+F12
[*] For best support, please use the Discord-channel for error-reporting.
[*] Do not report errors by making a discussion-thread, I get no notification of that.
[*] If you have the solution for a problem, please post it to the GitHub repository.
[*] Use [url=https://github.com/RimSort/RimSort/releases/latest]RimSort[/url] to sort your mods
[/list]

[url=https://steamcommunity.com/sharedfiles/filedetails/changelog/2018316486][img]https://img.shields.io/github/v/release/emipa606/CleaningPriority?label=latest%20version&amp;style=plastic&amp;color=9f1111&amp;labelColor=black[/img][/url]</description>
<modVersion IgnoreIfNoMatchingField="True">1.5.1</modVersion>
</ModMetaData>
35 changes: 35 additions & 0 deletions Mods/Cleaning Priority (Continued)/About/Changelog.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Changelog for CleaningPriority

1.5.1 - Updated Chinese translation by Buyue-z


1.5.0 - Mod updated for 1.5 and passed autotests


1.4.4 - Should now work correctly when removing the home-area


1.4.3 - Fixed changing priority of areas.
Used DeepL to update translations for ChineseSimplified, French, German


1.4.2 - Fix for logspam when Dubs Bad hygiene and Map preview is loaded


1.4.1 - Mod updated for 1.4 and passed autotests


1.0.11.0 - Rebuild on the 1.3 binaries as some functions changed from the beta


1.0.10.0 - Mod updated for 1.3 and passed autotests


1.0.9.0 - Refactored code, updated solution


1.0.8.0 - Refactored some code, updated folder structure


1.0.7.0 - Added 1.2 support

11 changes: 11 additions & 0 deletions Mods/Cleaning Priority (Continued)/About/Manifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest>
<identifier>CleaningPriority</identifier>
<version>1.5.1</version>
<dependencies />
<incompatibleWith />
<loadBefore />
<loadAfter />
<manifestUri>https://raw.githubusercontent.com/emipa606/CleaningPriority/master/About/Manifest.xml</manifestUri>
<downloadUri>https://github.com/emipa606/CleaningPriority/releases</downloadUri>
</Manifest>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions Mods/Cleaning Priority (Continued)/About/ModSync.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<ModSyncNinjaData>
<ID>f4f05f6a-8ae3-4d42-b2f5-734cae07b45f</ID>
<ModName>Cleaning Priority (Continued)</ModName>
<Version>1.5.1</Version>
<SaveBreaking>False</SaveBreaking>
<Host name="Github">
<Owner>emipa606</Owner>
<Project>CleaningPriority</Project>
<AboutDir>About</AboutDir>
<DownloadFrom>ModSyncMainPage</DownloadFrom>
<Branch>master</Branch>
</Host>
</ModSyncNinjaData>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2018316486
9 changes: 9 additions & 0 deletions Mods/Cleaning Priority (Continued)/Defs/Jobs_Work.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<JobDef>
<defName>Clean_Prioritized</defName>
<driverClass>CleaningPriority.JobDriver_CleanPrioritizedFilth</driverClass>
<reportString>cleaning TargetA in area.</reportString>
<allowOpportunisticPrefix>true</allowOpportunisticPrefix>
</JobDef>
</Defs>
21 changes: 21 additions & 0 deletions Mods/Cleaning Priority (Continued)/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 Mlie

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading

0 comments on commit c1dd2f6

Please sign in to comment.