external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 17:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'custom-sound-fx' into 'master'

Browse Source 
Auto-detect custom sound files for cards if they exist

See merge request core-developers/forge!5468
This commit is contained in:
Michael Kamensky
2021-09-29 11:01:14 +00:00
parent 3458a3adea 0454786545
commit b3d0e1c81d
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
forge-gui/src/main/java/forge/sound/EventVisualizer.java
View File

@@ -315,14 +315,18 @@ public class EventVisualizer extends IGameEventVisitor.Base<SoundEffectType> imp
// Implement sound effects for specific cards here, if necessary. // Implement sound effects for specific cards here, if necessary.
String effect = ""; String effect = "";
if (null != c) { if (null != c) {
effect = c.getSVar("SoundEffect"); if (c.hasSVar("SoundEffect")) {
} effect = c.getSVar("SoundEffect");
if (!effect.isEmpty()) { } else {
// Only proceed if the file actually exists effect = TextUtil.fastReplace(TextUtil.fastReplace(
return new File(ForgeConstants.SOUND_DIR, effect).exists(); TextUtil.fastReplace(c.getName(), ",", ""),
" ", "_"), "'", "").toLowerCase() + ".mp3";
}
} }
return false; // Only proceed if the file actually exists
return new File(ForgeConstants.SOUND_DIR, effect).exists();
} }
@@ -339,11 +343,24 @@ public class EventVisualizer extends IGameEventVisitor.Base<SoundEffectType> imp
if (evt instanceof GameEventSpellResolved) { if (evt instanceof GameEventSpellResolved) {
c = ((GameEventSpellResolved) evt).spell.getHostCard(); c = ((GameEventSpellResolved) evt).spell.getHostCard();
} else if (evt instanceof GameEventLandPlayed) { } else if (evt instanceof GameEventZone) {
c = ((GameEventLandPlayed) evt).land; GameEventZone evZone = (GameEventZone)evt;
if (evZone.zoneType == ZoneType.Battlefield && evZone.mode == EventValueChangeType.Added && evZone.card.isLand()) {
c = evZone.card; // assuming a land is played or otherwise put on the battlefield
}
} }
return c != null ? c.getSVar("SoundEffect") : ""; if (c == null) {
return "";
} else {
if (c.hasSVar("SoundEffect")) {
return c.getSVar("SoundEffect");
} else {
return TextUtil.fastReplace(TextUtil.fastReplace(
TextUtil.fastReplace(c.getName(), ",", ""),
" ", "_"), "'", "").toLowerCase() + ".mp3";
}
}
} }