diff --git a/src/main/kotlin/de/arindy/dicetower/DiceResource.kt b/src/main/kotlin/de/arindy/dicetower/DiceResource.kt index 95e528d..bd69959 100644 --- a/src/main/kotlin/de/arindy/dicetower/DiceResource.kt +++ b/src/main/kotlin/de/arindy/dicetower/DiceResource.kt @@ -37,7 +37,7 @@ final class DiceResource(@Context val sse: Sse) { .mediaType(MediaType.APPLICATION_JSON_TYPE).data(data).build() ) if (data.roll.all { it.trim().isNotEmpty() }) { - results(data.room!!, Result(data.name, data.user!!)) + results(data.room!!, Result(data.name, data.user!!, data.themeColor)) } } @@ -72,6 +72,6 @@ final class DiceResource(@Context val sse: Sse) { } @RegisterForReflection - data class Result(val name: String, val user: String) {} + data class Result(val name: String, val user: String, val themeColor: String) {} } diff --git a/src/main/resources/templates/overlay.html b/src/main/resources/templates/overlay.html index eec752f..7621b04 100644 --- a/src/main/resources/templates/overlay.html +++ b/src/main/resources/templates/overlay.html @@ -71,6 +71,7 @@ httpRequest.send(JSON.stringify({ name: data.name, user: data.user, + themeColor: data.themeColor, results: rollResult, } )) } diff --git a/src/main/resources/templates/results.html b/src/main/resources/templates/results.html index 3b101aa..83fe474 100644 --- a/src/main/resources/templates/results.html +++ b/src/main/resources/templates/results.html @@ -30,7 +30,7 @@ resultText += '
  D' + result.sides + ': [' + values.map(value => value === 1 ? '' + value + '' : value === result.sides ? '' + value + '' : value).join(' + ') + (result.modifier > 0 ? ' +' + result.modifier + '': result.modifier < 0 ? ' ' + result.modifier + '': '') + '] = ' + result.value + ' ' }) } - node.innerHTML = '' + data.name + ': 🎲 ' + resultText + node.innerHTML = '' + data.name + ': 🎲 ' + resultText name.appendChild(node) document.getElementById('results').appendChild(name); })