Skip to content

[lua] Move combat folder outside globals and make it load before it#10530

Merged
Xaver-DaRed merged 2 commits into
LandSandBoat:basefrom
Xaver-DaRed:combat3
Jul 8, 2026
Merged

[lua] Move combat folder outside globals and make it load before it#10530
Xaver-DaRed merged 2 commits into
LandSandBoat:basefrom
Xaver-DaRed:combat3

Conversation

@Xaver-DaRed

@Xaver-DaRed Xaver-DaRed commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

I affirm:

  • I understand that if I do not agree to the following points by completing the checkboxes my PR will be ignored.
  • I understand I should leave resolving conversations to the LandSandBoat team so that reviewers won't miss what was said.
  • I have read and understood the Contributing Guide and the Code of Conduct.
  • I have tested my code and the things my code has changed since the last commit in the PR and will test after any later commits.

What does this pull request do?

What title sais.
The reasoning behind it is the amount of require that were, and still probably are, missing from lua scripts.
The end-goal down the line is to have combat logic be separate from the rest whenever possible. We have too many dependencies for no reason.

Steps to test these changes

Draft.

@Xaver-DaRed Xaver-DaRed force-pushed the combat3 branch 6 times, most recently from 1e80175 to 5359193 Compare July 8, 2026 10:18
@Xaver-DaRed Xaver-DaRed marked this pull request as ready for review July 8, 2026 10:18
@Xaver-DaRed Xaver-DaRed enabled auto-merge July 8, 2026 10:18
Co-Authored-By: sruon <sruon@users.noreply.github.com>
@Xaver-DaRed Xaver-DaRed merged commit 65e308f into LandSandBoat:base Jul 8, 2026
22 of 23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants