• 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 24
  • Labels
  • Forks
  • Snippets
  • Network
Merged
MR Merge Request !683 opened
2020-12-01 23:50:09 UTC by K'van @nsrr

Update Wormblight / Take 2: WO Fix

It was pointed out that Writhing One relies on the 'worm' attribute for healing from wormblight pools created by the WtW pet's Infestation. The previous fix negated that. We amend the damage type to check for the 'worm' attribute again and make the 'worm' attribute a passive part of Infestation rather than part of the sustain. This prevents damage/death from wormblight if the sustain is deactivated. We also add a reaction check when deciding healing to prevent Writhing Ones and Reavers from healing from their foe's wormblight.

Edited 2021-02-15 14:32:18 UTC
Request to merge nsrr:update_wormblight 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 update_wormblight
git checkout -b nsrr/t-engine4-update_wormblight 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-update_wormblight

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 323012e3. View details
CI build skipped for 323012e3. View details
CI build canceled for 323012e3. View details
CI build failed for 323012e3. View details
CI build running for 323012e3. View details
CI build pending for 323012e3. View details

Merged by DarkGod 2021-02-15 14:32:18 UTC

  • Discussion 0
  • Commits 2
  • Builds 0
  • Changes 2
  • DarkGod
    @darkgod commented 2021-02-15 14:32:16 UTC

    mentioned in commit 61a3ba1a

  • DarkGod
    @darkgod commented 2021-02-15 14:32:18 UTC

    Status changed to merged

  • Please register or login to post a comment
683 of 698
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!683
×

Revert this merge request

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