• 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 !802 opened
2021-08-31 06:48:34 UTC by Ryan Yappert @RootOfAllThings

Make objects know what inventory they're in.

Inspired by the mess that is Wintertide's special on hit. As of !693, combat tables and their objects is now a two-way association. This MR aims to make the object-actor association similarly two way. Items should know where they are and who is holding them, which is accomplished by setting o.in_inven, which holds o.in_inven.actor and o.in_inven.id. This prevents requiring obnoxious searches of inventories for an item in question, and prevents potential search collisions (as define_as is not a perfect identifier).

This MR is save safe, although any behavior reliant on this will not apply to objects without changing their position in inventories.

Edited 2021-10-01 13:50:26 UTC
Request to merge RootOfAllThings:more_self_referential_inventory 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/RootOfAllThings/t-engine4.git more_self_referential_inventory
git checkout -b RootOfAllThings/t-engine4-more_self_referential_inventory 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 RootOfAllThings/t-engine4-more_self_referential_inventory

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

Merged by DarkGod 2021-10-01 13:50:26 UTC

The changes were merged into master. The source branch has been removed.

  • Discussion 0
  • Commits 1
  • Builds 0
  • Changes 2
  • DarkGod
    @darkgod commented 2021-10-01 13:50:26 UTC

    Status changed to merged

  • DarkGod
    @darkgod commented 2021-10-01 13:50:26 UTC

    mentioned in commit b5e41cbe

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

Revert this merge request

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