ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gemp-dev' into card-dev

Browse Source 
# Conflicts:
#	.gitignore
This commit is contained in:
Christian 'ketura' McCarty
2021-03-04 23:46:52 -06:00
parent 8712e43c1c 3ca4fb47d4
commit 3b45234ac1
7 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -18,3 +18,4 @@ logs/*
.idea/
*.iml
remote-sync
replay

BIN
gemp-lotr/gemp-lotr-async/src/main/web/awaiting_decision.mp3 Normal file
View File

Binary file not shown.

BIN
gemp-lotr/gemp-lotr-async/src/main/web/fanfare_x.mp3 Normal file
View File

Binary file not shown.

3
gemp-lotr/gemp-lotr-async/src/main/web/game.html
View File

@@ -42,6 +42,9 @@
<script type="text/javascript" src="js/gemp-022/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-022/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-022/merchantUi.js"></script>
<!-- Audio file downloaded from https://material.io/design/sound/sound-resources.html -->
<audio id="awaitAction" src="/gemp-lotr/awaiting_decision.mp3" type="audio/mpeg" preload="metadata"></audio>
<script type="text/javascript">

4
gemp-lotr/gemp-lotr-async/src/main/web/hall.html
View File

@@ -43,6 +43,8 @@
<script type="text/javascript" src="js/gemp-022/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-022/merchantUi.js"></script>
<audio id="gamestart" src="/gemp-lotr/fanfare_x.mp3" type="audio/mpeg" preload="metadata"></audio>
<script type="text/javascript">
var chat;
var hall;
@@ -145,6 +147,8 @@
chat.setBounds(2, 2, innerWidth - 4, middleHeight - 4);
hall.hallResized(innerWidth, middleHeight);
}
</script>
</head>

22
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/gameUi.js
View File

@@ -1536,7 +1536,10 @@ var GempLotrGameUI = Class.extend({
this.smallDialog.append(but);
}
if (!this.replayMode)
{
this.smallDialog.dialog("option", "buttons", {});
this.PlaySound("awaitAction");
}
}
this.smallDialog.dialog("open");
@@ -1798,7 +1801,10 @@ var GempLotrGameUI = Class.extend({
allowSelection();
if (!this.replayMode)
{
processButtons();
this.PlaySound("awaitAction");
}
openSizeDialog(this.cardActionDialog);
this.arbitraryDialogResize(false);
@@ -1940,10 +1946,18 @@ var GempLotrGameUI = Class.extend({
allowSelection();
if (!this.replayMode)
{
processButtons();
this.PlaySound("awaitAction");
}
$(':button').blur();
},
PlaySound: function(soundObj) {
var myAudio = document.getElementById(soundObj);
myAudio.play();
},
createActionChoiceContextMenu: function (actions, event, selectActionFunction) {
// Remove context menus that may be showing
@@ -2071,7 +2085,10 @@ var GempLotrGameUI = Class.extend({
allowSelection();
if (!this.replayMode)
{
processButtons();
this.PlaySound("awaitAction");
}
openSizeDialog(this.cardActionDialog);
this.arbitraryDialogResize(false);
@@ -2151,7 +2168,10 @@ var GempLotrGameUI = Class.extend({
allowSelection();
if (!this.replayMode)
{
processButtons();
this.PlaySound("awaitAction");
}
},
assignMinionsDecision: function (decision) {
@@ -2199,6 +2219,8 @@ var GempLotrGameUI = Class.extend({
that.clearSelection();
that.decisionFunction(id, "" + assignmentArray);
this.PlaySound("awaitAction");
});
}

19
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js
View File

@@ -397,6 +397,11 @@ var GempLotrHallUI = Class.extend({
.css({borderTopColor:"#000000", borderLeftColor:"#000000", borderBottomColor:"#000000", borderRightColor:"#000000"})
.animate({borderTopColor:"#ffffff", borderLeftColor:"#ffffff", borderBottomColor:"#ffffff", borderRightColor:"#ffffff"}, "fast");
},
PlaySound: function(soundObj) {
var myAudio = document.getElementById(soundObj);
myAudio.play();
},
processHall:function (xml) {
var that = this;
@@ -678,12 +683,14 @@ var GempLotrHallUI = Class.extend({
window.open("/gemp-lotr/game.html?gameId=" + waitingGameId + participantIdAppend, "_blank");
}
if (games.length > 0) {
var soundPlay = $("<embed src='/gemp-lotr/fanfare_x.wav' hidden='true' autostart='true' loop='false'>");
this.tablesDiv.append(soundPlay);
setTimeout(
function() {
soundPlay.remove();
}, 5000);
// var soundPlay = $("<embed src='/gemp-lotr/fanfare_x.mp3' hidden='true' autostart='true' loop='false'>");
// this.tablesDiv.append(soundPlay);
// setTimeout(
// function() {
// soundPlay.remove();
// }, 5000);
this.PlaySound("gamestart");
}
if (!this.supportedFormatsInitialized) {