-
Notifications
You must be signed in to change notification settings - Fork 11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Combat automation specific attacks #196
Closed
Closed
Changes from 4 commits
Commits
Show all changes
118 commits
Select commit
Hold shift + click to select a range
98b2614
specificAttacks-and-resistance-overhauled
paiva92 c5125d2
specific-attacks-macro-execution
paiva92 f41a974
fix-psychicImbalanceCheck-and-check-result
paiva92 a388b41
code-aesthetic-mystic
paiva92 aabe156
critic-automation
paiva92 cb31fdc
fix-localization-criticIfBeAble
paiva92 71bef2b
fix-executeMacro-resistanceRoll
paiva92 afaf929
fix-critic-location-side
paiva92 16f1cbd
fix-psychic-projection
paiva92 f3747d5
techniques-sheet-active-effects
paiva92 d6eb742
hotfix-all-attacks-ignores-armor
paiva92 22d1716
actor-active-effects
paiva92 7e5bdf1
specific-attacks-combat-damage-fix
paiva92 e0c6179
new-critic-penalty-flag-hook
paiva92 955c728
new-domineTechniqueEvaluate-actor
paiva92 6fd2e58
rebase-fixes
paiva92 ffb5b59
update-3 equals to
paiva92 492c163
update-PP
paiva92 58a7a78
fix-accumulateDefenses
paiva92 9c34db9
fix-rebase
paiva92 26cff91
remove-domine technique active effects
paiva92 c0ef608
revamp-criticPenalty + pain modifiers
paiva92 474c284
visual - painModifiers
paiva92 04733d7
replace visuals-effects for status
paiva92 a1eaaba
Merge branch 'feature/new-combat-automation' into combat-automation-s…
paiva92 1743d69
Merge branch 'feature/new-combat-automation' into combat-automation-s…
paiva92 0c49037
fix - specificAttack
paiva92 a95ecc4
fix-mutate ACT interger
paiva92 66ab55a
fix-localization combat Modifiers
paiva92 82cc682
added - endCombat physicalPainDisappearing
paiva92 49f90c9
new - Combat Surprised automated
paiva92 9acf7d1
update - modifiers allActrions secondaryInput
paiva92 e4467cf
fix - surprised without combat
paiva92 664e990
new - psychicFatigue Combat Dialog Attacker
paiva92 f422f05
fix-resistanceRoll
paiva92 d14eb65
new-resistanceRoll socket
paiva92 e48cac5
rename - psychicPotencialEffect > difficultyAchieved
paiva92 7f87c6c
revamp - oppousedCheckRoll, CriticRoll, ResistanceRoll - with sockets
paiva92 0b540af
fix - macro specificAttack
paiva92 3a128ba
Merge branch 'feature/new-combat-automation' into combat-automation-s…
paiva92 d776e86
Merge branch 'feature/new-combat-automation' into combat-automation-s…
paiva92 839f26a
Merge branch 'feature/new-combat-automation' into combat-automation-s…
paiva92 ee46826
new - Macro mystic-act
paiva92 108bd86
update - macro-mystic-act
paiva92 1227728
update - background img
paiva92 9b48a4b
fix - localization
paiva92 a0a29fe
update - macro hotbar for users with maxZeon
paiva92 0a448df
update - release-act & withstand-pain
paiva92 dff2a3f
fix - mutateMysticData
paiva92 d1d81f2
Merge branch 'feature/new-combat-automation' into combat-automation-s…
paiva92 f093771
Merge branch 'combat-automation-specific-attacks' into feature/macro-…
paiva92 54b5d37
update - mutateData added special for Active Effects
paiva92 6f4b799
fix - mutate AllActions + pain modifier
paiva92 4180c95
Merge branch 'feature/new-combat-automation' into combat-automation-s…
paiva92 7b18e1d
Merge branch 'combat-automation-specific-attacks' into feature/macro-…
paiva92 16778b1
fix - weapon template hasOwnStr
paiva92 fdecbba
Merge branch 'fix/weapon-template-hasOwnStr' into combat-automation-s…
paiva92 7639975
new - actor criticLevel attribute
paiva92 7318c84
fix - rollResistance rollCritic
paiva92 4faa356
fix - Active Effects name/label
paiva92 a38c264
update - executeCombatMacro args hasCritic criticImpact
paiva92 fa4a220
new - GMCombat applyDamage
paiva92 4814f83
delete console.log()
paiva92 c7cddce
Merge branch 'main' into combat-automation-specific-attacks
paiva92 9fcae48
new - metaMagic template and constant
paiva92 71bd976
fix - critic roll
paiva92 9f00995
update - bodyparts on Actor
paiva92 309bfe6
Merge branch 'develop/new-combat-automation' into combat-automation-s…
paiva92 83cfd5b
fix - weaponSpecialCheck
paiva92 65de616
new - applyCritic option GMCombatDialog
paiva92 40dbcca
update - critic resistance roll display gm-combat-dialog
paiva92 213c488
update - GMCombat attacker applyCritic
paiva92 566beed
Merge branch 'develop/new-combat-automation' into combat-automation-s…
paiva92 6a39947
new - openArmor targeted attack
paiva92 ab3cba3
Merge branch 'develop/new-combat-automation' into combat-automation-s…
paiva92 c5702d8
fix - act via = 0
paiva92 41bc4de
Merge branch 'combat-automation-specific-attacks' into feature/macro-…
paiva92 9dedaed
Merge branch 'combat-automation-specific-attacks' into feature/metaMagic
paiva92 59237f6
update - repleace old metamagics with newer version
paiva92 ee6767f
update - localization
paiva92 56f7b82
new - spellDamage actor method
paiva92 fe8da8c
update - spellCasting addedZeonCost
paiva92 8999f41
fix - mystic actor methods
paiva92 43e1201
new - metamagics in combat
paiva92 072c631
fix - combat when not mystic
paiva92 51302e6
fix - combat hbs
paiva92 b5fbfe8
fix - combat spellDamage
paiva92 42222ec
fix - specificAttack knockOut
paiva92 0b8d278
Merge branch 'develop/new-combat-automation' into combat-automation-s…
paiva92 c885b4c
Merge branch 'combat-automation-specific-attacks' into feature/macro-…
paiva92 ea3bc32
fix - zeon accumulated
paiva92 c54470e
fix - lang knockOut
paiva92 dcd3611
Merge branch 'combat-automation-specific-attacks' into feature/macro-…
paiva92 dd34b13
Merge branch 'combat-automation-specific-attacks' into feature/metaMagic
paiva92 2f6e15d
fix - zeon accumulated actor method
paiva92 d218f27
Merge branch 'feature/macro-mystic-act' into feature/metaMagic-in-combat
paiva92 f75d900
update - metamagic exploitationOfNaturalEnergy
paiva92 05f6b04
update - metamagic definedMagicProjection
paiva92 724be63
update - metamagic advancedZeonRegeneration
paiva92 cdf766e
update - flag lastDefinedMagicProjection
paiva92 43e8bbc
fix - flag lastDefinedMagicProjection
paiva92 f998766
update - metamagics supernaturalShield
paiva92 1cffd03
update - metamagic preparedSpell and supernatural shield
paiva92 9160816
Merge branch 'develop/new-combat-automation' into combat-automation-s…
paiva92 cebd160
update - spellDamage actor method
paiva92 9253e84
Merge branch 'feature/metaMagic-in-combat' into combat-automation-spe…
paiva92 e9072c9
update - rename wrong english properties
paiva92 b44b255
fix - fatigueUsedBonus
paiva92 8b2fdfb
Merge branch 'feature/macro-mystic-act' into feature/metaMagic-in-combat
paiva92 e7e80aa
Merge branch 'develop/new-combat-automation' into combat-automation-s…
paiva92 0a664de
fix - metamagic increasedDestruction when baseDamage is 0
paiva92 d2b736b
fix - spellCasting async get Data CombatDefense
paiva92 cf238b5
fix - async mysticCanCastEvaluate
paiva92 f799d94
Merge branch 'develop/new-combat-automation' into combat-automation-s…
paiva92 bd70bdc
update - painModifieres for penalties
paiva92 d9332ac
new - immuneToCritic
paiva92 d5a11c9
update - criticRoll display
paiva92 2774a6b
Merge branch 'develop/new-combat-automation' into combat-automation-s…
paiva92 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 20 additions & 12 deletions
32
src/module/actor/utils/prepareActor/calculations/actor/combat/mutateCombatData.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,24 @@ | ||
/** | ||
* @param {import('../../../../../../types/Actor').ABFActorDataSourceData} data | ||
*/ | ||
export const mutateCombatData = data => { | ||
data.combat.attack.final.value = | ||
data.combat.attack.base.value + | ||
data.general.modifiers.allActions.final.value + | ||
data.general.modifiers.physicalActions.final.value; | ||
const { combat: { attack, block, dodge }, general: { modifiers } } = data; | ||
|
||
data.combat.block.final.value = | ||
data.combat.block.base.value + | ||
data.general.modifiers.allActions.final.value + | ||
data.general.modifiers.physicalActions.final.value; | ||
attack.final.value = | ||
attack.base.value + | ||
attack.special.value + | ||
modifiers.allActions.final.value + | ||
modifiers.physicalActions.final.value; | ||
|
||
data.combat.dodge.final.value = | ||
data.combat.dodge.base.value + | ||
data.general.modifiers.allActions.final.value + | ||
data.general.modifiers.physicalActions.final.value; | ||
block.final.value = | ||
block.base.value + | ||
block.special.value + | ||
modifiers.allActions.final.value + | ||
modifiers.physicalActions.final.value; | ||
|
||
dodge.final.value = | ||
dodge.base.value + | ||
dodge.special.value + | ||
modifiers.allActions.final.value + | ||
modifiers.physicalActions.final.value; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
src/module/actor/utils/prepareActor/calculations/actor/psychic/mutatePsychicData.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
/** | ||
* @param {import('../../../../../../types/Actor').ABFActorDataSourceData} data | ||
*/ | ||
export const mutatePsychicData = data => { | ||
const allActionsPenalty = data.general.modifiers.allActions.final.value; | ||
|
||
const { psychicProjection, psychicPotential } = data.psychic; | ||
|
||
psychicProjection.final.value = Math.max( | ||
psychicProjection.base.value + allActionsPenalty, | ||
0 | ||
); | ||
psychicProjection.imbalance.offensive.final.value = Math.max( | ||
psychicProjection.imbalance.offensive.base.value + | ||
psychicProjection.imbalance.offensive.special.value + | ||
allActionsPenalty, | ||
0 | ||
); | ||
psychicProjection.imbalance.defensive.final.value = Math.max( | ||
psychicProjection.imbalance.defensive.base.value + | ||
psychicProjection.imbalance.defensive.special.value + | ||
allActionsPenalty, | ||
0 | ||
); | ||
|
||
psychicPotential.final.value = Math.max( | ||
psychicPotential.base.value + Math.min(allActionsPenalty, 0), | ||
0 | ||
); | ||
}; |
30 changes: 0 additions & 30 deletions
30
src/module/actor/utils/prepareActor/calculations/actor/psychic/mutatePsychicData.ts
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Esto no lo quitamos con la PR anterior? Pensaba que ahora sólo hay proyección ofensiva y proyección defensiva.
Si eso es así, deberíamos crear un issue para eliminar las proyecciones base y final, quedarnos sólo con la ofensiva y la defensiva y quitar el "imbalance" de la ruta, porque ya no tendría sentido.