diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 81787b2..c90417e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
applicationId = "me.lecaro.breakout"
minSdk = 21
targetSdk = 34
- versionCode = 29040063
- versionName = "29040063"
+ versionCode = 29040073
+ versionName = "29040073"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
useSupportLibrary = true
diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html
index d3b9b14..43a06a0 100644
--- a/app/src/main/assets/index.html
+++ b/app/src/main/assets/index.html
@@ -1 +1 @@
-Breakout 71
\ No newline at end of file
+Breakout 71
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 6fe429c..c8c3142 100755
--- a/build.sh
+++ b/build.sh
@@ -35,15 +35,14 @@ sed -i -e "s/VERSION = .*/ VERSION = '$versionCode'/" ./src/PWA/sw-b71.js
# remove all exif metadata from pictures, because i think fdroid doesn't like that. odd
-find -name '*.jp*g' -o -name '*.png' | xargs exiftool -all=
-
+find -name '*.jp*g' -o -name '*.png' | xargs exiftool -all= -overwrite_original
npx prettier --write src/
npx jest
-rm -rf dist/*
-npx parcel build src/index.html
+rm -rf build/*
+npx parcel build src/index.html --dist-dir build
rm -rf ./app/src/main/assets/*
-cp public/* dist
+cp public/* build
rm -rf ./app/src/main/assets/*
-cp dist/index.html ./app/src/main/assets/
+cp build/index.html ./app/src/main/assets/
diff --git a/deploy.sh b/deploy.sh
index 407b125..9d39e40 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -21,12 +21,12 @@ git push
# upload to breakout.lecaro.me
DOMAIN="breakout.lecaro.me"
-PUBLIC_CONTENT="./dist/*"
+PUBLIC_CONTENT="./build/*"
ssh staging "mkdir -p /opt/mup-nginx-proxy/config/html/static_sites/$DOMAIN"
rsync -avz --delete --delete-excluded --exclude="*.sh" --exclude="node_modules" --exclude="android" --exclude=".*" $PUBLIC_CONTENT staging:/opt/mup-nginx-proxy/config/html/static_sites/$DOMAIN
# upload to itch.io , upload the index file directly
-butler push "./dist/index.html" renanlecaro/breakout71:latest --userversion $versionCode
-butler push "./dist/index.html" renanlecaro/breakout71:offline --userversion $versionCode
+butler push "./build/index.html" renanlecaro/breakout71:latest --userversion $versionCode
+butler push "./build/index.html" renanlecaro/breakout71:offline --userversion $versionCode
diff --git a/dist/PWA/manifest.webmanifest b/dist/PWA/manifest.webmanifest
deleted file mode 100644
index d16f595..0000000
--- a/dist/PWA/manifest.webmanifest
+++ /dev/null
@@ -1 +0,0 @@
-{"short_name":"B71","name":"Breakout 71","icons":[{"src":"/icon.cad232de.svg","sizes":"48x48 72x72 96x96 128x128 256x256 512x512","type":"image/svg+xml","purpose":"any"},{"src":"/icon-128.07cda280.png","sizes":"128x128","type":"image/png"}],"start_url":"/index.html?isPWA=true","display":"fullscreen","theme_color":"#5DA3EA","background_color":"#ffffff"}
\ No newline at end of file
diff --git a/dist/icon-128.07cda280.png b/dist/icon-128.07cda280.png
deleted file mode 100644
index 3f471e1..0000000
Binary files a/dist/icon-128.07cda280.png and /dev/null differ
diff --git a/dist/icon.cad232de.svg b/dist/icon.cad232de.svg
deleted file mode 100644
index c79a139..0000000
--- a/dist/icon.cad232de.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/dist/index.html b/dist/index.html
index d3b9b14..48237eb 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -1 +1,3766 @@
-Breakout 71
\ No newline at end of file
+
+
+
+
+
+
+ Breakout 71
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dist/privacy.html b/dist/privacy.html
deleted file mode 100644
index f5c3d6b..0000000
--- a/dist/privacy.html
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
- Breakout 71 privacy policy
-
-
-
-
-
-
Privacy policy
-
- Breakout 71 is published
- by Renan LE CARO, a French citizen and programmer. You can contact me at
- this adress : breakout71@lecaro.me
-
-
- If you access breakout.lecaro.me though a web browser, your IP address
- will be logged on my server to prevent abuses.
- My server is hosted by Hetzner
- Online GmbH in germany.
-
-
- If you install the app through google play or f-droid, no information will
- be collected at all by me.
-
-
-
diff --git a/src/PWA/sw-b71.js b/src/PWA/sw-b71.js
index b8d345c..4a05d71 100644
--- a/src/PWA/sw-b71.js
+++ b/src/PWA/sw-b71.js
@@ -1,5 +1,5 @@
// The version of the cache.
-const VERSION = "29040063";
+const VERSION = "29040073";
// The name of the cache
const CACHE_NAME = `breakout-71-${VERSION}`;
diff --git a/src/data/version.json b/src/data/version.json
index e1f5d6b..97efed2 100644
--- a/src/data/version.json
+++ b/src/data/version.json
@@ -1 +1 @@
-"29040063"
+"29040073"
diff --git a/src/gameStateMutators.ts b/src/gameStateMutators.ts
index 8a78b9e..3040100 100644
--- a/src/gameStateMutators.ts
+++ b/src/gameStateMutators.ts
@@ -514,7 +514,7 @@ export function repulse(
) {
const distance = distanceBetween(a, b);
// Ensure we don't get soft locked
- const max = gameState.gameZoneWidth / 2;
+ const max = gameState.gameZoneWidth / 4;
if (distance > max) return;
// Unit vector
const dx = (a.x - b.x) / distance;
@@ -569,7 +569,7 @@ export function repulse(
export function attract(gameState: GameState, a: Ball, b: Ball, power: number) {
const distance = distanceBetween(a, b);
// Ensure we don't get soft locked
- const min = gameState.gameZoneWidth * 0.5;
+ const min = (gameState.gameZoneWidth * 3) / 4;
if (distance < min) return;
// Unit vector
const dx = (a.x - b.x) / distance;
diff --git a/staging_deploy.sh b/staging_deploy.sh
index 550b43b..6e0d9b6 100755
--- a/staging_deploy.sh
+++ b/staging_deploy.sh
@@ -6,12 +6,11 @@ versionCode=$(($(date +%s) / 60))
bash ./build.sh $versionCode
-
# we don't add a version tag to let fdroid ignore this build
# upload to breakout-v3-staging.lecaro.me
DOMAIN="breakout-v3-staging.lecaro.me"
-PUBLIC_CONTENT="./dist/*"
+PUBLIC_CONTENT="./build/*"
ssh staging "mkdir -p /opt/mup-nginx-proxy/config/html/static_sites/$DOMAIN"
rsync -avz --delete $PUBLIC_CONTENT staging:/opt/mup-nginx-proxy/config/html/static_sites/$DOMAIN