Compare commits
3 Commits
4ec04837ff
...
1.1.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cd5417d1d1 | ||
| f3e8432452 | |||
| 1eae3a8bbf |
2
pom.xml
2
pom.xml
@@ -4,7 +4,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>de.arindy</groupId>
|
<groupId>de.arindy</groupId>
|
||||||
<artifactId>dice-tower</artifactId>
|
<artifactId>dice-tower</artifactId>
|
||||||
<version>1.1.0-SNAPSHOT</version>
|
<version>1.1.0</version>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<compiler-plugin.version>3.13.0</compiler-plugin.version>
|
<compiler-plugin.version>3.13.0</compiler-plugin.version>
|
||||||
|
|||||||
@@ -28,7 +28,7 @@
|
|||||||
ComfyJS.onCommand = async (user, command, message, flags) => {
|
ComfyJS.onCommand = async (user, command, message, flags) => {
|
||||||
if ((
|
if ((
|
||||||
flags.broadcaster || ({modsAllowed} && flags.mod) || ({vipAllowed} && flags.vip) || ({subsAllowed} && flags.subscriber
|
flags.broadcaster || ({modsAllowed} && flags.mod) || ({vipAllowed} && flags.vip) || ({subsAllowed} && flags.subscriber
|
||||||
)) && '{cmd}' === command && !shouldWait() && message.match(/\d+d(4|6|8|10|12|20|100)/) && (+message.split('d')[0] <= {maxDice})
|
)) && '{cmd}' === command && !shouldWait() && message.match(/^\d+d(4|6|8|10|12|20|100)$/) && (+message.split('d')[0] <= {maxDice})
|
||||||
) {
|
) {
|
||||||
toggleWait(true);
|
toggleWait(true);
|
||||||
|
|
||||||
@@ -38,7 +38,7 @@
|
|||||||
result.rolls.forEach(roll => {
|
result.rolls.forEach(roll => {
|
||||||
values.push(roll.value);
|
values.push(roll.value);
|
||||||
})
|
})
|
||||||
document.getElementById('results').innerHTML = '<strong>  D' + result.sides + '</strong>: [' + values.map(value => value === 1 ? '<strong style="text-shadow: 2px 2px 10px red">' + value + '</strong>' : value === result.sides ? '<strong style="text-shadow: 2px 2px 10px green">' + value + '</strong>' : value).join(' + ') + (result.modifier > 0 ? ' <a style="text-decoration: underline">+' + result.modifier + '</a>' : result.modifier < 0 ? ' <a style="text-decoration: underline">' + result.modifier + '</a>' : '') + '] = <strong>' + result.value + '</strong> '
|
document.getElementById('results').innerHTML = '<strong>' + message + '</strong>: [' + values.map(value => value === 1 ? '<strong style="text-shadow: 2px 2px 10px red">' + value + '</strong>' : value === result.sides ? '<strong style="text-shadow: 2px 2px 10px green">' + value + '</strong>' : value).join(' + ') + (result.modifier > 0 ? ' <a style="text-decoration: underline">+' + result.modifier + '</a>' : result.modifier < 0 ? ' <a style="text-decoration: underline">' + result.modifier + '</a>' : '') + '] = <strong>' + result.value + '</strong> '
|
||||||
})
|
})
|
||||||
document.getElementById('results').showPopover()
|
document.getElementById('results').showPopover()
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
|||||||
@@ -127,7 +127,7 @@
|
|||||||
"/chatoverlay/" + document.getElementById('channel').value +
|
"/chatoverlay/" + document.getElementById('channel').value +
|
||||||
"?cmd=" + document.getElementById('cmd').value +
|
"?cmd=" + document.getElementById('cmd').value +
|
||||||
"&theme=" + document.getElementById('theme').value +
|
"&theme=" + document.getElementById('theme').value +
|
||||||
"&themeColor=" + document.getElementById('themeColor').value +
|
"&themeColor=" + encodeURIComponent(document.getElementById('themeColor').value) +
|
||||||
"&scale=" + document.getElementById('scale').value +
|
"&scale=" + document.getElementById('scale').value +
|
||||||
"&maxDice=" + document.getElementById('maxDice').value +
|
"&maxDice=" + document.getElementById('maxDice').value +
|
||||||
"&clearAfter=" + document.getElementById('clearAfter').value +
|
"&clearAfter=" + document.getElementById('clearAfter').value +
|
||||||
|
|||||||
@@ -176,7 +176,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div style="margin-top: 20px; flex-grow: 1" id="chatOverlay">
|
<div style="margin-top: 20px; flex-grow: 1" id="chatOverlay">
|
||||||
<div class="w3-panel w3-theme-l4 w3-card w3-display-container" style="padding: 25px; margin-bottom: auto">
|
<div class="w3-panel w3-theme-l4 w3-card w3-display-container" style="padding: 25px; margin-bottom: auto">
|
||||||
If you are looking for a way to let chat roll click <a href target="_blank" id="chatOverlayLink">here</a>
|
If you are looking for a way to let your twitch chat roll click <a href target="_blank" id="chatOverlayLink">here</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user