Skip to content

Commit eadb70d

Browse files
committed
dpone
1 parent 8521d40 commit eadb70d

File tree

4 files changed

+22
-1
lines changed

4 files changed

+22
-1
lines changed

Wordiple-Client/src/main/java/me/logicologist/wordiple/client/gui/controllers/game/GameController.java

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import me.logicologist.wordiple.client.gui.animations.BounceInAnimation;
1515
import me.logicologist.wordiple.client.gui.animations.PopAnimation;
1616
import me.logicologist.wordiple.client.manager.SessionManager;
17+
import me.logicologist.wordiple.client.manager.SoundManager;
18+
import me.logicologist.wordiple.client.sound.SoundType;
1719

1820
import java.util.ArrayList;
1921
import java.util.HashMap;
@@ -199,6 +201,7 @@ public void startTimer(int time, int maxGuesses) {
199201
setAnswerLocked(true);
200202
}
201203

204+
SoundManager.getInstance().stopSound(SoundType.CLOCK_TICK);
202205
Platform.runLater(() -> {
203206
timerLabel.setText(time + "s");
204207
});
@@ -239,6 +242,7 @@ public void resetBoards() {
239242
if (timerFuture != null) {
240243
timerFuture.cancel(true);
241244
timerFuture = null;
245+
SoundManager.getInstance().stopSound(SoundType.CLOCK_TICK);
242246
}
243247
lettersPane.getChildren().forEach(x -> {
244248
x.getStyleClass().clear();

Wordiple-Client/src/main/java/me/logicologist/wordiple/client/packets/game/GameOverlayPacket.java

+14
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import com.olziedev.olziesocket.framework.api.packet.PacketType;
66
import javafx.application.Platform;
77
import me.logicologist.wordiple.client.manager.GUIManager;
8+
import me.logicologist.wordiple.client.manager.SoundManager;
9+
import me.logicologist.wordiple.client.sound.SoundType;
810

911
public class GameOverlayPacket extends PacketAdapter implements PacketType {
1012

@@ -23,6 +25,18 @@ public boolean onlySendToServer() {
2325
public void onReceive(PacketArguments packetArguments) {
2426
Platform.runLater(() -> {
2527
GUIManager.getInstance().showGameTextOverlay(packetArguments.get("display", String.class));
28+
Integer countdownPosition = packetArguments.get("countdown_position", Integer.class);
29+
if (countdownPosition == null) return;
30+
31+
switch (countdownPosition) {
32+
case 1:
33+
case 2:
34+
SoundManager.getInstance().playSound(SoundType.COUNTDOWN_STAGE_1);
35+
break;
36+
case 3:
37+
SoundManager.getInstance().playSound(SoundType.COUNTDOWN_STAGE_2);
38+
break;
39+
}
2640
});
2741
}
2842

Wordiple-Client/src/main/java/me/logicologist/wordiple/client/sound/SoundType.java

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
public enum SoundType {
1313

1414
BUTTON_CLICK("https://www.dropbox.com/s/iepp33i8d0vi3tk/button_click.wav?dl=1", "button_click.wav", 0.0f),
15+
CLOCK_TICK("https://www.dropbox.com/s/5hpl3j6d66e4di5/clock_tick.wav?dl=1", "clock_tick.wav", -27.0f, false, false),
16+
COUNTDOWN_STAGE_1("https://www.dropbox.com/s/2saucvwuo81rbol/countdown_stage_1.wav?dl=1", "countdown_stage_1.wav", -27.0f),
17+
COUNTDOWN_STAGE_2("https://www.dropbox.com/s/7v53dh1vlk0cgel/countdown_stage_2.wav?dl=1", "countdown_stage_2.wav", -27.0f),
1518

1619
OVERWORLD("https://www.dropbox.com/s/8bbg2g80c4b6fu6/overworld.wav?dl=1", "overworld.wav", -27),
1720
BACKGROUND("https://www.dropbox.com/s/s7a261q3dctic50/background_music.wav?dl=1", "background_music.wav", -27, true),

Wordiple-Common/src/main/java/me/logicologist/wordiple/common/utils/Utils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
public class Utils {
77

88
private static final String VERSION = "1.0.1";
9-
private static final String ASSET_VERSION = "1.0.1";
9+
private static final String ASSET_VERSION = "1.0.2";
1010

1111
public static String formatNumber(double number) {
1212
return new DecimalFormat(number % 1 == 0 ? "#,###.##" : "#,##0.00").format(number);

0 commit comments

Comments
 (0)