Add support for tracking multiple guns - #17
Open
Crecket wants to merge 44 commits into
Open
Conversation
# Conflicts: # js/ui/inputs.js
# Conflicts: # docs/terrain.md # package.json # scripts/lib/terrain-source.mjs # src/pages/index.html # src/pages/locales/cat.html # src/pages/locales/de.html # src/pages/locales/es.html # src/pages/locales/fr.html # src/pages/locales/ko.html # src/pages/locales/pl.html # src/pages/locales/pt.html # src/pages/locales/ru.html # src/pages/locales/uk.html # src/pages/mobile/index.html
Owner
|
I really like the multiple-guns feature, and the amount of testing you added here is appreciated The problem is that this PR is built on top of #8–#16, including a few changes I don't want to merge in their current form Could you rebase the multi-gun work onto the cleaned-up main/integration branch once the other PRs are resolved, so the PR contains only the multiple-guns feature and its required changes? The feature itself is absolutely something I want |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Assumes all of #8 through #16 are merged; it is built on a local integration branch that merges all nine.
Artillery becomes a list. S.origin and S.weapon become accessors onto the selected gun, so every existing reader keeps working and js/core/core.js is not touched at all. A panel over the top-left of the map adds, selects, renames, hides and removes guns, and every visible gun draws its own range rings and target line with the selected one on top. Clicking a gun picks that gun up instead of moving the selected one onto it, on mouse and touch alike. The list persists, and a single origin stored by #8 migrates into gun 1.
Per-gun rings call drawMaxRangeRing from #11 with the gun passed through, so there is one terrain-aware ring implementation, not two.
The last two commits are droppable: unreviewed machine-written Korean strings, and browser tests that need playwright.
This is useful for 1 person picking targets whilst tracking more than 1 person shooting the targets once we have live sharing support