Skip to content

[pull] master from beyond-all-reason:master #26

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

Merged
pull merged 2 commits into from
Jul 10, 2026
+14 −12
Merged

[pull] master from beyond-all-reason:master #26

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
2ccc5c0
Dump state handles resource packs
sprunk May 8, 2026
74408d1
doc/site: rename 7Z_VERSION env var so mise/Tera can parse it
tomjn Jul 10, 2026
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 .github/workflows/publish-site.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
LUA_DOC_EXTRACTOR_VERSION: "3"
EMMYLUA_DOC_CLI_VERSION: "0.8.2"
JQ_VERSION: "1.8.0"
7Z_VERSION: "24.09"
SEVENZIP_VERSION: "24.09"
RUBY_VERSION: "3.3"
MISE_ENV: "ci"
jobs:
Expand Down
2 changes: 1 addition & 1 deletion doc/site/mise.ci.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
hugo = "{{env.HUGO_VERSION}}"
"cargo:emmylua_doc_cli" = "{{env.EMMYLUA_DOC_CLI_VERSION}}"
"aqua:jqlang/jq" = "{{env.JQ_VERSION}}"
"aqua:ip7z/7zip" = "{{env.7Z_VERSION}}"
"aqua:ip7z/7zip" = "{{env.SEVENZIP_VERSION}}"
"npm:lua-doc-extractor" = "{{env.LUA_DOC_EXTRACTOR_VERSION}}"
"ruby" = "{{env.RUBY_VERSION}}"
4 changes: 2 additions & 2 deletions doc/site/mise.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
EMMYLUA_DOC_CLI_VERSION = "0.8.2" # lua_pages lua_library lua_check
LUA_LANGUAGE_SERVER_VERSION = "3.15.0" # lua_check
JQ_VERSION = "1.8.0" # binary_pages
7Z_VERSION = "24.09" # binary_pages
SEVENZIP_VERSION = "24.09" # binary_pages
RUBY_VERSION = "3.3" # lua_pages
LUA_DOC_EXTRACTOR_SOURCE_REF = "https://github.com/beyond-all-reason/RecoilEngine/blob/master"
RECOIL_LUA_LIBRARY_DIR = "rts/Lua/library"
Expand Down Expand Up @@ -51,7 +51,7 @@
depends = ["latest_release_data"]
description = "Generate Docs from Recoil binary"
tools."aqua:jqlang/jq" = "{{env.JQ_VERSION}}"
tools."aqua:ip7z/7zip" = "{{env.7Z_VERSION}}"
tools."aqua:ip7z/7zip" = "{{env.SEVENZIP_VERSION}}"
run = '''
download_url=$(jq -r '.assets[] | select(.name | contains("amd64-linux.7z")).browser_download_url' {{vars.latest_release_data}})

Expand Down
18 changes: 10 additions & 8 deletions rts/System/Sync/DumpState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,14 +687,16 @@ void DumpState(int newMinFrameNum, int newMaxFrameNum, int newFramePeriod, std::
const CTeam* t = teamHandler.Team(a);

file << "\t\tteamID: " << t->teamNum << " (controller: " << t->GetControllerName() << ")\n";
file << "\t\t\tmetal: " << TapFloats(t->res.metal);
file << "\t\t\tenergy: " << TapFloats(t->res.energy);
file << "\t\t\tmetalPull: " << TapFloats(t->resPull.metal);
file << "\t\t\tenergyPull: " << TapFloats(t->resPull.energy);
file << "\t\t\tmetalIncome: " << TapFloats(t->resIncome.metal);
file << "\t\t\tenergyIncome: " << TapFloats(t->resIncome.energy);
file << "\t\t\tmetalExpense: " << TapFloats(t->resExpense.metal);
file << "\t\t\tenergyExpense: " << TapFloats(t->resExpense.energy);
for (const auto &[resourceID, value] : std::views::enumerate(t->res))
file << "\t\t\tstored[" << resourceID << "]: " << TapFloats(value);
for (const auto &[resourceID, value] : std::views::enumerate(t->resStorage))
file << "\t\t\tmaxStorage[" << resourceID << "]: " << TapFloats(value);
for (const auto &[resourceID, value] : std::views::enumerate(t->resPull))
file << "\t\t\tpull[" << resourceID << "]: " << TapFloats(value);
for (const auto &[resourceID, value] : std::views::enumerate(t->resIncome))
file << "\t\t\tincome[" << resourceID << "]: " << TapFloats(value);
for (const auto &[resourceID, value] : std::views::enumerate(t->resExpense))
file << "\t\t\texpense[" << resourceID << "]: " << TapFloats(value);
}
#endif

Expand Down
Loading