Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wzmaplib: Always include all HQ stats ids (even in MP) #4118

Merged
merged 2 commits into from
Nov 6, 2024
Merged

wzmaplib: Always include all HQ stats ids (even in MP) #4118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6ff6c5
wzmaplib: Always include all HQ stats ids (even in MP)
past-due Nov 6, 2024
b4c1852
wzmaplib: Bump version to 1.2.8
past-due Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/wzmaplib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

set(WZMAPLIB_VERSION_MAJOR 1)
set(WZMAPLIB_VERSION_MINOR 2)
set(WZMAPLIB_VERSION_REV 7)
set(WZMAPLIB_VERSION_REV 8)

###################
# Determine minimum CMake version
Expand Down
15 changes: 6 additions & 9 deletions lib/wzmaplib/src/map_stats.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,15 +372,9 @@ MapStatsConfiguration::MapStatsConfiguration(MapType mapType)
researchCenters = {"A0ResearchFacility"};
// the names (ids) of the HQ struct(s)
// - "type": "HQ"
if (mapType == MapType::CAMPAIGN)
{
// There are some campaign-only additional ids (A0CommandCentreNP, A0CommandCentreCO, A0CommandCentreNE)
hqStructs = {"A0CommandCentre", "A0CommandCentreNP", "A0CommandCentreCO", "A0CommandCentreNE"};
}
else
{
hqStructs = {"A0CommandCentre"};
}
// > NOTE: Prior to WZ 4.5.4, only "A0CommandCentre" was available in multiplayer stats
// > With 4.5.4, the remaining campaign-only HQs were also added to MP stats
hqStructs = {"A0CommandCentre", "A0CommandCentreNP", "A0CommandCentreCO", "A0CommandCentreNE"};
// the names (ids) of defense structs (i.e. bunkers, towers, hardpoints)
// - "type": "DEFENSE"
// extracted from the appropriate base/stats/structure.json or mp/stats/structure.json file using:
Expand Down Expand Up @@ -441,6 +435,9 @@ MapStatsConfiguration::MapStatsConfiguration(MapType mapType)
{"A0BaBaVtolFactory", StructureSize(2, 2)},
{"A0ComDroidControl", StructureSize(2, 2)},
{"A0CommandCentre", StructureSize(2, 2)},
{"A0CommandCentreCO", StructureSize(2, 2)},
{"A0CommandCentreNE", StructureSize(2, 2)},
{"A0CommandCentreNP", StructureSize(2, 2)},
{"A0CyborgFactory", StructureSize(1, 2)},
{"A0FacMod1", StructureSize(3, 3)},
{"A0LasSatCommand", StructureSize(2, 2)},
Expand Down
Loading