From 0d21a02da9a220bc23d6d3c7f5258989b026ae39 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Mon, 1 Apr 2024 22:17:11 -0400 Subject: [PATCH] [F] Fix wacca music unlock --- src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt | 2 +- src/main/resources/meta/update.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt b/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt index 08622b15..dbb87f56 100644 --- a/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt +++ b/src/main/java/icu/samnyan/aqua/sega/wacca/WaccaServer.kt @@ -185,7 +185,7 @@ fun WaccaServer.init() { // u.wp = 999999 // All unlock - if (go.unlockMusic) { + if (go.unlockMusic && !wacca.musicMapping.isEmpty()) { items[MUSIC_UNLOCK()] = wacca.musicMapping.keys.map { MUSIC_UNLOCK(u, it, p1 = INFERNO.value.long()) } } diff --git a/src/main/resources/meta/update.sh b/src/main/resources/meta/update.sh index f3667605..e766a6f1 100644 --- a/src/main/resources/meta/update.sh +++ b/src/main/resources/meta/update.sh @@ -3,9 +3,10 @@ # Current script dir DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -mkdir -p "$DIR/ongeki" "$DIR/mai2" "$DIR/chu3" +mkdir -p "$DIR/ongeki" "$DIR/mai2" "$DIR/chu3" "$DIR/wacca" curl "https://aquadx.net/d/ongeki/00/all-music.json" -o "$DIR/ongeki/music.json" curl "https://aquadx.net/d/mai2/00/all-music.json" -o "$DIR/mai2/music.json" curl "https://aquadx.net/d/mai2/00/all-items.json" -o "$DIR/mai2/items.json" curl "https://aquadx.net/d/chu3/00/all-music.json" -o "$DIR/chu3/music.json" +curl "https://aquadx.net/d/wacca/00/all-music.json" -o "$DIR/wacca/music.json"