diff --git a/.efrocachemap b/.efrocachemap index 2a959f04..dc6ed637 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -421,40 +421,40 @@ "build/assets/ba_data/audio/zoeOw.ogg": "https://files.ballistica.net/cache/ba1/51/22/5b47da0beb5800a004d4a4396632", "build/assets/ba_data/audio/zoePickup01.ogg": "https://files.ballistica.net/cache/ba1/16/7c/afb1cdfb86bdca56ca9118676b49", "build/assets/ba_data/audio/zoeScream01.ogg": "https://files.ballistica.net/cache/ba1/d2/c2/5689203c1819d0f3a344e3d46193", - "build/assets/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/3b/0c/e201c5f31d19e0b93c5e5af81a54", - "build/assets/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/f1/33/bee4a5dd13bf8a0b8566e2907876", - "build/assets/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/c0/82/9e3dfce6e766f015c10a2064278e", - "build/assets/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/aa/5e/bebd1031bb1b78c6fcbd18b9f3c0", - "build/assets/ba_data/data/languages/chinesetraditional.json": "https://files.ballistica.net/cache/ba1/fe/7f/7b58735c3a52167fb4f8c598d032", - "build/assets/ba_data/data/languages/croatian.json": "https://files.ballistica.net/cache/ba1/fb/02/bf4d9f8db85a43967319916ada0b", - "build/assets/ba_data/data/languages/czech.json": "https://files.ballistica.net/cache/ba1/46/49/8aad582c97def1b45cdae73a7445", + "build/assets/ba_data/data/langdata.json": "https://files.ballistica.net/cache/ba1/95/8e/3b8fd5d19e234342a9f5dc610a78", + "build/assets/ba_data/data/languages/arabic.json": "https://files.ballistica.net/cache/ba1/d5/70/3296c2e326874fa11d813e35aed0", + "build/assets/ba_data/data/languages/belarussian.json": "https://files.ballistica.net/cache/ba1/b6/42/dd53253b506f18d2851066c15672", + "build/assets/ba_data/data/languages/chinese.json": "https://files.ballistica.net/cache/ba1/ce/76/eef117a6d75204f49d4428429aed", + "build/assets/ba_data/data/languages/chinesetraditional.json": "https://files.ballistica.net/cache/ba1/5a/25/8c623e45ef3572c3632ae9f589d0", + "build/assets/ba_data/data/languages/croatian.json": "https://files.ballistica.net/cache/ba1/86/e7/62358d894a4f0069155c72bfbceb", + "build/assets/ba_data/data/languages/czech.json": "https://files.ballistica.net/cache/ba1/ea/77/035aac8b1642ae99c51476f9617d", "build/assets/ba_data/data/languages/danish.json": "https://files.ballistica.net/cache/ba1/58/a5/b47cbedf0089f2a91533d35f11c4", "build/assets/ba_data/data/languages/dutch.json": "https://files.ballistica.net/cache/ba1/8d/eb/98377780a8ca10fad206039a9855", "build/assets/ba_data/data/languages/english.json": "https://files.ballistica.net/cache/ba1/9f/98/06b9c62fc92ef12c1d9db45628ef", "build/assets/ba_data/data/languages/esperanto.json": "https://files.ballistica.net/cache/ba1/53/13/3bfa0a5c743cd62a6049081ca8bb", - "build/assets/ba_data/data/languages/filipino.json": "https://files.ballistica.net/cache/ba1/4f/f7/3d14933afd164cc01595be97b5db", - "build/assets/ba_data/data/languages/french.json": "https://files.ballistica.net/cache/ba1/9d/76/22ed68d506d347d4765398ea24c0", - "build/assets/ba_data/data/languages/german.json": "https://files.ballistica.net/cache/ba1/5f/d9/862fc0f299a87be14a53eb4bc712", + "build/assets/ba_data/data/languages/filipino.json": "https://files.ballistica.net/cache/ba1/05/9f/fca2243adbcf28bb69a9d3648da9", + "build/assets/ba_data/data/languages/french.json": "https://files.ballistica.net/cache/ba1/e2/18/15a112dd407a4f5cb0ca22bd3067", + "build/assets/ba_data/data/languages/german.json": "https://files.ballistica.net/cache/ba1/24/32/7c98a2a1f1eb1c4ce89603a2724a", "build/assets/ba_data/data/languages/gibberish.json": "https://files.ballistica.net/cache/ba1/3c/1c/16c6ca71928720e1e3e0d3fdbe90", - "build/assets/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/93/72/b773ef21cfaaa47c59a606ad7cc9", - "build/assets/ba_data/data/languages/hindi.json": "https://files.ballistica.net/cache/ba1/ab/60/1b460ab890a5dd45bfcbd4ff1d43", - "build/assets/ba_data/data/languages/hungarian.json": "https://files.ballistica.net/cache/ba1/e1/5e/65e12a78bdd09a6091c9b9e546fc", - "build/assets/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/2b/f2/a339f8634e8477504f64e6c85f6c", - "build/assets/ba_data/data/languages/italian.json": "https://files.ballistica.net/cache/ba1/54/31/7327631db1e56b644ab673b8a62b", - "build/assets/ba_data/data/languages/korean.json": "https://files.ballistica.net/cache/ba1/a3/a9/c85ae5914d23c4ca6fb830f7048a", - "build/assets/ba_data/data/languages/malay.json": "https://files.ballistica.net/cache/ba1/32/51/ed33be67091f4d23de7a0531c3d1", - "build/assets/ba_data/data/languages/persian.json": "https://files.ballistica.net/cache/ba1/b3/7a/0c82beaff067bdeac2914c5e3a95", - "build/assets/ba_data/data/languages/polish.json": "https://files.ballistica.net/cache/ba1/d9/74/93c94e24c480b50058fbf8c29575", - "build/assets/ba_data/data/languages/portuguese.json": "https://files.ballistica.net/cache/ba1/8e/c2/839e099cbbc420a7fd04c823bc4f", + "build/assets/ba_data/data/languages/greek.json": "https://files.ballistica.net/cache/ba1/16/89/a9d8e2f88935d9bf15187abb5d65", + "build/assets/ba_data/data/languages/hindi.json": "https://files.ballistica.net/cache/ba1/cd/14/8015add5aaf548ce4331bf50b1d5", + "build/assets/ba_data/data/languages/hungarian.json": "https://files.ballistica.net/cache/ba1/01/29/a1c235417824047197e2fe79d8cf", + "build/assets/ba_data/data/languages/indonesian.json": "https://files.ballistica.net/cache/ba1/7a/27/b3638cf7e27d9c06d8c9dd9f9123", + "build/assets/ba_data/data/languages/italian.json": "https://files.ballistica.net/cache/ba1/ab/61/c6f8e4d8772accf8f0d98ffb04ee", + "build/assets/ba_data/data/languages/korean.json": "https://files.ballistica.net/cache/ba1/12/20/18d34604ffd61e9f81a5ca2a3800", + "build/assets/ba_data/data/languages/malay.json": "https://files.ballistica.net/cache/ba1/b4/1d/e9aa13b23246b1e5270bef53f18c", + "build/assets/ba_data/data/languages/persian.json": "https://files.ballistica.net/cache/ba1/48/c2/c86b5fe7598de328d6c5ca6db5b9", + "build/assets/ba_data/data/languages/polish.json": "https://files.ballistica.net/cache/ba1/1a/a9/e9ea6fef590f149d1a6d615f4c08", + "build/assets/ba_data/data/languages/portuguese.json": "https://files.ballistica.net/cache/ba1/88/20/000ee8ecc06ee4e89a4596a46176", "build/assets/ba_data/data/languages/romanian.json": "https://files.ballistica.net/cache/ba1/2d/e9/daebca347a9450266a1c4f9c0fa5", - "build/assets/ba_data/data/languages/russian.json": "https://files.ballistica.net/cache/ba1/f3/d3/8c0e0965d88361c4efcdc4c4389c", + "build/assets/ba_data/data/languages/russian.json": "https://files.ballistica.net/cache/ba1/e5/b4/2a6e5a48b12eecb226a827975e5d", "build/assets/ba_data/data/languages/serbian.json": "https://files.ballistica.net/cache/ba1/5f/a9/3a0bd59533cf6cea2f3463b0f16f", - "build/assets/ba_data/data/languages/slovak.json": "https://files.ballistica.net/cache/ba1/23/a2/7cdf2946254cce58bcd37dd126a5", - "build/assets/ba_data/data/languages/spanish.json": "https://files.ballistica.net/cache/ba1/91/4e/1c5d58f9333fac73048b6f5dfa80", + "build/assets/ba_data/data/languages/slovak.json": "https://files.ballistica.net/cache/ba1/12/c7/2e123ab6be9c5326397dd4e02f9f", + "build/assets/ba_data/data/languages/spanish.json": "https://files.ballistica.net/cache/ba1/9f/8e/38a50d6b1ace1e461b57a63f3864", "build/assets/ba_data/data/languages/swedish.json": "https://files.ballistica.net/cache/ba1/87/cb/692935d8462ea4f0843e0e42582c", - "build/assets/ba_data/data/languages/tamil.json": "https://files.ballistica.net/cache/ba1/7d/1e/7895607192bd7967736cec5bfce6", + "build/assets/ba_data/data/languages/tamil.json": "https://files.ballistica.net/cache/ba1/11/7b/6fde0b82f8bce5dbcb847744c137", "build/assets/ba_data/data/languages/thai.json": "https://files.ballistica.net/cache/ba1/02/8a/a4c87d7e13f280dc6b18848f1058", - "build/assets/ba_data/data/languages/turkish.json": "https://files.ballistica.net/cache/ba1/39/53/c09ecffb5bf04c59ccb9f08ab835", + "build/assets/ba_data/data/languages/turkish.json": "https://files.ballistica.net/cache/ba1/f8/1a/da8d61236cfe345b874dd7c44b66", "build/assets/ba_data/data/languages/ukrainian.json": "https://files.ballistica.net/cache/ba1/f7/55/8362c390108bbe7eef4411c706a9", "build/assets/ba_data/data/languages/venetian.json": "https://files.ballistica.net/cache/ba1/d4/19/e1308b440afe2eacc05ed310ddc6", "build/assets/ba_data/data/languages/vietnamese.json": "https://files.ballistica.net/cache/ba1/dc/dd/13c188ea58ee0632e03e0790a879", @@ -4072,26 +4072,26 @@ "build/assets/workspace/ninjafightplug.py": "https://files.ballistica.net/cache/ba1/c5/09/4f10b8a21ba87aa5509cff7a164b", "build/assets/workspace/onslaughtplug.py": "https://files.ballistica.net/cache/ba1/ff/0a/a354984f9c074dab0676ac7e4877", "build/assets/workspace/runaroundplug.py": "https://files.ballistica.net/cache/ba1/2a/1c/9ee5db6d1bceca7fa6638fb8abde", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/16/45/d88feac0b70205ef727adb8e0539", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/6e/1e/4c65c27f16121fb19c1986975ac6", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c4/79/dda03acdac10dda499c97098b6df", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/5c/19/3f9e1db269df76ec37fc0e62f061", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/b0/e0/92ab1f913417c9854a726e1dccc7", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/a6/52/2df57c46b96ffe5e4f5fe7a738db", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/71/aa/530e5f451284e768c5ed4d4a4a80", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/27/b3/633f739fced5ac019aa219911ea6", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/70/65/86bf214eef166a3a508a296dcef9", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/02/ab/60c078c55c734699b6e15295277c", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/1c/3d/d8ec8383ae4a6bcfe7bca4274420", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d0/01/5da440631934aa5d2451e0bd59f7", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/15/0a/8b0b6ea93fa9b4b92c5a34885574", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/dd/a2/8a1904e5c440b7aa47e40600c9f7", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/52/1d/c80d4632d100260e2ff562171c59", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b0/f3/296763c20e84cf065626882196aa", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/6a/82/d66f2f99f003085ed785e602f0e2", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/bd/fd/a1c164169e9775cceee8ed801009", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/0d/d8/13bb9bf1f71f8e8867d4ed7ac1d6", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/ec/b1/c0c0041a6b3cfe32330b5c84bd59", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/eb/29/0e618578a3685adf8fb04f4dee7d", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/70/db/0ffd4749f048c72d183042e247ee", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b3/36/5eea5641d52a06781aebc080bb1f", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e5/63/a10937d07789b673348e80ac154e", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/9b/46/f0162e131c95ad16d8ea7b3c1e8a", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/ff/ff/31df1d157f5327e6f8102ce2ace4", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/2e/b6/8162bcfad6d314a40a7bd3525690", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/d4/90/505f4d2b7f50518878e2636c6ecc", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/23/64/0972ecd8f7807b81f9bd45dd6f7d", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/fa/0a/9e035d71823e1b4ca13f18885941", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/31/3d/bd4943dec572fc96b79bd3a21318", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/e7/f5/83b8ddba0d8b835883a067401df7", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/fc/53/872e739ffc532402c5ce84c5bedc", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/25/2b/2cfa1a686cb07ad02e375798cdcc", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/8e/d9/a3dc7d79adbf07b71c4b8114991d", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b6/f0/4d8abadd123afbfd472554c61f97", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/49/75/7150511fb343de9e849dff8a53ed", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/0b/0c/0d81d9e7acf1521ae1d9d828befe", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/14/ec/2406d58deefe9c528223be3f1dad", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/e2/8a/3bed3a20ddf0e34f7c1859112af3", "build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/86/b8/5aaa1f826bdb5abe5ad57b0fc0c9", "build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/d4/8e/70f425b0259655a3efe710846cce", "build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/f5/71/9c18e9e43026aa763c5ac6e5b445", @@ -4108,14 +4108,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/9b/30/f27a1766b6ce7c5dc63c0c5a1f65", "build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/8e/97/dc049e4ff4ad2c808a6f5c685dc7", "build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/c1/83/aacd3c0321301d6eaf81eb656456", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/f4/e3/51c0f6dab525d600ebedaea36ad3", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/f4/50/5c3d1fb95c5ce0de017205f16945", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/08/6d/5d9aa2e3edc78af51fba7e27f71e", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/84/93/e9e5fe8e5dacebdb8ac359f12c3f", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/83/08/dd85f77bded28958ce1eccc94434", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/ba/cf/094acd3d64454e199e992b4f909d", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/a4/95/b73b4d0726da5fb638d049681101", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/ce/2e/ae918b603dd8f6876680ba6c0064", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/ac/23/d6bc46cecf31b687522c21dfc249", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/d8/87/42f7d8ae59765dfc9fd2785461e8", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/bd/45/c70218464cba8587dbb0b039a620", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/4a/02/a5b4e021a1fc58329d286daeaada", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/59/d7/85fe6d5afb5194d969ff258c8226", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/d1/a0/172e45106d05ddab9a9583f47dad", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/f3/cd/5f1035d7d1c5cdc5d78201316c1f", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/0a/37/2e8d93c187186109f3299c9686d9", "src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/52/c6/c11130af7b10d6c0321add5518fa", "src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/38/c3/1dedd5e74f2508efc5974c8815a1", "src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/75/9f/bcf597b362c9f2480cb348188bdd", diff --git a/CHANGELOG.md b/CHANGELOG.md index d6723fba..5280e85f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.20 (build 21066, api 8, 2023-06-07) +### 1.7.20 (build 21068, api 8, 2023-06-07) - This seems like a good time for a `refactoring` release in anticipation of changes coming in 1.8. Basically this means that a lot of things will be @@ -294,6 +294,9 @@ old plugins which reference 'ba' and other modules that no longer exist. - (build 21064) Fixed an issue where the menu button wasn't clickable in-game (thanks for the heads up Irvin). +- (build 21067) Fixed timing bugs in MeteorShower and a few other places caused + by incorrect use of `bs.apptime()` there `bs.time()` should have been used + (thanks for the heads- up SEBASTIAN2059) ### 1.7.19 (build 20997, api 7, 2023-01-19) diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 9d59cb08..3f790cbd 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -28,7 +28,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21066 +TARGET_BALLISTICA_BUILD = 21068 TARGET_BALLISTICA_VERSION = '1.7.20' _g_env_config: EnvConfig | None = None diff --git a/src/assets/ba_data/python/bascenev1lib/actor/onscreentimer.py b/src/assets/ba_data/python/bascenev1lib/actor/onscreentimer.py index 9de5509d..6f3b8dfa 100644 --- a/src/assets/ba_data/python/bascenev1lib/actor/onscreentimer.py +++ b/src/assets/ba_data/python/bascenev1lib/actor/onscreentimer.py @@ -4,11 +4,12 @@ from __future__ import annotations from typing import TYPE_CHECKING +import logging import bascenev1 as bs if TYPE_CHECKING: - from typing import Any, Literal + from typing import Any class OnScreenTimer(bs.Actor): @@ -65,13 +66,15 @@ class OnScreenTimer(bs.Actor): endtime = bs.time() if self._starttime_ms is None: - print('Warning: OnScreenTimer.stop() called without start() first') + logging.warning( + 'OnScreenTimer.stop() called without first calling start()' + ) else: endtime_ms = int(endtime * 1000) self.inputnode.timemax = endtime_ms - self._starttime_ms def getstarttime(self) -> float: - """Return the sim-time when start() was called. + """Return the scene-time when start() was called. Time will be returned in seconds if timeformat is SECONDS or milliseconds if it is MILLISECONDS. diff --git a/src/assets/ba_data/python/bascenev1lib/game/assault.py b/src/assets/ba_data/python/bascenev1lib/game/assault.py index 28c462f3..183a017f 100644 --- a/src/assets/ba_data/python/bascenev1lib/game/assault.py +++ b/src/assets/ba_data/python/bascenev1lib/game/assault.py @@ -199,8 +199,8 @@ class AssaultGame(bs.TeamGameActivity[Player, Team]): player_team = player.team if player_team is not team: # Prevent multiple simultaneous scores. - if bs.apptime() != self._last_score_time: - self._last_score_time = bs.apptime() + if bs.time() != self._last_score_time: + self._last_score_time = bs.time() self.stats.player_scored(player, 50, big_message=True) self._score_sound.play() self._flash_base(team) diff --git a/src/assets/ba_data/python/bascenev1lib/game/elimination.py b/src/assets/ba_data/python/bascenev1lib/game/elimination.py index 1a6cc713..51b09895 100644 --- a/src/assets/ba_data/python/bascenev1lib/game/elimination.py +++ b/src/assets/ba_data/python/bascenev1lib/game/elimination.py @@ -301,7 +301,7 @@ class EliminationGame(bs.TeamGameActivity[Player, Team]): def on_begin(self) -> None: super().on_begin() - self._start_time = bs.apptime() + self._start_time = bs.time() self.setup_standard_time_limit(self._time_limit) self.setup_standard_powerup_drops() if self._solo_mode: @@ -513,7 +513,7 @@ class EliminationGame(bs.TeamGameActivity[Player, Team]): # for their team. if self._get_total_team_lives(player.team) == 0: assert self._start_time is not None - player.team.survival_seconds = int(bs.apptime() - self._start_time) + player.team.survival_seconds = int(bs.time() - self._start_time) def _get_total_team_lives(self, team: Team) -> int: return sum(player.lives for player in team.players) @@ -547,7 +547,7 @@ class EliminationGame(bs.TeamGameActivity[Player, Team]): if self._get_total_team_lives(player.team) == 0: assert self._start_time is not None player.team.survival_seconds = int( - bs.apptime() - self._start_time + bs.time() - self._start_time ) else: # Otherwise, in regular mode, respawn. diff --git a/src/assets/ba_data/python/bascenev1lib/game/meteorshower.py b/src/assets/ba_data/python/bascenev1lib/game/meteorshower.py index ea4f8671..35e0566d 100644 --- a/src/assets/ba_data/python/bascenev1lib/game/meteorshower.py +++ b/src/assets/ba_data/python/bascenev1lib/game/meteorshower.py @@ -127,7 +127,7 @@ class MeteorShowerGame(bs.TeamGameActivity[Player, Team]): # Augment standard behavior. super().handlemessage(msg) - curtime = bs.apptime() + curtime = bs.time() # Record the player's moment of death. # assert isinstance(msg.spaz.player @@ -214,7 +214,7 @@ class MeteorShowerGame(bs.TeamGameActivity[Player, Team]): self._meteor_time = max(0.01, self._meteor_time * 0.9) def end_game(self) -> None: - cur_time = bs.apptime() + cur_time = bs.time() assert self._timer is not None start_time = self._timer.getstarttime() diff --git a/src/assets/ba_data/python/bascenev1lib/game/ninjafight.py b/src/assets/ba_data/python/bascenev1lib/game/ninjafight.py index 9fa51013..501e920b 100644 --- a/src/assets/ba_data/python/bascenev1lib/game/ninjafight.py +++ b/src/assets/ba_data/python/bascenev1lib/game/ninjafight.py @@ -178,9 +178,7 @@ class NinjaFightGame(bs.TeamGameActivity[Player, Team]): # ..if we didn't win, leave scores as default (None) which means # we lost. if self._won: - elapsed_time_ms = int( - (bs.apptime() - self._timer.starttime) * 1000.0 - ) + elapsed_time_ms = int((bs.time() - self._timer.starttime) * 1000.0) bs.cameraflash() self._winsound.play() for team in self.teams: diff --git a/src/ballistica/scene_v1/node/time_display_node.h b/src/ballistica/scene_v1/node/time_display_node.h index 2b236f4a..a3b74594 100644 --- a/src/ballistica/scene_v1/node/time_display_node.h +++ b/src/ballistica/scene_v1/node/time_display_node.h @@ -53,17 +53,17 @@ class TimeDisplayNode : public Node { void OnLanguageChange() override; private: - bool output_dirty_ = true; + bool output_dirty_{true}; std::string output_; - millisecs_t time_min_ = -999999999; - millisecs_t time_max_ = 999999999; - millisecs_t time2_ = 0; - millisecs_t time1_ = 0; - bool show_sub_seconds_ = false; + millisecs_t time_min_{-999999999}; + millisecs_t time_max_{999999999}; + millisecs_t time2_{}; + millisecs_t time1_{}; + bool show_sub_seconds_{}; std::string time_suffix_hours_; std::string time_suffix_minutes_; std::string time_suffix_seconds_; - bool translations_dirty_ = true; + bool translations_dirty_{true}; }; } // namespace ballistica::scene_v1 diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index be5db71e..b7ad7ac5 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 21066; +const int kEngineBuildNumber = 21068; const char* kEngineVersion = "1.7.20"; auto MonolithicMain(const core::CoreConfig& core_config) -> int {