diff --git a/src/web/alerts/www/public/explosions/factorioexplosion1.ogg b/src/web/alerts/www/public/explosions/factorioexplosion1.ogg new file mode 100755 index 0000000..f0d1734 Binary files /dev/null and b/src/web/alerts/www/public/explosions/factorioexplosion1.ogg differ diff --git a/src/web/alerts/www/public/explosions/factorioexplosion2.ogg b/src/web/alerts/www/public/explosions/factorioexplosion2.ogg new file mode 100755 index 0000000..944b0d0 Binary files /dev/null and b/src/web/alerts/www/public/explosions/factorioexplosion2.ogg differ diff --git a/src/web/alerts/www/public/explosions/factorioexplosion3.ogg b/src/web/alerts/www/public/explosions/factorioexplosion3.ogg new file mode 100755 index 0000000..85b446b Binary files /dev/null and b/src/web/alerts/www/public/explosions/factorioexplosion3.ogg differ diff --git a/src/web/alerts/www/public/explosions/factorioexplosion4.ogg b/src/web/alerts/www/public/explosions/factorioexplosion4.ogg new file mode 100755 index 0000000..e2d876d Binary files /dev/null and b/src/web/alerts/www/public/explosions/factorioexplosion4.ogg differ diff --git a/src/web/alerts/www/public/explosions/factorioexplosion5.ogg b/src/web/alerts/www/public/explosions/factorioexplosion5.ogg new file mode 100755 index 0000000..a5960a0 Binary files /dev/null and b/src/web/alerts/www/public/explosions/factorioexplosion5.ogg differ diff --git a/src/web/alerts/www/public/explosions/factoriolargeexplosion1.ogg b/src/web/alerts/www/public/explosions/factoriolargeexplosion1.ogg new file mode 100755 index 0000000..c318922 Binary files /dev/null and b/src/web/alerts/www/public/explosions/factoriolargeexplosion1.ogg differ diff --git a/src/web/alerts/www/public/explosions/factoriolargeexplosion2.ogg b/src/web/alerts/www/public/explosions/factoriolargeexplosion2.ogg new file mode 100755 index 0000000..04407fc Binary files /dev/null and b/src/web/alerts/www/public/explosions/factoriolargeexplosion2.ogg differ diff --git a/src/web/alerts/www/public/explosions/factorionuke.ogg b/src/web/alerts/www/public/explosions/factorionuke.ogg new file mode 100755 index 0000000..efc9fa4 Binary files /dev/null and b/src/web/alerts/www/public/explosions/factorionuke.ogg differ diff --git a/src/web/alerts/www/public/explosion1.ogg b/src/web/alerts/www/public/explosions/halflifeexplosion1.ogg similarity index 100% rename from src/web/alerts/www/public/explosion1.ogg rename to src/web/alerts/www/public/explosions/halflifeexplosion1.ogg diff --git a/src/web/alerts/www/public/explosion2.ogg b/src/web/alerts/www/public/explosions/halflifeexplosion2.ogg similarity index 100% rename from src/web/alerts/www/public/explosion2.ogg rename to src/web/alerts/www/public/explosions/halflifeexplosion2.ogg diff --git a/src/web/alerts/www/public/explosion3.ogg b/src/web/alerts/www/public/explosions/halflifeexplosion3.ogg similarity index 100% rename from src/web/alerts/www/public/explosion3.ogg rename to src/web/alerts/www/public/explosions/halflifeexplosion3.ogg diff --git a/src/web/alerts/www/src/alerts/grenadeExplosion.ts b/src/web/alerts/www/src/alerts/grenadeExplosion.ts index d340aa9..e2fa5ac 100644 --- a/src/web/alerts/www/src/alerts/grenadeExplosion.ts +++ b/src/web/alerts/www/src/alerts/grenadeExplosion.ts @@ -2,12 +2,13 @@ import type { grenadeExplosionAlert } from "web/alerts/types"; import type { AlertRunner } from "./index"; const duration = 1000; -const volume = 0.1; +const volume = 1; export default async function execute( alert: grenadeExplosionAlert, ): Promise { - const audio = new Audio("/alerts/public/explosion2.ogg"); + const audioPath = `/alerts/public/explosions/factorioexplosion${Math.ceil(Math.random() * 5)}.ogg`; + const audio = new Audio(audioPath); audio.volume = volume; const parentDiv = document.createElement("div"); diff --git a/src/web/alerts/www/src/alerts/userBlast.ts b/src/web/alerts/www/src/alerts/userBlast.ts index c8eb131..925008a 100644 --- a/src/web/alerts/www/src/alerts/userBlast.ts +++ b/src/web/alerts/www/src/alerts/userBlast.ts @@ -2,12 +2,13 @@ import type { userBlastAlert } from "web/alerts/types"; import type { AlertRunner } from "./index"; const duration = 1000; -const volume = 0.1; +const volume = 1; export default async function execute( alert: userBlastAlert, ): Promise { - const audio = new Audio("/alerts/public/explosion1.ogg"); + const audioPath = `/alerts/public/explosions/factorioexplosion${Math.ceil(Math.random() * 5)}.ogg`; + const audio = new Audio(audioPath); audio.volume = volume; const parentDiv = document.createElement("div"); diff --git a/src/web/alerts/www/src/alerts/userExecution.ts b/src/web/alerts/www/src/alerts/userExecution.ts index 3fe17a2..86cba9e 100644 --- a/src/web/alerts/www/src/alerts/userExecution.ts +++ b/src/web/alerts/www/src/alerts/userExecution.ts @@ -2,7 +2,7 @@ import type { userExecutionAlert } from "web/alerts/types"; import type { AlertRunner } from "./index"; const duration = 3000; -const volume = 0.1; +const volume = 1; export default async function execute( alert: userExecutionAlert, @@ -56,9 +56,13 @@ export default async function execute( const randomX = Math.floor(Math.random() * (window.innerWidth - 800)); const randomY = Math.floor(Math.random() * (window.innerHeight - 800)); - const audio1 = new Audio("/alerts/public/explosion1.ogg"); - const audio2 = new Audio("/alerts/public/explosion2.ogg"); - const audio3 = new Audio("/alerts/public/explosion3.ogg"); + const audio1 = new Audio( + "/alerts/public/explosions/factoriolargeexplosion1.ogg", + ); + const audio2 = new Audio( + "/alerts/public/explosions/factoriolargeexplosion1.ogg", + ); + const audio3 = new Audio("/alerts/public/explosions/factorionuke.ogg"); audio1.volume = volume; audio2.volume = volume; diff --git a/src/web/index.ts b/src/web/index.ts index aca5235..922bb17 100644 --- a/src/web/index.ts +++ b/src/web/index.ts @@ -33,6 +33,16 @@ export default Bun.serve({ return new Response(`${target} not found`, { status: 404 }); return new Response(file); }, + // TODO: make this nicer, i don't want to redefine the same thing here every time + "/alerts/public/explosions/:filename": async (req) => { + const target = req.params.filename; + const file = Bun.file( + `${import.meta.dir}/alerts/www/public/explosions/${target}`, + ); + if (!(await file.exists())) + return new Response(`${target} not found`, { status: 404 }); + return new Response(file); + }, "/": async (req, srv) => { if (req.headers.get("Upgrade") === "websocket") { srv.upgrade(req);