Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix ES Bypass not overriding sources of negative bypass #6965

Merged
merged 5 commits into from
Dec 11, 2023
Merged

Fix ES Bypass not overriding sources of negative bypass #6965

merged 5 commits into from
Dec 11, 2023

Conversation

mortentc
Copy link
Contributor

@mortentc mortentc commented Dec 7, 2023 •
edited
Loading

Fixes issue brougth up on reddit .

Description of the problem being solved:

all damage taken bypasses energy shield was being parsed as Base ES Bypass, which made it interact with sources of "does not bypass" when it shouldn't. Reusing the flag UnblockedDamageDoesBypassES from Emperor's Vigilance fixes the issue. Emperor's is however not getting parsed correctly at the moment, but that's another issue.

Steps taken to verify a working solution:

  • Allocate Divine Flesh, 30% of Chaos Damage taken does not bypass Energy Shield from ES Mastery, Shavronne's Wrappings and check that energy shield absorbs no form of damage.

Link to a build that showcases this PR:

eNrdXFtv47YSfl7_CsJAD7JoLrr4muO0cOLc2mTXtZNs97wUjETb6lKil6KSdYv-9w5JyZIdS5FiFzhoC2Rtcb4ZzpAznBkq6f34zafoifDQY8FJ3Tw06ogEDnO9YHpSv7-7OOjUf_yh1htiMfs4OY08Kkd-qL3rqc-IkidCAWfVkcB8SsRDwsr-DVjNcSBmhAW3-HfGL5l7Uv_AAlJHjzhwPZF8cygOww_YJyf1sQPgOsKhQwL3LH0eE84wx44g_EaK7UeC3TIXRgWPYNTHXjBmzhciLjmL5jCrOnryyLOmub4dfhzdZabkBdkpgUrvekOKF4SPBRYohB8n9T5YBk_JAPvwE7hhGgEr47BpWh3LSH7WjwrRpxEPxRtZjOeEuEuUeWjlEQ45OZ9MiCO8J3LGPXE2w4GTkZeHq0p7G1HhzalHeGZWzTzE1Qvm7VzaOyYwHQzHGRu1zKbdacQ_rWIgE68r8MkTs1MKFn2LGAm-ngaeIG9FD5kXsmAbFVewucsUUQpOWop2RELCn7Dw1uaVy5v5j17wNgPe4gCfsbDEOknKIeEQA0QlwJg4DMJGVRkVkTfehJSnrKRHDKg6m7fpcT4uS1eZ8dsmNIIIWY5yzCJaklKkgcoqcIOvWcJWLuGAfCvB7joQ5YRmCc1OgdQnJtTB-Jq6KlCcXw1T8VYXDvV2o9Fo2obZzT0-ZovQczC9xd88P_Ihbt_hLyQVaHcKNuB0JgIIOHlYs5kbEi48TnJhVjs_ClH3LbAZZuEbcNLFUrquVXBYO8eS-DpwyjnufcBVAM6e8fn8JWIE_iTTikdKykJSIbFbpkDDKJY1JUEscFFOoRtCnNklJGIjLEi5IJzOxmwVWlYSl7KsJNxk2Xz-q4gKZpLAzWYqPAYrmuk8IHy6GM88QlN1Os1mGfpkYmd4XgaqLJ3Fl7L4qsBKuyYLrWiWT5i75U6VqnN6wmE23L6yMWPycnuTQP4JAJeUzbqHnP0u83paDdbnPosySXqnbRQqoelL6ZAcFrqmGRE3clZOp24u8pRCfbamQbMonlK6CWJ3crUWAjtfBsydljaUklIJsSy0FHQczecQOeQOWGPQKTr2IPP2MgnMQX4NmFJ_hO2b9WOj6IAsLyClLi1geeivS7FKIsqrIg_tCrqk5KVFLNfzFuKDD5FfVd23LBNcDruN3OWBcqtU7aQIS9ZwQ_YMk5_JlkpYjRrym9RPcqfCSfDHojT_FfJSAs4DN-LSGUrLWEdsEnPn-RA-w3CABUZunBQ_YO7hQFiq3xMSzJ3ZDaz-Bab0EWLBST37VH1TPaILjwrCB_BMCpUTW-doSo5ScO9INbvkp2t_zrhA5Jv8Z4i5WJzUJ5iGRBOqJ8AnFF6gimqISJTW0XjGnvvuk5R0xxgNExDC8zkJ3BUed5wQhJP44shMQikvvyAfhzDrhd6xwOZPs2M1jH2r2-y0_lrpm127SqeAwWxk-JdkjabZbu63LNvYN41GF3BWo23vNzsdG342u0Zr3240rX3bbrS7-1arDZhm0wYSyP8bnf2W3W23pDllTYf5or8qLvBAVQHTzzQBLSvu7-n5SE3e9e5HN-rDu5kQ8_D46Oj5-flwjsWMTcg3OOgOHeYfzQEENjgIv3iUHki2R33473Ta7w_O3X545Xx-8H5vPXQC_Hlqdqahy9wPsw_050GzBWRO86erX_onJ0rgUSKxpxuEoRYff1NGkvOTlqkjTxBffotjDKCzoJ4MK9wDq-o9eSTX5R9YIL00epn-0QWy_8kFopOffh7y_4sF6h1Jz5IfPjBBFK18mHzpjaUaIUQHLi6JH54uIFBfyKx0resVu6akHhOho04Wk7SjXTLBEZXPf4kw9WSkMLJPb3TrPGDcX9bdwAoihcwoNMe7xVxujv7NjR7pUxEzk-KSsKF3Xzwh5Llp3NI6yY9nmDpK5951MI_Aoqqt7nuh89tjNJnIHjmIEFz1_c8vLs7P7q4fzuO4m4Wo1f4tiPxH2QLW_y6XojcmKhVEYfQY6o8n9QePPKuJDIjAHoWzwGGU4nlIloFPTTrWgAKugJuiguo9aahv5pUS5HM6_0Y4xOkplBEO90juvJbjr0xKC5Qlhjyn8rjJRnU-I52_nkEQ0SVQjqXUrUA-F9moz1VHDhZg4YTDNFdyPPqKJYTctuB13sRz5BFfvORyk2uqArs4DmQHzqJgvePkO5-H6vznMdCD-WDdu89Dx6MFVlUXB7lW1aP58AFxcK7uejAfvKyqWQBmyuOypCrg9IEFapOD0_Q9KjPl3JU9p2RJks_wo5gRHp-VeZxuIUYlJIWOw73HSOS7cYaiwFaq1ZdjITmWD9W9rBwd5FhBJFrp7-QYNEuTz0r3RHIDWRFUV0259otrsIIliDsOOebXowVGSJouOfrHwwVOouJv_4l5ri7Dc9xljawoYEBasT0b1VvYns16s2F7jheQ9n3JXe94NB9-LzyZiWzgohOgUkykU23HQfrWdhxG64lEih0VpxAqfg3IhIChCwPYkqZgfUUUDOCQEwVrW5KVmtZmR0hVq8RLh_KNmlbmqDdofPtStIc1ySuM4Cy6Ksh2ynFadoCuCKbyop7R7Ri-uGXaSk8mQhy4A9nE3lJR2QOP5sAsmdnHTelquqTrXHtHSSGh-hQytY-7K2PBZXPlD8b8zyf1Rqt92La73ZZpdDr6aVzvdOMaBxK-gQdm52q7JDIl4a-yjdiwDtttw-iYlu6i9q6h6Avj4kt-TmqvKCT6jvkTwXMWqMeZskiSoifd0JGtlLg8UpXiCB6LxTG6_3D9y_157ZIy7rEoRA8Y0rFFLek2oZ_IM6G1G4KnETlGN2QKpqzFTaJjNGB8AQC0d8Y4j-aCuEheT79PKX71HvHXCKO9gfcEZSS6AK6zzPj_CJ_PgMG5IDzAFH1mkZi9R3tDTpB9aJqHRoa4P4sg4KG9a9-HGhGo-1CbysV9X9O1E8hfEls1ZfUR-QqfjdoIu14Uggqyw1a78XxPUgt2jMwaZPbUc8CTjpFR-zO22LH5158cB1NybBw2_zrFEAtc5AUI_kWPlDEXsQnaMw3joGMYxnsUYqiUIOlPqWTRKIliK6WcrV1xjq2bcrZ3xVmvS8q4sSvGeg1rQ91ACeUwV0uDMCz5GQu-RuAXLnpcKNgDxrR2BckX7E9HtTigXB_JmSA1H_U6WT1T-BdRWK9S2K9SNF6laL5KkVypHUkP3eCqdjLdTa46nuEnzoKA_Ad8PvxviD5xPJ_DURDWPkKlSAUYKxl6IKGQh1dNZ9BIp9DHyG4btWxSfYrD5EUajxLpEks3ko4IXnhorD6yVx-dRZxLOS_d0K7FXRvlhXGz6hidHiz_z_hpy8r6olnL7Lk9-8A03n8H-8XhBKYLkUYmhUhH6Ryv3bNgR1rNVdyKLXKccs9sANAoBbRXgSDRLJRoGt-hiWqVyvY_F9IrVigQnFTqIiCr__d7tnHQkHwFQ8sLJaQrE5nq1EZkIo0fIlOSgNYZMm0l-VxdwiLdayE8rKlLo2TcZeCRARPgfbLDuTbxf5f3FVB0XvFPK5nuJv889-eEM750QW_qUbU-Y0EIRT_DuZMYVNeFsNE74I_6y0tPXHfdrvWK6yaH9RXmEGDFut-a3XKOaxU4bsZlG6214zPrC60Dy4Idq9tTcvepsrKU59qG3O6rfqRNhCCFy3di8D-jGsZc819w3xWpvs5nkSzXsqgzHEhX0So9z8D6aMEiBOEZTju2Ji1xQJlNoglnvsYBe5nBI0fz2uh2L6H3wWMMnkkwps94EcZgsg6_lLtPxgAQ-Bz-W5x4s4vKO4D8pDib__bGFOwtb1OGj_ejG5m-6x6_RiEzvWoxksnkQU4JFaj_uAhDSEnjWxurAj4Ruc6jWZ2HVYqHGrp2gcHa7ZLmpXJ-lN43JaLKqjF-xvP1ebR2YI_WDuxRhccpg-JznYFdgcEVoT55sTW23VpvMsOmNWnuYE3MHfBoVDTIW0Ru0n8XPlqFh2rGVbL6xh1obbl_7MpTrrJAl5TJsm6LbbLZa1qVOVRW09xazSpr2_cjSsQOtqC9g7Bob616o7K5q-zjkUxgrLcGvsrKbeuizcrG2P5YsbbmsP0cGtsarrGr2G5Xmom7SOqEncet5q5Oa3M3GlnbLlHlDGrr0NLajebNrSdiV41Y5rbGNncQ23fmU83drENry_xl-2xk2wxqR65o7yo07IzRW0qLFGJXsEWKsrbakztaijf7yJY7aWeng7WDQLELHuauFNpZ1HrJSDeNxkSoS111uapeE2XBxJu-eOnTiULB_FvmhulLot-3DER0ly3MvpU0pNghM0ZdwmM0UPmL-C8ZJC-MtrO_U7eJPvuHCRJQsxiy-ntJKcwqIWodY7-CiX_3iVGqenNZxXKB_vJvJ8i_BiBv-MbqbU8WBWJM6CTzOu0rmibxI6Hvtovpl-9WLdUzzVxEKLv1Hyfql0pgguq3N1bf8-0dJfukd7T-l0H-BvN4lgk=

Before screenshot:

image

After screenshot:

image

@mortentc mortentc mentioned this pull request Dec 7, 2023
Open
Wires77
Wires77 reviewed Dec 11, 2023
View reviewed changes
Copy link
Member

@Wires77 Wires77 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't really the right approach, since you're reusing a completely separate flag just because that's how it's coded. Changing those mods to OVERRIDE, adding Chaos, and changing the calculation code to care about OVERRIDE mods is the better solution.

@Wires77
Copy link
Member

Wires77 commented Dec 11, 2023

I went ahead and pushed a commit that fixes this using the original mods, but haven't extensively tested it yet. Ideally this gets a test in the testing suite, too.

@mortentc
Copy link
Contributor Author

That's fair! I tried making as few changes as possible, but understand why OVERRIDE is a better approach.

@LocalIdentity LocalIdentity merged commit ec6a17e into PathOfBuildingCommunity:dev Dec 11, 2023
@mortentc mortentc deleted the ESBypass branch December 11, 2023 12:42
@Wires77 Wires77 mentioned this pull request Dec 11, 2023
Merged
deathbeam added a commit to deathbeam/PathOfBuilding-1 that referenced this pull request Dec 12, 2023
@deathbeam
Merge branch 'upstream-dev' into configcleanup
4ed2919 
* upstream-dev: (31 commits)
  Release 2.37.0 (PathOfBuildingCommunity#7019)
  Add support for new Uniques + fix parsing for changed mod names (PathOfBuildingCommunity#7016)
  Fix ES from Tricksters Escape Artist when using Oath of the Maji (PathOfBuildingCommunity#7018)
  Fix Necromancer Offering charm not working (PathOfBuildingCommunity#7014)
  Update Query mods (PathOfBuildingCommunity#7011)
  Fix projectile count being 1 higher on all skills (PathOfBuildingCommunity#7006)
  Fix Herald of Agony quality not working (PathOfBuildingCommunity#7017)
  Fix Pyroclast Mine Aura Effect scaling Maximum Added Flat Damage (PathOfBuildingCommunity#7005)
  Fix Ascendant nodes counting towards allocated passive skill total (PathOfBuildingCommunity#7002)
  Change Manastorm config option to not overrun options box (PathOfBuildingCommunity#7008)
  Release 2.36.1
  Release 2.36.1 (PathOfBuildingCommunity#6996)
  Fix pathing and mastery nodes (PathOfBuildingCommunity#6989)
  Export from game files
  Fix Crash when opening Timeless Jewel search (PathOfBuildingCommunity#6995)
  Fix negative bypass being ignored (PathOfBuildingCommunity#6992)
  Release 2.36.0
  Release 2.36.0 (PathOfBuildingCommunity#6988)
  Add support for Tincture Implicits
  Fix ES Bypass not overriding sources of negative bypass (PathOfBuildingCommunity#6965)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Wires77 Wires77 Wires77 left review comments

@LocalIdentity LocalIdentity LocalIdentity approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mortentc @Wires77 @LocalIdentity