From 79d85b31cb62457dc6c78d2b0004d11f623a17fa Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Wed, 16 Jun 2021 17:23:38 -0500 Subject: [PATCH] fixed tutorial breakage --- .efrocachemap | 52 ++++++++++----------- assets/src/ba_data/python/ba/_lobby.py | 12 +++-- assets/src/ba_data/python/bastd/tutorial.py | 2 +- docs/ba_module.md | 2 +- src/ballistica/ballistica.cc | 2 +- 5 files changed, 37 insertions(+), 33 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index a440fa18..d9eb3a93 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3934,26 +3934,26 @@ "assets/build/windows/Win32/vc_redist.x86.exe": "https://files.ballistica.net/cache/ba1/1c/e1/4a1a2eddda2f4aebd5f8b64ab08e", "assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f", "ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a", - "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/61/8d/3bd881b575b20d2539aebc3c5fbc", + "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/e2/8c/ba176411439f43001e474f232eed", "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/74/1d/fc9e33e565475daaac80da5252f0", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d2/ea/6381f6acbfa7e34c1af6b97748fc", - "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d0/91/08129c632d8ab190f616bfcc8d81", - "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/16/81/6cade558876a9853ffb41bd97d2f", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/50/33/f3866b039d82c192ea27caf5e1e1", + "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/78/3b/d0fe1f09368b0384d96b5bc52ce5", + "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/78/df/b78c08767f235704c5a55608aff9", "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9c/7b/ac1a200be0f37078af0991faca3b", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/15/82/c837b1277ce68259927ee76c70a2", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/87/38/d41db38f2a4b6c82e2f0190ac0c1", - "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/8c/4c/440acf05835f677f02bf45eea5f3", - "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/60/7c/036d94438a4c6688a19560586cc6", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/dd/66/5ccf21a659e5a93f554041196002", - "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/8d/a2/4bbbed39caf3ad45e97fd855bffc", - "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/ee/b6/0667a97d33810d50126bb5c2e79a", - "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/1e/ec/1dce16e09b5d2efbe86d9ef1fd22", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/03/d3/ade627a7f28d6443f03753e67c8c", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/56/72/65f211669bf7e59dc752505e70fa", - "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/2d/45/0f969be014d94450e0fecddb6892", - "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/1a/5b/f4f09d532190b2f374c769c36595", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/a2/f6/8ffa679c2219a41925c89d49e77b", - "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/08/1b/81b4d00361b1c98e729929de3af4", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/b7/ea/a2ecdf19132501e2fb1498e26726", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/7a/02/d5de1ec617a204fc9ba7116888bf", + "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/ac/c3/8d5585b83152c88f88bc9e2d6f23", + "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/5d/54/f03e0636e6cb26ae0a88d7307d0d", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/42/fd/1f9b293cfd9c322380454fab1a16", + "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/6b/dc/7b25fadcbfc034ab5fd0a565949d", + "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/7d/58/0e42e375ee58ee3f69055cd1a92a", + "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/20/81/62e470914774ee09c87017f0f4fb", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/b0/b4/4221778c5d956b80d29cc7927fce", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/0d/3e/c71327594cd0eab1a8a2d81dc4c1", + "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/6c/a5/0b0e2b734d3bd6a4a6bb0ee3839e", + "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/56/3f/62f79f479450e744d23afd06fe3d", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/d4/00/201bab2fa9efb6fae0b45b6f82ae", + "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/a3/1d/aeb5f326f50e8a9333a7a11fe420", "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/9a/32/bda06e355384dac2fc81c8357812", "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/34/f6/b4db57144d47cfdb153dd4de6742", "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/53/44/cf4405c2ebe2695d55858129d3fe", @@ -3970,12 +3970,12 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b5/5b/0390ee8916f97d302cde3ea356bc", "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/7a/ee/8249ede29becc0cd41178924b6dc", "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c0/5f/e89024a87dd092f6e0cc43afb707", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/98/96/f64c1236e4f328e1fec0d42ccd1f", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/8f/a6/e7e3bdf82333c7971eda5f01974c", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/e8/a4/eea8a31ffa673b3b7f2ead00c737", - "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/73/f7/04dcf8b208008d93110d494f4277", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/8b/b4/e345000aa4c97bd1f7527360d315", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/cf/99/0dd1c00a7155bcfba6fe905fe5b6", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/e8/c5/17a85bd9d4e012e8ef726c453fbc", - "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/39/a3/aa835091c1b383211d5751a0ed5e" + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/09/39/491c547fdd70fd613d510f023594", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/9d/98/206d85d959b687f3f3ff4dff05db", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/fb/69/6894597fe1553d4941016825eee5", + "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/6c/bb/08d622bf825fe1fbab861d8b917b", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/87/ae/9c06889156b74bae9a9c1d52a75e", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/46/44/f7937f9749b36d33dba127de5ff6", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/d1/55/a47b41c0064bcbe1b498aa4ef8b1", + "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/c3/24/c86aeac15cfca26266d1146fc01f" } \ No newline at end of file diff --git a/assets/src/ba_data/python/ba/_lobby.py b/assets/src/ba_data/python/ba/_lobby.py index 577a0c42..313b6ad5 100644 --- a/assets/src/ba_data/python/ba/_lobby.py +++ b/assets/src/ba_data/python/ba/_lobby.py @@ -32,10 +32,14 @@ class JoinInfo: from ba._nodeactor import NodeActor from ba._general import WeakCall self._state = 0 - self._press_to_punch: Union[str, ba.Lstr] = _ba.charstr( - SpecialChar.LEFT_BUTTON) - self._press_to_bomb: Union[str, ba.Lstr] = _ba.charstr( - SpecialChar.RIGHT_BUTTON) + self._press_to_punch: Union[str, + ba.Lstr] = ('C' if _ba.app.iircade_mode + else _ba.charstr( + SpecialChar.LEFT_BUTTON)) + self._press_to_bomb: Union[str, + ba.Lstr] = ('B' if _ba.app.iircade_mode else + _ba.charstr( + SpecialChar.RIGHT_BUTTON)) self._joinmsg = Lstr(resource='pressAnyButtonToJoinText') can_switch_teams = (len(lobby.sessionteams) > 1) diff --git a/assets/src/ba_data/python/bastd/tutorial.py b/assets/src/ba_data/python/bastd/tutorial.py index f4c0c50e..39bad74d 100644 --- a/assets/src/ba_data/python/bastd/tutorial.py +++ b/assets/src/ba_data/python/bastd/tutorial.py @@ -2302,7 +2302,7 @@ class TutorialActivity(ba.Activity[Player, Team]): while self._entries: entry = self._entries.pop(0) try: - result = entry.generate(self) + result = entry.run(self) except Exception: result = None ba.print_exception() diff --git a/docs/ba_module.md b/docs/ba_module.md index c28ddca8..3610060f 100644 --- a/docs/ba_module.md +++ b/docs/ba_module.md @@ -1,5 +1,5 @@ -

last updated on 2021-06-15 for Ballistica version 1.6.4 build 20381

+

last updated on 2021-06-16 for Ballistica version 1.6.4 build 20385

This page documents the Python classes and functions in the 'ba' module, which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please let me know. Happy modding!

diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc index f634182c..f4eae3c5 100644 --- a/src/ballistica/ballistica.cc +++ b/src/ballistica/ballistica.cc @@ -21,7 +21,7 @@ namespace ballistica { // These are set automatically via script; don't modify them here. -const int kAppBuildNumber = 20383; +const int kAppBuildNumber = 20385; const char* kAppVersion = "1.6.4"; // Our standalone globals.