diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000000..0d6de057b3 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,14 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations. + // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp + + // List of extensions which should be recommended for users of this workspace. + "recommendations": [ + "talv.sc2galaxy", + "talv.sc2layouts", + "redhat.vscode-xml" + ], + // List of extensions recommended by VS Code that should not be recommended for users of this workspace. + "unwantedRecommendations": [ + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 52c37a3917..986965f346 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,35 +1,46 @@ { - "sc2layout.builtinMods": { - "mods/core.sc2mod": false, - "mods/liberty.sc2mod": false, - "mods/swarm.sc2mod": false, - "mods/void.sc2mod": false, - "mods/libertymulti.sc2mod": false, - "mods/swarmmulti.sc2mod": false, - "mods/voidmulti.sc2mod": false, - "mods/balancemulti.sc2mod": false, - "mods/challenges.sc2mod": false, - "mods/voidprologue.sc2mod": false, - "mods/war3data.sc2mod": false, - "campaigns/liberty.sc2campaign": false, - "campaigns/libertystory.sc2campaign": false, - "campaigns/swarm.sc2campaign": false, - "campaigns/swarmstory.sc2campaign": false, - "campaigns/swarmstoryutil.sc2mod": false, - "campaigns/void.sc2campaign": false, - "campaigns/voidstory.sc2campaign": false, - "mods/missionpacks/campaigncommon.sc2mod": false, - "mods/missionpacks/novacampaign.sc2mod": false, - "mods/novastoryassets.sc2mod": false, - "mods/alliedcommanders.sc2mod": false, - "mods/starcoop/starcoop.sc2mod": false - }, + // nullify all builtin mods + "sc2layout.builtinMods": null, // use this repo as its main source of data files, to prevent indexing same files (which are packed extra with the extension) "sc2layout.dataPath": ".", "sc2galaxy.dataPath": ".", - // set mods/void.sc2mod as currently active document - seems like a sane default - // everything which isn't part of dependency chain of void.sc2mod will be ignored during initial indexing process - "sc2galaxy.archivePath": "mods/void.sc2mod", + // tweak sc2galaxy indexing level to something that will index all built-in mods, but skip the maps & campaigns stuff - seems like right balance between utility and performance + "sc2galaxy.metadata.loadLevel": "Builtin", + "sc2galaxy.dataCatalog.enabled": true, + "sc2galaxy.references.currentWorkspaceOnly": true, + + // manually specify what to load + "sc2galaxy.fallbackDependency": "mods/void.sc2mod", + "sc2galaxy.s2mod.overrides": { + "mods/core.sc2mod": "mods/core.sc2mod", + "mods/liberty.sc2mod": "mods/liberty.sc2mod", + "mods/swarm.sc2mod": "mods/swarm.sc2mod", + "mods/void.sc2mod": "mods/void.sc2mod", + "campaigns/liberty.sc2campaign": "campaigns/liberty.sc2campaign", + "campaigns/swarm.sc2campaign": "campaigns/swarm.sc2campaign", + "campaigns/void.sc2campaign": "campaigns/void.sc2campaign", + "mods/alliedcommanders.sc2mod": "mods/alliedcommanders.sc2mod", + "mods/starcoop/starcoop.sc2mod": "mods/starcoop/starcoop.sc2mod", + "mods/novastoryassets.sc2mod": "mods/novastoryassets.sc2mod", + "mods/missionpacks/campaigncommon.sc2mod": "mods/missionpacks/campaigncommon.sc2mod", + "mods/missionpacks/novacampaign.sc2mod": "mods/missionpacks/novacampaign.sc2mod", + }, + + // not needed? + "sc2galaxy.s2mod.extra": { + "mods/starcoop/starcoop.sc2mod": "mods/starcoop/starcoop.sc2mod", + "mods/novastoryassets.sc2mod": "mods/novastoryassets.sc2mod", + "mods/missionpacks/campaigncommon.sc2mod": "mods/missionpacks/campaigncommon.sc2mod", + "mods/missionpacks/novacampaign.sc2mod": "mods/missionpacks/novacampaign.sc2mod", + // "mods/starcoop/commanders/arcturusmengsk.sc2mod": "mods/starcoop/commanders/arcturusmengsk.sc2mod", + // "mods/starcoop/commanders/egonstetmann.sc2mod": "mods/starcoop/commanders/egonstetmann.sc2mod", + } + + // readonly mode also supressess stuff like manually triggered autocompletions etc. ; doesn't seem worth it + // "files.readonlyInclude": { + // "**/mods/**": true, + // "**/campaigns/**": true, + // } } \ No newline at end of file diff --git a/README.md b/README.md index 74b2ebb945..0f4a3ad73f 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,7 @@ GameData, UI and Galaxy files -This repository is being updated using [helper script in Lua](https://github.com/SC2Mapster/tools/blob/master/update.lua), which then calls [stormex](https://github.com/Talv/stormex) with appropiate set of filters to get files out of CASC. +--- + +⚠️ **NOTICE**: This repository is no longer receiving active updates. +- Tooling and automation is broken and maintainers do not have the time nor energy to do anything with this for now. diff --git a/mods/core.sc2mod/base.sc2data/BuildId.txt b/mods/core.sc2mod/base.sc2data/BuildId.txt index 4a792fda49..735780d310 100644 --- a/mods/core.sc2mod/base.sc2data/BuildId.txt +++ b/mods/core.sc2mod/base.sc2data/BuildId.txt @@ -1 +1 @@ -B89165 +B97364 diff --git a/mods/core.sc2mod/base.sc2data/DataBuildId.txt b/mods/core.sc2mod/base.sc2data/DataBuildId.txt index 4a792fda49..735780d310 100644 --- a/mods/core.sc2mod/base.sc2data/DataBuildId.txt +++ b/mods/core.sc2mod/base.sc2data/DataBuildId.txt @@ -1 +1 @@ -B89165 +B97364 diff --git a/mods/core.sc2mod/base.sc2data/GameData/GameUIData.xml b/mods/core.sc2mod/base.sc2data/GameData/GameUIData.xml index 9c7903f3f4..8e5ee05730 100644 --- a/mods/core.sc2mod/base.sc2data/GameData/GameUIData.xml +++ b/mods/core.sc2mod/base.sc2data/GameData/GameUIData.xml @@ -1368,5 +1368,6 @@ + diff --git a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/BattleMapInfoPanel.SC2Layout b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/BattleMapInfoPanel.SC2Layout index c9aaa789c1..cc811449ea 100644 --- a/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/BattleMapInfoPanel.SC2Layout +++ b/mods/core.sc2mod/base.sc2data/UI/Layout/Glue/BattleMapInfoPanel.SC2Layout @@ -34,22 +34,10 @@ - - + - - - - - - - - - - - - + @@ -159,6 +147,8 @@