Skip to content

Commit

Permalink
Merge pull request #3942 from AndreiAvinov/development
Browse files Browse the repository at this point in the history
added Favourites mod
  • Loading branch information
TheLoneTec authored Sep 15, 2024
2 parents b9218fe + 49aed37 commit d5acc0a
Show file tree
Hide file tree
Showing 16 changed files with 746 additions and 0 deletions.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>

<SpecialThingFilterDef>
<defName>RimworldFavourites_AllowFavourited</defName>
<label>allow favourited</label>
<description>Allow things that are designated as favourites</description>
<parentCategory>Root</parentCategory>
<allowedByDefault>true</allowedByDefault>
<saveKey>allowFavourited</saveKey>
<workerClass>RimworldFavourites.SpecialThingFilterWorker_Favourited</workerClass>
</SpecialThingFilterDef>

<SpecialThingFilterDef>
<defName>RimworldFavourites_AllowUnfavourited</defName>
<label>allow unfavourited</label>
<description>Allow things that are not designated as favourites or junk</description>
<parentCategory>Root</parentCategory>
<allowedByDefault>true</allowedByDefault>
<saveKey>allowUnfavourited</saveKey>
<workerClass>RimworldFavourites.SpecialThingFilterWorker_Unfavourited</workerClass>
</SpecialThingFilterDef>

<SpecialThingFilterDef>
<defName>RimworldFavourites_AllowJunk</defName>
<label>allow junk</label>
<description>Allow things that are designated as junk</description>
<parentCategory>Root</parentCategory>
<allowedByDefault>true</allowedByDefault>
<saveKey>allowJunk</saveKey>
<workerClass>RimworldFavourites.SpecialThingFilterWorker_Junk</workerClass>
</SpecialThingFilterDef>

</Defs>
49 changes: 49 additions & 0 deletions Mods/Favourites/1.5/Languages/English/Keyed/Keys.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8" ?>
<LanguageData>

<RimworldFavourites.Favourite>Favourite</RimworldFavourites.Favourite>
<RimworldFavourites.FavouriteDesc>Mark this item as a favourite. It will be highlighted in trade menus, on the map view and in inventories.\n\nRight click to change the colour of the star.</RimworldFavourites.FavouriteDesc>
<RimworldFavourites.FavouritedIconDesc>This item has been marked as a favourite.</RimworldFavourites.FavouritedIconDesc>
<RimworldFavourites.FavouritedShortUpper>FAV</RimworldFavourites.FavouritedShortUpper>

<RimworldFavourites.Junk>Junk</RimworldFavourites.Junk>
<RimworldFavourites.JunkDesc>Mark this item as junk. It will be highlighted in trade menus, on the map view and in inventories.\n\nRight click to change the colour of the bin.</RimworldFavourites.JunkDesc>
<RimworldFavourites.JunkIconDesc>This item has been marked as junk.</RimworldFavourites.JunkIconDesc>
<RimworldFavourites.JunkShortUpper>JNK</RimworldFavourites.JunkShortUpper>

<RimworldFavourites.Yellow>Yellow</RimworldFavourites.Yellow>
<RimworldFavourites.Red>Red</RimworldFavourites.Red>
<RimworldFavourites.Green>Green</RimworldFavourites.Green>
<RimworldFavourites.Cyan>Cyan</RimworldFavourites.Cyan>
<RimworldFavourites.Magenta>Magenta</RimworldFavourites.Magenta>

<RimworldFavourites.ShowFavouritesOverlayButton>Toggle favourited items overlay.</RimworldFavourites.ShowFavouritesOverlayButton>

<!-- Mod settings -->
<RimworldFavourites.SettingsCategoryTitle>Favourites!</RimworldFavourites.SettingsCategoryTitle>

<RimworldFavourites.Settings_AutoFavourite>Auto favouriting</RimworldFavourites.Settings_AutoFavourite>
<RimworldFavourites.Settings_AutoFavourite_ToolTip>Master toggle for auto favouriting.</RimworldFavourites.Settings_AutoFavourite_ToolTip>

<RimworldFavourites.Settings_AutoFavouriteManufacturedThings>Manufactured things</RimworldFavourites.Settings_AutoFavouriteManufacturedThings>
<RimworldFavourites.Settings_AutoFavouriteManufacturedThings_ToolTip>Auto favourite weapons, apparel etc that are made by your colonists.</RimworldFavourites.Settings_AutoFavouriteManufacturedThings_ToolTip>

<RimworldFavourites.Settings_AutoFavouriteConstructedThings>Constructed things</RimworldFavourites.Settings_AutoFavouriteConstructedThings>
<RimworldFavourites.Settings_AutoFavouriteConstructedThings_ToolTip>Auto favourite buildings that are made by your colonists.</RimworldFavourites.Settings_AutoFavouriteConstructedThings_ToolTip>


<RimworldFavourites.Settings_AutoFavouriteQuestRewards>Quest rewards</RimworldFavourites.Settings_AutoFavouriteQuestRewards>
<RimworldFavourites.Settings_AutoFavouriteQuestRewards_ToolTip>Auto favourite quest rewards.</RimworldFavourites.Settings_AutoFavouriteQuestRewards_ToolTip>

<RimworldFavourites.Settings_AutoFavouriteQuestRewardRawMaterials>Include raw materials</RimworldFavourites.Settings_AutoFavouriteQuestRewardRawMaterials>
<RimworldFavourites.Settings_AutoFavouriteQuestRewardRawMaterials_ToolTip>Auto favourite raw materials from quest rewards.</RimworldFavourites.Settings_AutoFavouriteQuestRewardRawMaterials_ToolTip>

<RimworldFavourites.Settings_AutoFavouriteQuestRewardPawns>Include people and animals</RimworldFavourites.Settings_AutoFavouriteQuestRewardPawns>
<RimworldFavourites.Settings_AutoFavouriteQuestRewardPawns_ToolTip>Auto favourite people and animals that have relations with any of your colonists or prisoners.</RimworldFavourites.Settings_AutoFavouriteQuestRewardPawns_ToolTip>

<RimworldFavourites.Settings_AutoFavouriteQuestRewardPawnsUnrelated>Include unrelated people and animals</RimworldFavourites.Settings_AutoFavouriteQuestRewardPawnsUnrelated>
<RimworldFavourites.Settings_AutoFavouriteQuestRewardPawnsUnrelated_ToolTip>Also auto favourite people and animals that aren't related to any of your colonists or prisoners.</RimworldFavourites.Settings_AutoFavouriteQuestRewardPawnsUnrelated_ToolTip>



</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LanguageData>

<RimworldFavourites_AllowFavourited.label>разрешить избранные</RimworldFavourites_AllowFavourited.label>
<RimworldFavourites_AllowFavourited.description>Разрешить вещи, отмеченные как избранные</RimworldFavourites_AllowFavourited.description>

<RimworldFavourites_AllowUnfavourited.label>разрешить не отмеченные</RimworldFavourites_AllowUnfavourited.label>
<RimworldFavourites_AllowUnfavourited.description>Разрешить вещи, не отмеченные как избанные или мусор</RimworldFavourites_AllowUnfavourited.description>

<RimworldFavourites_AllowJunk.label>разрешить мусор</RimworldFavourites_AllowJunk.label>
<RimworldFavourites_AllowJunk.description>Разрешить вещи, отмеченные как мусор</RimworldFavourites_AllowJunk.description>

</LanguageData>
49 changes: 49 additions & 0 deletions Mods/Favourites/1.5/Languages/Russian/Keyed/Keys.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8" ?>
<LanguageData>

<RimworldFavourites.Favourite>Избранное</RimworldFavourites.Favourite>
<RimworldFavourites.FavouriteDesc>Отметьте этот предмет как избранный. Он будет выделен в меню торговли, на карте и в инвентарях.\n\nЩелкните правой кнопкой мыши, чтобы изменить цвет звезды.</RimworldFavourites.FavouriteDesc>
<RimworldFavourites.FavouritedIconDesc>Этот предмет отмечен как избранный.</RimworldFavourites.FavouritedIconDesc>
<RimworldFavourites.FavouritedShortUpper>ИЗБ</RimworldFavourites.FavouritedShortUpper>

<RimworldFavourites.Junk>Мусор</RimworldFavourites.Junk>
<RimworldFavourites.JunkDesc>Отметить этот предмет как мусор. Он будет выделен в меню торговли, на карте и в инвентарях.\n\nЩелкните правой кнопкой мыши, чтобы изменить цвет мусорного значка.</RimworldFavourites.JunkDesc>
<RimworldFavourites.JunkIconDesc>Этот предмет был помечен как мусор.</RimworldFavourites.JunkIconDesc>
<RimworldFavourites.JunkShortUpper>МУС</RimworldFavourites.JunkShortUpper>

<RimworldFavourites.Yellow>Жёлтый</RimworldFavourites.Yellow>
<RimworldFavourites.Red>Красный</RimworldFavourites.Red>
<RimworldFavourites.Green>Зелёный</RimworldFavourites.Green>
<RimworldFavourites.Cyan>Голубой</RimworldFavourites.Cyan>
<RimworldFavourites.Magenta>Пурпурный</RimworldFavourites.Magenta>

<RimworldFavourites.ShowFavouritesOverlayButton>Включить отображение избранных предметов.</RimworldFavourites.ShowFavouritesOverlayButton>

<!-- Mod settings -->
<RimworldFavourites.SettingsCategoryTitle>Favourites!</RimworldFavourites.SettingsCategoryTitle>

<RimworldFavourites.Settings_AutoFavourite>Авто избранные</RimworldFavourites.Settings_AutoFavourite>
<RimworldFavourites.Settings_AutoFavourite_ToolTip>Глобальный переключатель для авто избранного.</RimworldFavourites.Settings_AutoFavourite_ToolTip>

<RimworldFavourites.Settings_AutoFavouriteManufacturedThings>Произведённые предметы</RimworldFavourites.Settings_AutoFavouriteManufacturedThings>
<RimworldFavourites.Settings_AutoFavouriteManufacturedThings_ToolTip>Отмечать как избранное оружие, одежду и прочие предметы, произведённые колонистами.</RimworldFavourites.Settings_AutoFavouriteManufacturedThings_ToolTip>

<RimworldFavourites.Settings_AutoFavouriteConstructedThings>Построенные здания</RimworldFavourites.Settings_AutoFavouriteConstructedThings>
<RimworldFavourites.Settings_AutoFavouriteConstructedThings_ToolTip>Отмечать как избранное здания, которые построены колонистами.</RimworldFavourites.Settings_AutoFavouriteConstructedThings_ToolTip>


<RimworldFavourites.Settings_AutoFavouriteQuestRewards>Награды за задания</RimworldFavourites.Settings_AutoFavouriteQuestRewards>
<RimworldFavourites.Settings_AutoFavouriteQuestRewards_ToolTip>Автоматически отмечать как избранное награды за задания.</RimworldFavourites.Settings_AutoFavouriteQuestRewards_ToolTip>

<RimworldFavourites.Settings_AutoFavouriteQuestRewardRawMaterials>Необработанные материалы</RimworldFavourites.Settings_AutoFavouriteQuestRewardRawMaterials>
<RimworldFavourites.Settings_AutoFavouriteQuestRewardRawMaterials_ToolTip>Автоматически отмечать как избранное необработанные материалы из наград за задания.</RimworldFavourites.Settings_AutoFavouriteQuestRewardRawMaterials_ToolTip>

<RimworldFavourites.Settings_AutoFavouriteQuestRewardPawns>Люди и животные</RimworldFavourites.Settings_AutoFavouriteQuestRewardPawns>
<RimworldFavourites.Settings_AutoFavouriteQuestRewardPawns_ToolTip>Автоматически отмечать как избранное людей и животных, которые имеют отношения с вашими колонистами или пленными.</RimworldFavourites.Settings_AutoFavouriteQuestRewardPawns_ToolTip>

<RimworldFavourites.Settings_AutoFavouriteQuestRewardPawnsUnrelated>Несвязанные люди и животные</RimworldFavourites.Settings_AutoFavouriteQuestRewardPawnsUnrelated>
<RimworldFavourites.Settings_AutoFavouriteQuestRewardPawnsUnrelated_ToolTip>Также автоматически отмечать людей и животных, которые неимеют отношения к вашим колостам и пленным.</RimworldFavourites.Settings_AutoFavouriteQuestRewardPawnsUnrelated_ToolTip>



</LanguageData>
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>

<Operation Class="PatchOperationFindMod">
<mods>
<li>MendAndRecycle</li>
</mods>
<match Class="PatchOperationSequence">
<success>Always</success>
<operations>

<li Class="PatchOperationSequence">
<success>Always</success>
<operations>
<li Class="PatchOperationTest">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter</xpath>
<success>Invert</success>
</li>
<li Class="PatchOperationAdd">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]</xpath>
<value>
<defaultIngredientFilter/>
</value>
</li>
</operations>
</li>
<li Class="PatchOperationSequence">
<success>Always</success>
<operations>
<li Class="PatchOperationTest">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter/specialFiltersToDisallow</xpath>
<success>Invert</success>
</li>
<li Class="PatchOperationAdd">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter</xpath>
<value>
<specialFiltersToDisallow/>
</value>
</li>
</operations>
</li>
<li Class="PatchOperationSequence">
<success>Always</success>
<operations>
<li Class="PatchOperationTest">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter/categories</xpath>
<success>Invert</success>
</li>
<li Class="PatchOperationAdd">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter</xpath>
<value>
<categories/>
</value>
</li>
</operations>
</li>
<li Class="PatchOperationSequence">
<success>Always</success>
<operations>
<li Class="PatchOperationTest">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter/categories/li[text()="Apparel"]</xpath>
<success>Invert</success>
</li>
<li Class="PatchOperationAdd">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter/categories</xpath>
<value>
<li>Apparel</li>
</value>
</li>
</operations>
</li>

<li Class="PatchOperationAdd">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter/specialFiltersToDisallow</xpath>
<value>
<li>RimworldFavourites_AllowFavourited</li>
</value>
</li>

</operations>
</match>
</Operation>

</Patch>
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="utf-8" ?>
<Patch>

<Operation Class="PatchOperationFindMod">
<mods>
<li>Simple Recycling</li>
</mods>
<match Class="PatchOperationSequence">
<success>Always</success>
<operations>

<li Class="PatchOperationSequence">
<success>Always</success>
<operations>
<li Class="PatchOperationTest">
<xpath>/Defs/RecipeDef[defName="NeolithicRecycleApparel"]/defaultIngredientFilter</xpath>
<success>Invert</success>
</li>
<li Class="PatchOperationAdd">
<xpath>/Defs/RecipeDef[defName="NeolithicRecycleApparel"]</xpath>
<value>
<defaultIngredientFilter/>
</value>
</li>
</operations>
</li>
<li Class="PatchOperationSequence">
<success>Always</success>
<operations>
<li Class="PatchOperationTest">
<xpath>/Defs/RecipeDef[defName="NeolithicRecycleApparel"]/defaultIngredientFilter/specialFiltersToDisallow</xpath>
<success>Invert</success>
</li>
<li Class="PatchOperationAdd">
<xpath>/Defs/RecipeDef[defName="NeolithicRecycleApparel"]/defaultIngredientFilter</xpath>
<value>
<specialFiltersToDisallow/>
</value>
</li>
</operations>
</li>

<li Class="PatchOperationSequence">
<success>Always</success>
<operations>
<li Class="PatchOperationTest">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter</xpath>
<success>Invert</success>
</li>
<li Class="PatchOperationAdd">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]</xpath>
<value>
<defaultIngredientFilter/>
</value>
</li>
</operations>
</li>
<li Class="PatchOperationSequence">
<success>Always</success>
<operations>
<li Class="PatchOperationTest">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter/specialFiltersToDisallow</xpath>
<success>Invert</success>
</li>
<li Class="PatchOperationAdd">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter</xpath>
<value>
<specialFiltersToDisallow/>
</value>
</li>
</operations>
</li>
<li Class="PatchOperationSequence">
<success>Always</success>
<operations>
<li Class="PatchOperationTest">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter/categories</xpath>
<success>Invert</success>
</li>
<li Class="PatchOperationAdd">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter</xpath>
<value>
<categories/>
</value>
</li>
</operations>
</li>
<li Class="PatchOperationSequence">
<success>Always</success>
<operations>
<li Class="PatchOperationTest">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter/categories/li[text()="Apparel"]</xpath>
<success>Invert</success>
</li>
<li Class="PatchOperationAdd">
<xpath>/Defs/RecipeDef[defName="RecycleApparel"]/defaultIngredientFilter/categories</xpath>
<value>
<li>Apparel</li>
</value>
</li>
</operations>
</li>

<li Class="PatchOperationAdd">
<xpath>/Defs/RecipeDef[defName="NeolithicRecycleApparel" or defName="RecycleApparel"]/defaultIngredientFilter/specialFiltersToDisallow</xpath>
<value>
<li>RimworldFavourites_AllowFavourited</li>
</value>
</li>

</operations>
</match>
</Operation>

</Patch>
Loading

0 comments on commit d5acc0a

Please sign in to comment.