Optimizations, bug fixes and suggestions. by HIEROT · Pull Request #27 · HaVeNII7/Home-Brew---Comprehensive-Reworks

HIEROT · 2026-07-09T21:56:33Z

Each category of changes are commited separately, please refer to each commit comment.

New icons

…see WeaponDR.md for details. Please remove the doc after review.

…ther similar passives can be fixed similarly.

…but this change won't affect saves.

…uture commits.

Copilot

Pull request overview

This pull request updates several “weapon-spell” entries to ensure weapon-related bonuses apply correctly (once) on hybrid weapon+spell attacks, alongside a few Lua/script adjustments and added balance/systems suggestion documentation.

Changes:

Adjusted multiple weapon-spell SpellSuccess functors to use non-suppressed weapon hits so weapon bonuses can apply (without double-dipping on riders).
Tweaked Script Extender Lua behavior for party-follower DB access and an item distribution equip flag.
Added/updated markdown documentation capturing the weapon-spell bonus rationale and broader balance suggestions.

Reviewed changes

Copilot reviewed 4 out of 14 changed files in this pull request and generated 14 comments.

Show a summary per file

File	Description
WeaponDR.md	Documents the recommended pattern for hybrid weapon spells receiving weapon bonuses once.
OtherSuggestions.md	Adds broader balance feedback/suggestions documentation.
Home Brew - Comprehensive Reworks/Public/HomeBrew - Comprehensive Reworks/Stats/Generated/Data/Spells Reworked - Spell_Target.txt	Updates melee weapon-spell `SpellSuccess` weapon hit functors (e.g., Green-Flame Blade, Thunderous Strike).
Home Brew - Comprehensive Reworks/Public/HomeBrew - Comprehensive Reworks/Stats/Generated/Data/Spells Reworked - Spell_Projectile.txt	Updates Lightning Arrow weapon hit functors in `SpellSuccess` across upcast variants.
Home Brew - Comprehensive Reworks/Public/HomeBrew - Comprehensive Reworks/Stats/Generated/Data/Feats Reworked - Spell_Target.txt	Updates weapon hit functors for feat-based weapon-spells with riders.
Home Brew - Comprehensive Reworks/Public/HomeBrew - Comprehensive Reworks/Stats/Generated/Data/Classes Reworked (Wizard) - Spell_Projectile.txt	Updates weapon hit functor for a wizard weapon-spell projectile entry.
Home Brew - Comprehensive Reworks/Public/HomeBrew - Comprehensive Reworks/Stats/Generated/Data/Classes Reworked (Warlock) - Spell_Target.txt	Updates Eldritch Strike weapon hit functors across scaling variants.
Home Brew - Comprehensive Reworks/Public/HomeBrew - Comprehensive Reworks/Stats/Generated/Data/Classes Reworked (Sorcerer) - Passive.txt	Changes Frigid Madness save DC calculation to an explicit `CalculateSpellDC(...)`.
Home Brew - Comprehensive Reworks/Public/HomeBrew - Comprehensive Reworks/Stats/Generated/Data/Classes Reworked (Fighter) - Spell_Zone.txt	Updates zone-based elemental fletching weapon hit functors on `SpellSuccess`.
Home Brew - Comprehensive Reworks/Public/HomeBrew - Comprehensive Reworks/Stats/Generated/Data/Classes Reworked (Fighter) - Spell_Rush.txt	Updates Rush_DraconicBlitz weapon hit functor in `SpellSuccess`.
Home Brew - Comprehensive Reworks/Public/HomeBrew - Comprehensive Reworks/Stats/Generated/Data/Classes Reworked (Fighter) - Spell_Projectile.txt	Updates multiple elemental fletching projectile entries to use non-suppressed weapon hits on `SpellSuccess`.
Home Brew - Comprehensive Reworks/Public/HomeBrew - Comprehensive Reworks/Stats/Generated/Data/Classes Reworked (Cleric) - Spell_Target.txt	Updates Striking Iron weapon hit functor in `SpellSuccess`.
Home Brew - Comprehensive Reworks/Mods/HomeBrew - Comprehensive Reworks/ScriptExtender/Lua/JWL_ItemDistribution.lua	Changes one distribution entry to no longer auto-equip an item.
Home Brew - Comprehensive Reworks/Mods/HomeBrew - Comprehensive Reworks/ScriptExtender/Lua/AddCreaturetoParty.lua	Adds safer DB access helper for party followers and updates call sites.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

 data "SpellProperties" "GROUND:DealDamage(MainRangedWeapon, MainRangedWeaponDamageType,,,0,,true);GROUND:DealDamage(LevelMapValue(D8Cantrip), Psychic,Magical);GROUND:ExecuteWeaponFunctors(MainHand)"
-data "SpellSuccess" "DealDamage(max(1,MainRangedWeapon), MainRangedWeaponDamageType,,,0,,true); DealDamage(LevelMapValue(D8Cantrip), Psychic,Magical); ExecuteWeaponFunctors(MainHand)"
+data "SpellSuccess" "DealDamage(max(1,MainRangedWeapon), MainRangedWeaponDamageType); DealDamage(LevelMapValue(D8Cantrip), Psychic,Magical); ExecuteWeaponFunctors(MainHand)"
 data "SpellFail" "DealDamage((max(1,MainRangedWeapon))/2, MainRangedWeaponDamageType,,,0,,true); DealDamage(LevelMapValue(D8Cantrip)/2, Psychic,Magical); ExecuteWeaponFunctors(MainHand)"


 data "Level" "2"
-data "SpellSuccess" "DealDamage(MainMeleeWeapon, MainMeleeWeaponDamageType,,,0,,true);DealDamage(2d12+16,Force,Magical);IF(not (HasStatus('PENUMBRA_LIGHT', context.Source) or HasStatus('PENUMBRA_LIGHT_TECHNICAL', context.Source) or HasStatus('PENUMBRA_DARK', context.Source) or HasStatus('PENUMBRA_DARK_TECHNICAL', context.Source))):SpawnExtraProjectiles(Projectile_EldritchBlastStrike);IF(HasStatus('PENUMBRA_LIGHT', context.Source) or HasStatus('PENUMBRA_LIGHT_TECHNICAL', context.Source)):SpawnExtraProjectiles(Projectile_EldritchBlastStrike_Penumbral_Radiant);IF(HasStatus('PENUMBRA_DARK', context.Source) or HasStatus('PENUMBRA_DARK_TECHNICAL', context.Source)):SpawnExtraProjectiles(Projectile_EldritchBlastStrike_Penumbral_Necrotic)"
+data "SpellSuccess" "DealDamage(MainMeleeWeapon, MainMeleeWeaponDamageType);DealDamage(2d12+16,Force,Magical);IF(not (HasStatus('PENUMBRA_LIGHT', context.Source) or HasStatus('PENUMBRA_LIGHT_TECHNICAL', context.Source) or HasStatus('PENUMBRA_DARK', context.Source) or HasStatus('PENUMBRA_DARK_TECHNICAL', context.Source))):SpawnExtraProjectiles(Projectile_EldritchBlastStrike);IF(HasStatus('PENUMBRA_LIGHT', context.Source) or HasStatus('PENUMBRA_LIGHT_TECHNICAL', context.Source)):SpawnExtraProjectiles(Projectile_EldritchBlastStrike_Penumbral_Radiant);IF(HasStatus('PENUMBRA_DARK', context.Source) or HasStatus('PENUMBRA_DARK_TECHNICAL', context.Source)):SpawnExtraProjectiles(Projectile_EldritchBlastStrike_Penumbral_Necrotic)"
 data "TooltipDamageList" "DealDamage(MainMeleeWeapon, MainMeleeWeaponDamageType,,,0,,true);DealDamage(2d12+16,Force)"


 data "Level" "3"
-data "SpellSuccess" "DealDamage(MainMeleeWeapon, MainMeleeWeaponDamageType,,,0,,true);DealDamage(3d12+24,Force,Magical);IF(not (HasStatus('PENUMBRA_LIGHT', context.Source) or HasStatus('PENUMBRA_LIGHT_TECHNICAL', context.Source) or HasStatus('PENUMBRA_DARK', context.Source) or HasStatus('PENUMBRA_DARK_TECHNICAL', context.Source))):SpawnExtraProjectiles(Projectile_EldritchBlastStrike);IF(HasStatus('PENUMBRA_LIGHT', context.Source) or HasStatus('PENUMBRA_LIGHT_TECHNICAL', context.Source)):SpawnExtraProjectiles(Projectile_EldritchBlastStrike_Penumbral_Radiant);IF(HasStatus('PENUMBRA_DARK', context.Source) or HasStatus('PENUMBRA_DARK_TECHNICAL', context.Source)):SpawnExtraProjectiles(Projectile_EldritchBlastStrike_Penumbral_Necrotic)"
+data "SpellSuccess" "DealDamage(MainMeleeWeapon, MainMeleeWeaponDamageType);DealDamage(3d12+24,Force,Magical);IF(not (HasStatus('PENUMBRA_LIGHT', context.Source) or HasStatus('PENUMBRA_LIGHT_TECHNICAL', context.Source) or HasStatus('PENUMBRA_DARK', context.Source) or HasStatus('PENUMBRA_DARK_TECHNICAL', context.Source))):SpawnExtraProjectiles(Projectile_EldritchBlastStrike);IF(HasStatus('PENUMBRA_LIGHT', context.Source) or HasStatus('PENUMBRA_LIGHT_TECHNICAL', context.Source)):SpawnExtraProjectiles(Projectile_EldritchBlastStrike_Penumbral_Radiant);IF(HasStatus('PENUMBRA_DARK', context.Source) or HasStatus('PENUMBRA_DARK_TECHNICAL', context.Source)):SpawnExtraProjectiles(Projectile_EldritchBlastStrike_Penumbral_Necrotic)"
 data "TooltipDamageList" "DealDamage(MainMeleeWeapon, MainMeleeWeaponDamageType,,,0,,true);DealDamage(3d12+24,Force)"


 using "Projectile_LightningArrow"
-data "SpellSuccess" "TARGET:DealDamage(MainRangedWeapon, MainRangedWeaponDamageType,,,0,,true);TARGET:DealDamage(3d6+12,Lightning,Magical);ExecuteWeaponFunctors(MainHand);AOE:DealDamage(3d6+12,Lightning,Magical);ApplyStatus(SELF,MAG_CHARGED_LIGHTNING,100,1)"
+data "SpellSuccess" "TARGET:DealDamage(MainRangedWeapon, MainRangedWeaponDamageType);TARGET:DealDamage(3d6+12,Lightning,Magical);ExecuteWeaponFunctors(MainHand);AOE:DealDamage(3d6+12,Lightning,Magical);ApplyStatus(SELF,MAG_CHARGED_LIGHTNING,100,1)"
 data "TooltipDamageList" "DealDamage(3d6+12,Lightning)"


 using "Projectile_LightningArrow"
-data "SpellSuccess" "TARGET:DealDamage(MainRangedWeapon, MainRangedWeaponDamageType,,,0,,true);TARGET:DealDamage(4d6+16,Lightning,Magical);ExecuteWeaponFunctors(MainHand);AOE:DealDamage(4d6+16,Lightning,Magical);ApplyStatus(SELF,MAG_CHARGED_LIGHTNING,100,1)"
+data "SpellSuccess" "TARGET:DealDamage(MainRangedWeapon, MainRangedWeaponDamageType);TARGET:DealDamage(4d6+16,Lightning,Magical);ExecuteWeaponFunctors(MainHand);AOE:DealDamage(4d6+16,Lightning,Magical);ApplyStatus(SELF,MAG_CHARGED_LIGHTNING,100,1)"
 data "TooltipDamageList" "DealDamage(4d6+16,Lightning)"


 using "Projectile_LightningArrow"
-data "SpellSuccess" "TARGET:DealDamage(MainRangedWeapon, MainRangedWeaponDamageType,,,0,,true);TARGET:DealDamage(5d6+20,Lightning,Magical);ExecuteWeaponFunctors(MainHand);AOE:DealDamage(5d6+20,Lightning,Magical);ApplyStatus(SELF,MAG_CHARGED_LIGHTNING,100,1)"
+data "SpellSuccess" "TARGET:DealDamage(MainRangedWeapon, MainRangedWeaponDamageType);TARGET:DealDamage(5d6+20,Lightning,Magical);ExecuteWeaponFunctors(MainHand);AOE:DealDamage(5d6+20,Lightning,Magical);ApplyStatus(SELF,MAG_CHARGED_LIGHTNING,100,1)"
 data "TooltipDamageList" "DealDamage(5d6+20,Lightning)"


 using "Projectile_LightningArrow"
-data "SpellSuccess" "TARGET:DealDamage(MainRangedWeapon, MainRangedWeaponDamageType,,,0,,true);TARGET:DealDamage(6d6+24,Lightning,Magical);ExecuteWeaponFunctors(MainHand);AOE:DealDamage(6d6+24,Lightning,Magical);ApplyStatus(SELF,MAG_CHARGED_LIGHTNING,100,1)"
+data "SpellSuccess" "TARGET:DealDamage(MainRangedWeapon, MainRangedWeaponDamageType);TARGET:DealDamage(6d6+24,Lightning,Magical);ExecuteWeaponFunctors(MainHand);AOE:DealDamage(6d6+24,Lightning,Magical);ApplyStatus(SELF,MAG_CHARGED_LIGHTNING,100,1)"
 data "TooltipDamageList" "DealDamage(6d6+24,Lightning)"


 data "SpellProperties" "ApplyStatus(STRIKINGIRON_VFX,100,1);IF(HasPassive('BrazenEmbers', context.Source)):ApplyStatus(STRIKINGIRON_ADVANTAGE,100,3);IF(HasPassive('Smeltsong', context.Source)):ApplyStatus(BURNING_LAVA,100,3);GROUND:DealDamage(MainMeleeWeapon, MainMeleeWeaponDamageType);GROUND:ExecuteWeaponFunctors(MainHand)"
 data "SpellRoll" "Attack(AttackType.MeleeWeaponAttack)"
-data "SpellSuccess" "DealDamage(MainMeleeWeapon, MainMeleeWeaponDamageType,,,0,,true);DealDamage(LevelMapValue(D8Cantrip),Fire,Magical);ExecuteWeaponFunctors(MainHand)"
+data "SpellSuccess" "DealDamage(MainMeleeWeapon, MainMeleeWeaponDamageType);DealDamage(LevelMapValue(D8Cantrip),Fire,Magical);ExecuteWeaponFunctors(MainHand)"


Balin-P and others added 9 commits July 3, 2026 20:29

New icons

30a3f53

Merge remote-tracking branch 'upstream/main' into icons

0b01bb8

re-add homebrew icons

0b93949

Merge pull request HaVeNII7#26 from Balin-P/icons

3a5ca35

New icons

Fixed Spell-based weapon attack to normally attach 1 instance of DR, …

84e5398

…see WeaponDR.md for details. Please remove the doc after review.

Fix console error when checking lonewolf status.

8a036b0

Fixed FrigidMadness DC set to default (10) if not applied directly. O…

45b5f0f

…ther similar passives can be fixed similarly.

Perhaps fixed Ansur not dropping Empowered Guardian Emblem. Untested …

b132000

…but this change won't affect saves.

Add a suggestion doc collected from some players. Can be removed in f…

ed12aef

…uture commits.

Copilot AI review requested due to automatic review settings July 9, 2026 21:56

Copilot started reviewing on behalf of HIEROT July 9, 2026 21:57 View session

Copilot AI reviewed Jul 9, 2026

View reviewed changes

HIEROT force-pushed the main branch from 33033fd to ed12aef Compare July 9, 2026 22:26

Fix spell weapon attack tooltip damage

0d9e57f

HaVeNII7 force-pushed the main branch from 3a5ca35 to 1724494 Compare July 19, 2026 19:09

Navigation Menu

Optimizations, bug fixes and suggestions. - #27

Optimizations, bug fixes and suggestions.#27
HIEROT wants to merge 10 commits into
HaVeNII7:mainfrom
HIEROT:main

HIEROT commented Jul 9, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

HIEROT commented Jul 9, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants