diff --git a/.efrocachemap b/.efrocachemap index 74d83a3e..057ab683 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4135,16 +4135,16 @@ "assets/build/windows/x64/vc_redist.x64.exe": "https://files.ballistica.net/cache/ba1/ea/19/8b8787d81abcdce158ba608cd24f", "assets/build/windows/x64/vcruntime140_1d.dll": "https://files.ballistica.net/cache/ba1/11/d8/ff6344b429b00c24d9a1930d4338", "assets/build/windows/x64/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/20/33/0825e11e6518f87ece3009309933", - "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/05/0d/bc658d9bcf94d07bde0812c3f4a7", - "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2f/ce/d2018415a449ad310a68970ac848", - "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/4e/60/bbf2bf14e58835ea71897366674c", - "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/7b/7b/5c7d8989c1cf1a34c3b84390d26d", - "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d2/33/f26482f85d7e3fe349badc83fb38", - "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/24/30/0a93d6fb06eaf30e698900f7719f", - "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/c9/7f/d3d4952829448c53ad93c4a7a7f6", - "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/64/40/0e1838ce963ebc0ff5927d2ef096", - "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/3b/3b/13e222119a4fae02a43ebca3a2e1", - "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/5b/90/2f7e0be10cf2e4681902b1dbfac5", - "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/8e/76/6b1a723d85bc9fd81ca44f71c653", - "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/11/cd/8152982a3b7f9970cde209470f9c" + "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/4e/53/7ec6327e532452541ad97ff927ab", + "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/70/7f/d853bede37c4b91d822cf853fc51", + "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/9f/be/93c11fb8a237efcec5fe9e95b52f", + "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/a2/4a/cd3f8408329ac476450b14d961a4", + "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/0f/6e/fb1fffbb11902f90edd5ea3ff257", + "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f0/f7/9cb910b949bab6ac8b4c82f8b03d", + "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/f2/1e/483962e078392dafe3c47ab56ec8", + "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/ca/70/1c30ceee55f2a89657507b7023d7", + "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/56/89/69526aeb40798e71afe19984b68f", + "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/93/d1/23e82bfbdfb38bf3e443939490be", + "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/e5/a2/96201ceeefb90d6ebb4b81089b67", + "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/55/42/cfd614f84ade2658ba12dff258b6" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 27c2b7a5..18789952 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### 1.5.19 (20114) +- Cleaned up some bomb chain-reaction logic to avoid weird corner-cases such as land-mine explosions behaving like punches when set off by a punch. Holler if anything explosion-related looks broken. + ### 1.5.18 (20108) - A bit of project cleanup; tools/snippets is now tools/pcommand, etc. - More minor bug fixes and crash/bug-logging improvements. diff --git a/assets/src/ba_data/python/_ba.py b/assets/src/ba_data/python/_ba.py index c5078118..1a03a0e9 100644 --- a/assets/src/ba_data/python/_ba.py +++ b/assets/src/ba_data/python/_ba.py @@ -613,6 +613,7 @@ class Node: model_opaque: Optional[ba.Model] = None model_transparent: Optional[ba.Model] = None damage_smoothed: float = 0.0 + gravity_scale: float = 1.0 punch_power: float = 0.0 punch_momentum_linear: Sequence[float] = (0.0, 0.0, 0.0) punch_momentum_angular: float = 0.0 diff --git a/tools/batools/pcommand.py b/tools/batools/pcommand.py index 177a43d4..7e904c7e 100644 --- a/tools/batools/pcommand.py +++ b/tools/batools/pcommand.py @@ -674,10 +674,11 @@ def efro_gradle() -> None: enabled_tags = {'google', 'crashlytics'} buildfilename = 'BallisticaCore/build.gradle' - # Backup the original file, preserving timestamps and whatnot so as to not - # trip modification tests. - subprocess.run(['cp', '-p', buildfilename, f'{buildfilename}.prev'], - check=True) + + # Move the original file out of the way and operate on a copy of it. + subprocess.run(['mv', buildfilename, f'{buildfilename}.prev'], check=True) + subprocess.run(['cp', f'{buildfilename}.prev', buildfilename], check=True) + filter_gradle_file(buildfilename, enabled_tags) try: