Skip to content

Fixes merge issues caused by merging new changes into the trigger rework code. - #6447

Merged
LocalIdentity merged 42 commits into
PathOfBuildingCommunity:betafrom
Paliak:fixbetaMergeIssues
Aug 24, 2023
Merged

LocalIdentity merged 42 commits into
PathOfBuildingCommunity:betafrom
Paliak:fixbetaMergeIssues

Conversation

@Paliak

@Paliak Paliak commented Aug 24, 2023

Copy link
Copy Markdown
Contributor

Description of the problem being solved:

  • Fixes merge issues
  • Includes change log
  • Includes ModCache

Wires77 and others added 30 commits August 15, 2023 20:02
* move timeless jewel stuff

* add back all the local versions of functions for future use
* increase size of box and text

* implement hotkey to directly open help at a given section

* add ability to "fast scroll" to next section

* add section heights to changelog

* update txt

* fix merge issue

* fix line overlap and add note about scrollbars
* FEAT: impl explode and extra support mods

* FEAT: impl new aura recovery mod

* FEAT: impl between you and linked target mods

* FEAT: impl Sentinel of Radiance mod

Currently implemented as less damage taken as that's what the
spreadsheet said.

I think this may be possible to implement like frost shield or other
"taken before you" mods given more info on stats of the sentinel.

* FEAT: impl reserved mana as armor mod

* FIX: use arbitrary taken before you instead of generic less dmg taken

* FIX: cache result of dmg type max hit str concat

* FEAT: code for generally supporting have no mods

* FEAT: impl resistance conversion mods

* FEAT: impl extra jewel func code for new chief mod

* FEAT: impl mod on all other slots condition

* FEAT: add new uniques

* Wording fixes, new unique

* Remove debugging lines

* Adding fire mastery explosion mod

* FIX: use ailment immunity flags from PathOfBuildingCommunity#6297

* Late breaking Chieftain change

* Update mod ranges

* Fix Amulet and belt

---------

Co-authored-by: Wires77 <Wires77@users.noreply.github.com>
Co-authored-by: LocalIdentity <31035929+LocalIdentity@users.noreply.github.com>
…nity#6380)

The block was inside the 2 pass loop so was running twice
Also fixes the issue when you used a custom `more DPS` mod

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
…ity#6376)

* Apply RepeatCount according to their SkillTypes

* Fix Vaal Flicker Strike

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
)

* Fix lower channel time stat using red text

* Fix Channel time showing on calcs page for more skills than necessary

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
PathOfBuildingCommunity#6400)

The mod was not displaying in the breakdown as it was using the dot flag instead of `DamageTakenOverTime`

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
…dingCommunity#6401)

* Fix Pierced count config not appearing sometimes

* Fix Chain config not appearing

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
* FIX: snipe damage going negative

* Set SnipeStacks min value earlier

---------

Co-authored-by: LocalIdentity <31035929+LocalIdentity@users.noreply.github.com>
…nity#6408)

Looks like node.finalModList is not initalized when hovering trees, this
simply null checks it.

Closes PathOfBuildingCommunity#6405

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
* update tree

* Fix rewording on Chieftain Node

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
…ildingCommunity#6415)

Added damage was still contributing to the damage of the skill so it was showing DPS numbers even if the skill was actually dealing no damage
Also removes the debug tooltip I forgot to remove from testing

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
* FEAT: impl more sources of self hit dmg

This code has been moved from PathOfBuildingCommunity#4599 after abandoning cwdt loop support.

* FIX: spelling

* FIX: remove file implemented in PathOfBuildingCommunity#4599

* Add support for non-Boneshatter Trauma

* Add new gems from 3.22 and other stuff

* Fix Crucible Export

* Fix Ruthless support to work with all ailments

* Update for actual support gem

* Support inc stun duration per trauma

* add devour, volatility and locus mine support (PathOfBuildingCommunity#6412)

* add devour, volatility and locus mine support

* Add full support for gems

Add mine tag to Locus Mine
Add support for Anomalous Devour
Fix Mine PvP damage multiplier
Fix flags for damage against full/low life enemies

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>

* Spellblade support (PathOfBuildingCommunity#6343)

* Initial spellblade support

* Update label for spellblade damage breakdown

* Update with actual stats and qualities

* Update .txt too

* Floor all final flat values

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>

* Fix export

* Add spacing and fix typos

Alter the breakdowns to no longer show the damage taken multi/taken % line if the value has not changed
Added spacing to the lines so you can more clearly read the breakdown when you have multiple taken as elements
Fix some spacing and spelling mistakes

---------

Co-authored-by: Paliak <91493239+Paliak@users.noreply.github.com>
Co-authored-by: Lilylicious <lily.hammerskog@gmail.com>
Co-authored-by: LocalIdentity <localidentity2@gmail.com>
Co-authored-by: Regisle <49933620+Regisle@users.noreply.github.com>
Co-authored-by: Lily <Lilylicious@users.noreply.github.com>
* FEAT: impl Corrupting Cry support

* FIX: crash caused by incorrect capitalization

* FIX: add statMap and baseFlags to txt template

* FIX: spelling

* Revert "FEAT: impl Corrupting Cry support"

* FIX: reimplement using generic physDot

* FIX: copy paste issue

* FIX: cap corrupting blood staged.

Note that this config option also is affected by the one off bug in
config tab code.

* FIX: off by one in the config

* FIX: don't override skillData.durationSecondary

Overriding skillData.durationSecondary of exterted attacks may mess with
secondary effect of skills such as Dominating Blow

* FIX: CorruptingCry cfg stages not affecting exerts

* FIX: crash when hovering over more mult

* change dot type to corrupting blood to prevent dot from stacking

* Remove Attack dot addition + move config

* Fix removal of line

* Empty

---------

Co-authored-by: Paliak <91493239+Paliak@users.noreply.github.com>
Co-authored-by: LocalIdentity <localidentity2@gmail.com>
* Add mod text only

Signed-off-by: Wires77 <Wires77@users.noreply.github.com>

* Fix Level requirements and add Replica Dragonfang's Flight

* Support Ahuana's Bite

* Support Bound Fate

* Support Kahuturoa's Certainty

* Support Rakiata's Dance

* Fix global gem level/quality name change

---------

Signed-off-by: Wires77 <Wires77@users.noreply.github.com>
Co-authored-by: LocalIdentity <localidentity2@gmail.com>
)

* Removing allocated mastery from hover list

* Updating wording on mastery

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
* Add support for Ruthless trees

* Fix export URL for Ruthless trees

* Removed data.json

* Fix PR comments

* Fix edge cases around converting and importing

* Updating support for 3rd party ruthless tree links

* Update tree and add Tattoos

* Add support for new Ruthless tree mods

* Fix comment

---------

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
Lancej and others added 12 commits August 24, 2023 06:30
…unity#6407)

* Add applyRange tests

* Optimize itemLib.applyRange, improve startup time
* Initial tattoo implementation

* Tattoo spec update

* Tattoo export

* Update spec

* Fix spec

* New dat files

* More fixes

* Add artwork, restrict Makanga tattoos

Signed-off-by: Wires77 <Wires77@users.noreply.github.com>

* Fix bug with saving/loading, cleanup code

* Fixed import bug and matched format for save files

* Fixing logic issues preventing proper tattoos from appearing

* Fixed bug with linked node count and supported new tattoo jewel

* Temp fix for effectSprites

* Can't tattoo changed nodes

* Fix tattoo interaction with Timeless jewels

* Update tree, fix more bugs

* Add dropdown search

* Add help text to tattoo dropdown

* Fix stat description error

* Dynamically set popup width

* Made popup width fully dynamic

* Truncate mod lines in tattoo popup

* text wrap in popup

* Dynamic word wrapping, ignoring GGG wrapping

* Revert tree merge

---------

Signed-off-by: Wires77 <Wires77@users.noreply.github.com>
Co-authored-by: LocalIdentity <localidentity2@gmail.com>
Co-authored-by: Peechey <92683202+Peechey@users.noreply.github.com>
…mmunity#6393)

* FIX:secondary effect skills being added as support

* FIX: cleanup duplicate code
The config was not affecting the number of bleeds/ignites affecting the enemy and was instead only affecting the average roll %
Ignite and Bleed roll % was not calculated to be at least 50% roll as a minimum
Ignite was also not taking into account Hit Chance when calculating the average roll
Breakdowns were improved to show the potential when max stacks is more than 1

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
* Version dropdown QoL

* ruthless update
* Add support for Fresh Meat Support

* Adding general support for increased minion critical strike chance

* Move Config

---------

Co-authored-by: LocalIdentity <31035929+LocalIdentity@users.noreply.github.com>
Adds support for the new Guardian minions to show in the sidebar. The level is manually set to 85 right now as we don't support the `minion_actor_level_is_user_level_up_to_maximum` stat yet

Co-authored-by: LocalIdentity <localidentity2@gmail.com>
* Prepare release 2.32.0

* Fix changelogs

* Spelling

---------

Co-authored-by: LocalIdentity <LocalIdentity@users.noreply.github.com>
Co-authored-by: LocalIdentity <localidentity2@gmail.com>
@LocalIdentity
LocalIdentity merged commit 2581e60 into PathOfBuildingCommunity:beta Aug 24, 2023
@Paliak
Paliak deleted the fixbetaMergeIssues branch August 24, 2023 01:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants