diff --git a/SolastaCommunityExpansion/Displays/RulesDisplay.cs b/SolastaCommunityExpansion/Displays/RulesDisplay.cs index 69cc4a88e3..ee44fa742c 100644 --- a/SolastaCommunityExpansion/Displays/RulesDisplay.cs +++ b/SolastaCommunityExpansion/Displays/RulesDisplay.cs @@ -23,6 +23,14 @@ internal static void DisplayRules() UI.Label(""); + toggle = Main.Settings.AllowCrossbowsToUseBowFeatures; + if (UI.Toggle(Gui.Localize("ModUi/&AllowCrossbowsToUseBowFeatures"), ref toggle, UI.AutoWidth())) + { + Main.Settings.AllowCrossbowsToUseBowFeatures = toggle; + } + + UI.Label(""); + toggle = Main.Settings.AddBleedingToLesserRestoration; if (UI.Toggle(Gui.Localize("ModUi/&AddBleedingToLesserRestoration"), ref toggle, UI.AutoWidth())) { diff --git a/SolastaCommunityExpansion/Patches/CustomFeatures/CustomAttacks/RulesetCharacterHeroPatcher.cs b/SolastaCommunityExpansion/Patches/CustomFeatures/CustomAttacks/RulesetCharacterHeroPatcher.cs index 13281aa58e..045e21855c 100644 --- a/SolastaCommunityExpansion/Patches/CustomFeatures/CustomAttacks/RulesetCharacterHeroPatcher.cs +++ b/SolastaCommunityExpansion/Patches/CustomFeatures/CustomAttacks/RulesetCharacterHeroPatcher.cs @@ -106,6 +106,11 @@ internal static class RulesetCharacterHero_IsWieldingBow { internal static bool Prefix(RulesetCharacterHero __instance, ref bool __result) { + if (!Main.Settings.AllowCrossbowsToUseBowFeatures) + { + return true; + } + var equipedItem = __instance.characterInventory.InventorySlotsByName[EquipmentDefinitions.SlotTypeMainHand] .EquipedItem; diff --git a/SolastaCommunityExpansion/Resources/Translations/Modui-de.txt b/SolastaCommunityExpansion/Resources/Translations/Modui-de.txt index 24cd609c61..4a137090fa 100644 --- a/SolastaCommunityExpansion/Resources/Translations/Modui-de.txt +++ b/SolastaCommunityExpansion/Resources/Translations/Modui-de.txt @@ -184,4 +184,5 @@ ModUi/&UnlockMarkAndTatoosForAllCharacters Schalte Markierungen und Tattoos für ModUi/&UsableDevice Verwendbares Gerät ModUi/&UseOfficialAdvantageDisadvantageRules Verwenden Sie die offiziellen Vorteils- / Nachteilsregeln ModUi/&Visuals Visuals: -ModUi/&Weapon Waffen \ No newline at end of file +ModUi/&Weapon Waffen +ModUi/&AllowCrossbowsToUseBowFeatures Ermöglichen Sie Armbrüsten, von den Bogenfunktionen zu profitieren \ No newline at end of file diff --git a/SolastaCommunityExpansion/Resources/Translations/Modui-en.txt b/SolastaCommunityExpansion/Resources/Translations/Modui-en.txt index 7eccbb972f..e7bce1c65e 100644 --- a/SolastaCommunityExpansion/Resources/Translations/Modui-en.txt +++ b/SolastaCommunityExpansion/Resources/Translations/Modui-en.txt @@ -184,4 +184,5 @@ ModUi/&UnlockMarkAndTatoosForAllCharacters Unlock markings and tattoos for all c ModUi/&UsableDevice Usable Device ModUi/&UseOfficialAdvantageDisadvantageRules Use official advantage / disadvantage rules ModUi/&Visuals Visuals: -ModUi/&Weapon Weapons \ No newline at end of file +ModUi/&Weapon Weapons +ModUi/&AllowCrossbowsToUseBowFeatures Allow crossbows to benefit from bows features \ No newline at end of file diff --git a/SolastaCommunityExpansion/Resources/Translations/Modui-fr.txt b/SolastaCommunityExpansion/Resources/Translations/Modui-fr.txt index 64cca9a41d..ea91b99f71 100644 --- a/SolastaCommunityExpansion/Resources/Translations/Modui-fr.txt +++ b/SolastaCommunityExpansion/Resources/Translations/Modui-fr.txt @@ -184,4 +184,5 @@ ModUi/&UnlockMarkAndTatoosForAllCharacters Débloquez des marquages ​​et des ModUi/&UsableDevice Appareil utilisable ModUi/&UseOfficialAdvantageDisadvantageRules Utiliser les règles officielles d'avantage/désavantage ModUi/&Visuals Visuels : -ModUi/&Weapon Armes \ No newline at end of file +ModUi/&Weapon Armes +ModUi/&AllowCrossbowsToUseBowFeatures Permettre aux arbalètes de bénéficier des fonctionnalités des arcs \ No newline at end of file diff --git a/SolastaCommunityExpansion/Resources/Translations/Modui-pt-br.txt b/SolastaCommunityExpansion/Resources/Translations/Modui-pt-br.txt index 891ad79e52..f517bd360f 100644 --- a/SolastaCommunityExpansion/Resources/Translations/Modui-pt-br.txt +++ b/SolastaCommunityExpansion/Resources/Translations/Modui-pt-br.txt @@ -184,4 +184,5 @@ ModUi/&UnlockMarkAndTatoosForAllCharacters Desbloqueie marcações e tatuagens p ModUi/&UsableDevice Dispositivos ModUi/&UseOfficialAdvantageDisadvantageRules Use regras oficiais de vantagem/desvantagem ModUi/&Visuals Visual: -ModUi/&Weapon Armas \ No newline at end of file +ModUi/&Weapon Armas +ModUi/&AllowCrossbowsToUseBowFeatures Permitir que as bestas se beneficiem dos recursos dos arcos \ No newline at end of file diff --git a/SolastaCommunityExpansion/Resources/Translations/Modui-ru.txt b/SolastaCommunityExpansion/Resources/Translations/Modui-ru.txt index b50bccada7..9b5cf3a2ff 100644 --- a/SolastaCommunityExpansion/Resources/Translations/Modui-ru.txt +++ b/SolastaCommunityExpansion/Resources/Translations/Modui-ru.txt @@ -184,4 +184,5 @@ ModUi/&UnlockMarkAndTatoosForAllCharacters Разблокировать отме ModUi/&UsableDevice Используемое устройство ModUi/&UseOfficialAdvantageDisadvantageRules Использовать официальные правила преимущества/помехи ModUi/&Visuals Визуальные эффекты: -ModUi/&Weapon Оружие \ No newline at end of file +ModUi/&Weapon Оружие +ModUi/&AllowCrossbowsToUseBowFeatures Разрешить арбалетам пользоваться преимуществами луков \ No newline at end of file diff --git a/SolastaCommunityExpansion/Resources/Translations/Modui-zh-CN.txt b/SolastaCommunityExpansion/Resources/Translations/Modui-zh-CN.txt index 41c5875a41..94a46e14d3 100644 --- a/SolastaCommunityExpansion/Resources/Translations/Modui-zh-CN.txt +++ b/SolastaCommunityExpansion/Resources/Translations/Modui-zh-CN.txt @@ -184,4 +184,5 @@ ModUi/&UnlockMarkAndTatoosForAllCharacters 解锁全部角色的标记和纹身 ModUi/&UsableDevice 可用装置 ModUi/&UseOfficialAdvantageDisadvantageRules 应用官方的优势/劣势规则 ModUi/&Visuals 视效: -ModUi/&Weapon 武器 \ No newline at end of file +ModUi/&Weapon 武器 +ModUi/&AllowCrossbowsToUseBowFeatures 允许弩从弓相关的特性中收益 \ No newline at end of file diff --git a/SolastaCommunityExpansion/Utils/Settings.cs b/SolastaCommunityExpansion/Utils/Settings.cs index 8bc7562461..be893b8781 100644 --- a/SolastaCommunityExpansion/Utils/Settings.cs +++ b/SolastaCommunityExpansion/Utils/Settings.cs @@ -142,6 +142,7 @@ public class Settings : UnityModManager.ModSettings // SRD public bool UseOfficialAdvantageDisadvantageRules { get; set; } + public bool AllowCrossbowsToUseBowFeatures { get; set; } public bool AddBleedingToLesserRestoration { get; set; } public bool BlindedConditionDontAllowAttackOfOpportunity { get; set; } public bool AllowTargetingSelectionWhenCastingChainLightningSpell { get; set; }