Milestone 2: Maps Extended Pt 1 — Menu System, Throwback Maps, Campaigns, Multi-wave opt-out - #217
Open
FluxxSynth wants to merge 4 commits into
Open
Milestone 2: Maps Extended Pt 1 — Menu System, Throwback Maps, Campaigns, Multi-wave opt-out#217FluxxSynth wants to merge 4 commits into
FluxxSynth wants to merge 4 commits into
Conversation
- Fish-Community#154: Menu Based Map System — /nextmap GUI with Current/Throwback/Campaigns tabs - Fish-Community#155: Throwback Maps — configurable retired maps, hidden from normal rotation - Fish-Community#156: Campaign Support — Campaign class + config for curated map sequences - Fish-Community#151: Multi-wave opt-out — maps can set no-multi-vnw tag to limit /vnw to 1 wave - Fix: setNextMapOverride always passed null (pre-existing bug)
Resolved conflicts in: - src/mindustryTypes.ts (kept all properties from both sides) - src/commands/general.ts (kept master's ternary syntax) - build/scripts JS files (rebuilt from merged TypeScript sources) Master changes merged: - Text input menu framework (88cb886, cb0cea5) - Team resolution using menus (d0a61cb) - Fix /nextmap and /forcenextmap (dff4bfc) - setrank prevention (4e44b81) - Promotion/demotion notifications (ec9e5f1) - Team resolution fix (2dc120a) - Custom world data sync (e0ca485) - Debug logging changes
The master branch introduced registerTextInput on the Menus global, but the test environment mock was missing it. Without this mock, the test suite crashes when Menus.registerTextInput() is called during registerListeners().
Member
|
please fix the line ending issues, I can't see what you've changed |
All files in build/scripts had CRLF (Windows) line endings which caused the entire file to show as changed in diffs, making code review impossible. Converted all 33 files to LF (Unix) line endings for consistency with the master branch and to enable proper code review. This fixes the line ending issues mentioned in PR Fish-Community#217 review comment.
Author
hope this is better, I changed all the CRLF to LF |
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.
Summary
Completes Milestone 2 (Mindustry Maps Extended, Pt 1).
#154
/nextmapnow shows an interactive menu with the current map stats at the topThree tabs: Current Maps, Throwback Maps, Campaigns
Paged list with map selection → map info/details → vote confirmation flow
-Info screen shows description, author, fastest time, run count, winrate
#155
Configurable via
throwbackMapFileNamesinsrc/config.tsThrowback maps are excluded from the normal "Current Maps" tab
Accessible via the dedicated "Throwback Maps" tab in the menu
Admins list retired map file names; they won't appear in random rotation but can still be voted for
#156
New Campaign class with name, description, mapFileNames
Configurable via
campaignsarray insrc/config.tsCampaigns tab shows available campaigns → selecting one shows its ordered maps
#151
Maps can set
no-multi-vnwmap rule tag to"true"When set,
/vnwis capped at skipping 1 wave per callPrevents map wave-processing scripts (wproc) from breaking
Bug fix
Fixed
setNextMapOverride()in the vote system — was always passingnull, so the vote winner was never actually set as the next mapTesting
tsc --noEmit — 0 errors
tsc -p tsconfig.json && node scripts/remap-imports.js && tsc -p spec — all compile
jasmine — 8 specs, 0 failures
Credit
By Agent Orange/FluxxSynth
and reviewed Big Pickle