RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-07 08:03:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into respawn_dec

Browse Source
This commit is contained in:
Eric Froemling 2024-03-13 16:24:00 -07:00 committed by GitHub
commit 89008f4c27
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
247 changed files with 2747 additions and 1866 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
.efrocachemap generated
View File

@ -421,42 +421,42 @@
"build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26", "build/assets/ba_data/audio/zoeOw.ogg": "74befe45a8417e95b6a2233c51992a26",
"build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8", "build/assets/ba_data/audio/zoePickup01.ogg": "48ab8cddfcde36a750856f3f81dd20c8",
"build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55", "build/assets/ba_data/audio/zoeScream01.ogg": "2b468aedfa8741090247f04eb9e6df55",
"build/assets/ba_data/data/langdata.json": "5273cf3bfe2d25d70395690bf3c21825", "build/assets/ba_data/data/langdata.json": "8409781047f46ca6627eacdfc0b4d3d3",
"build/assets/ba_data/data/languages/arabic.json": "0db32e21b6d5337ccca478381744aa88", "build/assets/ba_data/data/languages/arabic.json": "2c2915e10124bb8f69206da9c608d57c",
"build/assets/ba_data/data/languages/belarussian.json": "09954e550d13d3d9cb5a635a1d32a151", "build/assets/ba_data/data/languages/belarussian.json": "09954e550d13d3d9cb5a635a1d32a151",
"build/assets/ba_data/data/languages/chinese.json": "1360ffde06828b63ce4fe956c3c3cd1d", "build/assets/ba_data/data/languages/chinese.json": "bb51b5aa614830c561e8fe2542a9ab8a",
"build/assets/ba_data/data/languages/chinesetraditional.json": "319565f8a15667488f48dbce59278e39", "build/assets/ba_data/data/languages/chinesetraditional.json": "319565f8a15667488f48dbce59278e39",
"build/assets/ba_data/data/languages/croatian.json": "e671b9d0c012be1a30f9c15eb1b81860", "build/assets/ba_data/data/languages/croatian.json": "e671b9d0c012be1a30f9c15eb1b81860",
"build/assets/ba_data/data/languages/czech.json": "7171420af6d662e3a47b64576850a384", "build/assets/ba_data/data/languages/czech.json": "15be4fd59895135bad0265f79b362d5b",
"build/assets/ba_data/data/languages/danish.json": "8e57db30c5250df2abff14a822f83ea7", "build/assets/ba_data/data/languages/danish.json": "8e57db30c5250df2abff14a822f83ea7",
"build/assets/ba_data/data/languages/dutch.json": "b0900d572c9141897d53d6574c471343", "build/assets/ba_data/data/languages/dutch.json": "b0900d572c9141897d53d6574c471343",
"build/assets/ba_data/data/languages/english.json": "28a1c17925aba4f4f908732e5e5cb266", "build/assets/ba_data/data/languages/english.json": "0a95fdbc1564161bc7c8b419b0c03651",
"build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880", "build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880",
"build/assets/ba_data/data/languages/filipino.json": "fe3f1efcb47efaa23524300d21728933", "build/assets/ba_data/data/languages/filipino.json": "5226bf247fa1c8f4406360644f3fa15f",
"build/assets/ba_data/data/languages/french.json": "cc8ac601f5443dd539893728db983f5c", "build/assets/ba_data/data/languages/french.json": "917e4174d6f0eb7f00c27fd79cfbb924",
"build/assets/ba_data/data/languages/german.json": "450fa41ae264f29a5d1af22143d0d0ad", "build/assets/ba_data/data/languages/german.json": "450fa41ae264f29a5d1af22143d0d0ad",
"build/assets/ba_data/data/languages/gibberish.json": "ab9571486f703b8d57eab61dbf1d54d8", "build/assets/ba_data/data/languages/gibberish.json": "5533873020e51186beb2f209adbbfb08",
"build/assets/ba_data/data/languages/greek.json": "287c0ec437b38772284ef9d3e4fb2fc3", "build/assets/ba_data/data/languages/greek.json": "287c0ec437b38772284ef9d3e4fb2fc3",
"build/assets/ba_data/data/languages/hindi.json": "90f54663e15d85a163f1848a8e9d8d07", "build/assets/ba_data/data/languages/hindi.json": "90f54663e15d85a163f1848a8e9d8d07",
"build/assets/ba_data/data/languages/hungarian.json": "796a290a8c44a1e7635208c2ff5fdc6e", "build/assets/ba_data/data/languages/hungarian.json": "796a290a8c44a1e7635208c2ff5fdc6e",
"build/assets/ba_data/data/languages/indonesian.json": "9103845242b572aa8ba48e24f81ddb68", "build/assets/ba_data/data/languages/indonesian.json": "9103845242b572aa8ba48e24f81ddb68",
"build/assets/ba_data/data/languages/italian.json": "f550810b6866ea9bcf1985b7228f8cff", "build/assets/ba_data/data/languages/italian.json": "55c350f8f5039802138ffc1013f14ed3",
"build/assets/ba_data/data/languages/korean.json": "4e3524327a0174250aff5e1ef4c0c597", "build/assets/ba_data/data/languages/korean.json": "4e3524327a0174250aff5e1ef4c0c597",
"build/assets/ba_data/data/languages/malay.json": "832562ce997fc70704b9234c95fb2e38", "build/assets/ba_data/data/languages/malay.json": "f6ce0426d03a62612e3e436ed5d1be1f",
"build/assets/ba_data/data/languages/persian.json": "1a4c74ad9089cd746ad6fda4186c2220", "build/assets/ba_data/data/languages/persian.json": "07eddcf92d3dcc7a745ea74e2b0007c8",
"build/assets/ba_data/data/languages/polish.json": "9d22c6643c097c4cb268d0d6b6319cd4", "build/assets/ba_data/data/languages/polish.json": "9d22c6643c097c4cb268d0d6b6319cd4",
"build/assets/ba_data/data/languages/portuguese.json": "b52164747c6308fc9d054eb6c0ff3c54", "build/assets/ba_data/data/languages/portuguese.json": "a48df1d11a088a1a2e6e3f66627444be",
"build/assets/ba_data/data/languages/romanian.json": "b3e46efd6f869dbd78014570e037c290", "build/assets/ba_data/data/languages/romanian.json": "b3e46efd6f869dbd78014570e037c290",
"build/assets/ba_data/data/languages/russian.json": "30d5f3d2415088e1fb6558fcd6ccfa98", "build/assets/ba_data/data/languages/russian.json": "0590f49889616b5279be569dea926e17",
"build/assets/ba_data/data/languages/serbian.json": "d7452dd72ac0e51680cb39b5ebaa1c69", "build/assets/ba_data/data/languages/serbian.json": "d7452dd72ac0e51680cb39b5ebaa1c69",
"build/assets/ba_data/data/languages/slovak.json": "c00fb27cf982ffad5a4370ad3b16bd21", "build/assets/ba_data/data/languages/slovak.json": "c00fb27cf982ffad5a4370ad3b16bd21",
"build/assets/ba_data/data/languages/spanish.json": "e3e9ac8f96f52302a480c7e955aed71f", "build/assets/ba_data/data/languages/spanish.json": "b2edb923fdca973a16f0efb1acc26a97",
"build/assets/ba_data/data/languages/swedish.json": "5142a96597d17d8344be96a603da64ac", "build/assets/ba_data/data/languages/swedish.json": "5142a96597d17d8344be96a603da64ac",
"build/assets/ba_data/data/languages/tamil.json": "b9fcc523639f55e05c7f4e7914f3321a", "build/assets/ba_data/data/languages/tamil.json": "b9fcc523639f55e05c7f4e7914f3321a",
"build/assets/ba_data/data/languages/thai.json": "1d665629361f302693dead39de8fa945", "build/assets/ba_data/data/languages/thai.json": "1d665629361f302693dead39de8fa945",
"build/assets/ba_data/data/languages/turkish.json": "2be25c89ca754341f27750e0d595f31e", "build/assets/ba_data/data/languages/turkish.json": "db71f3776072b7a15ef37b1bb1245795",
"build/assets/ba_data/data/languages/ukrainian.json": "b54a38e93deebafa5706ba2d1f626892", "build/assets/ba_data/data/languages/ukrainian.json": "3d75d21205c82db34fb1a1b014592747",
"build/assets/ba_data/data/languages/venetian.json": "f896fc3df13a42f1bef8813ca80b1a09", "build/assets/ba_data/data/languages/venetian.json": "035034e0b4de696a41bf753ab4d0e194",
"build/assets/ba_data/data/languages/vietnamese.json": "921cd1e50f60fe3e101f246e172750ba", "build/assets/ba_data/data/languages/vietnamese.json": "921cd1e50f60fe3e101f246e172750ba",
"build/assets/ba_data/data/maps/big_g.json": "1dd301d490643088a435ce75df971054", "build/assets/ba_data/data/maps/big_g.json": "1dd301d490643088a435ce75df971054",
"build/assets/ba_data/data/maps/bridgit.json": "6aea74805f4880cc11237c5734a24422", "build/assets/ba_data/data/maps/bridgit.json": "6aea74805f4880cc11237c5734a24422",
@ -3521,6 +3521,7 @@
"build/assets/pylib-apple/zoneinfo/_common.py": "5b52bdac4156dcbac96743fa99468bf2", "build/assets/pylib-apple/zoneinfo/_common.py": "5b52bdac4156dcbac96743fa99468bf2",
"build/assets/pylib-apple/zoneinfo/_tzpath.py": "f021e91036bd38590f2ce643b59dc881", "build/assets/pylib-apple/zoneinfo/_tzpath.py": "f021e91036bd38590f2ce643b59dc881",
"build/assets/pylib-apple/zoneinfo/_zoneinfo.py": "d000d61aa8998d0076c37f96cf40ca69", "build/assets/pylib-apple/zoneinfo/_zoneinfo.py": "d000d61aa8998d0076c37f96cf40ca69",
"build/assets/sphinx/template/conf.py": "1d00917de95f8f62f372caa1146ff602",
"build/assets/windows/Win32/DLLs/_asyncio.pyd": "36024ca5f0f257dd4edfe1a3e92c1a07", "build/assets/windows/Win32/DLLs/_asyncio.pyd": "36024ca5f0f257dd4edfe1a3e92c1a07",
"build/assets/windows/Win32/DLLs/_asyncio_d.pyd": "a809fe3d7f3b6931e5f127821d0d30b6", "build/assets/windows/Win32/DLLs/_asyncio_d.pyd": "a809fe3d7f3b6931e5f127821d0d30b6",
"build/assets/windows/Win32/DLLs/_bz2.pyd": "cf535d3d0a020f0ae5ff20336a56ba3b", "build/assets/windows/Win32/DLLs/_bz2.pyd": "cf535d3d0a020f0ae5ff20336a56ba3b",
@ -4060,50 +4061,50 @@
"build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1",
"build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae",
"build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
"build/prefab/full/linux_arm64_gui/debug/ballisticakit": "a7161a4100172e2bb42b838a9851c353", "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "db921cf43e8ebf733712fb5bbc673f66",
"build/prefab/full/linux_arm64_gui/release/ballisticakit": "9a63e694db2ed7536374c58a45ce65d3", "build/prefab/full/linux_arm64_gui/release/ballisticakit": "4be0f3a7a88da423847863af41ac9c63",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "9668ef38ddc59fadf323cf460c8b692c", "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "7c92d738e7cc724de2ca31cb876224e6",
"build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "8f58837d238dba248ae2e23e20bc3f06", "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "c2f69ed83f77b602e2a2b2b1c1c78cc6",
"build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "f8a6e20f3fffd198494adfba4e884588", "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "b1c766d4ce567f965c53ff2a4c5c85f4",
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "255205c95d519a594041fc239e435883", "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "86ebbd9111f8a0fe7905cef7aba1f6db",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "36facf256b69a8c0037370e23c82470d", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "8182f4e00ad579eb4c7be5ec1ddca8cb",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "d78aef348baf274f476ce9e344b80122", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "3d9e0e7ad8706133e61fb7f7127c3ff5",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "f1b9732cc7e7728dcedc39a55d9afea2", "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "20373ee90f8987bed980143d5377ae44",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "8cfc0e04c10a315cce91dae041dfc3ff", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "99d7d247a422eaa46737e3232408e879",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "a9fec1930c851f8ed743b08669df2d75", "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "079c4fd0b6f8aa50510064704466904b",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "a6fcaa9d7eb10412787e4416f3536bb9", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "216efc77915b75f39f0f15c2806bfbb9",
"build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "a39230df064404a3b1dd18a644f2f6d6", "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "204320756307e1833b284c3180e70319",
"build/prefab/full/mac_x86_64_gui/release/ballisticakit": "04e971f62a000383a13eb021e30afa7b", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "3e9e4e1761fd763eb584598fc0a3ad0a",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "a93fe4f0cfb3c2c9061df049068230ac", "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "b8f587f21f39f35072d6c83116c9ae96",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "0f08a84bb09589991faaca9250171e3c", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "0c92e386ab7406da6a719131321bf592",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "12c079e62d0125b8a24b16e418405ba9", "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "ce48b60be52023e1942cb493bb2f58fb",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "eb0d76fd3be03082572b0d835df05252", "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "d53ee4e8eed3e1a218db2f927a62c353",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "e4268ef0b50e94747081ee83666d80ab", "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "6597b00a07975230cb3f5b0fa19e0ed4",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "f4646fecfed11f5e2b2ee5c892b2940a", "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "0ff41b8dc440c0490e9ae3bc22c3d201",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "ee36a39fd0f524989cb68930c89c8868", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "dbed9145e5db116d92aa47cb9e98da39", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "56d6440f62c271c4ce9ef520400395a3",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "ee36a39fd0f524989cb68930c89c8868", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "d9865523059d8cf11b2bef4b9da9a8c9",
"build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "dbed9145e5db116d92aa47cb9e98da39", "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "56d6440f62c271c4ce9ef520400395a3",
"build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "dc078f11a4e93062adc7d210fd4f08fb", "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "390a90cf4af1c55662c61ec19f9481bb",
"build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "a74bea3380d0fb39f78ac7b7598c1a72", "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "e55895a55cc40f79be9e2e8095e8adf2",
"build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "dc078f11a4e93062adc7d210fd4f08fb", "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "390a90cf4af1c55662c61ec19f9481bb",
"build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "a74bea3380d0fb39f78ac7b7598c1a72", "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "e55895a55cc40f79be9e2e8095e8adf2",
"build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "b397e020f33132c4dd2280cb1222cd14", "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "9846a6a3dd3685417fe834b91be8ac74",
"build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "ff0cb4db976707d25bd401bce80a4882", "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "68087f1bac1513e92cabdb59c637e759",
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "b397e020f33132c4dd2280cb1222cd14", "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "9846a6a3dd3685417fe834b91be8ac74",
"build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "ff0cb4db976707d25bd401bce80a4882", "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "68087f1bac1513e92cabdb59c637e759",
"build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "c464accef921df1325459bdd10c59b84", "build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "72a7370f23c76ed8018999b78d88a545",
"build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "0896e849885cef50bcf33ce863efa7d2", "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316",
"build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "e53c808357cc0a2f0da7b870be147083", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "fbdc80e41c5883b4a893d2f0786e377f",
"build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "0896e849885cef50bcf33ce863efa7d2", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "c2cf0dc227e41a826c913d12e117c316",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "f53601899c23c90c2b7e65836c805d8e", "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "b04c0e9f0753d99707dc0091f838c724",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "f31b348a7612e5fa3a968f3cc81cefcd", "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "526a6da71fee4e782a5e881cfc747d53",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "b8339779a2571b169f9d63c11aa7dfa3", "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "9148df22e55a23d1fc5c0674f476af3e",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "511bc23565e830778d5ff183a201579d", "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "a46936b72035132ddde1dc166b507d7b",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "b02faf2aa2df1de233a0549295e6b0ed", "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "33595ffc0c36f2280a9215b48284c322",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "2e07aaa6d445caf3b33d79dc40bd2475", "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "432bf79a12258e353a498399d248775f",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "00f50fb4a3a9bbecd1b1188b78abae4b", "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "6cd33778d0c471e79b252696a22d69ba",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "88fb67cb3f3752f0b0db1d583f90490d", "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "a735a0b19249050d2b6b428be6274c37",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "b611c090513a21e2fe90e56582724e9d", "src/assets/ba_data/python/babase/_mgen/enums.py": "b611c090513a21e2fe90e56582724e9d",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "72bfed2cce8ff19741989dec28302f3f", "src/ballistica/base/mgen/pyembed/binding_base.inc": "72bfed2cce8ff19741989dec28302f3f",

62
.github/workflows/cd.yml vendored
View File

@ -9,9 +9,9 @@ jobs:
make_linux_x86_64_gui_debug_build: make_linux_x86_64_gui_debug_build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
# Remove this once we upgrade to 3.12. # Remove this once we upgrade to 3.12.
@ -29,9 +29,9 @@ jobs:
make_linux_x86_64_server_debug_build: make_linux_x86_64_server_debug_build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
# Remove this once we upgrade to 3.12. # Remove this once we upgrade to 3.12.
@ -49,9 +49,9 @@ jobs:
make_linux_arm64_gui_debug_build: make_linux_arm64_gui_debug_build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
# Remove this once we upgrade to 3.12. # Remove this once we upgrade to 3.12.
@ -69,9 +69,9 @@ jobs:
make_linux_arm64_server_debug_build: make_linux_arm64_server_debug_build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
# Remove this once we upgrade to 3.12. # Remove this once we upgrade to 3.12.
@ -89,9 +89,9 @@ jobs:
make_mac_x86_64_gui_debug_build: make_mac_x86_64_gui_debug_build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
# Remove this once we upgrade to 3.12. # Remove this once we upgrade to 3.12.
@ -109,9 +109,9 @@ jobs:
make_mac_x86_64_server_debug_build: make_mac_x86_64_server_debug_build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
# Remove this once we upgrade to 3.12. # Remove this once we upgrade to 3.12.
@ -129,9 +129,9 @@ jobs:
make_mac_arm64_gui_debug_build: make_mac_arm64_gui_debug_build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
# Remove this once we upgrade to 3.12. # Remove this once we upgrade to 3.12.
@ -149,9 +149,9 @@ jobs:
make_mac_arm64_server_debug_build: make_mac_arm64_server_debug_build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
# Remove this once we upgrade to 3.12. # Remove this once we upgrade to 3.12.
@ -169,9 +169,9 @@ jobs:
make_windows_x86_gui_debug_build: make_windows_x86_gui_debug_build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
# Remove this once we upgrade to 3.12. # Remove this once we upgrade to 3.12.
@ -189,9 +189,9 @@ jobs:
make_windows_x86_server_debug_build: make_windows_x86_server_debug_build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
# Remove this once we upgrade to 3.12. # Remove this once we upgrade to 3.12.
@ -206,3 +206,25 @@ jobs:
with: with:
name: windows_x86_server_(debug) name: windows_x86_server_(debug)
path: build/prefab/full/windows_x86_server path: build/prefab/full/windows_x86_server
make_sphinx_docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'
# Remove this once we upgrade to 3.12.
- name: Install typing_extensions (temp)
run: python3.11 -m pip install typing_extensions
- name: Install sphinx
run: python3.11 -m pip install sphinx furo
- name: Install pip requirements
run: tools/pcommand install_pip_reqs
- name: Make the build
run: make docs-sphinx
- name: Upload the build
uses: actions/upload-artifact@v3
with:
name: sphinx_html_docs
path: build/sphinx

20
.github/workflows/ci.yml vendored
View File

@ -16,9 +16,9 @@ jobs:
check_linux: check_linux:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
# Remove this once we upgrade to 3.12. # Remove this once we upgrade to 3.12.
@ -33,9 +33,9 @@ jobs:
build_and_test_linux: build_and_test_linux:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
# Remove this once we upgrade to 3.12. # Remove this once we upgrade to 3.12.
@ -54,9 +54,9 @@ jobs:
spinoff_test_linux: spinoff_test_linux:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
# Remove this once we upgrade to 3.12. # Remove this once we upgrade to 3.12.
@ -75,9 +75,9 @@ jobs:
feature_set_copy_test_linux: feature_set_copy_test_linux:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
# Remove this once we upgrade to 3.12. # Remove this once we upgrade to 3.12.
@ -102,9 +102,9 @@ jobs:
build_and_test_windows: build_and_test_windows:
runs-on: windows-2022 runs-on: windows-2022
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v4 uses: actions/setup-python@v5
with: with:
python-version: '3.11' python-version: '3.11'
- name: Install dependencies - name: Install dependencies

13
CHANGELOG.md
View File

@ -1,4 +1,4 @@
### 1.7.33 (build 21770, api 8, 2024-03-01) ### 1.7.33 (build 21778, api 8, 2024-03-13)
- Stress test input-devices are now a bit smarter; they won't press any buttons - Stress test input-devices are now a bit smarter; they won't press any buttons
while UIs are up (this could cause lots of chaos if it happened). while UIs are up (this could cause lots of chaos if it happened).
- Added a 'Show Demos When Idle' option in advanced settings. If enabled, the - Added a 'Show Demos When Idle' option in advanced settings. If enabled, the
@ -22,6 +22,7 @@
classes forget to adapt to the change. classes forget to adapt to the change.
- Respawn icons now have dotted steps showing decimal progress to assist - Respawn icons now have dotted steps showing decimal progress to assist
players on calculating when they are gonna respawn. (Thanks 3alTemp!) players on calculating when they are gonna respawn. (Thanks 3alTemp!)
- Replays now have rewind/fast-forward buttons!! (Thanks Dliwk, vishal332008!)
- Custom spaz "curse_time" values now work properly. (Thanks Temp!) - Custom spaz "curse_time" values now work properly. (Thanks Temp!)
- Implemented `efro.dataclassio.IOMultiType` which will make my life a lot - Implemented `efro.dataclassio.IOMultiType` which will make my life a lot
easier. easier.
@ -31,6 +32,16 @@
brostos!). brostos!).
- Fixes a bug where Meteor Shower could make the game-end bell sound twice - Fixes a bug where Meteor Shower could make the game-end bell sound twice
(Thanks 3alTemp!). (Thanks 3alTemp!).
- Leaving the game or dying while touching your team's flag will no longer
recover & return it indefinitely in a teams game of Capture the Flag. (Thanks
3alTemp!)
- Added a server config setting for max players (not max clients) (Thanks
EraOSBeta!)
- Added a UI for customizing Series Length in Teams and Points-to-Win in FFA
(Thanks EraOSBeta!)
- Sphinx based Python documentation generation is now wired up (Thanks
Loup-Garou911XD!)
- Renaming & overwriting existing profiles is no longer possible (Thanks Temp!)
### 1.7.32 (build 21741, api 8, 2023-12-20) ### 1.7.32 (build 21741, api 8, 2023-12-20)
- Fixed a screen message that no one will ever see (Thanks vishal332008?...) - Fixed a screen message that no one will ever see (Thanks vishal332008?...)

9
CONTRIBUTORS.md
View File

@ -37,12 +37,12 @@
- Added feature - Added feature
### Vishal332008 ### Vishal332008
- Bug Fixer - QoL and Bug Fixer
- Modder - Modder
### Era0S ### Era0S
- Community Suggestions Implementer - Community Suggestions Implementer
- Bug Fixer - QoL and Bug Fixer
- Modder - Modder
### VinniTR ### VinniTR
@ -52,7 +52,12 @@
- Created the original "reject_recently_left_players" plugin - Created the original "reject_recently_left_players" plugin
### Temp (3alTemp) ### Temp (3alTemp)
- Original idea for customizable series length on GUI builds
- Modder & Bug Fixer - Modder & Bug Fixer
### brostos ### brostos
- Added support for joining using ipv6 address - Added support for joining using ipv6 address
### Loup Garou
- Added sphinx documentation generation

8
Makefile
View File

@ -183,6 +183,14 @@ docs:
docs-pdoc: docs-pdoc:
@$(PCOMMAND) gen_docs_pdoc @$(PCOMMAND) gen_docs_pdoc
docs-sphinx:
$(MAKE) dummymodules
@$(PCOMMAND) gen_docs_sphinx
docs-sphinx-clean:
rm -rf .cache/sphinx
rm -rf build/sphinx
pcommandbatch_speed_test: prereqs pcommandbatch_speed_test: prereqs
@$(PCOMMAND) pcommandbatch_speed_test $(PCOMMANDBATCH) @$(PCOMMAND) pcommandbatch_speed_test $(PCOMMANDBATCH)

1
config/spinoffconfig.py
View File

@ -278,6 +278,7 @@ ctx.filter_file_extensions = {
'.xcsettings', '.xcsettings',
'.xcstrings', '.xcstrings',
'.filters', '.filters',
'.rst',
} }
# ELSE files with these extensions will NOT be filtered. # ELSE files with these extensions will NOT be filtered.

2
src/assets/.asset_manifest_private.json
View File

@ -4487,6 +4487,8 @@
"pylib-apple/zoneinfo/_common.py", "pylib-apple/zoneinfo/_common.py",
"pylib-apple/zoneinfo/_tzpath.py", "pylib-apple/zoneinfo/_tzpath.py",
"pylib-apple/zoneinfo/_zoneinfo.py", "pylib-apple/zoneinfo/_zoneinfo.py",
"sphinx/template/__pycache__/conf.cpython-311.opt-1.pyc",
"sphinx/template/conf.py",
"windows/Win32/DLLs/_asyncio.pyd", "windows/Win32/DLLs/_asyncio.pyd",
"windows/Win32/DLLs/_asyncio_d.pyd", "windows/Win32/DLLs/_asyncio_d.pyd",
"windows/Win32/DLLs/_bz2.pyd", "windows/Win32/DLLs/_bz2.pyd",

6
src/assets/Makefile
View File

@ -2742,7 +2742,8 @@ SCRIPT_TARGETS_PY_PRIVATE_COMMON = \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/resolver.py \ $(BUILD_DIR)/ba_data/python-site-packages/yaml/resolver.py \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/scanner.py \ $(BUILD_DIR)/ba_data/python-site-packages/yaml/scanner.py \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/serializer.py \ $(BUILD_DIR)/ba_data/python-site-packages/yaml/serializer.py \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/tokens.py $(BUILD_DIR)/ba_data/python-site-packages/yaml/tokens.py \
$(BUILD_DIR)/sphinx/template/conf.py
SCRIPT_TARGETS_PYC_PRIVATE_COMMON = \ SCRIPT_TARGETS_PYC_PRIVATE_COMMON = \
$(BUILD_DIR)/ba_data/python-site-packages/_yaml/__pycache__/__init__.cpython-311.opt-1.pyc \ $(BUILD_DIR)/ba_data/python-site-packages/_yaml/__pycache__/__init__.cpython-311.opt-1.pyc \
@ -2766,7 +2767,8 @@ SCRIPT_TARGETS_PYC_PRIVATE_COMMON = \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/resolver.cpython-311.opt-1.pyc \ $(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/resolver.cpython-311.opt-1.pyc \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/scanner.cpython-311.opt-1.pyc \ $(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/scanner.cpython-311.opt-1.pyc \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/serializer.cpython-311.opt-1.pyc \ $(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/serializer.cpython-311.opt-1.pyc \
$(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/tokens.cpython-311.opt-1.pyc $(BUILD_DIR)/ba_data/python-site-packages/yaml/__pycache__/tokens.cpython-311.opt-1.pyc \
$(BUILD_DIR)/sphinx/template/__pycache__/conf.cpython-311.opt-1.pyc
# Rule to copy src asset scripts to dst. # Rule to copy src asset scripts to dst.
# (and make non-writable so I'm less likely to accidentally edit them there) # (and make non-writable so I'm less likely to accidentally edit them there)

6
src/assets/ba_data/python/babase/modutils.py
View File

@ -136,7 +136,9 @@ def create_user_system_scripts() -> None:
path = f'{env.python_directory_user}/sys/{env.version}' path = f'{env.python_directory_user}/sys/{env.version}'
pathtmp = path + '_tmp' pathtmp = path + '_tmp'
if os.path.exists(path): if os.path.exists(path):
shutil.rmtree(path) print('Delete Existing User Scripts and try again.')
_babase.screenmessage('Delete Existing User Scripts and try again.')
return
if os.path.exists(pathtmp): if os.path.exists(pathtmp):
shutil.rmtree(pathtmp) shutil.rmtree(pathtmp)
@ -159,6 +161,7 @@ def create_user_system_scripts() -> None:
f"'\nRestart {_babase.appname()} to use them." f"'\nRestart {_babase.appname()} to use them."
f' (use babase.quit() to exit the game)' f' (use babase.quit() to exit the game)'
) )
_babase.screenmessage('Created User System Scripts')
if app.classic is not None and app.classic.platform == 'android': if app.classic is not None and app.classic.platform == 'android':
print( print(
'Note: the new files may not be visible via ' 'Note: the new files may not be visible via '
@ -183,6 +186,7 @@ def delete_user_system_scripts() -> None:
f'Restart {_babase.appname()} to use internal' f'Restart {_babase.appname()} to use internal'
f' scripts. (use babase.quit() to exit the game)' f' scripts. (use babase.quit() to exit the game)'
) )
_babase.screenmessage('Deleted User System Scripts')
else: else:
print(f"User system scripts not found at '{path}'.") print(f"User system scripts not found at '{path}'.")

6
src/assets/ba_data/python/baclassic/_accountv1.py
View File

@ -152,9 +152,9 @@ class AccountV1Subsystem:
"""(internal)""" """(internal)"""
for entry in info: for entry in info:
cache_entry = self.tournament_info[ cache_entry = self.tournament_info[entry['tournamentID']] = (
entry['tournamentID'] copy.deepcopy(entry)
] = copy.deepcopy(entry) )
# Also store the time we received this, so we can adjust # Also store the time we received this, so we can adjust
# time-remaining values/etc. # time-remaining values/etc.

6
src/assets/ba_data/python/baclassic/_achievement.py
View File

@ -75,9 +75,9 @@ class AchievementSubsystem:
def __init__(self) -> None: def __init__(self) -> None:
self.achievements: list[Achievement] = [] self.achievements: list[Achievement] = []
self.achievements_to_display: ( self.achievements_to_display: list[
list[tuple[baclassic.Achievement, bool]] tuple[baclassic.Achievement, bool]
) = [] ] = []
self.achievement_display_timer: bascenev1.BaseTimer | None = None self.achievement_display_timer: bascenev1.BaseTimer | None = None
self.last_achievement_display_time: float = 0.0 self.last_achievement_display_time: float = 0.0
self.achievement_completion_banner_slots: set[int] = set() self.achievement_completion_banner_slots: set[int] = set()

24
src/assets/ba_data/python/baclassic/_servermode.py
View File

@ -310,9 +310,7 @@ class ServerController:
typename = ( typename = (
'teams' 'teams'
if result['playlistType'] == 'Team Tournament' if result['playlistType'] == 'Team Tournament'
else 'ffa' else 'ffa' if result['playlistType'] == 'Free-for-All' else '??'
if result['playlistType'] == 'Free-for-All'
else '??'
) )
plistname = result['playlistName'] plistname = result['playlistName']
print(f'{Clr.SBLU}Got playlist: "{plistname}" ({typename}).{Clr.RST}') print(f'{Clr.SBLU}Got playlist: "{plistname}" ({typename}).{Clr.RST}')
@ -390,14 +388,14 @@ class ServerController:
if sessiontype is bascenev1.FreeForAllSession: if sessiontype is bascenev1.FreeForAllSession:
appcfg['Free-for-All Playlist Selection'] = self._playlist_name appcfg['Free-for-All Playlist Selection'] = self._playlist_name
appcfg[ appcfg['Free-for-All Playlist Randomize'] = (
'Free-for-All Playlist Randomize' self._config.playlist_shuffle
] = self._config.playlist_shuffle )
elif sessiontype is bascenev1.DualTeamSession: elif sessiontype is bascenev1.DualTeamSession:
appcfg['Team Tournament Playlist Selection'] = self._playlist_name appcfg['Team Tournament Playlist Selection'] = self._playlist_name
appcfg[ appcfg['Team Tournament Playlist Randomize'] = (
'Team Tournament Playlist Randomize' self._config.playlist_shuffle
] = self._config.playlist_shuffle )
elif sessiontype is bascenev1.CoopSession: elif sessiontype is bascenev1.CoopSession:
classic.coop_session_args = { classic.coop_session_args = {
'campaign': self._config.coop_campaign, 'campaign': self._config.coop_campaign,
@ -406,6 +404,10 @@ class ServerController:
else: else:
raise RuntimeError(f'Unknown session type {sessiontype}') raise RuntimeError(f'Unknown session type {sessiontype}')
appcfg['Teams Series Length'] = self._config.teams_series_length
appcfg['FFA Series Length'] = self._config.ffa_series_length
# deprecated, left here in order to not break mods
classic.teams_series_length = self._config.teams_series_length classic.teams_series_length = self._config.teams_series_length
classic.ffa_series_length = self._config.ffa_series_length classic.ffa_series_length = self._config.ffa_series_length
@ -427,6 +429,10 @@ class ServerController:
self._config.player_rejoin_cooldown self._config.player_rejoin_cooldown
) )
bascenev1.set_max_players_override(
self._config.session_max_players_override
)
# And here.. we.. go. # And here.. we.. go.
if self._config.stress_test_players is not None: if self._config.stress_test_players is not None:
# Special case: run a stress test. # Special case: run a stress test.

4
src/assets/ba_data/python/baclassic/_subsystem.py
View File

@ -103,8 +103,8 @@ class ClassicSubsystem(babase.AppSubsystem):
self.maps: dict[str, type[bascenev1.Map]] = {} self.maps: dict[str, type[bascenev1.Map]] = {}
# Gameplay. # Gameplay.
self.teams_series_length = 7 self.teams_series_length = 7 # deprecated, left for old mods
self.ffa_series_length = 24 self.ffa_series_length = 24 # deprecated, left for old mods
self.coop_session_args: dict = {} self.coop_session_args: dict = {}
# UI. # UI.

8
src/assets/ba_data/python/baclassic/_tournament.py
View File

@ -35,9 +35,11 @@ def get_tournament_prize_strings(entry: dict[str, Any]) -> list[str]:
prval = ( prval = (
'' ''
if rng is None if rng is None
else ('#' + str(rng[0])) else (
if (rng[0] == rng[1]) ('#' + str(rng[0]))
else ('#' + str(rng[0]) + '-' + str(rng[1])) if (rng[0] == rng[1])
else ('#' + str(rng[0]) + '-' + str(rng[1]))
)
) )
pvval = '' pvval = ''
if trophy_type is not None: if trophy_type is not None:

6
src/assets/ba_data/python/baenv.py
View File

@ -52,7 +52,7 @@ if TYPE_CHECKING:
# Build number and version of the ballistica binary we expect to be # Build number and version of the ballistica binary we expect to be
# using. # using.
TARGET_BALLISTICA_BUILD = 21770 TARGET_BALLISTICA_BUILD = 21778
TARGET_BALLISTICA_VERSION = '1.7.33' TARGET_BALLISTICA_VERSION = '1.7.33'
@ -264,6 +264,10 @@ def _calc_data_dir(data_dir: str | None) -> str:
def _setup_logging() -> LogHandler: def _setup_logging() -> LogHandler:
from efro.log import setup_logging, LogLevel from efro.log import setup_logging, LogLevel
# TODO: should set this up with individual loggers under a top level
# 'ba' logger, and at that point we can kill off the
# suppress_non_root_debug option since we'll only ever need to set
# 'ba' to DEBUG at most.
log_handler = setup_logging( log_handler = setup_logging(
log_path=None, log_path=None,
level=LogLevel.DEBUG, level=LogLevel.DEBUG,

33
src/assets/ba_data/python/baplus/_cloud.py
View File

@ -57,8 +57,7 @@ class CloudSubsystem(babase.AppSubsystem):
on_response: Callable[ on_response: Callable[
[bacommon.cloud.LoginProxyRequestResponse | Exception], None [bacommon.cloud.LoginProxyRequestResponse | Exception], None
], ],
) -> None: ) -> None: ...
...
@overload @overload
def send_message_cb( def send_message_cb(
@ -67,24 +66,21 @@ class CloudSubsystem(babase.AppSubsystem):
on_response: Callable[ on_response: Callable[
[bacommon.cloud.LoginProxyStateQueryResponse | Exception], None [bacommon.cloud.LoginProxyStateQueryResponse | Exception], None
], ],
) -> None: ) -> None: ...
...
@overload @overload
def send_message_cb( def send_message_cb(
self, self,
msg: bacommon.cloud.LoginProxyCompleteMessage, msg: bacommon.cloud.LoginProxyCompleteMessage,
on_response: Callable[[None | Exception], None], on_response: Callable[[None | Exception], None],
) -> None: ) -> None: ...
...
@overload @overload
def send_message_cb( def send_message_cb(
self, self,
msg: bacommon.cloud.PingMessage, msg: bacommon.cloud.PingMessage,
on_response: Callable[[bacommon.cloud.PingResponse | Exception], None], on_response: Callable[[bacommon.cloud.PingResponse | Exception], None],
) -> None: ) -> None: ...
...
@overload @overload
def send_message_cb( def send_message_cb(
@ -93,8 +89,7 @@ class CloudSubsystem(babase.AppSubsystem):
on_response: Callable[ on_response: Callable[
[bacommon.cloud.SignInResponse | Exception], None [bacommon.cloud.SignInResponse | Exception], None
], ],
) -> None: ) -> None: ...
...
@overload @overload
def send_message_cb( def send_message_cb(
@ -103,8 +98,7 @@ class CloudSubsystem(babase.AppSubsystem):
on_response: Callable[ on_response: Callable[
[bacommon.cloud.ManageAccountResponse | Exception], None [bacommon.cloud.ManageAccountResponse | Exception], None
], ],
) -> None: ) -> None: ...
...
def send_message_cb( def send_message_cb(
self, self,
@ -129,20 +123,17 @@ class CloudSubsystem(babase.AppSubsystem):
@overload @overload
def send_message( def send_message(
self, msg: bacommon.cloud.WorkspaceFetchMessage self, msg: bacommon.cloud.WorkspaceFetchMessage
) -> bacommon.cloud.WorkspaceFetchResponse: ) -> bacommon.cloud.WorkspaceFetchResponse: ...
...
@overload @overload
def send_message( def send_message(
self, msg: bacommon.cloud.MerchAvailabilityMessage self, msg: bacommon.cloud.MerchAvailabilityMessage
) -> bacommon.cloud.MerchAvailabilityResponse: ) -> bacommon.cloud.MerchAvailabilityResponse: ...
...
@overload @overload
def send_message( def send_message(
self, msg: bacommon.cloud.TestMessage self, msg: bacommon.cloud.TestMessage
) -> bacommon.cloud.TestResponse: ) -> bacommon.cloud.TestResponse: ...
...
def send_message(self, msg: Message) -> Response | None: def send_message(self, msg: Message) -> Response | None:
"""Synchronously send a message to the cloud. """Synchronously send a message to the cloud.
@ -154,14 +145,12 @@ class CloudSubsystem(babase.AppSubsystem):
@overload @overload
async def send_message_async( async def send_message_async(
self, msg: bacommon.cloud.PromoCodeMessage self, msg: bacommon.cloud.PromoCodeMessage
) -> bacommon.cloud.PromoCodeResponse: ) -> bacommon.cloud.PromoCodeResponse: ...
...
@overload @overload
async def send_message_async( async def send_message_async(
self, msg: bacommon.cloud.TestMessage self, msg: bacommon.cloud.TestMessage
) -> bacommon.cloud.TestResponse: ) -> bacommon.cloud.TestResponse: ...
...
async def send_message_async(self, msg: Message) -> Response | None: async def send_message_async(self, msg: Message) -> Response | None:
"""Synchronously send a message to the cloud. """Synchronously send a message to the cloud.

9
src/assets/ba_data/python/bascenev1/__init__.py
View File

@ -120,6 +120,7 @@ from _bascenev1 import (
release_keyboard_input, release_keyboard_input,
reset_random_player_names, reset_random_player_names,
resume_replay, resume_replay,
seek_replay,
broadcastmessage, broadcastmessage,
SessionData, SessionData,
SessionPlayer, SessionPlayer,
@ -231,7 +232,11 @@ from bascenev1._settings import (
IntSetting, IntSetting,
Setting, Setting,
) )
from bascenev1._session import Session, set_player_rejoin_cooldown from bascenev1._session import (
Session,
set_player_rejoin_cooldown,
set_max_players_override,
)
from bascenev1._stats import PlayerScoredMessage, PlayerRecord, Stats from bascenev1._stats import PlayerScoredMessage, PlayerRecord, Stats
from bascenev1._team import SessionTeam, Team, EmptyTeam from bascenev1._team import SessionTeam, Team, EmptyTeam
from bascenev1._teamgame import TeamGameActivity from bascenev1._teamgame import TeamGameActivity
@ -400,6 +405,7 @@ __all__ = [
'release_keyboard_input', 'release_keyboard_input',
'reset_random_player_names', 'reset_random_player_names',
'resume_replay', 'resume_replay',
'seek_replay',
'safecolor', 'safecolor',
'screenmessage', 'screenmessage',
'SceneV1AppMode', 'SceneV1AppMode',
@ -426,6 +432,7 @@ __all__ = [
'set_public_party_queue_enabled', 'set_public_party_queue_enabled',
'set_public_party_stats_url', 'set_public_party_stats_url',
'set_player_rejoin_cooldown', 'set_player_rejoin_cooldown',
'set_max_players_override',
'set_replay_speed_exponent', 'set_replay_speed_exponent',
'set_touchscreen_editing', 'set_touchscreen_editing',
'setmusic', 'setmusic',

8
src/assets/ba_data/python/bascenev1/_activitytypes.py
View File

@ -203,9 +203,11 @@ class ScoreScreenActivity(Activity[EmptyPlayer, EmptyTeam]):
sval = babase.Lstr(resource='pressAnyButtonText') sval = babase.Lstr(resource='pressAnyButtonText')
Text( Text(
self._custom_continue_message (
if self._custom_continue_message is not None self._custom_continue_message
else sval, if self._custom_continue_message is not None
else sval
),
v_attach=Text.VAttach.BOTTOM, v_attach=Text.VAttach.BOTTOM,
h_align=Text.HAlign.CENTER, h_align=Text.HAlign.CENTER,
flash=True, flash=True,

10
src/assets/ba_data/python/bascenev1/_actor.py
View File

@ -198,12 +198,14 @@ class Actor:
# Overloads to convey our exact return type depending on 'doraise' value. # Overloads to convey our exact return type depending on 'doraise' value.
@overload @overload
def getactivity(self, doraise: Literal[True] = True) -> bascenev1.Activity: def getactivity(
... self, doraise: Literal[True] = True
) -> bascenev1.Activity: ...
@overload @overload
def getactivity(self, doraise: Literal[False]) -> bascenev1.Activity | None: def getactivity(
... self, doraise: Literal[False]
) -> bascenev1.Activity | None: ...
def getactivity(self, doraise: bool = True) -> bascenev1.Activity | None: def getactivity(self, doraise: bool = True) -> bascenev1.Activity | None:
"""Return the bascenev1.Activity this Actor is associated with. """Return the bascenev1.Activity this Actor is associated with.

6
src/assets/ba_data/python/bascenev1/_gameresults.py
View File

@ -42,9 +42,9 @@ class GameResults:
self._scores: dict[ self._scores: dict[
int, tuple[weakref.ref[bascenev1.SessionTeam], int | None] int, tuple[weakref.ref[bascenev1.SessionTeam], int | None]
] = {} ] = {}
self._sessionteams: list[ self._sessionteams: list[weakref.ref[bascenev1.SessionTeam]] | None = (
weakref.ref[bascenev1.SessionTeam] None
] | None = None )
self._playerinfos: list[bascenev1.PlayerInfo] | None = None self._playerinfos: list[bascenev1.PlayerInfo] | None = None
self._lower_is_better: bool | None = None self._lower_is_better: bool | None = None
self._score_label: str | None = None self._score_label: str | None = None

8
src/assets/ba_data/python/bascenev1/_level.py
View File

@ -73,9 +73,11 @@ class Level:
return babase.Lstr( return babase.Lstr(
translate=( translate=(
'coopLevelNames', 'coopLevelNames',
self._displayname (
if self._displayname is not None self._displayname
else self._name, if self._displayname is not None
else self._name
),
), ),
subs=[ subs=[
('${GAME}', self._gametype.get_display_string(self._settings)) ('${GAME}', self._gametype.get_display_string(self._settings))

4
src/assets/ba_data/python/bascenev1/_multiteamsession.py
View File

@ -67,8 +67,8 @@ class MultiTeamSession(Session):
max_players=self.get_max_players(), max_players=self.get_max_players(),
) )
self._series_length: int = classic.teams_series_length self._series_length: int = int(cfg.get('Teams Series Length', 7))
self._ffa_series_length: int = classic.ffa_series_length self._ffa_series_length: int = int(cfg.get('FFA Series Length', 24))
show_tutorial = cfg.get('Show Tutorial', True) show_tutorial = cfg.get('Show Tutorial', True)

30
src/assets/ba_data/python/bascenev1/_playlist.py
View File

@ -89,18 +89,18 @@ def filter_playlist(
'bs_king_of_the_hill.KingOfTheHillGame', 'bs_king_of_the_hill.KingOfTheHillGame',
'bastd.game.kingofthehill.KingOfTheHillGame', 'bastd.game.kingofthehill.KingOfTheHillGame',
): ):
entry[ entry['type'] = (
'type' 'bascenev1lib.game.kingofthehill.KingOfTheHillGame'
] = 'bascenev1lib.game.kingofthehill.KingOfTheHillGame' )
if entry['type'] in ( if entry['type'] in (
'Capture_the_Flag.CTFGame', 'Capture_the_Flag.CTFGame',
'bsCaptureTheFlag.CTFGame', 'bsCaptureTheFlag.CTFGame',
'bs_capture_the_flag.CTFGame', 'bs_capture_the_flag.CTFGame',
'bastd.game.capturetheflag.CaptureTheFlagGame', 'bastd.game.capturetheflag.CaptureTheFlagGame',
): ):
entry[ entry['type'] = (
'type' 'bascenev1lib.game.capturetheflag.CaptureTheFlagGame'
] = 'bascenev1lib.game.capturetheflag.CaptureTheFlagGame' )
if entry['type'] in ( if entry['type'] in (
'Death_Match.DeathMatchGame', 'Death_Match.DeathMatchGame',
'bsDeathMatch.DeathMatchGame', 'bsDeathMatch.DeathMatchGame',
@ -163,25 +163,25 @@ def filter_playlist(
'bs_easter_egg_hunt.EasterEggHuntGame', 'bs_easter_egg_hunt.EasterEggHuntGame',
'bastd.game.easteregghunt.EasterEggHuntGame', 'bastd.game.easteregghunt.EasterEggHuntGame',
): ):
entry[ entry['type'] = (
'type' 'bascenev1lib.game.easteregghunt.EasterEggHuntGame'
] = 'bascenev1lib.game.easteregghunt.EasterEggHuntGame' )
if entry['type'] in ( if entry['type'] in (
'bsMeteorShower.MeteorShowerGame', 'bsMeteorShower.MeteorShowerGame',
'bs_meteor_shower.MeteorShowerGame', 'bs_meteor_shower.MeteorShowerGame',
'bastd.game.meteorshower.MeteorShowerGame', 'bastd.game.meteorshower.MeteorShowerGame',
): ):
entry[ entry['type'] = (
'type' 'bascenev1lib.game.meteorshower.MeteorShowerGame'
] = 'bascenev1lib.game.meteorshower.MeteorShowerGame' )
if entry['type'] in ( if entry['type'] in (
'bsTargetPractice.TargetPracticeGame', 'bsTargetPractice.TargetPracticeGame',
'bs_target_practice.TargetPracticeGame', 'bs_target_practice.TargetPracticeGame',
'bastd.game.targetpractice.TargetPracticeGame', 'bastd.game.targetpractice.TargetPracticeGame',
): ):
entry[ entry['type'] = (
'type' 'bascenev1lib.game.targetpractice.TargetPracticeGame'
] = 'bascenev1lib.game.targetpractice.TargetPracticeGame' )
gameclass = babase.getclass(entry['type'], GameActivity) gameclass = babase.getclass(entry['type'], GameActivity)

17
src/assets/ba_data/python/bascenev1/_session.py
View File

@ -23,6 +23,9 @@ if TYPE_CHECKING:
# such as skipping respawn waits. # such as skipping respawn waits.
_g_player_rejoin_cooldown: float = 0.0 _g_player_rejoin_cooldown: float = 0.0
# overrides the session's decision of max_players
_max_players_override: int | None = None
def set_player_rejoin_cooldown(cooldown: float) -> None: def set_player_rejoin_cooldown(cooldown: float) -> None:
"""Set the cooldown for individual players rejoining after leaving.""" """Set the cooldown for individual players rejoining after leaving."""
@ -30,6 +33,12 @@ def set_player_rejoin_cooldown(cooldown: float) -> None:
_g_player_rejoin_cooldown = max(0.0, cooldown) _g_player_rejoin_cooldown = max(0.0, cooldown)
def set_max_players_override(max_players: int | None) -> None:
"""Set the override for how many players can join a session"""
global _max_players_override # pylint: disable=global-statement
_max_players_override = max_players
class Session: class Session:
"""Defines a high level series of bascenev1.Activity-es. """Defines a high level series of bascenev1.Activity-es.
@ -161,7 +170,11 @@ class Session:
self.sessionteams = [] self.sessionteams = []
self.sessionplayers = [] self.sessionplayers = []
self.min_players = min_players self.min_players = min_players
self.max_players = max_players self.max_players = (
max_players
if _max_players_override is None
else _max_players_override
)
self.customdata = {} self.customdata = {}
self._in_set_activity = False self._in_set_activity = False
@ -255,7 +268,7 @@ class Session:
babase.app.classic is not None babase.app.classic is not None
and babase.app.classic.stress_test_update_timer is None and babase.app.classic.stress_test_update_timer is None
): ):
if len(self.sessionplayers) >= self.max_players: if len(self.sessionplayers) >= self.max_players >= 0:
# Print a rejection message *only* to the client trying to # Print a rejection message *only* to the client trying to
# join (prevents spamming everyone else in the game). # join (prevents spamming everyone else in the game).
_bascenev1.getsound('error').play() _bascenev1.getsound('error').play()

131
src/assets/ba_data/python/bascenev1lib/activity/coopscore.py
View File

@ -395,11 +395,15 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
color=(0.45, 0.4, 0.5), color=(0.45, 0.4, 0.5),
position=(160, v_offs + 480), position=(160, v_offs + 480),
size=(350, 62), size=(350, 62),
label=bui.Lstr(resource='tournamentStandingsText') label=(
if self.session.tournament_id is not None bui.Lstr(resource='tournamentStandingsText')
else bui.Lstr(resource='worldsBestScoresText') if self.session.tournament_id is not None
if self._score_type == 'points' else (
else bui.Lstr(resource='worldsBestTimesText'), bui.Lstr(resource='worldsBestScoresText')
if self._score_type == 'points'
else bui.Lstr(resource='worldsBestTimesText')
)
),
autoselect=True, autoselect=True,
on_activate_call=bui.WeakCall(self._ui_worlds_best), on_activate_call=bui.WeakCall(self._ui_worlds_best),
transition_delay=delay + 1.9, transition_delay=delay + 1.9,
@ -515,9 +519,11 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
bui.containerwidget( bui.containerwidget(
edit=rootc, edit=rootc,
selected_child=next_button selected_child=(
if (self._newly_complete and self._victory and show_next_button) next_button
else restart_button, if (self._newly_complete and self._victory and show_next_button)
else restart_button
),
on_cancel_call=menu_button.activate, on_cancel_call=menu_button.activate,
) )
@ -644,14 +650,16 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
and not (env.demo or env.arcade) and not (env.demo or env.arcade)
): ):
Text( Text(
bs.Lstr( (
value='${A}:\n', bs.Lstr(
subs=[('${A}', bs.Lstr(resource='levelUnlockedText'))], value='${A}:\n',
) subs=[('${A}', bs.Lstr(resource='levelUnlockedText'))],
if self._newly_complete )
else bs.Lstr( if self._newly_complete
value='${A}:\n', else bs.Lstr(
subs=[('${A}', bs.Lstr(resource='nextLevelText'))], value='${A}:\n',
subs=[('${A}', bs.Lstr(resource='nextLevelText'))],
)
), ),
transition=Text.Transition.IN_RIGHT, transition=Text.Transition.IN_RIGHT,
transition_delay=5.2, transition_delay=5.2,
@ -860,11 +868,15 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
ts_h_offs = 210 ts_h_offs = 210
v_offs = 40 v_offs = 40
txt = Text( txt = Text(
bs.Lstr(resource='tournamentStandingsText') (
if self.session.tournament_id is not None bs.Lstr(resource='tournamentStandingsText')
else bs.Lstr(resource='worldsBestScoresText') if self.session.tournament_id is not None
if self._score_type == 'points' else (
else bs.Lstr(resource='worldsBestTimesText'), bs.Lstr(resource='worldsBestScoresText')
if self._score_type == 'points'
else bs.Lstr(resource='worldsBestTimesText')
)
),
maxwidth=210, maxwidth=210,
position=(ts_h_offs - 10, ts_height / 2 + 25 + v_offs + 20), position=(ts_h_offs - 10, ts_height / 2 + 25 + v_offs + 20),
transition=Text.Transition.IN_LEFT, transition=Text.Transition.IN_LEFT,
@ -882,9 +894,11 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
ts_h_offs = -480 ts_h_offs = -480
v_offs = 40 v_offs = 40
Text( Text(
bs.Lstr(resource='yourBestScoresText') (
if self._score_type == 'points' bs.Lstr(resource='yourBestScoresText')
else bs.Lstr(resource='yourBestTimesText'), if self._score_type == 'points'
else bs.Lstr(resource='yourBestTimesText')
),
maxwidth=210, maxwidth=210,
position=(ts_h_offs - 10, ts_height / 2 + 25 + v_offs + 20), position=(ts_h_offs - 10, ts_height / 2 + 25 + v_offs + 20),
transition=Text.Transition.IN_RIGHT, transition=Text.Transition.IN_RIGHT,
@ -948,9 +962,11 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
tdelay1 = times[i][0] tdelay1 = times[i][0]
tdelay2 = times[i][1] tdelay2 = times[i][1]
Text( Text(
str(display_scores[i][0]) (
if self._score_type == 'points' str(display_scores[i][0])
else bs.timestring((display_scores[i][0] * 10) / 1000.0), if self._score_type == 'points'
else bs.timestring((display_scores[i][0] * 10) / 1000.0)
),
position=( position=(
ts_h_offs + 20 + h_offs_extra, ts_h_offs + 20 + h_offs_extra,
v_offs_extra v_offs_extra
@ -1127,9 +1143,11 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
tdelay2 = times[i][1] tdelay2 = times[i][1]
if name_str != '-': if name_str != '-':
Text( Text(
str(score) (
if self._score_type == 'points' str(score)
else bs.timestring((score * 10) / 1000.0), if self._score_type == 'points'
else bs.timestring((score * 10) / 1000.0)
),
position=( position=(
ts_h_offs + 20 + h_offs_extra, ts_h_offs + 20 + h_offs_extra,
v_offs_extra v_offs_extra
@ -1313,9 +1331,11 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
if name_str != '-': if name_str != '-':
Text( Text(
str(score) (
if self._score_type == 'points' str(score)
else bs.timestring((score * 10) / 1000.0), if self._score_type == 'points'
else bs.timestring((score * 10) / 1000.0)
),
position=( position=(
ts_h_offs + 20 + h_offs_extra, ts_h_offs + 20 + h_offs_extra,
ts_height / 2 ts_height / 2
@ -1689,17 +1709,22 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
) )
if not self._newly_complete: if not self._newly_complete:
Text( Text(
bs.Lstr( (
value='${A}${B}', bs.Lstr(
subs=[ value='${A}${B}',
('${A}', bs.Lstr(resource='newPersonalBestText')), subs=[
('${B}', was_string), (
], '${A}',
) bs.Lstr(resource='newPersonalBestText'),
if new_best ),
else bs.Lstr( ('${B}', was_string),
resource='bestRatingText', ],
subs=[('${RATING}', str(best_rank))], )
if new_best
else bs.Lstr(
resource='bestRatingText',
subs=[('${RATING}', str(best_rank))],
)
), ),
position=(0, -165), position=(0, -165),
color=(1, 1, 1, 0.7), color=(1, 1, 1, 0.7),
@ -1773,14 +1798,16 @@ class CoopScoreScreen(bs.Activity[bs.Player, bs.Team]):
jitter=1.0, jitter=1.0,
).autoretain() ).autoretain()
Text( Text(
bs.Lstr( (
value='${A}:', bs.Lstr(
subs=[('${A}', bs.Lstr(resource='finalScoreText'))], value='${A}:',
) subs=[('${A}', bs.Lstr(resource='finalScoreText'))],
if self._score_type == 'points' )
else bs.Lstr( if self._score_type == 'points'
value='${A}:', else bs.Lstr(
subs=[('${A}', bs.Lstr(resource='finalTimeText'))], value='${A}:',
subs=[('${A}', bs.Lstr(resource='finalTimeText'))],
)
), ),
maxwidth=300, maxwidth=300,
position=(0, 200), position=(0, 200),

6
src/assets/ba_data/python/bascenev1lib/activity/multiteamscore.py
View File

@ -199,9 +199,9 @@ class MultiTeamScoreScreenActivity(bs.ScoreScreenActivity):
ts_v_offset + (voffs + 15) * scale, ts_v_offset + (voffs + 15) * scale,
), ),
scale=scale, scale=scale,
color=(1.0, 0.9, 0.5, 1.0) color=(
if highlight (1.0, 0.9, 0.5, 1.0) if highlight else (0.5, 0.5, 0.6, 0.5)
else (0.5, 0.5, 0.6, 0.5), ),
h_align=Text.HAlign.RIGHT, h_align=Text.HAlign.RIGHT,
v_align=Text.VAlign.CENTER, v_align=Text.VAlign.CENTER,
maxwidth=maxwidth, maxwidth=maxwidth,

8
src/assets/ba_data/python/bascenev1lib/activity/multiteamvictory.py
View File

@ -374,9 +374,11 @@ class TeamSeriesVictoryScoreScreenActivity(MultiTeamScoreScreenActivity):
tdelay -= 4 * t_incr tdelay -= 4 * t_incr
v_offs -= 40 v_offs -= 40
Text( Text(
str(prec.team.customdata['score']) (
if self._is_ffa str(prec.team.customdata['score'])
else str(prec.score), if self._is_ffa
else str(prec.score)
),
color=(0.5, 0.5, 0.5, 1.0), color=(0.5, 0.5, 0.5, 1.0),
position=(ts_h_offs + 230, ts_height / 2 + v_offs), position=(ts_h_offs + 230, ts_height / 2 + v_offs),
h_align=Text.HAlign.RIGHT, h_align=Text.HAlign.RIGHT,

8
src/assets/ba_data/python/bascenev1lib/actor/controlsguide.py
View File

@ -456,9 +456,11 @@ class ControlsGuide(bs.Actor):
( (
'${B}', '${B}',
bs.Lstr( bs.Lstr(
resource='holdAnyKeyText' resource=(
if all_keyboards 'holdAnyKeyText'
else 'holdAnyButtonText' if all_keyboards
else 'holdAnyButtonText'
)
), ),
), ),
], ],

6
src/assets/ba_data/python/bascenev1lib/actor/playerspaz.py
View File

@ -79,14 +79,12 @@ class PlayerSpaz(Spaz):
@overload @overload
def getplayer( def getplayer(
self, playertype: type[PlayerT], doraise: Literal[False] = False self, playertype: type[PlayerT], doraise: Literal[False] = False
) -> PlayerT | None: ) -> PlayerT | None: ...
...
@overload @overload
def getplayer( def getplayer(
self, playertype: type[PlayerT], doraise: Literal[True] self, playertype: type[PlayerT], doraise: Literal[True]
) -> PlayerT: ) -> PlayerT: ...
...
def getplayer( def getplayer(
self, playertype: type[PlayerT], doraise: bool = False self, playertype: type[PlayerT], doraise: bool = False

1
src/assets/ba_data/python/bascenev1lib/actor/spazbot.py
View File

@ -776,7 +776,6 @@ class ChargerBotPro(ChargerBot):
color = PRO_BOT_COLOR color = PRO_BOT_COLOR
highlight = PRO_BOT_HIGHLIGHT highlight = PRO_BOT_HIGHLIGHT
default_shields = True
default_boxing_gloves = True default_boxing_gloves = True
points_mult = 3 points_mult = 3

8
src/assets/ba_data/python/bascenev1lib/actor/tipstext.py
View File

@ -73,9 +73,11 @@ class TipsText(bs.Actor):
next_tip = bs.Lstr( next_tip = bs.Lstr(
translate=( translate=(
'tips', 'tips',
bs.app.classic.get_next_tip() (
if bs.app.classic is not None bs.app.classic.get_next_tip()
else '', if bs.app.classic is not None
else ''
),
), ),
subs=[('${REMOTE_APP_NAME}', get_remote_app_name())], subs=[('${REMOTE_APP_NAME}', get_remote_app_name())],
) )

30
src/assets/ba_data/python/bascenev1lib/game/capturetheflag.py
View File

@ -529,6 +529,30 @@ class CaptureTheFlagGame(bs.TeamGameActivity[Player, Team]):
if team.flag_return_touches < 0: if team.flag_return_touches < 0:
logging.exception('CTF flag_return_touches < 0') logging.exception('CTF flag_return_touches < 0')
def _handle_death_flag_capture(self, player: Player) -> None:
"""Handles flag values when a player dies or leaves the game."""
# Don't do anything if the player hasn't touched the flag at all.
if not player.touching_own_flag:
return
team = player.team
# For each "point" our player has touched theflag (Could be multiple),
# deduct one from both our player and
# the flag's return touches variable.
for _ in range(player.touching_own_flag):
# Deduct
player.touching_own_flag -= 1
team.flag_return_touches -= 1
# Update our flag's timer accordingly
# (Prevents immediate resets in case
# there might be more people touching it).
if team.flag_return_touches == 0:
team.touch_return_timer = None
team.touch_return_timer_ticking = None
# Safety check, just to be sure!
if team.flag_return_touches < 0:
logging.exception('CTF flag_return_touches < 0')
def _flash_base(self, team: Team, length: float = 2.0) -> None: def _flash_base(self, team: Team, length: float = 2.0) -> None:
light = bs.newnode( light = bs.newnode(
'light', 'light',
@ -591,6 +615,7 @@ class CaptureTheFlagGame(bs.TeamGameActivity[Player, Team]):
def handlemessage(self, msg: Any) -> Any: def handlemessage(self, msg: Any) -> Any:
if isinstance(msg, bs.PlayerDiedMessage): if isinstance(msg, bs.PlayerDiedMessage):
super().handlemessage(msg) # Augment standard behavior. super().handlemessage(msg) # Augment standard behavior.
self._handle_death_flag_capture(msg.getplayer(Player))
self.respawn_player(msg.getplayer(Player)) self.respawn_player(msg.getplayer(Player))
elif isinstance(msg, FlagDiedMessage): elif isinstance(msg, FlagDiedMessage):
@ -617,3 +642,8 @@ class CaptureTheFlagGame(bs.TeamGameActivity[Player, Team]):
else: else:
super().handlemessage(msg) super().handlemessage(msg)
@override
def on_player_leave(self, player: Player) -> None:
"""Prevents leaving players from capturing their flag."""
self._handle_death_flag_capture(player)

383
src/assets/ba_data/python/bascenev1lib/game/onslaught.py
View File

@ -334,29 +334,37 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
Wave( Wave(
base_angle=130, base_angle=130,
entries=[ entries=[
Spawn(BrawlerBotLite, spacing=5) (
if player_count > 1 Spawn(BrawlerBotLite, spacing=5)
else None, if player_count > 1
else None
),
Spawn(BrawlerBotLite, spacing=5), Spawn(BrawlerBotLite, spacing=5),
Spacing(30), Spacing(30),
Spawn(BomberBotLite, spacing=5) (
if player_count > 3 Spawn(BomberBotLite, spacing=5)
else None, if player_count > 3
else None
),
Spawn(BomberBotLite, spacing=5), Spawn(BomberBotLite, spacing=5),
Spacing(30), Spacing(30),
Spawn(BrawlerBotLite, spacing=5), Spawn(BrawlerBotLite, spacing=5),
Spawn(BrawlerBotLite, spacing=5) (
if player_count > 2 Spawn(BrawlerBotLite, spacing=5)
else None, if player_count > 2
else None
),
], ],
), ),
Wave( Wave(
base_angle=195, base_angle=195,
entries=[ entries=[
Spawn(TriggerBot, spacing=90), Spawn(TriggerBot, spacing=90),
Spawn(TriggerBot, spacing=90) (
if player_count > 1 Spawn(TriggerBot, spacing=90)
else None, if player_count > 1
else None
),
], ],
), ),
] ]
@ -367,9 +375,11 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
self._waves = [ self._waves = [
Wave( Wave(
entries=[ entries=[
Spawn(ChargerBot, Point.LEFT_UPPER_MORE) (
if player_count > 2 Spawn(ChargerBot, Point.LEFT_UPPER_MORE)
else None, if player_count > 2
else None
),
Spawn(ChargerBot, Point.LEFT_UPPER), Spawn(ChargerBot, Point.LEFT_UPPER),
] ]
), ),
@ -377,36 +387,50 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
entries=[ entries=[
Spawn(BomberBotStaticLite, Point.TURRET_TOP_RIGHT), Spawn(BomberBotStaticLite, Point.TURRET_TOP_RIGHT),
Spawn(BrawlerBotLite, Point.RIGHT_UPPER), Spawn(BrawlerBotLite, Point.RIGHT_UPPER),
Spawn(BrawlerBotLite, Point.RIGHT_LOWER) (
if player_count > 1 Spawn(BrawlerBotLite, Point.RIGHT_LOWER)
else None, if player_count > 1
Spawn(BomberBotStaticLite, Point.TURRET_BOTTOM_RIGHT) else None
if player_count > 2 ),
else None, (
Spawn(
BomberBotStaticLite, Point.TURRET_BOTTOM_RIGHT
)
if player_count > 2
else None
),
] ]
), ),
Wave( Wave(
entries=[ entries=[
Spawn(BomberBotStaticLite, Point.TURRET_BOTTOM_LEFT), Spawn(BomberBotStaticLite, Point.TURRET_BOTTOM_LEFT),
Spawn(TriggerBot, Point.LEFT), Spawn(TriggerBot, Point.LEFT),
Spawn(TriggerBot, Point.LEFT_LOWER) (
if player_count > 1 Spawn(TriggerBot, Point.LEFT_LOWER)
else None, if player_count > 1
Spawn(TriggerBot, Point.LEFT_UPPER) else None
if player_count > 2 ),
else None, (
Spawn(TriggerBot, Point.LEFT_UPPER)
if player_count > 2
else None
),
] ]
), ),
Wave( Wave(
entries=[ entries=[
Spawn(BrawlerBotLite, Point.TOP_RIGHT), Spawn(BrawlerBotLite, Point.TOP_RIGHT),
Spawn(BrawlerBot, Point.TOP_HALF_RIGHT) (
if player_count > 1 Spawn(BrawlerBot, Point.TOP_HALF_RIGHT)
else None, if player_count > 1
else None
),
Spawn(BrawlerBotLite, Point.TOP_LEFT), Spawn(BrawlerBotLite, Point.TOP_LEFT),
Spawn(BrawlerBotLite, Point.TOP_HALF_LEFT) (
if player_count > 2 Spawn(BrawlerBotLite, Point.TOP_HALF_LEFT)
else None, if player_count > 2
else None
),
Spawn(BrawlerBot, Point.TOP), Spawn(BrawlerBot, Point.TOP),
Spawn(BomberBotStaticLite, Point.TURRET_TOP_MIDDLE), Spawn(BomberBotStaticLite, Point.TURRET_TOP_MIDDLE),
] ]
@ -416,12 +440,16 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
Spawn(TriggerBotStatic, Point.TURRET_BOTTOM_LEFT), Spawn(TriggerBotStatic, Point.TURRET_BOTTOM_LEFT),
Spawn(TriggerBotStatic, Point.TURRET_BOTTOM_RIGHT), Spawn(TriggerBotStatic, Point.TURRET_BOTTOM_RIGHT),
Spawn(TriggerBot, Point.BOTTOM), Spawn(TriggerBot, Point.BOTTOM),
Spawn(TriggerBot, Point.BOTTOM_HALF_RIGHT) (
if player_count > 1 Spawn(TriggerBot, Point.BOTTOM_HALF_RIGHT)
else None, if player_count > 1
Spawn(TriggerBot, Point.BOTTOM_HALF_LEFT) else None
if player_count > 2 ),
else None, (
Spawn(TriggerBot, Point.BOTTOM_HALF_LEFT)
if player_count > 2
else None
),
] ]
), ),
Wave( Wave(
@ -429,12 +457,16 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
Spawn(BomberBotStaticLite, Point.TURRET_TOP_LEFT), Spawn(BomberBotStaticLite, Point.TURRET_TOP_LEFT),
Spawn(BomberBotStaticLite, Point.TURRET_TOP_RIGHT), Spawn(BomberBotStaticLite, Point.TURRET_TOP_RIGHT),
Spawn(ChargerBot, Point.BOTTOM), Spawn(ChargerBot, Point.BOTTOM),
Spawn(ChargerBot, Point.BOTTOM_HALF_LEFT) (
if player_count > 1 Spawn(ChargerBot, Point.BOTTOM_HALF_LEFT)
else None, if player_count > 1
Spawn(ChargerBot, Point.BOTTOM_HALF_RIGHT) else None
if player_count > 2 ),
else None, (
Spawn(ChargerBot, Point.BOTTOM_HALF_RIGHT)
if player_count > 2
else None
),
] ]
), ),
] ]
@ -446,44 +478,62 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
Wave( Wave(
base_angle=-50, base_angle=-50,
entries=[ entries=[
Spawn(BrawlerBot, spacing=12) (
if player_count > 3 Spawn(BrawlerBot, spacing=12)
else None, if player_count > 3
else None
),
Spawn(BrawlerBot, spacing=12), Spawn(BrawlerBot, spacing=12),
Spawn(BomberBot, spacing=6), Spawn(BomberBot, spacing=6),
Spawn(BomberBot, spacing=6) (
if self._preset is Preset.PRO Spawn(BomberBot, spacing=6)
else None, if self._preset is Preset.PRO
Spawn(BomberBot, spacing=6) else None
if player_count > 1 ),
else None, (
Spawn(BomberBot, spacing=6)
if player_count > 1
else None
),
Spawn(BrawlerBot, spacing=12), Spawn(BrawlerBot, spacing=12),
Spawn(BrawlerBot, spacing=12) (
if player_count > 2 Spawn(BrawlerBot, spacing=12)
else None, if player_count > 2
else None
),
], ],
), ),
Wave( Wave(
base_angle=180, base_angle=180,
entries=[ entries=[
Spawn(BrawlerBot, spacing=6) (
if player_count > 3 Spawn(BrawlerBot, spacing=6)
else None, if player_count > 3
Spawn(BrawlerBot, spacing=6) else None
if self._preset is Preset.PRO ),
else None, (
Spawn(BrawlerBot, spacing=6)
if self._preset is Preset.PRO
else None
),
Spawn(BrawlerBot, spacing=6), Spawn(BrawlerBot, spacing=6),
Spawn(ChargerBot, spacing=45), Spawn(ChargerBot, spacing=45),
Spawn(ChargerBot, spacing=45) (
if player_count > 1 Spawn(ChargerBot, spacing=45)
else None, if player_count > 1
else None
),
Spawn(BrawlerBot, spacing=6), Spawn(BrawlerBot, spacing=6),
Spawn(BrawlerBot, spacing=6) (
if self._preset is Preset.PRO Spawn(BrawlerBot, spacing=6)
else None, if self._preset is Preset.PRO
Spawn(BrawlerBot, spacing=6) else None
if player_count > 2 ),
else None, (
Spawn(BrawlerBot, spacing=6)
if player_count > 2
else None
),
], ],
), ),
Wave( Wave(
@ -492,15 +542,21 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
Spawn(ChargerBot, spacing=30), Spawn(ChargerBot, spacing=30),
Spawn(TriggerBot, spacing=30), Spawn(TriggerBot, spacing=30),
Spawn(TriggerBot, spacing=30), Spawn(TriggerBot, spacing=30),
Spawn(TriggerBot, spacing=30) (
if self._preset is Preset.PRO Spawn(TriggerBot, spacing=30)
else None, if self._preset is Preset.PRO
Spawn(TriggerBot, spacing=30) else None
if player_count > 1 ),
else None, (
Spawn(TriggerBot, spacing=30) Spawn(TriggerBot, spacing=30)
if player_count > 3 if player_count > 1
else None, else None
),
(
Spawn(TriggerBot, spacing=30)
if player_count > 3
else None
),
Spawn(ChargerBot, spacing=30), Spawn(ChargerBot, spacing=30),
], ],
), ),
@ -508,16 +564,22 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
base_angle=90, base_angle=90,
entries=[ entries=[
Spawn(StickyBot, spacing=50), Spawn(StickyBot, spacing=50),
Spawn(StickyBot, spacing=50) (
if self._preset is Preset.PRO Spawn(StickyBot, spacing=50)
else None, if self._preset is Preset.PRO
else None
),
Spawn(StickyBot, spacing=50), Spawn(StickyBot, spacing=50),
Spawn(StickyBot, spacing=50) (
if player_count > 1 Spawn(StickyBot, spacing=50)
else None, if player_count > 1
Spawn(StickyBot, spacing=50) else None
if player_count > 3 ),
else None, (
Spawn(StickyBot, spacing=50)
if player_count > 3
else None
),
], ],
), ),
Wave( Wave(
@ -525,14 +587,18 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
entries=[ entries=[
Spawn(TriggerBot, spacing=72), Spawn(TriggerBot, spacing=72),
Spawn(TriggerBot, spacing=72), Spawn(TriggerBot, spacing=72),
Spawn(TriggerBot, spacing=72) (
if self._preset is Preset.PRO Spawn(TriggerBot, spacing=72)
else None, if self._preset is Preset.PRO
else None
),
Spawn(TriggerBot, spacing=72), Spawn(TriggerBot, spacing=72),
Spawn(TriggerBot, spacing=72), Spawn(TriggerBot, spacing=72),
Spawn(TriggerBot, spacing=36) (
if player_count > 2 Spawn(TriggerBot, spacing=36)
else None, if player_count > 2
else None
),
], ],
), ),
Wave( Wave(
@ -540,15 +606,21 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
entries=[ entries=[
Spawn(ChargerBotProShielded, spacing=50), Spawn(ChargerBotProShielded, spacing=50),
Spawn(ChargerBotProShielded, spacing=50), Spawn(ChargerBotProShielded, spacing=50),
Spawn(ChargerBotProShielded, spacing=50) (
if self._preset is Preset.PRO Spawn(ChargerBotProShielded, spacing=50)
else None, if self._preset is Preset.PRO
Spawn(ChargerBotProShielded, spacing=50) else None
if player_count > 1 ),
else None, (
Spawn(ChargerBotProShielded, spacing=50) Spawn(ChargerBotProShielded, spacing=50)
if player_count > 2 if player_count > 1
else None, else None
),
(
Spawn(ChargerBotProShielded, spacing=50)
if player_count > 2
else None
),
], ],
), ),
] ]
@ -566,15 +638,21 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
self._waves = [ self._waves = [
Wave( Wave(
entries=[ entries=[
Spawn(BomberBotProStatic, Point.TURRET_TOP_MIDDLE_LEFT) (
if hard Spawn(
else None, BomberBotProStatic, Point.TURRET_TOP_MIDDLE_LEFT
)
if hard
else None
),
Spawn( Spawn(
BomberBotProStatic, Point.TURRET_TOP_MIDDLE_RIGHT BomberBotProStatic, Point.TURRET_TOP_MIDDLE_RIGHT
), ),
Spawn(BomberBotProStatic, Point.TURRET_TOP_LEFT) (
if player_count > 2 Spawn(BomberBotProStatic, Point.TURRET_TOP_LEFT)
else None, if player_count > 2
else None
),
Spawn(ExplodeyBot, Point.TOP_RIGHT), Spawn(ExplodeyBot, Point.TOP_RIGHT),
Delay(4.0), Delay(4.0),
Spawn(ExplodeyBot, Point.TOP_LEFT), Spawn(ExplodeyBot, Point.TOP_LEFT),
@ -584,9 +662,11 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
entries=[ entries=[
Spawn(ChargerBot, Point.LEFT), Spawn(ChargerBot, Point.LEFT),
Spawn(ChargerBot, Point.RIGHT), Spawn(ChargerBot, Point.RIGHT),
Spawn(ChargerBot, Point.RIGHT_UPPER_MORE) (
if player_count > 2 Spawn(ChargerBot, Point.RIGHT_UPPER_MORE)
else None, if player_count > 2
else None
),
Spawn(BomberBotProStatic, Point.TURRET_TOP_LEFT), Spawn(BomberBotProStatic, Point.TURRET_TOP_LEFT),
Spawn(BomberBotProStatic, Point.TURRET_TOP_RIGHT), Spawn(BomberBotProStatic, Point.TURRET_TOP_RIGHT),
] ]
@ -594,29 +674,39 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
Wave( Wave(
entries=[ entries=[
Spawn(TriggerBotPro, Point.TOP_RIGHT), Spawn(TriggerBotPro, Point.TOP_RIGHT),
Spawn(TriggerBotPro, Point.RIGHT_UPPER_MORE) (
if player_count > 1 Spawn(TriggerBotPro, Point.RIGHT_UPPER_MORE)
else None, if player_count > 1
else None
),
Spawn(TriggerBotPro, Point.RIGHT_UPPER), Spawn(TriggerBotPro, Point.RIGHT_UPPER),
Spawn(TriggerBotPro, Point.RIGHT_LOWER) (
if hard Spawn(TriggerBotPro, Point.RIGHT_LOWER)
else None, if hard
Spawn(TriggerBotPro, Point.RIGHT_LOWER_MORE) else None
if player_count > 2 ),
else None, (
Spawn(TriggerBotPro, Point.RIGHT_LOWER_MORE)
if player_count > 2
else None
),
Spawn(TriggerBotPro, Point.BOTTOM_RIGHT), Spawn(TriggerBotPro, Point.BOTTOM_RIGHT),
] ]
), ),
Wave( Wave(
entries=[ entries=[
Spawn(ChargerBotProShielded, Point.BOTTOM_RIGHT), Spawn(ChargerBotProShielded, Point.BOTTOM_RIGHT),
Spawn(ChargerBotProShielded, Point.BOTTOM) (
if player_count > 2 Spawn(ChargerBotProShielded, Point.BOTTOM)
else None, if player_count > 2
else None
),
Spawn(ChargerBotProShielded, Point.BOTTOM_LEFT), Spawn(ChargerBotProShielded, Point.BOTTOM_LEFT),
Spawn(ChargerBotProShielded, Point.TOP) (
if hard Spawn(ChargerBotProShielded, Point.TOP)
else None, if hard
else None
),
Spawn(BomberBotProStatic, Point.TURRET_TOP_MIDDLE), Spawn(BomberBotProStatic, Point.TURRET_TOP_MIDDLE),
] ]
), ),
@ -643,12 +733,21 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
Spawn(BomberBotProStatic, Point.TURRET_TOP_RIGHT), Spawn(BomberBotProStatic, Point.TURRET_TOP_RIGHT),
Spawn(BomberBotProStatic, Point.TURRET_BOTTOM_LEFT), Spawn(BomberBotProStatic, Point.TURRET_BOTTOM_LEFT),
Spawn(BomberBotProStatic, Point.TURRET_BOTTOM_RIGHT), Spawn(BomberBotProStatic, Point.TURRET_BOTTOM_RIGHT),
Spawn(BomberBotProStatic, Point.TURRET_TOP_MIDDLE_LEFT) (
if hard Spawn(
else None, BomberBotProStatic, Point.TURRET_TOP_MIDDLE_LEFT
Spawn(BomberBotProStatic, Point.TURRET_TOP_MIDDLE_RIGHT) )
if hard if hard
else None, else None
),
(
Spawn(
BomberBotProStatic,
Point.TURRET_TOP_MIDDLE_RIGHT,
)
if hard
else None
),
] ]
), ),
] ]
@ -667,12 +766,14 @@ class OnslaughtGame(bs.CoopGameActivity[Player, Team]):
# Spit out a few powerups and start dropping more shortly. # Spit out a few powerups and start dropping more shortly.
self._drop_powerups( self._drop_powerups(
standard_points=True, standard_points=True,
poweruptype='curse' poweruptype=(
if self._preset in [Preset.UBER, Preset.UBER_EASY] 'curse'
else ( if self._preset in [Preset.UBER, Preset.UBER_EASY]
'land_mines' else (
if self._preset in [Preset.ROOKIE, Preset.ROOKIE_EASY] 'land_mines'
else None if self._preset in [Preset.ROOKIE, Preset.ROOKIE_EASY]
else None
)
), ),
) )
bs.timer(4.0, self._start_powerup_drops) bs.timer(4.0, self._start_powerup_drops)

8
src/assets/ba_data/python/bascenev1lib/game/race.py
View File

@ -778,9 +778,11 @@ class RaceGame(bs.TeamGameActivity[Player, Team]):
assert self._timer is not None assert self._timer is not None
if self._timer.has_started(): if self._timer.has_started():
self._timer.stop( self._timer.stop(
endtime=None endtime=(
if self._last_team_time is None None
else (self._timer.getstarttime() + self._last_team_time) if self._last_team_time is None
else (self._timer.getstarttime() + self._last_team_time)
)
) )
results = bs.GameResults() results = bs.GameResults()

104
src/assets/ba_data/python/bascenev1lib/game/runaround.py
View File

@ -279,9 +279,11 @@ class RunaroundGame(bs.CoopGameActivity[Player, Team]):
Spacing(duration=1.0), Spacing(duration=1.0),
Spawn(TriggerBot, path=3), Spawn(TriggerBot, path=3),
Spacing(duration=1.0), Spacing(duration=1.0),
Spawn(TriggerBot, path=1) (
if (player_count > 1 and hard) Spawn(TriggerBot, path=1)
else None, if (player_count > 1 and hard)
else None
),
Spacing(duration=1.0), Spacing(duration=1.0),
Spawn(TriggerBot, path=2) if player_count > 2 else None, Spawn(TriggerBot, path=2) if player_count > 2 else None,
Spacing(duration=1.0), Spacing(duration=1.0),
@ -320,17 +322,23 @@ class RunaroundGame(bs.CoopGameActivity[Player, Team]):
Spacing(duration=1.5), Spacing(duration=1.5),
Spawn(BomberBotProShielded, path=1) if hard else None, Spawn(BomberBotProShielded, path=1) if hard else None,
Spacing(duration=1.5) if hard else None, Spacing(duration=1.5) if hard else None,
Spawn(BomberBotProShielded, path=3) (
if player_count > 1 Spawn(BomberBotProShielded, path=3)
else None, if player_count > 1
else None
),
Spacing(duration=1.5), Spacing(duration=1.5),
Spawn(BomberBotProShielded, path=2) (
if player_count > 2 Spawn(BomberBotProShielded, path=2)
else None, if player_count > 2
else None
),
Spacing(duration=1.5), Spacing(duration=1.5),
Spawn(BomberBotProShielded, path=1) (
if player_count > 3 Spawn(BomberBotProShielded, path=1)
else None, if player_count > 3
else None
),
] ]
), ),
] ]
@ -352,9 +360,11 @@ class RunaroundGame(bs.CoopGameActivity[Player, Team]):
BrawlerBotPro if hard else BrawlerBot, BrawlerBotPro if hard else BrawlerBot,
point=Point.BOTTOM_LEFT, point=Point.BOTTOM_LEFT,
), ),
Spawn(BrawlerBotPro, point=Point.BOTTOM_RIGHT) (
if player_count > 2 Spawn(BrawlerBotPro, point=Point.BOTTOM_RIGHT)
else None, if player_count > 2
else None
),
] ]
), ),
Wave( Wave(
@ -375,9 +385,11 @@ class RunaroundGame(bs.CoopGameActivity[Player, Team]):
Spawn(BomberBotProShielded, path=3), Spawn(BomberBotProShielded, path=3),
Spawn(BomberBotProShielded, path=3), Spawn(BomberBotProShielded, path=3),
Spawn(ChargerBot, point=Point.BOTTOM_RIGHT), Spawn(ChargerBot, point=Point.BOTTOM_RIGHT),
Spawn(ChargerBot, point=Point.BOTTOM_LEFT) (
if player_count > 2 Spawn(ChargerBot, point=Point.BOTTOM_LEFT)
else None, if player_count > 2
else None
),
] ]
), ),
Wave( Wave(
@ -388,12 +400,16 @@ class RunaroundGame(bs.CoopGameActivity[Player, Team]):
Spawn(TriggerBotPro, path=1 if hard else 2), Spawn(TriggerBotPro, path=1 if hard else 2),
Spawn(TriggerBotPro, path=1 if hard else 2), Spawn(TriggerBotPro, path=1 if hard else 2),
Spawn(TriggerBotPro, path=1 if hard else 2), Spawn(TriggerBotPro, path=1 if hard else 2),
Spawn(TriggerBotPro, path=1 if hard else 2) (
if player_count > 1 Spawn(TriggerBotPro, path=1 if hard else 2)
else None, if player_count > 1
Spawn(TriggerBotPro, path=1 if hard else 2) else None
if player_count > 3 ),
else None, (
Spawn(TriggerBotPro, path=1 if hard else 2)
if player_count > 3
else None
),
] ]
), ),
Wave( Wave(
@ -402,12 +418,20 @@ class RunaroundGame(bs.CoopGameActivity[Player, Team]):
TriggerBotProShielded if hard else TriggerBotPro, TriggerBotProShielded if hard else TriggerBotPro,
point=Point.BOTTOM_LEFT, point=Point.BOTTOM_LEFT,
), ),
Spawn(TriggerBotProShielded, point=Point.BOTTOM_RIGHT) (
if hard Spawn(
else None, TriggerBotProShielded, point=Point.BOTTOM_RIGHT
Spawn(TriggerBotProShielded, point=Point.BOTTOM_RIGHT) )
if player_count > 2 if hard
else None, else None
),
(
Spawn(
TriggerBotProShielded, point=Point.BOTTOM_RIGHT
)
if player_count > 2
else None
),
Spawn(BomberBot, path=3), Spawn(BomberBot, path=3),
Spawn(BomberBot, path=3), Spawn(BomberBot, path=3),
Spacing(duration=5.0), Spacing(duration=5.0),
@ -425,15 +449,19 @@ class RunaroundGame(bs.CoopGameActivity[Player, Team]):
Spawn(StickyBot, point=Point.BOTTOM_RIGHT), Spawn(StickyBot, point=Point.BOTTOM_RIGHT),
Spawn(BomberBotProShielded, path=2), Spawn(BomberBotProShielded, path=2),
Spawn(BomberBotProShielded, path=2), Spawn(BomberBotProShielded, path=2),
Spawn(StickyBot, point=Point.BOTTOM_RIGHT) (
if player_count > 2 Spawn(StickyBot, point=Point.BOTTOM_RIGHT)
else None, if player_count > 2
else None
),
Spawn(BomberBotProShielded, path=2), Spawn(BomberBotProShielded, path=2),
Spawn(ExplodeyBot, point=Point.BOTTOM_LEFT), Spawn(ExplodeyBot, point=Point.BOTTOM_LEFT),
Spawn(BomberBotProShielded, path=2), Spawn(BomberBotProShielded, path=2),
Spawn(BomberBotProShielded, path=2) (
if player_count > 1 Spawn(BomberBotProShielded, path=2)
else None, if player_count > 1
else None
),
Spacing(duration=5.0), Spacing(duration=5.0),
Spawn(StickyBot, point=Point.BOTTOM_LEFT), Spawn(StickyBot, point=Point.BOTTOM_LEFT),
Spacing(duration=2.0), Spacing(duration=2.0),
@ -461,9 +489,7 @@ class RunaroundGame(bs.CoopGameActivity[Player, Team]):
l_offs = ( l_offs = (
-80 -80
if uiscale is bs.UIScale.SMALL if uiscale is bs.UIScale.SMALL
else -40 else -40 if uiscale is bs.UIScale.MEDIUM else 0
if uiscale is bs.UIScale.MEDIUM
else 0
) )
self._lives_bg = bs.NodeActor( self._lives_bg = bs.NodeActor(

14
src/assets/ba_data/python/bascenev1lib/game/targetpractice.py
View File

@ -321,11 +321,15 @@ class Target(bs.Actor):
bs.getsound( bs.getsound(
'orchestraHit4' 'orchestraHit4'
if streak > 3 if streak > 3
else 'orchestraHit3' else (
if streak > 2 'orchestraHit3'
else 'orchestraHit2' if streak > 2
if streak > 1 else (
else 'orchestraHit' 'orchestraHit2'
if streak > 1
else 'orchestraHit'
)
)
).play() ).play()
elif dist <= self._r2 + self._rfudge: elif dist <= self._r2 + self._rfudge:
self._nodes[0].color = cdull self._nodes[0].color = cdull

4
src/assets/ba_data/python/bauiv1/_uitypes.py
View File

@ -164,9 +164,7 @@ class UIController:
entrynew = ( entrynew = (
self._dialog_stack[-1] self._dialog_stack[-1]
if self._dialog_stack if self._dialog_stack
else self._main_stack[-1] else self._main_stack[-1] if self._main_stack else None
if self._main_stack
else None
) )
if entrynew is not None: if entrynew is not None:
entrynew.create() entrynew.create()

22
src/assets/ba_data/python/bauiv1/onscreenkeyboard.py
View File

@ -41,15 +41,13 @@ class OnScreenKeyboardWindow(Window):
scale=( scale=(
2.0 2.0
if uiscale is babase.UIScale.SMALL if uiscale is babase.UIScale.SMALL
else 1.5 else 1.5 if uiscale is babase.UIScale.MEDIUM else 1.0
if uiscale is babase.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, 0)
if uiscale is babase.UIScale.SMALL
else (0, 0) if uiscale is babase.UIScale.MEDIUM else (0, 0)
), ),
stack_offset=(0, 0)
if uiscale is babase.UIScale.SMALL
else (0, 0)
if uiscale is babase.UIScale.MEDIUM
else (0, 0),
) )
) )
self._cancel_button = _bauiv1.buttonwidget( self._cancel_button = _bauiv1.buttonwidget(
@ -300,9 +298,11 @@ class OnScreenKeyboardWindow(Window):
chars = [c.upper() for c in chars] chars = [c.upper() for c in chars]
_bauiv1.buttonwidget( _bauiv1.buttonwidget(
edit=self._shift_button, edit=self._shift_button,
color=self._key_color_lit color=(
if self._mode == 'caps' self._key_color_lit
else self._key_color_dark, if self._mode == 'caps'
else self._key_color_dark
),
label=babase.charstr(babase.SpecialChar.SHIFT), label=babase.charstr(babase.SpecialChar.SHIFT),
on_activate_call=self._shift, on_activate_call=self._shift,
) )

14
src/assets/ba_data/python/bauiv1lib/account/link.py
View File

@ -38,9 +38,7 @@ class AccountLinkWindow(bui.Window):
base_scale = ( base_scale = (
1.65 1.65
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.5 else 1.5 if uiscale is bui.UIScale.MEDIUM else 1.1
if uiscale is bui.UIScale.MEDIUM
else 1.1
) )
super().__init__( super().__init__(
root_widget=bui.containerwidget( root_widget=bui.containerwidget(
@ -48,9 +46,9 @@ class AccountLinkWindow(bui.Window):
transition=transition, transition=transition,
scale=base_scale, scale=base_scale,
scale_origin_stack_offset=scale_origin, scale_origin_stack_offset=scale_origin,
stack_offset=(0, -10) stack_offset=(
if uiscale is bui.UIScale.SMALL (0, -10) if uiscale is bui.UIScale.SMALL else (0, 0)
else (0, 0), ),
) )
) )
self._cancel_button = bui.buttonwidget( self._cancel_button = bui.buttonwidget(
@ -159,9 +157,7 @@ class AccountLinkCodeWindow(bui.Window):
scale=( scale=(
1.8 1.8
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.35 else 1.35 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
) )
) )

20
src/assets/ba_data/python/bauiv1lib/account/settings.py
View File

@ -74,9 +74,7 @@ class AccountSettingsWindow(bui.Window):
self._height = ( self._height = (
390 390
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 430 else 430 if uiscale is bui.UIScale.MEDIUM else 490
if uiscale is bui.UIScale.MEDIUM
else 490
) )
self._sign_in_button = None self._sign_in_button = None
@ -112,13 +110,11 @@ class AccountSettingsWindow(bui.Window):
scale=( scale=(
2.09 2.09
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.4 else 1.4 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -19) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -19)
if uiscale is bui.UIScale.SMALL
else (0, 0),
) )
) )
if uiscale is bui.UIScale.SMALL and app.ui_v1.use_toolbars: if uiscale is bui.UIScale.SMALL and app.ui_v1.use_toolbars:
@ -928,9 +924,9 @@ class AccountSettingsWindow(bui.Window):
if gpgs_active if gpgs_active
else 'achievementsIcon' else 'achievementsIcon'
), ),
icon_color=(0.8, 0.95, 0.7) icon_color=(
if gpgs_active (0.8, 0.95, 0.7) if gpgs_active else (0.85, 0.8, 0.9)
else (0.85, 0.8, 0.9), ),
on_activate_call=( on_activate_call=(
self._on_custom_achievements_press self._on_custom_achievements_press
if gpgs_active if gpgs_active

10
src/assets/ba_data/python/bauiv1lib/account/unlink.py
View File

@ -39,9 +39,7 @@ class AccountUnlinkWindow(bui.Window):
base_scale = ( base_scale = (
2.0 2.0
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.6 else 1.6 if uiscale is bui.UIScale.MEDIUM else 1.1
if uiscale is bui.UIScale.MEDIUM
else 1.1
) )
super().__init__( super().__init__(
root_widget=bui.containerwidget( root_widget=bui.containerwidget(
@ -49,9 +47,9 @@ class AccountUnlinkWindow(bui.Window):
transition=transition, transition=transition,
scale=base_scale, scale=base_scale,
scale_origin_stack_offset=scale_origin, scale_origin_stack_offset=scale_origin,
stack_offset=(0, -10) stack_offset=(
if uiscale is bui.UIScale.SMALL (0, -10) if uiscale is bui.UIScale.SMALL else (0, 0)
else (0, 0), ),
) )
) )
self._cancel_button = bui.buttonwidget( self._cancel_button = bui.buttonwidget(

4
src/assets/ba_data/python/bauiv1lib/account/v2proxy.py
View File

@ -34,9 +34,7 @@ class V2ProxySignInWindow(bui.Window):
scale=( scale=(
1.25 1.25
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.05 else 1.05 if uiscale is bui.UIScale.MEDIUM else 0.9
if uiscale is bui.UIScale.MEDIUM
else 0.9
), ),
) )
) )

12
src/assets/ba_data/python/bauiv1lib/account/viewer.py
View File

@ -43,9 +43,7 @@ class AccountViewerWindow(PopupWindow):
scale = ( scale = (
2.6 2.6
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.8 else 1.8 if uiscale is bui.UIScale.MEDIUM else 1.4
if uiscale is bui.UIScale.MEDIUM
else 1.4
) )
self._transitioning_out = False self._transitioning_out = False
@ -53,9 +51,7 @@ class AccountViewerWindow(PopupWindow):
self._height = ( self._height = (
300 300
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 400 else 400 if uiscale is bui.UIScale.MEDIUM else 450
if uiscale is bui.UIScale.MEDIUM
else 450
) )
self._subcontainer: bui.Widget | None = None self._subcontainer: bui.Widget | None = None
@ -186,9 +182,7 @@ class AccountViewerWindow(PopupWindow):
scale=( scale=(
2.3 2.3
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.65 else 1.65 if uiscale is bui.UIScale.MEDIUM else 1.23
if uiscale is bui.UIScale.MEDIUM
else 1.23
), ),
choices=choices, choices=choices,
choices_display=choices_display, choices_display=choices_display,

24
src/assets/ba_data/python/bauiv1lib/achievements.py
View File

@ -23,18 +23,14 @@ class AchievementsWindow(PopupWindow):
scale = ( scale = (
2.3 2.3
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.65 else 1.65 if uiscale is bui.UIScale.MEDIUM else 1.23
if uiscale is bui.UIScale.MEDIUM
else 1.23
) )
self._transitioning_out = False self._transitioning_out = False
self._width = 450 self._width = 450
self._height = ( self._height = (
300 300
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 370 else 370 if uiscale is bui.UIScale.MEDIUM else 450
if uiscale is bui.UIScale.MEDIUM
else 450
) )
bg_color = (0.5, 0.4, 0.6) bg_color = (0.5, 0.4, 0.6)
@ -126,9 +122,11 @@ class AchievementsWindow(PopupWindow):
bui.imagewidget( bui.imagewidget(
parent=self._subcontainer, parent=self._subcontainer,
position=(sub_width * 0.10 + 1, sub_height - 20 - incr * i - 9) position=(
if complete (sub_width * 0.10 + 1, sub_height - 20 - incr * i - 9)
else (sub_width * 0.10 - 4, sub_height - 20 - incr * i - 14), if complete
else (sub_width * 0.10 - 4, sub_height - 20 - incr * i - 14)
),
size=(18, 18) if complete else (27, 27), size=(18, 18) if complete else (27, 27),
opacity=1.0 if complete else 0.3, opacity=1.0 if complete else 0.3,
color=ach.get_icon_color(complete)[:3], color=ach.get_icon_color(complete)[:3],
@ -167,9 +165,11 @@ class AchievementsWindow(PopupWindow):
flatness=1.0, flatness=1.0,
shadow=0.0, shadow=0.0,
color=(0.83, 0.8, 0.85) if complete else (0.8, 0.8, 0.8, 0.2), color=(0.83, 0.8, 0.85) if complete else (0.8, 0.8, 0.8, 0.2),
text=ach.description_full_complete text=(
if complete ach.description_full_complete
else ach.description_full, if complete
else ach.description_full
),
size=(0, 0), size=(0, 0),
h_align='left', h_align='left',
v_align='center', v_align='center',

4
src/assets/ba_data/python/bauiv1lib/appinvite.py
View File

@ -31,9 +31,7 @@ class ShowFriendCodeWindow(bui.Window):
scale=( scale=(
1.7 1.7
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.35 else 1.35 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
) )
) )

4
src/assets/ba_data/python/bauiv1lib/characterpicker.py
View File

@ -41,9 +41,7 @@ class CharacterPicker(PopupWindow):
scale = ( scale = (
1.85 1.85
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.65 else 1.65 if uiscale is bui.UIScale.MEDIUM else 1.23
if uiscale is bui.UIScale.MEDIUM
else 1.23
) )
self._delegate = delegate self._delegate = delegate

8
src/assets/ba_data/python/bauiv1lib/colorpicker.py
View File

@ -43,9 +43,7 @@ class ColorPicker(PopupWindow):
scale = ( scale = (
2.3 2.3
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.65 else 1.65 if uiscale is bui.UIScale.MEDIUM else 1.23
if uiscale is bui.UIScale.MEDIUM
else 1.23
) )
self._parent = parent self._parent = parent
self._position = position self._position = position
@ -206,9 +204,7 @@ class ColorPickerExact(PopupWindow):
scale = ( scale = (
2.3 2.3
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.65 else 1.65 if uiscale is bui.UIScale.MEDIUM else 1.23
if uiscale is bui.UIScale.MEDIUM
else 1.23
) )
self._delegate = delegate self._delegate = delegate
self._transitioning_out = False self._transitioning_out = False

10
src/assets/ba_data/python/bauiv1lib/config.py
View File

@ -94,6 +94,8 @@ class ConfigNumberEdit:
changesound: bool = True, changesound: bool = True,
textscale: float = 1.0, textscale: float = 1.0,
as_percent: bool = False, as_percent: bool = False,
fallback_value: float = 0.0,
f: int = 1,
): ):
if displayname is None: if displayname is None:
displayname = configkey displayname = configkey
@ -103,8 +105,12 @@ class ConfigNumberEdit:
self._maxval = maxval self._maxval = maxval
self._increment = increment self._increment = increment
self._callback = callback self._callback = callback
self._value = bui.app.config.resolve(configkey) try:
self._value = bui.app.config.resolve(configkey)
except ValueError:
self._value = bui.app.config.get(configkey, fallback_value)
self._as_percent = as_percent self._as_percent = as_percent
self._f = f
self.nametext = bui.textwidget( self.nametext = bui.textwidget(
parent=parent, parent=parent,
@ -171,5 +177,5 @@ class ConfigNumberEdit:
if self._as_percent: if self._as_percent:
val = f'{round(self._value*100.0)}%' val = f'{round(self._value*100.0)}%'
else: else:
val = f'{self._value:.1f}' val = f'{self._value:.{self._f}f}'
bui.textwidget(edit=self.valuetext, text=val) bui.textwidget(edit=self.valuetext, text=val)

12
src/assets/ba_data/python/bauiv1lib/confirm.py
View File

@ -61,9 +61,7 @@ class ConfirmWindow:
scale=( scale=(
2.1 2.1
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.5 else 1.5 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
scale_origin_stack_offset=scale_origin, scale_origin_stack_offset=scale_origin,
) )
@ -187,8 +185,10 @@ class QuitWindow:
resource=quit_resource, resource=quit_resource,
subs=[('${APP_NAME}', bui.Lstr(resource='titleText'))], subs=[('${APP_NAME}', bui.Lstr(resource='titleText'))],
), ),
lambda: bui.quit(confirm=False, quit_type=self._quit_type) lambda: (
if self._quit_type is not None bui.quit(confirm=False, quit_type=self._quit_type)
else bui.quit(confirm=False), if self._quit_type is not None
else bui.quit(confirm=False)
),
origin_widget=origin_widget, origin_widget=origin_widget,
).root_widget ).root_widget

12
src/assets/ba_data/python/bauiv1lib/coop/gamebutton.py
View File

@ -148,9 +148,11 @@ class GameButton:
draw_controller=btn, draw_controller=btn,
position=(xach, yach), position=(xach, yach),
size=(a_scale, a_scale), size=(a_scale, a_scale),
color=tuple(ach.get_icon_color(a_complete)[:3]) color=(
if a_complete tuple(ach.get_icon_color(a_complete)[:3])
else (1.2, 1.2, 1.2), if a_complete
else (1.2, 1.2, 1.2)
),
texture=ach.get_icon_ui_texture(a_complete), texture=ach.get_icon_ui_texture(a_complete),
) )
imw2 = bui.imagewidget( imw2 = bui.imagewidget(
@ -307,8 +309,6 @@ class GameButton:
opacity=( opacity=(
1.0 1.0
if (a_complete and unlocked) if (a_complete and unlocked)
else 0.2 else 0.2 if a_complete else 0.0
if a_complete
else 0.0
), ),
) )

4
src/assets/ba_data/python/bauiv1lib/coop/level.py
View File

@ -23,9 +23,7 @@ class CoopLevelLockedWindow(bui.Window):
scale=( scale=(
1.7 1.7
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.3 else 1.3 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
) )
) )

36
src/assets/ba_data/python/bauiv1lib/coop/tournamentbutton.py
View File

@ -417,9 +417,7 @@ class TournamentButton:
prize_y_offs = ( prize_y_offs = (
34 34
if 'prizeRange3' in entry if 'prizeRange3' in entry
else 20 else 20 if 'prizeRange2' in entry else 12
if 'prizeRange2' in entry
else 12
) )
x_offs = 90 x_offs = 90
@ -460,9 +458,11 @@ class TournamentButton:
bui.textwidget( bui.textwidget(
edit=self.prize_value_1_text, edit=self.prize_value_1_text,
text='-' if pv1 == '' else pv1, text='-' if pv1 == '' else pv1,
scale=prize_value_scale_large scale=(
if ticket_char not in pv1 prize_value_scale_large
else prize_value_scale_small, if ticket_char not in pv1
else prize_value_scale_small
),
position=( position=(
self.button_x + 380 + x_offs, self.button_x + 380 + x_offs,
self.button_y + self.button_scale_y - 93 + prize_y_offs, self.button_y + self.button_scale_y - 93 + prize_y_offs,
@ -480,9 +480,11 @@ class TournamentButton:
bui.textwidget( bui.textwidget(
edit=self.prize_value_2_text, edit=self.prize_value_2_text,
text=pv2, text=pv2,
scale=prize_value_scale_large scale=(
if ticket_char not in pv2 prize_value_scale_large
else prize_value_scale_small, if ticket_char not in pv2
else prize_value_scale_small
),
position=( position=(
self.button_x + 380 + x_offs, self.button_x + 380 + x_offs,
self.button_y + self.button_scale_y - 93 - 45 + prize_y_offs, self.button_y + self.button_scale_y - 93 - 45 + prize_y_offs,
@ -500,9 +502,11 @@ class TournamentButton:
bui.textwidget( bui.textwidget(
edit=self.prize_value_3_text, edit=self.prize_value_3_text,
text=pv3, text=pv3,
scale=prize_value_scale_large scale=(
if ticket_char not in pv3 prize_value_scale_large
else prize_value_scale_small, if ticket_char not in pv3
else prize_value_scale_small
),
position=( position=(
self.button_x + 380 + x_offs, self.button_x + 380 + x_offs,
self.button_y + self.button_scale_y - 93 - 90 + prize_y_offs, self.button_y + self.button_scale_y - 93 - 90 + prize_y_offs,
@ -667,9 +671,11 @@ class TournamentButton:
self.button_x + 360, self.button_x + 360,
self.button_y + self.button_scale_y - 146, self.button_y + self.button_scale_y - 146,
), ),
text='' text=(
if ad_tries_remaining in [None, 0] ''
else ('' + str(ad_tries_remaining)), if ad_tries_remaining in [None, 0]
else ('' + str(ad_tries_remaining))
),
color=(0.6, 0.6, 0.6, 1 if ads_enabled else 0.2), color=(0.6, 0.6, 0.6, 1 if ads_enabled else 0.2),
) )
else: else:

10
src/assets/ba_data/python/bauiv1lib/creditslist.py
View File

@ -51,13 +51,11 @@ class CreditsListWindow(bui.Window):
scale=( scale=(
2.0 2.0
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.3 else 1.3 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -8) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -8)
if uiscale is bui.UIScale.SMALL
else (0, 0),
) )
) )

14
src/assets/ba_data/python/bauiv1lib/debug.py
View File

@ -25,9 +25,7 @@ class DebugWindow(bui.Window):
self._height = height = ( self._height = height = (
350 350
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 420 else 420 if uiscale is bui.UIScale.MEDIUM else 520
if uiscale is bui.UIScale.MEDIUM
else 520
) )
self._scroll_width = self._width - 100 self._scroll_width = self._width - 100
@ -50,13 +48,11 @@ class DebugWindow(bui.Window):
scale=( scale=(
2.35 2.35
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.55 else 1.55 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -30) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -30)
if uiscale is bui.UIScale.SMALL
else (0, 0),
) )
) )

4
src/assets/ba_data/python/bauiv1lib/discord.py
View File

@ -45,9 +45,7 @@ class DiscordWindow(bui.Window):
scale=( scale=(
1.6 1.6
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.3 else 1.3 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
stack_offset=(0, 5) if uiscale is bui.UIScale.SMALL else (0, 0), stack_offset=(0, 5) if uiscale is bui.UIScale.SMALL else (0, 0),
) )

4
src/assets/ba_data/python/bauiv1lib/feedback.py
View File

@ -33,9 +33,7 @@ def ask_for_rating() -> bui.Widget | None:
scale=( scale=(
1.6 1.6
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.35 else 1.35 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
) )
v = height - 50 v = height - 50

32
src/assets/ba_data/python/bauiv1lib/fileselector.py
View File

@ -57,13 +57,11 @@ class FileSelectorWindow(bui.Window):
scale=( scale=(
2.23 2.23
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.4 else 1.4 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -35) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -35)
if uiscale is bui.UIScale.SMALL
else (0, 0),
) )
) )
bui.textwidget( bui.textwidget(
@ -73,11 +71,15 @@ class FileSelectorWindow(bui.Window):
color=bui.app.ui_v1.title_color, color=bui.app.ui_v1.title_color,
h_align='center', h_align='center',
v_align='center', v_align='center',
text=bui.Lstr(resource=self._r + '.titleFolderText') text=(
if (allow_folders and not valid_file_extensions) bui.Lstr(resource=self._r + '.titleFolderText')
else bui.Lstr(resource=self._r + '.titleFileText') if (allow_folders and not valid_file_extensions)
if not allow_folders else (
else bui.Lstr(resource=self._r + '.titleFileFolderText'), bui.Lstr(resource=self._r + '.titleFileText')
if not allow_folders
else bui.Lstr(resource=self._r + '.titleFileFolderText')
)
),
maxwidth=210, maxwidth=210,
) )
@ -444,9 +446,11 @@ class FileSelectorWindow(bui.Window):
position=(10 + folder_icon_size * 1.05, entry_height * 0.5), position=(10 + folder_icon_size * 1.05, entry_height * 0.5),
size=(0, 0), size=(0, 0),
maxwidth=self._scroll_width * 0.93 - 50, maxwidth=self._scroll_width * 0.93 - 50,
color=(1, 1, 1, 1) color=(
if (is_valid_file_path or is_dir) (1, 1, 1, 1)
else (0.5, 0.5, 0.5, 1), if (is_valid_file_path or is_dir)
else (0.5, 0.5, 0.5, 1)
),
) )
v -= entry_height v -= entry_height

22
src/assets/ba_data/python/bauiv1lib/gather/__init__.py
View File

@ -99,9 +99,7 @@ class GatherWindow(bui.Window):
self._height = ( self._height = (
582 582
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 680 else 680 if uiscale is bui.UIScale.MEDIUM else 800
if uiscale is bui.UIScale.MEDIUM
else 800
) )
self._current_tab: GatherWindow.TabID | None = None self._current_tab: GatherWindow.TabID | None = None
extra_top = 20 if uiscale is bui.UIScale.SMALL else 0 extra_top = 20 if uiscale is bui.UIScale.SMALL else 0
@ -116,15 +114,13 @@ class GatherWindow(bui.Window):
scale=( scale=(
1.3 1.3
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 0.97 else 0.97 if uiscale is bui.UIScale.MEDIUM else 0.8
if uiscale is bui.UIScale.MEDIUM ),
else 0.8 stack_offset=(
(0, -11)
if uiscale is bui.UIScale.SMALL
else (0, 0) if uiscale is bui.UIScale.MEDIUM else (0, 0)
), ),
stack_offset=(0, -11)
if uiscale is bui.UIScale.SMALL
else (0, 0)
if uiscale is bui.UIScale.MEDIUM
else (0, 0),
) )
) )
@ -165,9 +161,7 @@ class GatherWindow(bui.Window):
scale=( scale=(
1.5 1.5
if not condensed if not condensed
else 1.0 else 1.0 if uiscale is bui.UIScale.MEDIUM else 0.6
if uiscale is bui.UIScale.MEDIUM
else 0.6
), ),
h_align='center', h_align='center',
v_align='center', v_align='center',

4
src/assets/ba_data/python/bauiv1lib/gather/abouttab.py
View File

@ -44,9 +44,7 @@ class AboutGatherTab(GatherTab):
message_height = ( message_height = (
210 210
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 305 else 305 if uiscale is bui.UIScale.MEDIUM else 370
if uiscale is bui.UIScale.MEDIUM
else 370
) )
# Let's not talk about sharing in vr-mode; its tricky to fit more # Let's not talk about sharing in vr-mode; its tricky to fit more
# than one head in a VR-headset. # than one head in a VR-headset.

4
src/assets/ba_data/python/bauiv1lib/gather/privatetab.py
View File

@ -837,9 +837,7 @@ class PrivateGatherTab(GatherTab):
color=( color=(
(0.6, 0.6, 0.6) (0.6, 0.6, 0.6)
if disabled if disabled
else (0.5, 1.0, 0.5) else (0.5, 1.0, 0.5) if waiting else None
if waiting
else None
), ),
enable_sound=False, enable_sound=False,
label=btnlabel, label=btnlabel,

22
src/assets/ba_data/python/bauiv1lib/gather/publictab.py
View File

@ -204,11 +204,11 @@ class UIRow:
bui.textwidget( bui.textwidget(
edit=self._ping_widget, edit=self._ping_widget,
text=str(int(party.ping)), text=str(int(party.ping)),
color=(0, 1, 0) color=(
if party.ping <= ping_good (0, 1, 0)
else (1, 1, 0) if party.ping <= ping_good
if party.ping <= ping_med else (1, 1, 0) if party.ping <= ping_med else (1, 0, 0)
else (1, 0, 0), ),
) )
party.clean_display_index = index party.clean_display_index = index
@ -369,8 +369,8 @@ class PublicGatherTab(GatherTab):
self._join_status_text: bui.Widget | None = None self._join_status_text: bui.Widget | None = None
self._no_servers_found_text: bui.Widget | None = None self._no_servers_found_text: bui.Widget | None = None
self._host_max_party_size_value: bui.Widget | None = None self._host_max_party_size_value: bui.Widget | None = None
self._host_max_party_size_minus_button: (bui.Widget | None) = None self._host_max_party_size_minus_button: bui.Widget | None = None
self._host_max_party_size_plus_button: (bui.Widget | None) = None self._host_max_party_size_plus_button: bui.Widget | None = None
self._host_status_text: bui.Widget | None = None self._host_status_text: bui.Widget | None = None
self._signed_in = False self._signed_in = False
self._ui_rows: list[UIRow] = [] self._ui_rows: list[UIRow] = []
@ -800,9 +800,11 @@ class PublicGatherTab(GatherTab):
parent=self._container, parent=self._container,
label=label, label=label,
size=(400, 80), size=(400, 80),
on_activate_call=self._on_stop_advertising_press on_activate_call=(
if is_public_enabled self._on_stop_advertising_press
else self._on_start_advertizing_press, if is_public_enabled
else self._on_start_advertizing_press
),
position=(c_width * 0.5 - 200, v), position=(c_width * 0.5 - 200, v),
autoselect=True, autoselect=True,
up_widget=btn2, up_widget=btn2,

20
src/assets/ba_data/python/bauiv1lib/getcurrency.py
View File

@ -72,13 +72,11 @@ class GetCurrencyWindow(bui.Window):
scale=( scale=(
1.63 1.63
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.2 else 1.2 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -3) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -3)
if uiscale is bui.UIScale.SMALL
else (0, 0),
) )
) )
@ -605,11 +603,11 @@ class GetCurrencyWindow(bui.Window):
self._smooth_increase_speed = ( self._smooth_increase_speed = (
diff / 100.0 diff / 100.0
if diff >= 5000 if diff >= 5000
else diff / 50.0 else (
if diff >= 1500 diff / 50.0
else diff / 30.0 if diff >= 1500
if diff >= 500 else diff / 30.0 if diff >= 500 else diff / 15.0
else diff / 15.0 )
) )
def _disabled_press(self) -> None: def _disabled_press(self) -> None:

4
src/assets/ba_data/python/bauiv1lib/getremote.py
View File

@ -20,9 +20,7 @@ class GetBSRemoteWindow(PopupWindow):
scale = ( scale = (
2.3 2.3
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.65 else 1.65 if uiscale is bui.UIScale.MEDIUM else 1.23
if uiscale is bui.UIScale.MEDIUM
else 1.23
) )
self._transitioning_out = False self._transitioning_out = False
self._width = 570 self._width = 570

26
src/assets/ba_data/python/bauiv1lib/helpui.py
View File

@ -41,9 +41,7 @@ class HelpWindow(bui.Window):
height = ( height = (
460 460
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 530 else 530 if uiscale is bui.UIScale.MEDIUM else 600
if uiscale is bui.UIScale.MEDIUM
else 600
) )
super().__init__( super().__init__(
@ -55,15 +53,13 @@ class HelpWindow(bui.Window):
scale=( scale=(
1.77 1.77
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.25 else 1.25 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -30)
if uiscale is bui.UIScale.SMALL
else (0, 15) if uiscale is bui.UIScale.MEDIUM else (0, 0)
), ),
stack_offset=(0, -30)
if uiscale is bui.UIScale.SMALL
else (0, 15)
if uiscale is bui.UIScale.MEDIUM
else (0, 0),
) )
) )
@ -119,9 +115,11 @@ class HelpWindow(bui.Window):
), ),
size=(140, 60), size=(140, 60),
scale=0.7 if uiscale is bui.UIScale.SMALL else 0.8, scale=0.7 if uiscale is bui.UIScale.SMALL else 0.8,
label=bui.Lstr(resource='backText') label=(
if self._main_menu bui.Lstr(resource='backText')
else 'Close', if self._main_menu
else 'Close'
),
button_type='back' if self._main_menu else None, button_type='back' if self._main_menu else None,
extra_touch_border_scale=2.0, extra_touch_border_scale=2.0,
autoselect=True, autoselect=True,

4
src/assets/ba_data/python/bauiv1lib/iconpicker.py
View File

@ -40,9 +40,7 @@ class IconPicker(PopupWindow):
scale = ( scale = (
1.85 1.85
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.65 else 1.65 if uiscale is bui.UIScale.MEDIUM else 1.23
if uiscale is bui.UIScale.MEDIUM
else 1.23
) )
self._delegate = delegate self._delegate = delegate

14
src/assets/ba_data/python/bauiv1lib/kiosk.py
View File

@ -472,9 +472,9 @@ class KioskWindow(bui.Window):
'type': 'bs_hockey.HockeyGame', 'type': 'bs_hockey.HockeyGame',
} }
] ]
appconfig[ appconfig['Team Tournament Playlist Selection'] = (
'Team Tournament Playlist Selection' 'Just Hockey'
] = 'Just Hockey' )
bui.fade_screen( bui.fade_screen(
False, False,
endcall=bui.Call( endcall=bui.Call(
@ -488,9 +488,11 @@ class KioskWindow(bui.Window):
game = ( game = (
'Easy:Onslaught Training' 'Easy:Onslaught Training'
if mode == 'easy' if mode == 'easy'
else 'Easy:Rookie Football' else (
if mode == 'medium' 'Easy:Rookie Football'
else 'Easy:Uber Onslaught' if mode == 'medium'
else 'Easy:Uber Onslaught'
)
) )
cfg = bui.app.config cfg = bui.app.config
cfg['Selected Coop Game'] = game cfg['Selected Coop Game'] = game

115
src/assets/ba_data/python/bauiv1lib/league/rankwindow.py
View File

@ -63,9 +63,7 @@ class LeagueRankWindow(bui.Window):
self._height = ( self._height = (
657 657
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 710 else 710 if uiscale is bui.UIScale.MEDIUM else 800
if uiscale is bui.UIScale.MEDIUM
else 800
) )
self._r = 'coopSelectWindow' self._r = 'coopSelectWindow'
self._rdict = bui.app.lang.get_resource(self._r) self._rdict = bui.app.lang.get_resource(self._r)
@ -79,19 +77,17 @@ class LeagueRankWindow(bui.Window):
super().__init__( super().__init__(
root_widget=bui.containerwidget( root_widget=bui.containerwidget(
size=(self._width, self._height + top_extra), size=(self._width, self._height + top_extra),
stack_offset=(0, -15) stack_offset=(
if uiscale is bui.UIScale.SMALL (0, -15)
else (0, 10) if uiscale is bui.UIScale.SMALL
if uiscale is bui.UIScale.MEDIUM else (0, 10) if uiscale is bui.UIScale.MEDIUM else (0, 0)
else (0, 0), ),
transition=transition, transition=transition,
scale_origin_stack_offset=scale_origin, scale_origin_stack_offset=scale_origin,
scale=( scale=(
1.2 1.2
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 0.93 else 0.93 if uiscale is bui.UIScale.MEDIUM else 0.8
if uiscale is bui.UIScale.MEDIUM
else 0.8
), ),
) )
) )
@ -210,9 +206,11 @@ class LeagueRankWindow(bui.Window):
assert plus is not None assert plus is not None
txt = bui.Lstr( txt = bui.Lstr(
resource='coopSelectWindow.activenessAllTimeInfoText' resource=(
if self._season == 'a' 'coopSelectWindow.activenessAllTimeInfoText'
else 'coopSelectWindow.activenessInfoText', if self._season == 'a'
else 'coopSelectWindow.activenessInfoText'
),
subs=[ subs=[
( (
'${MAX}', '${MAX}',
@ -853,9 +851,11 @@ class LeagueRankWindow(bui.Window):
bui.textwidget( bui.textwidget(
edit=self._league_title_text, edit=self._league_title_text,
text='' text=(
if self._season == 'a' ''
else bui.Lstr(resource='league.leagueText'), if self._season == 'a'
else bui.Lstr(resource='league.leagueText')
),
) )
if data is None: if data is None:
@ -910,9 +910,11 @@ class LeagueRankWindow(bui.Window):
bui.textwidget(edit=self._season_ends_text, text=to_end_string) bui.textwidget(edit=self._season_ends_text, text=to_end_string)
bui.textwidget( bui.textwidget(
edit=self._trophy_counts_reset_text, edit=self._trophy_counts_reset_text,
text=bui.Lstr(resource='league.trophyCountsResetText') text=(
if self._is_current_season and show_season_end bui.Lstr(resource='league.trophyCountsResetText')
else '', if self._is_current_season and show_season_end
else ''
),
) )
bui.textwidget(edit=self._league_text, text=lname, color=lcolor) bui.textwidget(edit=self._league_text, text=lname, color=lcolor)
@ -932,21 +934,25 @@ class LeagueRankWindow(bui.Window):
) )
bui.textwidget( bui.textwidget(
edit=self._to_ranked_text, edit=self._to_ranked_text,
text=bui.Lstr(resource='coopSelectWindow.toRankedText').evaluate() text=(
+ '' bui.Lstr(resource='coopSelectWindow.toRankedText').evaluate()
+ extra_text + ''
if do_percent + extra_text
else '', if do_percent
else ''
),
) )
bui.textwidget( bui.textwidget(
edit=self._your_power_ranking_text, edit=self._your_power_ranking_text,
text=bui.Lstr( text=(
resource='rankText', bui.Lstr(
fallback_resource='coopSelectWindow.yourPowerRankingText', resource='rankText',
) fallback_resource='coopSelectWindow.yourPowerRankingText',
if (not do_percent) )
else '', if (not do_percent)
else ''
),
) )
bui.textwidget( bui.textwidget(
@ -954,11 +960,11 @@ class LeagueRankWindow(bui.Window):
position=(473, v - 70 - (170 if do_percent else 220)), position=(473, v - 70 - (170 if do_percent else 220)),
text=status_text, text=status_text,
big=(in_top or do_percent), big=(in_top or do_percent),
scale=3.0 scale=(
if (in_top or do_percent) 3.0
else 0.7 if (in_top or do_percent)
if finished_season_unranked else 0.7 if finished_season_unranked else 1.0
else 1.0, ),
) )
if self._activity_mult_button is not None: if self._activity_mult_button is not None:
@ -992,9 +998,11 @@ class LeagueRankWindow(bui.Window):
# pylint: disable=consider-using-f-string # pylint: disable=consider-using-f-string
bui.textwidget( bui.textwidget(
edit=self._pro_mult_text, edit=self._pro_mult_text,
text=' -' text=(
if (data is None or not have_pro) ' -'
else 'x ' + ('%.2f' % pro_mult), if (data is None or not have_pro)
else 'x ' + ('%.2f' % pro_mult)
),
) )
bui.buttonwidget( bui.buttonwidget(
edit=self._pro_mult_button, edit=self._pro_mult_button,
@ -1019,9 +1027,11 @@ class LeagueRankWindow(bui.Window):
bui.textwidget( bui.textwidget(
edit=self._power_ranking_achievement_total_text, edit=self._power_ranking_achievement_total_text,
text='-' text=(
if data is None '-'
else ('+ ' + pts_txt.replace('${NUMBER}', str(total_ach_value))), if data is None
else ('+ ' + pts_txt.replace('${NUMBER}', str(total_ach_value)))
),
) )
total_trophies_count = accounts.get_league_rank_points( total_trophies_count = accounts.get_league_rank_points(
@ -1035,19 +1045,24 @@ class LeagueRankWindow(bui.Window):
) )
bui.textwidget( bui.textwidget(
edit=self._power_ranking_trophies_total_text, edit=self._power_ranking_trophies_total_text,
text='-' text=(
if data is None '-'
else ( if data is None
'+ ' + pts_txt.replace('${NUMBER}', str(total_trophies_value)) else (
'+ '
+ pts_txt.replace('${NUMBER}', str(total_trophies_value))
)
), ),
) )
bui.textwidget( bui.textwidget(
edit=self._power_ranking_total_text, edit=self._power_ranking_total_text,
text='-' text=(
if data is None '-'
else eq_text.replace( if data is None
'${NUMBER}', str(accounts.get_league_rank_points(data)) else eq_text.replace(
'${NUMBER}', str(accounts.get_league_rank_points(data))
)
), ),
) )
for widget in self._power_ranking_score_widgets: for widget in self._power_ranking_score_widgets:

101
src/assets/ba_data/python/bauiv1lib/mainmenu.py
View File

@ -43,9 +43,11 @@ class MainMenuWindow(bui.Window):
super().__init__( super().__init__(
root_widget=bui.containerwidget( root_widget=bui.containerwidget(
transition=transition, transition=transition,
toolbar_visibility='menu_minimal_no_back' toolbar_visibility=(
if self._in_game 'menu_minimal_no_back'
else 'menu_minimal_no_back', if self._in_game
else 'menu_minimal_no_back'
),
) )
) )
@ -142,9 +144,11 @@ class MainMenuWindow(bui.Window):
return ( return (
'storeCharacterXmas' 'storeCharacterXmas'
if plus.get_v1_account_misc_read_val('xmas', False) if plus.get_v1_account_misc_read_val('xmas', False)
else 'storeCharacterEaster' else (
if plus.get_v1_account_misc_read_val('easter', False) 'storeCharacterEaster'
else 'storeCharacter' if plus.get_v1_account_misc_read_val('easter', False)
else 'storeCharacter'
)
) )
def _check_refresh(self) -> None: def _check_refresh(self) -> None:
@ -344,9 +348,7 @@ class MainMenuWindow(bui.Window):
icon_size = ( icon_size = (
55 55
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 55 else 55 if uiscale is bui.UIScale.MEDIUM else 70
if uiscale is bui.UIScale.MEDIUM
else 70
) )
bui.imagewidget( bui.imagewidget(
parent=self._root_widget, parent=self._root_widget,
@ -452,7 +454,7 @@ class MainMenuWindow(bui.Window):
resource='watchWindow.playbackSpeedText', resource='watchWindow.playbackSpeedText',
subs=[('${SPEED}', str(1.23))], subs=[('${SPEED}', str(1.23))],
), ),
position=(h, v + v_offs + 7 * t_scale), position=(h, v + v_offs + 15 * t_scale),
h_align='center', h_align='center',
v_align='center', v_align='center',
size=(0, 0), size=(0, 0),
@ -526,6 +528,64 @@ class MainMenuWindow(bui.Window):
autoselect=True, autoselect=True,
on_activate_call=bui.Call(self._pause_or_resume_replay), on_activate_call=bui.Call(self._pause_or_resume_replay),
) )
btn = bui.buttonwidget(
parent=self._root_widget,
position=(
h - b_size * 1.5 - b_buffer_1 * 2,
v - b_size - b_buffer_2 + v_offs,
),
button_type='square',
size=(b_size, b_size),
label='',
autoselect=True,
on_activate_call=bui.WeakCall(self._rewind_replay),
)
bui.textwidget(
parent=self._root_widget,
draw_controller=btn,
# text='<<',
text=bui.charstr(bui.SpecialChar.REWIND_BUTTON),
position=(
h - b_size - b_buffer_1 * 2,
v - b_size * 0.5 - b_buffer_2 + 5 * t_scale + v_offs,
),
h_align='center',
v_align='center',
size=(0, 0),
scale=2.0 * t_scale,
)
btn = bui.buttonwidget(
parent=self._root_widget,
position=(
h + b_size * 0.5 + b_buffer_1 * 2,
v - b_size - b_buffer_2 + v_offs,
),
button_type='square',
size=(b_size, b_size),
label='',
autoselect=True,
on_activate_call=bui.WeakCall(self._forward_replay),
)
bui.textwidget(
parent=self._root_widget,
draw_controller=btn,
# text='>>',
text=bui.charstr(bui.SpecialChar.FAST_FORWARD_BUTTON),
position=(
h + b_size + b_buffer_1 * 2,
v - b_size * 0.5 - b_buffer_2 + 5 * t_scale + v_offs,
),
h_align='center',
v_align='center',
size=(0, 0),
scale=2.0 * t_scale,
)
def _rewind_replay(self) -> None:
bs.seek_replay(-2 * pow(2, bs.get_replay_speed_exponent()))
def _forward_replay(self) -> None:
bs.seek_replay(2 * pow(2, bs.get_replay_speed_exponent()))
def _refresh_not_in_game( def _refresh_not_in_game(
self, positions: list[tuple[float, float, float]] self, positions: list[tuple[float, float, float]]
@ -646,9 +706,11 @@ class MainMenuWindow(bui.Window):
color=(0.45, 0.55, 0.45), color=(0.45, 0.55, 0.45),
textcolor=(0.7, 0.8, 0.7), textcolor=(0.7, 0.8, 0.7),
label=bui.Lstr( label=bui.Lstr(
resource='modeArcadeText' resource=(
if bui.app.env.arcade 'modeArcadeText'
else 'modeDemoText' if bui.app.env.arcade
else 'modeDemoText'
)
), ),
transition_delay=demo_menu_delay, transition_delay=demo_menu_delay,
on_activate_call=self._demo_menu_press, on_activate_call=self._demo_menu_press,
@ -659,9 +721,7 @@ class MainMenuWindow(bui.Window):
foof = ( foof = (
-1 -1
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1 else 1 if uiscale is bui.UIScale.MEDIUM else 3
if uiscale is bui.UIScale.MEDIUM
else 3
) )
h, v, scale = positions[self._p_index] h, v, scale = positions[self._p_index]
v = v + foof v = v + foof
@ -906,9 +966,7 @@ class MainMenuWindow(bui.Window):
scale=( scale=(
2.15 2.15
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.6 else 1.6 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
) )
h = 125.0 h = 125.0
@ -1398,8 +1456,9 @@ class MainMenuWindow(bui.Window):
def _resume(self) -> None: def _resume(self) -> None:
assert bui.app.classic is not None assert bui.app.classic is not None
bui.app.classic.resume() bui.app.classic.resume()
if self._root_widget: # if self._root_widget:
bui.containerwidget(edit=self._root_widget, transition='out_right') # bui.containerwidget(edit=self._root_widget,
# transition='out_right')
bui.app.ui_v1.clear_main_menu_window(transition='out_right') bui.app.ui_v1.clear_main_menu_window(transition='out_right')
# If there's callbacks waiting for this window to go away, call them. # If there's callbacks waiting for this window to go away, call them.

32
src/assets/ba_data/python/bauiv1lib/party.py
View File

@ -36,9 +36,7 @@ class PartyWindow(bui.Window):
self._height = ( self._height = (
365 365
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 480 else 480 if uiscale is bui.UIScale.MEDIUM else 600
if uiscale is bui.UIScale.MEDIUM
else 600
) )
self._display_old_msgs = True self._display_old_msgs = True
super().__init__( super().__init__(
@ -52,15 +50,15 @@ class PartyWindow(bui.Window):
scale=( scale=(
2.0 2.0
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.35 else 1.35 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -10)
if uiscale is bui.UIScale.SMALL
else (
(240, 0) if uiscale is bui.UIScale.MEDIUM else (330, 20)
)
), ),
stack_offset=(0, -10)
if uiscale is bui.UIScale.SMALL
else (240, 0)
if uiscale is bui.UIScale.MEDIUM
else (330, 20),
) )
) )
@ -251,9 +249,7 @@ class PartyWindow(bui.Window):
scale=( scale=(
2.3 2.3
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.65 else 1.65 if uiscale is bui.UIScale.MEDIUM else 1.23
if uiscale is bui.UIScale.MEDIUM
else 1.23
), ),
choices=choices, choices=choices,
choices_display=choices_display, choices_display=choices_display,
@ -312,9 +308,7 @@ class PartyWindow(bui.Window):
columns = ( columns = (
1 1
if len(self._roster) == 1 if len(self._roster) == 1
else 2 else 2 if len(self._roster) == 2 else 3
if len(self._roster) == 2
else 3
) )
rows = int(math.ceil(float(len(self._roster)) / columns)) rows = int(math.ceil(float(len(self._roster)) / columns))
c_width = (self._width * 0.9) / max(3, columns) c_width = (self._width * 0.9) / max(3, columns)
@ -572,9 +566,7 @@ class PartyWindow(bui.Window):
scale=( scale=(
2.3 2.3
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.65 else 1.65 if uiscale is bui.UIScale.MEDIUM else 1.23
if uiscale is bui.UIScale.MEDIUM
else 1.23
), ),
choices=['kick'], choices=['kick'],
choices_display=[kick_str], choices_display=[kick_str],

4
src/assets/ba_data/python/bauiv1lib/partyqueue.py
View File

@ -274,9 +274,7 @@ class PartyQueueWindow(bui.Window):
scale=( scale=(
1.4 1.4
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.2 else 1.2 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
) )
) )

28
src/assets/ba_data/python/bauiv1lib/play.py
View File

@ -57,9 +57,7 @@ class PlayWindow(bui.Window):
scale=( scale=(
1.6 1.6
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 0.9 else 0.9 if uiscale is bui.UIScale.MEDIUM else 0.8
if uiscale is bui.UIScale.MEDIUM
else 0.8
), ),
stack_offset=(0, 0) if uiscale is bui.UIScale.SMALL else (0, 0), stack_offset=(0, 0) if uiscale is bui.UIScale.SMALL else (0, 0),
) )
@ -83,9 +81,11 @@ class PlayWindow(bui.Window):
# (101 if main_menu else 61)), # (101 if main_menu else 61)),
size=(0, 0), size=(0, 0),
text=bui.Lstr( text=bui.Lstr(
resource=(self._r + '.titleText') resource=(
if self._is_main_menu (self._r + '.titleText')
else 'playlistsText' if self._is_main_menu
else 'playlistsText'
)
), ),
scale=1.7, scale=1.7,
res_scale=2.0, res_scale=2.0,
@ -494,18 +494,22 @@ class PlayWindow(bui.Window):
bui.containerwidget( bui.containerwidget(
edit=self._root_widget, edit=self._root_widget,
on_cancel_call=self._back, on_cancel_call=self._back,
selected_child=self._coop_button selected_child=(
if self._is_main_menu self._coop_button
else self._teams_button, if self._is_main_menu
else self._teams_button
),
) )
else: else:
bui.buttonwidget(edit=back_button, on_activate_call=self._back) bui.buttonwidget(edit=back_button, on_activate_call=self._back)
bui.containerwidget( bui.containerwidget(
edit=self._root_widget, edit=self._root_widget,
cancel_button=back_button, cancel_button=back_button,
selected_child=self._coop_button selected_child=(
if self._is_main_menu self._coop_button
else self._teams_button, if self._is_main_menu
else self._teams_button
),
) )
self._restore_state() self._restore_state()

8
src/assets/ba_data/python/bauiv1lib/playlist/addgame.py
View File

@ -30,9 +30,7 @@ class PlaylistAddGameWindow(bui.Window):
self._height = ( self._height = (
346 346
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 380 else 380 if uiscale is bui.UIScale.MEDIUM else 440
if uiscale is bui.UIScale.MEDIUM
else 440
) )
top_extra = 30 if uiscale is bui.UIScale.SMALL else 20 top_extra = 30 if uiscale is bui.UIScale.SMALL else 20
self._scroll_width = 210 self._scroll_width = 210
@ -44,9 +42,7 @@ class PlaylistAddGameWindow(bui.Window):
scale=( scale=(
2.17 2.17
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.5 else 1.5 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
stack_offset=(0, 1) if uiscale is bui.UIScale.SMALL else (0, 0), stack_offset=(0, 1) if uiscale is bui.UIScale.SMALL else (0, 0),
) )

20
src/assets/ba_data/python/bauiv1lib/playlist/browser.py
View File

@ -67,9 +67,7 @@ class PlaylistBrowserWindow(bui.Window):
self._height = ( self._height = (
480 480
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 510 else 510 if uiscale is bui.UIScale.MEDIUM else 580
if uiscale is bui.UIScale.MEDIUM
else 580
) )
top_extra = 20 if uiscale is bui.UIScale.SMALL else 0 top_extra = 20 if uiscale is bui.UIScale.SMALL else 0
@ -83,13 +81,11 @@ class PlaylistBrowserWindow(bui.Window):
scale=( scale=(
1.69 1.69
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.05 else 1.05 if uiscale is bui.UIScale.MEDIUM else 0.9
if uiscale is bui.UIScale.MEDIUM ),
else 0.9 stack_offset=(
(0, -26) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -26)
if uiscale is bui.UIScale.SMALL
else (0, 0),
) )
) )
@ -714,9 +710,9 @@ class PlaylistBrowserWindow(bui.Window):
) )
if self._selected_playlist != prev_sel: if self._selected_playlist != prev_sel:
cfg = bui.app.config cfg = bui.app.config
cfg[ cfg[self._pvars.config_name + ' Playlist Selection'] = (
self._pvars.config_name + ' Playlist Selection' self._selected_playlist
] = self._selected_playlist )
cfg.commit() cfg.commit()
self._save_state() self._save_state()

18
src/assets/ba_data/python/bauiv1lib/playlist/edit.py
View File

@ -36,9 +36,7 @@ class PlaylistEditWindow(bui.Window):
self._height = ( self._height = (
400 400
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 470 else 470 if uiscale is bui.UIScale.MEDIUM else 540
if uiscale is bui.UIScale.MEDIUM
else 540
) )
top_extra = 20 if uiscale is bui.UIScale.SMALL else 0 top_extra = 20 if uiscale is bui.UIScale.SMALL else 0
@ -49,13 +47,11 @@ class PlaylistEditWindow(bui.Window):
scale=( scale=(
2.0 2.0
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.3 else 1.3 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -16) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -16)
if uiscale is bui.UIScale.SMALL
else (0, 0),
) )
) )
cancel_button = bui.buttonwidget( cancel_button = bui.buttonwidget(
@ -149,9 +145,7 @@ class PlaylistEditWindow(bui.Window):
scl = ( scl = (
1.03 1.03
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.36 else 1.36 if uiscale is bui.UIScale.MEDIUM else 1.74
if uiscale is bui.UIScale.MEDIUM
else 1.74
) )
v -= 63.0 * scl v -= 63.0 * scl

46
src/assets/ba_data/python/bauiv1lib/playlist/editgame.py
View File

@ -108,9 +108,7 @@ class PlaylistEditGameWindow(bui.Window):
height = ( height = (
365 365
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 460 else 460 if uiscale is bui.UIScale.MEDIUM else 550
if uiscale is bui.UIScale.MEDIUM
else 550
) )
spacing = 52 spacing = 52
y_extra = 15 y_extra = 15
@ -129,13 +127,11 @@ class PlaylistEditGameWindow(bui.Window):
scale=( scale=(
2.19 2.19
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.35 else 1.35 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -17) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -17)
if uiscale is bui.UIScale.SMALL
else (0, 0),
) )
) )
@ -143,9 +139,11 @@ class PlaylistEditGameWindow(bui.Window):
parent=self._root_widget, parent=self._root_widget,
position=(45 + x_inset, height - 82 + y_extra2), position=(45 + x_inset, height - 82 + y_extra2),
size=(180, 70) if is_add else (180, 65), size=(180, 70) if is_add else (180, 65),
label=bui.Lstr(resource='backText') label=(
if is_add bui.Lstr(resource='backText')
else bui.Lstr(resource='cancelText'), if is_add
else bui.Lstr(resource='cancelText')
),
button_type='back' if is_add else None, button_type='back' if is_add else None,
autoselect=True, autoselect=True,
scale=0.75, scale=0.75,
@ -160,9 +158,11 @@ class PlaylistEditGameWindow(bui.Window):
size=(200, 65), size=(200, 65),
scale=0.75, scale=0.75,
text_scale=1.3, text_scale=1.3,
label=bui.Lstr(resource=self._r + '.addGameText') label=(
if is_add bui.Lstr(resource=self._r + '.addGameText')
else bui.Lstr(resource='doneText'), if is_add
else bui.Lstr(resource='doneText')
),
) )
if bui.app.ui_v1.use_toolbars: if bui.app.ui_v1.use_toolbars:
@ -447,9 +447,11 @@ class PlaylistEditGameWindow(bui.Window):
parent=self._subcontainer, parent=self._subcontainer,
position=(h + 509 - 95, v), position=(h + 509 - 95, v),
size=(0, 28), size=(0, 28),
text=bui.Lstr(resource='onText') text=(
if value bui.Lstr(resource='onText')
else bui.Lstr(resource='offText'), if value
else bui.Lstr(resource='offText')
),
editable=False, editable=False,
color=(0.6, 1.0, 0.6, 1.0), color=(0.6, 1.0, 0.6, 1.0),
maxwidth=mw2, maxwidth=mw2,
@ -566,9 +568,11 @@ class PlaylistEditGameWindow(bui.Window):
) -> None: ) -> None:
bui.textwidget( bui.textwidget(
edit=widget, edit=widget,
text=bui.Lstr(resource='onText') text=(
if value bui.Lstr(resource='onText')
else bui.Lstr(resource='offText'), if value
else bui.Lstr(resource='offText')
),
) )
self._settings[setting_name] = value self._settings[setting_name] = value

14
src/assets/ba_data/python/bauiv1lib/playlist/mapselect.py
View File

@ -49,9 +49,7 @@ class PlaylistMapSelectWindow(bui.Window):
height = ( height = (
400 400
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 480 else 480 if uiscale is bui.UIScale.MEDIUM else 600
if uiscale is bui.UIScale.MEDIUM
else 600
) )
top_extra = 20 if uiscale is bui.UIScale.SMALL else 0 top_extra = 20 if uiscale is bui.UIScale.SMALL else 0
@ -62,13 +60,11 @@ class PlaylistMapSelectWindow(bui.Window):
scale=( scale=(
2.17 2.17
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.3 else 1.3 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -27) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -27)
if uiscale is bui.UIScale.SMALL
else (0, 0),
) )
) )

4
src/assets/ba_data/python/bauiv1lib/playlist/share.py
View File

@ -93,9 +93,7 @@ class SharePlaylistResultsWindow(bui.Window):
scale=( scale=(
1.8 1.8
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.35 else 1.35 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
) )
) )

43
src/assets/ba_data/python/bauiv1lib/playoptions.py
View File

@ -33,6 +33,7 @@ class PlayOptionsWindow(PopupWindow):
# pylint: disable=too-many-locals # pylint: disable=too-many-locals
from bascenev1 import filter_playlist, get_map_class from bascenev1 import filter_playlist, get_map_class
from bauiv1lib.playlist import PlaylistTypeVars from bauiv1lib.playlist import PlaylistTypeVars
from bauiv1lib.config import ConfigNumberEdit
self._r = 'gameListWindow' self._r = 'gameListWindow'
self._delegate = delegate self._delegate = delegate
@ -52,7 +53,7 @@ class PlayOptionsWindow(PopupWindow):
self._playlist = playlist self._playlist = playlist
self._width = 500.0 self._width = 500.0
self._height = 330.0 - 50.0 self._height = 370.0 - 50.0
# In teams games, show the custom names/colors button. # In teams games, show the custom names/colors button.
if self._sessiontype is bs.DualTeamSession: if self._sessiontype is bs.DualTeamSession:
@ -145,9 +146,7 @@ class PlayOptionsWindow(PopupWindow):
scale = ( scale = (
1.69 1.69
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.1 else 1.1 if uiscale is bui.UIScale.MEDIUM else 0.85
if uiscale is bui.UIScale.MEDIUM
else 0.85
) )
# Creates our _root_widget. # Creates our _root_widget.
super().__init__( super().__init__(
@ -275,13 +274,39 @@ class PlayOptionsWindow(PopupWindow):
texture=bui.gettexture('lock'), texture=bui.gettexture('lock'),
) )
y_offs = 50 if show_shuffle_check_box else 0
# Series Length
y_offs2 = 40 if self._sessiontype is bs.DualTeamSession else 0
self._series_length_numedit = ConfigNumberEdit(
parent=self.root_widget,
position=(100, 200 + y_offs + y_offs2),
configkey=(
'FFA' if self._sessiontype is bs.FreeForAllSession else 'Teams'
)
+ ' Series Length',
displayname=bui.Lstr(
resource=self._r
+ (
'.pointsToWinText'
if self._sessiontype is bs.FreeForAllSession
else '.seriesLengthText'
)
),
minval=1.0,
increment=1.0 if self._sessiontype is bs.FreeForAllSession else 2.0,
fallback_value=(
24 if self._sessiontype is bs.FreeForAllSession else 7
),
f=0,
)
# Team names/colors. # Team names/colors.
self._custom_colors_names_button: bui.Widget | None self._custom_colors_names_button: bui.Widget | None
if self._sessiontype is bs.DualTeamSession: if self._sessiontype is bs.DualTeamSession:
y_offs = 50 if show_shuffle_check_box else 0
self._custom_colors_names_button = bui.buttonwidget( self._custom_colors_names_button = bui.buttonwidget(
parent=self.root_widget, parent=self.root_widget,
position=(100, 200 + y_offs), position=(100, 195 + y_offs),
size=(290, 35), size=(290, 35),
on_activate_call=bui.WeakCall(self._custom_colors_names_press), on_activate_call=bui.WeakCall(self._custom_colors_names_press),
autoselect=True, autoselect=True,
@ -304,9 +329,9 @@ class PlayOptionsWindow(PopupWindow):
def _cb_callback(val: bool) -> None: def _cb_callback(val: bool) -> None:
self._do_randomize_val = val self._do_randomize_val = val
cfg = bui.app.config cfg = bui.app.config
cfg[ cfg[self._pvars.config_name + ' Playlist Randomize'] = (
self._pvars.config_name + ' Playlist Randomize' self._do_randomize_val
] = self._do_randomize_val )
cfg.commit() cfg.commit()
if show_shuffle_check_box: if show_shuffle_check_box:

18
src/assets/ba_data/python/bauiv1lib/popup.py
View File

@ -223,12 +223,14 @@ class PopupMenuWindow(PopupWindow):
size=(self._width - 40, 28), size=(self._width - 40, 28),
on_select_call=bui.Call(self._select, index), on_select_call=bui.Call(self._select, index),
click_activate=True, click_activate=True,
color=(0.5, 0.5, 0.5, 0.5) color=(
if inactive (0.5, 0.5, 0.5, 0.5)
else ( if inactive
(0.5, 1, 0.5, 1) else (
if choice == self._current_choice (0.5, 1, 0.5, 1)
else (0.8, 0.8, 0.8, 1.0) if choice == self._current_choice
else (0.8, 0.8, 0.8, 1.0)
)
), ),
padding=0, padding=0,
maxwidth=maxwidth, maxwidth=maxwidth,
@ -318,9 +320,7 @@ class PopupMenu:
scale = ( scale = (
2.3 2.3
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.65 else 1.65 if uiscale is bui.UIScale.MEDIUM else 1.23
if uiscale is bui.UIScale.MEDIUM
else 1.23
) )
if current_choice not in choices: if current_choice not in choices:
current_choice = None current_choice = None

18
src/assets/ba_data/python/bauiv1lib/profile/browser.py
View File

@ -38,9 +38,7 @@ class ProfileBrowserWindow(bui.Window):
self._height = ( self._height = (
360.0 360.0
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 385.0 else 385.0 if uiscale is bui.UIScale.MEDIUM else 410.0
if uiscale is bui.UIScale.MEDIUM
else 410.0
) )
# If we're being called up standalone, handle pause/resume ourself. # If we're being called up standalone, handle pause/resume ourself.
@ -74,13 +72,11 @@ class ProfileBrowserWindow(bui.Window):
scale=( scale=(
2.2 2.2
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.6 else 1.6 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -14) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -14)
if uiscale is bui.UIScale.SMALL
else (0, 0),
) )
) )
@ -125,9 +121,7 @@ class ProfileBrowserWindow(bui.Window):
scl = ( scl = (
1.055 1.055
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.18 else 1.18 if uiscale is bui.UIScale.MEDIUM else 1.3
if uiscale is bui.UIScale.MEDIUM
else 1.3
) )
v -= 70.0 * scl v -= 70.0 * scl
self._new_button = bui.buttonwidget( self._new_button = bui.buttonwidget(

31
src/assets/ba_data/python/bauiv1lib/profile/edit.py
View File

@ -65,17 +65,13 @@ class EditProfileWindow(bui.Window):
self._height = height = ( self._height = height = (
350.0 350.0
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 400.0 else 400.0 if uiscale is bui.UIScale.MEDIUM else 450.0
if uiscale is bui.UIScale.MEDIUM
else 450.0
) )
spacing = 40 spacing = 40
self._base_scale = ( self._base_scale = (
2.05 2.05
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.5 else 1.5 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
) )
top_extra = 15 if uiscale is bui.UIScale.SMALL else 15 top_extra = 15 if uiscale is bui.UIScale.SMALL else 15
super().__init__( super().__init__(
@ -83,9 +79,9 @@ class EditProfileWindow(bui.Window):
size=(width, height + top_extra), size=(width, height + top_extra),
transition=transition, transition=transition,
scale=self._base_scale, scale=self._base_scale,
stack_offset=(0, 15) stack_offset=(
if uiscale is bui.UIScale.SMALL (0, 15) if uiscale is bui.UIScale.SMALL else (0, 0)
else (0, 0), ),
) )
) )
cancel_button = btn = bui.buttonwidget( cancel_button = btn = bui.buttonwidget(
@ -475,9 +471,11 @@ class EditProfileWindow(bui.Window):
parent=self._root_widget, parent=self._root_widget,
autoselect=True, autoselect=True,
position=(self._width * 0.5 + b_offs - b_size * 0.5, v - 50), position=(self._width * 0.5 + b_offs - b_size * 0.5, v - 50),
up_widget=self._upgrade_button up_widget=(
if self._upgrade_button is not None self._upgrade_button
else self._account_type_info_button, if self._upgrade_button is not None
else self._account_type_info_button
),
size=(b_size, b_size), size=(b_size, b_size),
color=self._highlight, color=self._highlight,
label='', label='',
@ -803,6 +801,15 @@ class EditProfileWindow(bui.Window):
bui.getsound('error').play() bui.getsound('error').play()
return False return False
# Make sure we're not renaming to another existing profile.
profiles: dict = bui.app.config.get('Player Profiles', {})
if self._existing_profile != new_name and new_name in profiles.keys():
bui.screenmessage(
bui.Lstr(resource='editProfileWindow.profileAlreadyExistsText')
)
bui.getsound('error').play()
return False
if transition_out: if transition_out:
bui.getsound('gunCocking').play() bui.getsound('gunCocking').play()

10
src/assets/ba_data/python/bauiv1lib/profile/upgrade.py
View File

@ -39,9 +39,7 @@ class ProfileUpgradeWindow(bui.Window):
self._base_scale = ( self._base_scale = (
2.05 2.05
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.5 else 1.5 if uiscale is bui.UIScale.MEDIUM else 1.2
if uiscale is bui.UIScale.MEDIUM
else 1.2
) )
self._upgrade_start_time: float | None = None self._upgrade_start_time: float | None = None
self._name = edit_profile_window.getname() self._name = edit_profile_window.getname()
@ -54,9 +52,9 @@ class ProfileUpgradeWindow(bui.Window):
toolbar_visibility='menu_currency', toolbar_visibility='menu_currency',
transition=transition, transition=transition,
scale=self._base_scale, scale=self._base_scale,
stack_offset=(0, 15) stack_offset=(
if uiscale is bui.UIScale.SMALL (0, 15) if uiscale is bui.UIScale.SMALL else (0, 0)
else (0, 0), ),
) )
) )
cancel_button = bui.buttonwidget( cancel_button = bui.buttonwidget(

4
src/assets/ba_data/python/bauiv1lib/promocode.py
View File

@ -47,9 +47,7 @@ class PromoCodeWindow(bui.Window):
scale=( scale=(
2.0 2.0
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.5 else 1.5 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
) )
) )

10
src/assets/ba_data/python/bauiv1lib/purchase.py
View File

@ -48,13 +48,11 @@ class PurchaseWindow(bui.Window):
scale=( scale=(
1.2 1.2
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.1 else 1.1 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -15) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -15)
if uiscale is bui.UIScale.SMALL
else (0, 0),
) )
) )
self._is_double = False self._is_double = False

4
src/assets/ba_data/python/bauiv1lib/qrcode.py
View File

@ -19,9 +19,7 @@ class QRCodeWindow(PopupWindow):
scale = ( scale = (
2.3 2.3
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.65 else 1.65 if uiscale is bui.UIScale.MEDIUM else 1.23
if uiscale is bui.UIScale.MEDIUM
else 1.23
) )
self._transitioning_out = False self._transitioning_out = False
self._width = 450 self._width = 450

4
src/assets/ba_data/python/bauiv1lib/report.py
View File

@ -29,9 +29,7 @@ class ReportPlayerWindow(bui.Window):
scale=( scale=(
1.8 1.8
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.35 else 1.35 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
) )
) )

4
src/assets/ba_data/python/bauiv1lib/resourcetypeinfo.py
View File

@ -19,9 +19,7 @@ class ResourceTypeInfoWindow(PopupWindow):
scale = ( scale = (
2.3 2.3
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.65 else 1.65 if uiscale is bui.UIScale.MEDIUM else 1.23
if uiscale is bui.UIScale.MEDIUM
else 1.23
) )
self._transitioning_out = False self._transitioning_out = False
self._width = 570 self._width = 570

12
src/assets/ba_data/python/bauiv1lib/serverdialog.py
View File

@ -51,9 +51,7 @@ class ServerDialogWindow(bui.Window):
scale=( scale=(
1.8 1.8
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.35 else 1.35 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
) )
) )
@ -114,9 +112,11 @@ class ServerDialogWindow(bui.Window):
self._ok_button = bui.buttonwidget( self._ok_button = bui.buttonwidget(
parent=self._root_widget, parent=self._root_widget,
position=( position=(
(self._width - 182) (
if (data.show_cancel or show_copy) (self._width - 182)
else (self._width * 0.5 - 80), if (data.show_cancel or show_copy)
else (self._width * 0.5 - 80)
),
30, 30,
), ),
size=(160, 60), size=(160, 60),

58
src/assets/ba_data/python/bauiv1lib/settings/advanced.py
View File

@ -52,9 +52,7 @@ class AdvancedSettingsWindow(bui.Window):
self._height = ( self._height = (
390.0 390.0
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 450.0 else 450.0 if uiscale is bui.UIScale.MEDIUM else 520.0
if uiscale is bui.UIScale.MEDIUM
else 520.0
) )
self._lang_status_text: bui.Widget | None = None self._lang_status_text: bui.Widget | None = None
@ -71,13 +69,11 @@ class AdvancedSettingsWindow(bui.Window):
scale=( scale=(
2.06 2.06
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.4 else 1.4 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -25) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -25)
if uiscale is bui.UIScale.SMALL
else (0, 0),
) )
) )
@ -202,30 +198,38 @@ class AdvancedSettingsWindow(bui.Window):
up_to_date = bui.app.lang.language in self._complete_langs_list up_to_date = bui.app.lang.language in self._complete_langs_list
bui.textwidget( bui.textwidget(
edit=self._lang_status_text, edit=self._lang_status_text,
text='' text=(
if bui.app.lang.language == 'Test' ''
else bui.Lstr( if bui.app.lang.language == 'Test'
resource=f'{self._r}.translationNoUpdateNeededText' else (
) bui.Lstr(
if up_to_date resource=f'{self._r}.translationNoUpdateNeededText'
else bui.Lstr( )
resource=f'{self._r}.translationUpdateNeededText' if up_to_date
else bui.Lstr(
resource=f'{self._r}.translationUpdateNeededText'
)
)
),
color=(
(0.2, 1.0, 0.2, 0.8) if up_to_date else (1.0, 0.2, 0.2, 0.8)
), ),
color=(0.2, 1.0, 0.2, 0.8)
if up_to_date
else (1.0, 0.2, 0.2, 0.8),
) )
else: else:
bui.textwidget( bui.textwidget(
edit=self._lang_status_text, edit=self._lang_status_text,
text=bui.Lstr(resource=f'{self._r}.translationFetchErrorText') text=(
if self._complete_langs_error bui.Lstr(resource=f'{self._r}.translationFetchErrorText')
else bui.Lstr( if self._complete_langs_error
resource=f'{self._r}.translationFetchingStatusText' else bui.Lstr(
resource=f'{self._r}.translationFetchingStatusText'
)
),
color=(
(1.0, 0.5, 0.2)
if self._complete_langs_error
else (0.7, 0.7, 0.7)
), ),
color=(1.0, 0.5, 0.2)
if self._complete_langs_error
else (0.7, 0.7, 0.7),
) )
def _rebuild(self) -> None: def _rebuild(self) -> None:

10
src/assets/ba_data/python/bauiv1lib/settings/allsettings.py
View File

@ -56,13 +56,11 @@ class AllSettingsWindow(bui.Window):
scale=( scale=(
1.75 1.75
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.35 else 1.35 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -8) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -8)
if uiscale is bui.UIScale.SMALL
else (0, 0),
) )
) )

10
src/assets/ba_data/python/bauiv1lib/settings/audio.py
View File

@ -63,9 +63,7 @@ class AudioSettingsWindow(bui.Window):
base_scale = ( base_scale = (
2.05 2.05
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.6 else 1.6 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
) )
popup_menu_scale = base_scale * 1.2 popup_menu_scale = base_scale * 1.2
@ -75,9 +73,9 @@ class AudioSettingsWindow(bui.Window):
transition=transition, transition=transition,
scale=base_scale, scale=base_scale,
scale_origin_stack_offset=scale_origin, scale_origin_stack_offset=scale_origin,
stack_offset=(0, -20) stack_offset=(
if uiscale is bui.UIScale.SMALL (0, -20) if uiscale is bui.UIScale.SMALL else (0, 0)
else (0, 0), ),
) )
) )

4
src/assets/ba_data/python/bauiv1lib/settings/controls.py
View File

@ -124,9 +124,7 @@ class ControlsSettingsWindow(bui.Window):
scale=( scale=(
smallscale smallscale
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.5 else 1.5 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
) )
) )

26
src/assets/ba_data/python/bauiv1lib/settings/gamepad.py
View File

@ -53,13 +53,11 @@ class GamepadSettingsWindow(bui.Window):
scale=( scale=(
1.63 1.63
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.35 else 1.35 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(-20, -16) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(-20, -16)
if uiscale is bui.UIScale.SMALL
else (0, 0),
transition=transition, transition=transition,
) )
) )
@ -543,16 +541,12 @@ class GamepadSettingsWindow(bui.Window):
sval1 = ( sval1 = (
self._settings['analogStickLR' + self._ext] self._settings['analogStickLR' + self._ext]
if 'analogStickLR' + self._ext in self._settings if 'analogStickLR' + self._ext in self._settings
else 5 else 5 if self._is_secondary else None
if self._is_secondary
else None
) )
sval2 = ( sval2 = (
self._settings['analogStickUD' + self._ext] self._settings['analogStickUD' + self._ext]
if 'analogStickUD' + self._ext in self._settings if 'analogStickUD' + self._ext in self._settings
else 6 else 6 if self._is_secondary else None
if self._is_secondary
else None
) )
assert isinstance(sval1, (int, type(None))) assert isinstance(sval1, (int, type(None)))
assert isinstance(sval2, (int, type(None))) assert isinstance(sval2, (int, type(None)))
@ -595,9 +589,7 @@ class GamepadSettingsWindow(bui.Window):
dpadnum = ( dpadnum = (
self._settings['dpad' + self._ext] self._settings['dpad' + self._ext]
if 'dpad' + self._ext in self._settings if 'dpad' + self._ext in self._settings
else 2 else 2 if self._is_secondary else None
if self._is_secondary
else None
) )
assert isinstance(dpadnum, (int, type(None))) assert isinstance(dpadnum, (int, type(None)))
if dpadnum is not None: if dpadnum is not None:
@ -893,9 +885,7 @@ class AwaitGamepadInputWindow(bui.Window):
scale=( scale=(
2.0 2.0
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.9 else 1.9 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
size=(width, height), size=(width, height),
transition='in_scale', transition='in_scale',

10
src/assets/ba_data/python/bauiv1lib/settings/gamepadadvanced.py
View File

@ -42,13 +42,11 @@ class GamepadAdvancedSettingsWindow(bui.Window):
* ( * (
1.85 1.85
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.35 else 1.35 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -25) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -25)
if uiscale is bui.UIScale.SMALL
else (0, 0),
scale_origin_stack_offset=(advb.get_screen_space_center()), scale_origin_stack_offset=(advb.get_screen_space_center()),
) )
) )

8
src/assets/ba_data/python/bauiv1lib/settings/gamepadselect.py
View File

@ -45,9 +45,7 @@ def gamepad_configure_callback(event: dict[str, Any]) -> None:
scale=( scale=(
1.7 1.7
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.4 else 1.4 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
size=(width, height), size=(width, height),
transition='in_right', transition='in_right',
@ -122,9 +120,7 @@ class GamepadSelectWindow(bui.Window):
scale=( scale=(
2.3 2.3
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.5 else 1.5 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
size=(width, height), size=(width, height),
transition='in_right', transition='in_right',

18
src/assets/ba_data/python/bauiv1lib/settings/graphics.py
View File

@ -75,9 +75,7 @@ class GraphicsSettingsWindow(bui.Window):
base_scale = ( base_scale = (
2.0 2.0
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.5 else 1.5 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
) )
popup_menu_scale = base_scale * 1.2 popup_menu_scale = base_scale * 1.2
v = height - 50 v = height - 50
@ -88,9 +86,9 @@ class GraphicsSettingsWindow(bui.Window):
transition=transition, transition=transition,
scale_origin_stack_offset=scale_origin, scale_origin_stack_offset=scale_origin,
scale=base_scale, scale=base_scale,
stack_offset=(0, -30) stack_offset=(
if uiscale is bui.UIScale.SMALL (0, -30) if uiscale is bui.UIScale.SMALL else (0, 0)
else (0, 0), ),
) )
) )
@ -174,9 +172,11 @@ class GraphicsSettingsWindow(bui.Window):
width=150, width=150,
scale=popup_menu_scale, scale=popup_menu_scale,
choices=['Auto', 'Higher', 'High', 'Medium', 'Low'], choices=['Auto', 'Higher', 'High', 'Medium', 'Low'],
choices_disabled=['Higher', 'High'] choices_disabled=(
if bui.get_max_graphics_quality() == 'Medium' ['Higher', 'High']
else [], if bui.get_max_graphics_quality() == 'Medium'
else []
),
choices_display=[ choices_display=[
bui.Lstr(resource='autoText'), bui.Lstr(resource='autoText'),
bui.Lstr(resource=self._r + '.higherText'), bui.Lstr(resource=self._r + '.higherText'),

16
src/assets/ba_data/python/bauiv1lib/settings/keyboard.py
View File

@ -39,9 +39,7 @@ class ConfigKeyboardWindow(bui.Window):
scale=( scale=(
1.6 1.6
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.3 else 1.3 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
stack_offset=(0, 5) if uiscale is bui.UIScale.SMALL else (0, 0), stack_offset=(0, 5) if uiscale is bui.UIScale.SMALL else (0, 0),
transition=transition, transition=transition,
@ -70,10 +68,10 @@ class ConfigKeyboardWindow(bui.Window):
'buttonLeft', 'buttonLeft',
'buttonRight', 'buttonRight',
]: ]:
self._settings[ self._settings[button] = (
button bui.app.classic.get_input_device_mapped_value(
] = bui.app.classic.get_input_device_mapped_value( self._input, button
self._input, button )
) )
cancel_button = bui.buttonwidget( cancel_button = bui.buttonwidget(
@ -347,9 +345,7 @@ class AwaitKeyboardInputWindow(bui.Window):
scale=( scale=(
2.0 2.0
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.5 else 1.5 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM
else 1.0
), ),
) )
) )

4
src/assets/ba_data/python/bauiv1lib/settings/nettesting.py
View File

@ -37,9 +37,7 @@ class NetTestingWindow(bui.Window):
scale=( scale=(
1.56 1.56
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.2 else 1.2 if uiscale is bui.UIScale.MEDIUM else 0.8
if uiscale is bui.UIScale.MEDIUM
else 0.8
), ),
stack_offset=(0.0, -7 if uiscale is bui.UIScale.SMALL else 0.0), stack_offset=(0.0, -7 if uiscale is bui.UIScale.SMALL else 0.0),
transition=transition, transition=transition,

26
src/assets/ba_data/python/bauiv1lib/settings/plugins.py
View File

@ -58,9 +58,7 @@ class PluginWindow(bui.Window):
self._height = ( self._height = (
390.0 390.0
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 450.0 else 450.0 if uiscale is bui.UIScale.MEDIUM else 520.0
if uiscale is bui.UIScale.MEDIUM
else 520.0
) )
top_extra = 10 if uiscale is bui.UIScale.SMALL else 0 top_extra = 10 if uiscale is bui.UIScale.SMALL else 0
super().__init__( super().__init__(
@ -72,13 +70,11 @@ class PluginWindow(bui.Window):
scale=( scale=(
2.06 2.06
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.4 else 1.4 if uiscale is bui.UIScale.MEDIUM else 1.0
if uiscale is bui.UIScale.MEDIUM ),
else 1.0 stack_offset=(
(0, -25) if uiscale is bui.UIScale.SMALL else (0, 0)
), ),
stack_offset=(0, -25)
if uiscale is bui.UIScale.SMALL
else (0, 0),
) )
) )
@ -252,9 +248,7 @@ class PluginWindow(bui.Window):
scale=( scale=(
2.3 2.3
if uiscale is bui.UIScale.SMALL if uiscale is bui.UIScale.SMALL
else 1.65 else 1.65 if uiscale is bui.UIScale.MEDIUM else 1.23
if uiscale is bui.UIScale.MEDIUM
else 1.23
), ),
choices=[c.value for c in Category], choices=[c.value for c in Category],
choices_display=[bui.Lstr(resource=c.resource) for c in Category], choices_display=[bui.Lstr(resource=c.resource) for c in Category],
@ -365,9 +359,11 @@ class PluginWindow(bui.Window):
textcolor=( textcolor=(
(0.8, 0.3, 0.3) (0.8, 0.3, 0.3)
if (plugspec.attempted_load and plugspec.plugin is None) if (plugspec.attempted_load and plugspec.plugin is None)
else (0.6, 0.6, 0.6) else (
if plugspec.plugin is None (0.6, 0.6, 0.6)
else (0, 1, 0) if plugspec.plugin is None
else (0, 1, 0)
)
), ),
) )
# noinspection PyUnresolvedReferences # noinspection PyUnresolvedReferences

Some files were not shown because too many files have changed in this diff Show More