• 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 !764 opened
2021-07-04 19:05:48 UTC by K'van @nsrr

Update Lichform quest with on_grant to check for Celia complete.

Allows Adventurers in AoA to complete the Lichform quest if they kill Celia before gaining it. Checks if grave-necromancer quest is done and completes the 'heart' objective onTickEnd if so.

Edited 2021-11-03 06:24:20 UTC
Request to merge nsrr:fix-adventurer-lichform-heart 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 fix-adventurer-lichform-heart
git checkout -b nsrr/t-engine4-fix-adventurer-lichform-heart 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-fix-adventurer-lichform-heart

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

Merged by DarkGod 2021-10-01 08:44:47 UTC

  • Discussion 2
  • Commits 7
  • Builds 0
  • Changes 1
  • K'van
    @nsrr commented 2021-07-27 13:44:16 UTC

    Marked this merge request as a Work In Progress

  • K'van
    @nsrr commented 2021-07-30 00:57:54 UTC

    Added 1 commit:

    • 723c4410 - Revert changes. Implement in Lichform quest on_grant.
  • K'van
    @nsrr commented 2021-07-30 01:01:52 UTC

    Added 1 commit:

    • 7b2f2729 - Set "heart" status to complete if graveyard quest is complete already (for Adven…
  • K'van
    @nsrr commented 2021-07-30 01:03:05 UTC

    Added 1 commit:

    • 89c592d2 - Indent :/
  • K'van
    @nsrr commented 2021-07-30 01:05:26 UTC

    Added 1 commit:

    • ec0d327a - indent...
  • K'van
    @nsrr commented 2021-07-30 01:06:22 UTC

    Added 1 commit:

    • 4f9e9e25 - why
  • K'van
    @nsrr commented 2021-07-30 01:13:16 UTC

    Unmarked this merge request as a Work In Progress

  • DarkGod
    @darkgod commented 2021-10-01 08:44:45 UTC

    mentioned in commit f6b0b4cf

  • DarkGod
    @darkgod commented 2021-10-01 08:44:47 UTC

    Status changed to merged

  • Gareth Christopher Stanley Jones
    @ScienceBall commented 2021-11-02 14:26:45 UTC

    I think this merge request was initially intended to fix 2 bugs (the Celia heart bug and the quest being given to undead: https://forums.te4.org/viewtopic.php?f=69&t=52100), but then after 723c4410 reverted the changes, only the Celia heart fix was re-implemented. Therefore the "quest is given to undead" bug has not been fixed in master.

    Does this need another merge request to fix this, or can this merge request be revived or something?

    Edited 2021-11-02 14:27:08 UTC
  • Gareth Christopher Stanley Jones
    @ScienceBall commented 2021-11-03 06:24:20 UTC

    nsrr created another merge request !821 containing the missing fix. So nothing needs to be done with this merge request now.

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

Revert this merge request

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