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

Shields and suppresion #2809

Merged
merged 22 commits into from
Jan 1, 2024
Merged

Shields and suppresion #2809

merged 22 commits into from
Jan 1, 2024

Conversation

MaxDorob
Copy link
Contributor

@MaxDorob MaxDorob commented Oct 11, 2023 •
edited
Loading

Additions

  • 2 New callbacks for custom interceptors.

Changes

  • Pawn won't run into an enemy-occupied sheild.
  • Pawn won't be suppresed if suppresion origin is outside of shield.
  • Pawn won't be suppresed if there is a custom self-defend interceptor (e.g. Overshield from VPE)

Reasoning

  • Pawn runs into the enemy-occupied shield
  • Pawn can run out of the custom shield
  • AOE shield doesn't provide suppresion protection (shield belt does)

Testing

Check tests you have performed:

  • Compiles without warnings
  • Game runs without errors
  • Playtested a colony (just few tests with default and VPE shields)

@MaxDorob MaxDorob requested review from a team as code owners October 11, 2023 08:47
@github-actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-6480163158.zip

@github-actions github-actions bot added the Download in Comments This PR has a zipfile download available. label Oct 11, 2023
@github-actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-6480201451.zip

@MaxDorob MaxDorob requested a review from perkinslr October 20, 2023 16:31
@github-actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-6590321153.zip

perkinslr
perkinslr previously approved these changes Oct 20, 2023
View reviewed changes
@github-actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-6605554174.zip

@perkinslr perkinslr force-pushed the ShieldsAndSuppresion branch from aa26498 to 3b28e66 Compare October 22, 2023 18:41
@github-actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-6605571940.zip

perkinslr
perkinslr previously approved these changes Oct 27, 2023
View reviewed changes
@github-actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-6674475462.zip

N7Huntsman
N7Huntsman requested changes Oct 28, 2023
View reviewed changes
Copy link
Contributor

@N7Huntsman N7Huntsman left a comment

Choose a reason for hiding this comment

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

Throws an error when loaded without Vanilla Psycasts Expanded. https://pastebin.com/JRjMuHNG

@github-actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-6674677922.zip

@perkinslr perkinslr force-pushed the ShieldsAndSuppresion branch from 7ae47f0 to e57945f Compare October 28, 2023 04:10
@github-actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-6674712605.zip

@github-actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-6678398883.zip

@perkinslr perkinslr force-pushed the ShieldsAndSuppresion branch from 93b524e to e1c34d5 Compare October 28, 2023 18:03
@github-actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-6678430465.zip

@github-actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-6684013386.zip

@N7Huntsman N7Huntsman mentioned this pull request Oct 29, 2023
Closed
4 tasks
@github-actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-6691966753.zip

@github-actions GitHub Actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-6857749094.zip

N7Huntsman
N7Huntsman previously approved these changes Nov 28, 2023
View reviewed changes
Copy link
Contributor

@N7Huntsman N7Huntsman left a comment

Choose a reason for hiding this comment

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

No issues in testing.

@github-actions GitHub Actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-7036622106.zip

@github-actions GitHub Actions
Copy link

You can download the rebuilt assembly for this PR here: https://combatextended.lp-programming.com/CombatExtended-7036909110.zip

@MaxDorob
Copy link
Contributor Author

MaxDorob commented Nov 29, 2023 •
edited
Loading

Tested with RM2 caretaker, VFE Archon apparel and Rimatomics shield

@N7Huntsman N7Huntsman merged commit 23f8fd5 into Development Jan 1, 2024
2 checks passed
@N7Huntsman N7Huntsman deleted the ShieldsAndSuppresion branch January 1, 2024 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@perkinslr perkinslr perkinslr approved these changes

@N7Huntsman N7Huntsman N7Huntsman approved these changes

Assignees
No one assigned
Labels
Download in Comments This PR has a zipfile download available.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MaxDorob @perkinslr @N7Huntsman