[Jrisk-cvs] SF.net SVN: domination-code:[2509] Domination
Brought to you by:
yuranet
Menu
▾
▴
[Jrisk-cvs] SF.net SVN: domination-code:[2509] Domination
|
From: <yu...@us...> - 2024-02-11 20:01:28
|
Revision: 2509
http://sourceforge.net/p/domination/code/2509
Author: yuranet
Date: 2024-02-11 20:01:25 +0000 (Sun, 11 Feb 2024)
Log Message:
-----------
lobby sounds added
Modified Paths:
--------------
Domination/sharedUI/src_mapstore_lobby/net/yura/domination/audio/GameSound.java
Domination/sharedUI/src_mapstore_lobby/net/yura/domination/lobby/mini/MiniLobbyRisk.java
Domination/sharedUI/src_mapstore_lobby/net/yura/lobby/mini/MiniLobbyClient.java
Domination/sharedUI/src_mapstore_lobby/net/yura/lobby/mini/MiniLobbyGame.java
Domination/swingUI/game/Domination/sound/medieval.xml
Domination/swingUI/src/net/yura/domination/ui/flashgui/MainMenu.java
Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/domination/audio/GameSound.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/domination/audio/GameSound.java 2024-02-11 19:27:40 UTC (rev 2508)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/domination/audio/GameSound.java 2024-02-11 20:01:25 UTC (rev 2509)
@@ -63,10 +63,10 @@
public static final String LOBBY_START = "lobby_start";
public static final String LOBBY_JOIN = "lobby_join";
+ public static final String LOBBY_LEAVE = "lobby_leave";
public static final String LOBBY_PLAY = "lobby_play";
public static final String LOBBY_WATCH = "lobby_watch";
public static final String LOBBY_SET_NICK = "lobby_set_nick";
- public static final String LOBBY_CLOSE_GAME = "lobby_close_game";
private boolean soundEnabled = true;
private boolean musicEnabled = true;
@@ -259,6 +259,7 @@
public void closeGame() {
gameWon = false;
gameLost = false;
+ // TODO maybe play sound for closing game
switchToMusic( getOutOfGameMusic() );
}
Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/domination/lobby/mini/MiniLobbyRisk.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/domination/lobby/mini/MiniLobbyRisk.java 2024-02-11 19:27:40 UTC (rev 2508)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/domination/lobby/mini/MiniLobbyRisk.java 2024-02-11 20:01:25 UTC (rev 2509)
@@ -137,6 +137,7 @@
}
public void connected(String username) {
+ GameSound.INSTANCE.playSound(GameSound.LOBBY_SET_NICK);
}
public void loginGoogle() {
}
@@ -143,6 +144,18 @@
public void gameStarted(int id) {
}
+ public void gameActionPerformed(int action) {
+ String sound = null;
+ switch (action) {
+ case Game.STATE_CAN_JOIN: sound = GameSound.LOBBY_JOIN; break;
+ case Game.STATE_CAN_LEAVE: sound = GameSound.LOBBY_LEAVE; break;
+ case Game.STATE_CAN_WATCH: sound = GameSound.LOBBY_WATCH; break;
+ case Game.STATE_CAN_PLAY: sound = GameSound.LOBBY_PLAY; break;
+ }
+ if (sound != null) {
+ GameSound.INSTANCE.playSound(sound);
+ }
+ }
WeakHashMap mapping = new WeakHashMap();
Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/lobby/mini/MiniLobbyClient.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/lobby/mini/MiniLobbyClient.java 2024-02-11 19:27:40 UTC (rev 2508)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/lobby/mini/MiniLobbyClient.java 2024-02-11 20:01:25 UTC (rev 2509)
@@ -220,6 +220,7 @@
final Game game = (Game)gameList.getSelectedValue();
if (game!=null) {
int state = game.getState( whoAmI() );
+ this.game.gameActionPerformed(state);
switch (state) {
case Game.STATE_CAN_JOIN:
if (game.getMagicWord() != null) {
Modified: Domination/sharedUI/src_mapstore_lobby/net/yura/lobby/mini/MiniLobbyGame.java
===================================================================
--- Domination/sharedUI/src_mapstore_lobby/net/yura/lobby/mini/MiniLobbyGame.java 2024-02-11 19:27:40 UTC (rev 2508)
+++ Domination/sharedUI/src_mapstore_lobby/net/yura/lobby/mini/MiniLobbyGame.java 2024-02-11 20:01:25 UTC (rev 2509)
@@ -60,4 +60,6 @@
void renameSpectator(String oldname, String newname, int newtype);
void updatePlayerList(Collection<Player> playersInGame, String whoTurn);
+
+ void gameActionPerformed(int state);
}
Modified: Domination/swingUI/game/Domination/sound/medieval.xml
===================================================================
--- Domination/swingUI/game/Domination/sound/medieval.xml 2024-02-11 19:27:40 UTC (rev 2508)
+++ Domination/swingUI/game/Domination/sound/medieval.xml 2024-02-11 20:01:25 UTC (rev 2509)
@@ -20,6 +20,8 @@
<sound name="music_defeat" file="medieval/music_defeat1.mp3"/>
<sound name="menu_button" file="medieval/select1.mp3"/>
+
+ <!-- buttoms on game setup screen -->
<sound name="button" file="medieval/button1.mp3"/>
<sound name="back_button" file="medieval/return button3.mp3"/>
<sound name="button_start_game" file="medieval/game starting.mp3"/>
@@ -50,9 +52,9 @@
<sound name="lobby_start" file="medieval/entered lobby.mp3"/>
<sound name="lobby_join" file="medieval/joining room.mp3"/>
+ <sound name="lobby_leave" file="medieval/leaving match.mp3"/>
<sound name="lobby_play" file="medieval/joining match.mp3"/>
<sound name="lobby_watch" file="medieval/spectator mode.mp3"/>
<sound name="lobby_set_nick" file="medieval/saving name.mp3"/>
- <sound name="lobby_close_game" file="medieval/leaving match.mp3"/>
</sounds>
Modified: Domination/swingUI/src/net/yura/domination/ui/flashgui/MainMenu.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/ui/flashgui/MainMenu.java 2024-02-11 19:27:40 UTC (rev 2508)
+++ Domination/swingUI/src/net/yura/domination/ui/flashgui/MainMenu.java 2024-02-11 20:01:25 UTC (rev 2509)
@@ -302,7 +302,7 @@
private void activateButton(int thebutton) {
if (thebutton != 0) {
- GameSound.INSTANCE.playSound(GameSound.MENU_BUTTON);
+ GameSound.INSTANCE.playSound(thebutton == MainMenu.BUTTON_LOBBY ? GameSound.LOBBY_START : GameSound.MENU_BUTTON);
switch (thebutton) {
case MainMenu.BUTTON_NEW:{
|
