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.

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

SOG Compat - Add isDamageAllowed check to punji damage handler #8670

Merged
merged 2 commits into from
Nov 9, 2021

Conversation

Zman6258
Copy link
Contributor

@Zman6258 Zman6258 commented Nov 7, 2021

When merged this pull request will:

  • Title.

Title. Previously, even units with damage disabled would still have wounds added upon triggering punji traps.
Co-authored-by: commy2 <commy-2@gmx.de>
@veteran29
Copy link
Member

Could use the new parameter introduced in #8599 instead of the filter.

@PabstMirror
Copy link
Contributor

right now 8599 throws an ERROR_1 (we might want to change?),
but I still think it's better to handle in the calling function like this PR is doing

@PabstMirror PabstMirror added the kind/bug-fix Release Notes: **FIXED:** label Nov 7, 2021
@PabstMirror PabstMirror added this to the 3.14.1 milestone Nov 7, 2021
@jonpas jonpas changed the title SOG Compat - Add isDamageAllowed check to punji damage handler SOG Compat - Add isDamageAllowed check to punji damage handler Nov 7, 2021
@PabstMirror PabstMirror merged commit f8e06b4 into acemod:master Nov 9, 2021
@Zman6258 Zman6258 deleted the patch-2 branch November 11, 2021 01:01
AndreasBrostrom pushed a commit to AndreasBrostrom/ACE3 that referenced this pull request Dec 3, 2021
…mod#8670)

* SOG Compat - Exclude invulnerable units from punji damage handler

Title. Previously, even units with damage disabled would still have wounds added upon triggering punji traps.

* Implement lazy select

Co-authored-by: commy2 <commy-2@gmx.de>

Co-authored-by: commy2 <commy-2@gmx.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug-fix Release Notes: **FIXED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants