• 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 !758 opened
2021-06-27 08:37:35 UTC by yutio888 @yutio888

(for 1.8) add power vs save description for talents

Currently, power vs save mechanism is not explained in game, and players can only tell which power/save the specific talent is using for debuff/knockback/... by experience or diving into the code. This merge request add more details in the descriptions of talents, in the form like (Physical Power vs Mental Save). Some helper functions are also provided in DescHelper.lua.

Besides, some minor bugs have been fixed, most of which are inappropriate power used in complex damage type. Higher draconic T1 is worth noting that it contains 5 damage types, each one uses a slightly difference power. This merge request changes that to use physical power & mindpower, whichever is larger.

Note: This merge request changes many files and brings much work for translation. Besides, I currently have no access to dlcs' repo, and the work for dlcs' talents description might need to be done by someone with the access.

Edited 2021-10-01 08:21:43 UTC
Request to merge yutio888:power_vs_save_desc 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/yutio888/t-engine4.git power_vs_save_desc
git checkout -b yutio888/t-engine4-power_vs_save_desc 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 yutio888/t-engine4-power_vs_save_desc

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

Merged by DarkGod 2021-10-01 08:21:43 UTC

  • Discussion 5
  • Commits 10
  • Builds 0
  • Changes 168
  • yutio888
    @yutio888 commented 2021-06-27 08:38:02 UTC

    Title changed from add power vs save description for talents to (for 1.8) add power vs save description for talents

  • DarkGod
    @darkgod commented 2021-06-29 15:40:41 UTC

    Desc.vs(Desc.pp, Desc.ps) looks a bit cumbersome to write, what about Desc.vs("pp", "ps") or even could shorten it to Desc.vs("p", "p") (while keeping Desc.vs("pp", "ps") valid syntax too for strange cases like power vs power or whatever). We coudl even have an even shorter syntax for the most common cases: Desc.vs"pp"

  • DarkGod
    @darkgod commented 2021-06-29 15:43:52 UTC

    oh and you have access to the DLCs now :)

  • yutio888
    @yutio888 commented 2021-06-29 16:00:03 UTC

    The simplified syntax seems fine, and I'll try make it. But it suddenly occurs to me, what is the proper abbreviation of steampower? Of course, steampower cannot be shortened as "ss" or "s", which is already used by spellpower. Maybe we could use "t" / "st" or something else?

    Edited 2021-06-29 16:00:54 UTC
  • DarkGod
    @darkgod commented 2021-06-29 22:12:45 UTC

    Hum, just use "t" for steam power, but it means Desc class needs to be superloaded from embers to define it

  • yutio888
    @yutio888 commented 2021-06-30 00:49:18 UTC

    Added 4 commits:

    • eb237159 - rework DescHelper to make syntax much simpler
    • 98ffc5a1 - simplified DescHelper
    • 5cf8033c - remove unused params in DescHelper
    • 2dfebdd6 - adjust some talents' description
  • yutio888
    @yutio888 commented 2021-06-30 00:52:51 UTC

    The main part is done, I've checked most setEffect/checkHit usage in talents. There should be some bypass-save effects not described specifically, which should be fine, I'll do it later and add description for DLCs first.

    Edited 2021-06-30 00:59:37 UTC
  • yutio888
    @yutio888 commented 2021-06-30 07:08:16 UTC

    Added 1 commit:

    • 44f393fc - typo
  • yutio888
    @yutio888 commented 2021-06-30 07:13:53 UTC

    Added 23 commits:

    • 44f393fc...905a4a6d - 22 commits from branch tome:master
    • 94bde388 - Merge remote-tracking branch 'upstream/master' into power_vs_save_desc
  • yutio888
    @yutio888 commented 2021-07-02 02:51:21 UTC

    Added 1 commit:

    • 252b69d4 - add description in cross tier effects of how it is applied
  • yutio888
    @yutio888 commented 2021-07-03 16:27:03 UTC

    Added 1 commit:

    • 1e15d6da - fix ICE damage type
  • yutio888
    @yutio888 commented 2021-07-04 10:27:07 UTC

    Added 1 commit:

    • 3906b7a3 - fix Ice storm & Glacial Vapour damage type
  • DarkGod
    @darkgod commented 2021-10-01 08:21:43 UTC

    Status changed to merged

  • DarkGod
    @darkgod commented 2021-10-01 08:21:43 UTC

    mentioned in commit 9b214c3c

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

Revert this merge request

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