From 1d6c7213c428e8d1f902d43e395ec4a2784ac9b3 Mon Sep 17 00:00:00 2001 From: lodici Date: Sat, 8 Apr 2017 09:37:24 +0100 Subject: [PATCH] add new click sound and play each time style/layout dial button rotates. --- resources/soundfx/click.wav | Bin 0 -> 2860 bytes src/magic/ui/MagicSound.java | 3 ++- src/magic/ui/screen/widget/BigDialButton.java | 2 ++ src/magic/ui/screen/widget/DialButton.java | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 resources/soundfx/click.wav diff --git a/resources/soundfx/click.wav b/resources/soundfx/click.wav new file mode 100644 index 0000000000000000000000000000000000000000..aa4a5dfef2580be45d78ad73c838bdf827582486 GIT binary patch literal 2860 zcmZ`*J&znk5Ur~2*}c2PI%AMPfDR5>A^;PRgJdCFA|)^hi6ulv<{v=JKY+i0h)Cc+ zAU+ZZkOK&Tv+wZN?#y%*uco%Q=MK2N*`4X`s(SBLO;^AF-p!j=S41CNzjfo|Pwu>O znTQylvs*;Je?=s8nLfIG=Qd%D8Dn<)J#rz^hxxa1%rEd?4zMQ43Mwu6+ zmgTVAPYXTZJxjoQ#SZxt_*YhVw1>R31)tbs?rjZR_iV#v_sF>DNqSPwWF*nGWJ}aj z&x1aZjSaStPMMVr&!_r;d)m-Inf4*unjYg*%%s;M3+>owVrT#0VM% zK)pa6omc9F88<+WrBmE#94G+PFRxi&>2({IKib-<_UJV?KI-u!8?h?Z&>RnYJ6s<~o?t)>96_Gu9*fi{cFuab4 zKcFUCj@)AY=Xz9MO&j+a3@_?_aV8MedYmgzF*o$>t|Dkr=Fws{=Bk>GV?HwX9^{UfT=RjW1D>eVC6XIwS^Yq6rf;?1vY{+;($yYBJ)<^HOrzuEPzj#00? z*yEzMt18YSSpI*dM4als#;DONO8?E%j^ef5RE_zXzd&8tHibf+S~2ro!Q+Oebr1A+ zFjjiIj5@5I=IknCL+?4izgPCH1}dV8J8V5l<&|-d%$lMH@>n)$C}^GIG98qIw9-BA zVdz;4bboYMB^l7MH|FO7?}zAkaFuDnOGQV=jyv#rIz?=J77Ys*>^j-keOcLxE-`vK z`k~>!z{}w0jxywezCV^8r-Z@!G>iq^FeRK{XoesDX6aKsE(Bl9T{h`RJ>bf+zEDn^y{fwYUSb#fMg&JIN%?iVJTAB zk65^%S3&QGkyopqX`C$Po6w$_?Q#`y&41Iy_oGFk2JFV;}A^SbdjsqJ*pi#z%Ujrf+x literal 0 HcmV?d00001 diff --git a/src/magic/ui/MagicSound.java b/src/magic/ui/MagicSound.java index 3402f1b3ca..3c816c10de 100644 --- a/src/magic/ui/MagicSound.java +++ b/src/magic/ui/MagicSound.java @@ -24,6 +24,7 @@ public enum MagicSound { BEEP("noAction.wav"), BOOM("boom.wav"), REMOVE_CARD("cardTakeOutPackage1.wav"), + CLICK("click.wav"), // gameSounds - keep sorted and verify enumset range if changed. COMBAT("combat.au"), @@ -32,7 +33,7 @@ public enum MagicSound { RESOLVE("resolve.au"), WIN("win.au"); - private static final Set uiSounds = EnumSet.range(ADD_CARD, REMOVE_CARD); + private static final Set uiSounds = EnumSet.range(ADD_CARD, CLICK); private static final Set gameSounds = EnumSet.range(COMBAT, WIN); private static final GeneralConfig config = GeneralConfig.getInstance(); diff --git a/src/magic/ui/screen/widget/BigDialButton.java b/src/magic/ui/screen/widget/BigDialButton.java index bd20766e73..1e39d99d2a 100644 --- a/src/magic/ui/screen/widget/BigDialButton.java +++ b/src/magic/ui/screen/widget/BigDialButton.java @@ -12,6 +12,7 @@ import java.awt.image.BufferedImage; import javax.swing.AbstractAction; import javax.swing.ImageIcon; import javax.swing.SwingUtilities; +import magic.ui.MagicSound; import magic.ui.helpers.ImageHelper; @SuppressWarnings("serial") @@ -37,6 +38,7 @@ public class BigDialButton extends ActionBarButton { if (SwingUtilities.isLeftMouseButton(e)) { position = position >= positions - 1 ? 0 : position + 1; rotateIconImage(); + MagicSound.CLICK.play(); } } }); diff --git a/src/magic/ui/screen/widget/DialButton.java b/src/magic/ui/screen/widget/DialButton.java index dec5aa2af3..7463ea53be 100644 --- a/src/magic/ui/screen/widget/DialButton.java +++ b/src/magic/ui/screen/widget/DialButton.java @@ -10,6 +10,7 @@ import javax.swing.ImageIcon; import javax.swing.SwingUtilities; import magic.data.MagicIcon; import magic.ui.MagicImages; +import magic.ui.MagicSound; import magic.ui.helpers.ImageHelper; @SuppressWarnings("serial") @@ -35,6 +36,7 @@ public class DialButton extends ActionBarButton { if (SwingUtilities.isLeftMouseButton(e)) { position = (position + increment) % 360; rotateIconImage(); + MagicSound.CLICK.play(); } } });