• This project
    • Loading...
  • Sign in

tome / Tales of MajEyal · Merge Requests

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Graphs
  • Milestones
  • Merge Requests 55
  • Labels
  • Forks
  • Snippets
  • Network
Merged
MR Merge Request !754 opened
2021-06-19 17:27:15 UTC by K'van @nsrr

Shield effect subtype consolidation

  1. Limit "shield" effect subtype to effects with a limited damage absorption amount (magical shields affected by getShieldAmount() etc, Psi Damage Shield, and Resonance Shield). Removed subtype from many effects that are not impacted by getShieldAmount, getShieldDuration, or that grant other types of protection, such as damage redirection, damage negation, negative life, and so on.
  2. Clarify that only one shield is removed and chosen at random for Shattering Blow, Sunder Armour and Impale.
Edited 2021-06-29 16:46:29 UTC
Request to merge nsrr:shield-effect-subtype-consolidation into master
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://git.net-core.org/nsrr/t-engine4.git shield-effect-subtype-consolidation
git checkout -b nsrr/t-engine4-shield-effect-subtype-consolidation FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff nsrr/t-engine4-shield-effect-subtype-consolidation

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

CI build passed for 3730c36a. View details
CI build skipped for 3730c36a. View details
CI build canceled for 3730c36a. View details
CI build failed for 3730c36a. View details
CI build running for 3730c36a. View details
CI build pending for 3730c36a. View details

Merged by DarkGod 2021-06-29 16:46:29 UTC

  • Discussion 0
  • Commits 6
  • Builds 0
  • Changes 6
  • DarkGod
    @darkgod commented 2021-06-29 16:46:29 UTC

    mentioned in commit c6ecacc1

  • DarkGod
    @darkgod commented 2021-06-29 16:46:29 UTC

    Status changed to merged

  • Please register or login to post a comment
754 of 849
Prev Next
Assignee
No assignee
Assign to
No
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
2
2 participants
Reference: tome/t-engine4!754
×

Revert this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.