• 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 57
  • Labels
  • Forks
  • Snippets
  • Network
Merged
MR Merge Request !727 opened
2021-05-27 12:38:55 UTC by Otowa Kotori @otowakotori

Support inconstant resource drain

Make things like drain_vim recalculate in every turn.

This will fix the problem with Fearscape, and the regen value of Dream Prison and Meditation will be automatically updated.

It will also make addon maker easier to make sustained talent with changing resource drain.

Edited 2021-06-10 13:01:35 UTC
Request to merge otowakotori:inconstant-resource-drain 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/otowakotori/t-engine4.git inconstant-resource-drain
git checkout -b otowakotori/t-engine4-inconstant-resource-drain 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 otowakotori/t-engine4-inconstant-resource-drain

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

Merged by DarkGod 2021-06-10 13:01:35 UTC

  • Discussion 0
  • Commits 4
  • Builds 0
  • Changes 2
  • Otowa Kotori
    @otowakotori commented 2021-05-28 05:25:49 UTC

    Added 1 commit:

    • 691381e8 - Only update temporary_value on cost chagnes
  • DarkGod
    @darkgod commented 2021-06-10 13:01:33 UTC

    mentioned in commit 49efd939

  • DarkGod
    @darkgod commented 2021-06-10 13:01:35 UTC

    Status changed to merged

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

Revert this merge request

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