Skip to content

Commit

Permalink
minor clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThyWoof
ThyWoof committed May 20, 2023
1 parent 6b68963 commit 15a0d74
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
5 changes: 5 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1159,6 +1159,7 @@ AttributeModifierGambitSwitchBad FeatureDefinitionAttributeModifier FeatureDefin
AttributeModifierGambitSwitchGood FeatureDefinitionAttributeModifier FeatureDefinition fac73097-26ac-58f8-9cd6-3a78dacefbbc
AttributeModifierGnomeAbilityScoreIncrease FeatureDefinitionAttributeModifier FeatureDefinition 3e408ad8-a69c-594f-b099-ce572770f3f8
AttributeModifierGrayDwarfStrengthAbilityScoreIncrease FeatureDefinitionAttributeModifier FeatureDefinition 25954e3c-a310-5775-84b7-1c936d815cca
AttributeModifierHandAndAHalf FeatureDefinitionAttributeModifier FeatureDefinition 1d4acff8-789d-5676-bb0d-f19f4fa79368
AttributeModifierInfusionEnhanceDefense FeatureDefinitionAttributeModifier FeatureDefinition fcbad6d4-7420-5c63-ae55-8a5bca4b0209
AttributeModifierInfusionEnhanceDefenseUpgraded FeatureDefinitionAttributeModifier FeatureDefinition b072f680-c2ac-54b5-a195-9a1ba916e77f
AttributeModifierInnovationArmorExtraAttack FeatureDefinitionAttributeModifier FeatureDefinition 0c1cff3e-7c84-5d6e-963e-7b910f9e96c5
Expand Down Expand Up @@ -1326,6 +1327,7 @@ CombatAffinityWayOfTheDistantHandUpgradedDistract FeatureDefinitionCombatAffinit
CombatAffinityWayOfTheTempestAppliedEyeOfTheStorm FeatureDefinitionCombatAffinity FeatureDefinition b0a739e0-ee58-59e1-8de5-748dc4059c1d
CombatAffinityWayOfTheTempestAppliedGatheringStorm FeatureDefinitionCombatAffinity FeatureDefinition 6fe6edc7-f30b-5a8c-9cc2-b3c3c1219127
CombatAffinityWildMasterSummonerIsNextToBeast FeatureDefinitionCombatAffinity FeatureDefinition 5caab56f-2aec-5048-b426-36ae4df0b447
ConditionAffinityGrappledRestrainedSpellWebImmunity FeatureDefinitionConditionAffinity FeatureDefinition 1dbd0da8-d0cc-5aa1-a257-3046578f53bd
ConditionAffinityGrayDwarfCharm FeatureDefinitionConditionAffinity FeatureDefinition 6af82f51-d3f5-55e1-ae2f-0873c50c278b
ConditionAffinityGrayDwarfCharmedByHypnoticPattern FeatureDefinitionConditionAffinity FeatureDefinition 16ff7c64-5aa5-508d-a02b-1e912203079b
ConditionAffinityGrayDwarfParalyzedAdvantage FeatureDefinitionConditionAffinity FeatureDefinition e7b5e170-5ced-5242-bc3a-5b2bb689d2cd
Expand Down Expand Up @@ -2812,6 +2814,7 @@ CombatAffinityWayOfTheDistantHandUpgradedDistract FeatureDefinitionCombatAffinit
CombatAffinityWayOfTheTempestAppliedEyeOfTheStorm FeatureDefinitionCombatAffinity FeatureDefinitionAffinity b0a739e0-ee58-59e1-8de5-748dc4059c1d
CombatAffinityWayOfTheTempestAppliedGatheringStorm FeatureDefinitionCombatAffinity FeatureDefinitionAffinity 6fe6edc7-f30b-5a8c-9cc2-b3c3c1219127
CombatAffinityWildMasterSummonerIsNextToBeast FeatureDefinitionCombatAffinity FeatureDefinitionAffinity 5caab56f-2aec-5048-b426-36ae4df0b447
ConditionAffinityGrappledRestrainedSpellWebImmunity FeatureDefinitionConditionAffinity FeatureDefinitionAffinity 1dbd0da8-d0cc-5aa1-a257-3046578f53bd
ConditionAffinityGrayDwarfCharm FeatureDefinitionConditionAffinity FeatureDefinitionAffinity 6af82f51-d3f5-55e1-ae2f-0873c50c278b
ConditionAffinityGrayDwarfCharmedByHypnoticPattern FeatureDefinitionConditionAffinity FeatureDefinitionAffinity 16ff7c64-5aa5-508d-a02b-1e912203079b
ConditionAffinityGrayDwarfParalyzedAdvantage FeatureDefinitionConditionAffinity FeatureDefinitionAffinity e7b5e170-5ced-5242-bc3a-5b2bb689d2cd
Expand Down Expand Up @@ -3103,6 +3106,7 @@ AttributeModifierGambitSwitchBad FeatureDefinitionAttributeModifier FeatureDefin
AttributeModifierGambitSwitchGood FeatureDefinitionAttributeModifier FeatureDefinitionAttributeModifier fac73097-26ac-58f8-9cd6-3a78dacefbbc
AttributeModifierGnomeAbilityScoreIncrease FeatureDefinitionAttributeModifier FeatureDefinitionAttributeModifier 3e408ad8-a69c-594f-b099-ce572770f3f8
AttributeModifierGrayDwarfStrengthAbilityScoreIncrease FeatureDefinitionAttributeModifier FeatureDefinitionAttributeModifier 25954e3c-a310-5775-84b7-1c936d815cca
AttributeModifierHandAndAHalf FeatureDefinitionAttributeModifier FeatureDefinitionAttributeModifier 1d4acff8-789d-5676-bb0d-f19f4fa79368
AttributeModifierInfusionEnhanceDefense FeatureDefinitionAttributeModifier FeatureDefinitionAttributeModifier fcbad6d4-7420-5c63-ae55-8a5bca4b0209
AttributeModifierInfusionEnhanceDefenseUpgraded FeatureDefinitionAttributeModifier FeatureDefinitionAttributeModifier b072f680-c2ac-54b5-a195-9a1ba916e77f
AttributeModifierInnovationArmorExtraAttack FeatureDefinitionAttributeModifier FeatureDefinitionAttributeModifier 0c1cff3e-7c84-5d6e-963e-7b910f9e96c5
Expand Down Expand Up @@ -3293,6 +3297,7 @@ CombatAffinityWayOfTheDistantHandUpgradedDistract FeatureDefinitionCombatAffinit
CombatAffinityWayOfTheTempestAppliedEyeOfTheStorm FeatureDefinitionCombatAffinity FeatureDefinitionCombatAffinity b0a739e0-ee58-59e1-8de5-748dc4059c1d
CombatAffinityWayOfTheTempestAppliedGatheringStorm FeatureDefinitionCombatAffinity FeatureDefinitionCombatAffinity 6fe6edc7-f30b-5a8c-9cc2-b3c3c1219127
CombatAffinityWildMasterSummonerIsNextToBeast FeatureDefinitionCombatAffinity FeatureDefinitionCombatAffinity 5caab56f-2aec-5048-b426-36ae4df0b447
ConditionAffinityGrappledRestrainedSpellWebImmunity FeatureDefinitionConditionAffinity FeatureDefinitionConditionAffinity 1dbd0da8-d0cc-5aa1-a257-3046578f53bd
ConditionAffinityGrayDwarfCharm FeatureDefinitionConditionAffinity FeatureDefinitionConditionAffinity 6af82f51-d3f5-55e1-ae2f-0873c50c278b
ConditionAffinityGrayDwarfCharmedByHypnoticPattern FeatureDefinitionConditionAffinity FeatureDefinitionConditionAffinity 16ff7c64-5aa5-508d-a02b-1e912203079b
ConditionAffinityGrayDwarfParalyzedAdvantage FeatureDefinitionConditionAffinity FeatureDefinitionConditionAffinity e7b5e170-5ced-5242-bc3a-5b2bb689d2cd
Expand Down
3 changes: 0 additions & 3 deletions Scripts/translate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,7 @@ def main():
translate_folder("en", "en", "es")
translate_folder("en", "en", "fr")
translate_folder("en", "en", "de")

translate_folder("en", "en", "it")
# translate_folder("en", "en", "zh-CN")
# translate_folder("en", "en", "ru")

if __name__ == "__main__":
main()
10 changes: 5 additions & 5 deletions Scripts/translateAutoSync.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ def sync_folder(root_folder_name, folder_name, code):
def main():
# sync cn language
sync_folder("en", "en", "zh-CN")
# sync_folder("en", "en", "pt")
# sync_folder("en", "en", "es")
# sync_folder("en", "en", "fr")
# sync_folder("en", "en", "de")
# sync_folder("en", "en", "it")
sync_folder("en", "en", "pt")
sync_folder("en", "en", "es")
sync_folder("en", "en", "fr")
sync_folder("en", "en", "de")
sync_folder("en", "en", "it")

if __name__ == "__main__":
main()
9 changes: 3 additions & 6 deletions SolastaUnfinishedBusiness/CustomBehaviors/GuardianAuraHpSwap.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,13 @@ internal static IEnumerator ProcessOnCharacterAttackHitFinished(
}

var units = battle.AllContenders
.Where(u => u.RulesetCharacter is { IsDeadOrDyingOrUnconscious: false })
.Where(u => u.RulesetCharacter is { IsDeadOrDyingOrUnconscious: false } && attacker != u && defender != u)
.ToList();

foreach (var unit in units)
{
if (attacker != unit && defender != unit)
{
yield return ActiveHealthSwap(
unit, attacker, defender, battleManager, attackerAttackMode, rulesetEffect, damageAmount);
}
yield return ActiveHealthSwap(
unit, attacker, defender, battleManager, attackerAttackMode, rulesetEffect, damageAmount);
}
}

Expand Down
2 changes: 1 addition & 1 deletion SolastaUnfinishedBusiness/Patches/CharacterActionPanelPatcher.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ public static void Prefix(
}
}
}

//PATCH: don't display the break free selection panel if restrained by web or or ice bound
[HarmonyPatch(typeof(CharacterActionPanel), nameof(CharacterActionPanel.SelectBreakFreeMode))]
[SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Patch")]
Expand Down
Binary file modified SolastaUnfinishedBusiness/Resources/Subclasses/MartialTactician.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions SolastaUnfinishedBusiness/Spells/SpellBuildersLevel02.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ internal static SpellDefinition BuildWeb()

var conditionAffinityGrappledRestrainedSpellWebImmunity = FeatureDefinitionConditionAffinityBuilder
.Create("ConditionAffinityGrappledRestrainedSpellWebImmunity")
.SetGuiPresentationNoContent(true)
.SetConditionType(conditionRestrainedBySpellWeb)
.SetConditionAffinityType(ConditionAffinityType.Immunity)
.AddToDB();
Expand Down

0 comments on commit 15a0d74

Please sign in to comment.