Compare commits

..

7 Commits

Author SHA1 Message Date
2077bf7cbb changes to dice-box-threejs
All checks were successful
CI / deploy (push) Successful in 5m30s
2025-02-16 17:43:57 +01:00
gitea
5d15976c9f [no ci] prepare new Version 2025-02-16 16:13:19 +00:00
gitea
d0a6a9ce3f [no ci] release 1.1.5 2025-02-16 16:13:12 +00:00
87f4d71cc9 moves userId to index
All checks were successful
CI / deploy (push) Successful in 5m49s
2025-02-16 17:07:24 +01:00
gitea
53a047217a [no ci] prepare new Version 2025-02-16 15:40:18 +00:00
gitea
3dbd19ee3b [no ci] release 1.1.4 2025-02-16 15:40:09 +00:00
c0415561ee fixes rich-preview
All checks were successful
CI / deploy (push) Successful in 6m0s
2025-02-16 16:31:53 +01:00
5 changed files with 22 additions and 15 deletions

View File

@ -24,7 +24,7 @@ class ChatOverlayResource {
@QueryParam("cmd") cmd: String? = "roll", @QueryParam("cmd") cmd: String? = "roll",
@QueryParam("theme") theme: String? = "default", @QueryParam("theme") theme: String? = "default",
@QueryParam("faceColor") faceColor: String? = "#ff0202", @QueryParam("faceColor") faceColor: String? = "#ff0202",
@QueryParam("faceColor") numberColor: String? = "#ffffff", @QueryParam("numberColor") numberColor: String? = "#ffffff",
@QueryParam("clearAfter") clearAfter: Long? = -1, @QueryParam("clearAfter") clearAfter: Long? = -1,
@QueryParam("timeout") timeout: Long? = -1 @QueryParam("timeout") timeout: Long? = -1
): TemplateInstance { ): TemplateInstance {

View File

@ -219,6 +219,3 @@ document.addEventListener("DOMContentLoaded", async () => {
configurePopover(); configurePopover();
}) })
if (!localStorage.getItem("userId")) {
localStorage.setItem("userId", self.crypto.randomUUID());
}

View File

@ -12,15 +12,20 @@
<div popover id="results" class="tooltip"> <div popover id="results" class="tooltip">
</div> </div>
<script type="module"> <script type="module">
import DiceBox from "/vendor/dice-box/dice-box.es.js"; import DiceBox from "/vendor/dice-box/dice-box-threejs.es.js";
const diceBox = new DiceBox("#dice-box", { const diceBox = new DiceBox("#dice-box", {
assetPath: "/vendor/assets/", assetPath: "/vendor/dice-box/",
theme: '{theme}', light_intensity: 2,
faceColor: '{faceColor}', gravity_multiplier: 600,
scale: {scale} baseScale: {scale} * 10,
strength: Math.floor(Math.random() * 4),
theme_customColorset: {
texture: '{theme}',
background: '{faceColor}',
foreground: '{numberColor}'
}
}); });
diceBox.init() diceBox.initialize();
ComfyJS.Init('{channel}'); ComfyJS.Init('{channel}');
//maxDice //maxDice
@ -33,16 +38,16 @@
toggleWait(true); toggleWait(true);
diceBox.onRollComplete = (rollResult) => { diceBox.onRollComplete = (rollResult) => {
rollResult.forEach(result => { rollResult.sets.forEach(result => {
let values = [] let values = []
result.rolls.forEach(roll => { result.rolls.forEach(roll => {
values.push(roll.value); values.push(roll.value);
}) })
document.getElementById('results').innerHTML = '<strong>' + user + '</strong> rolls <strong>' + message + '</strong>:<br/> [' + 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>' + user + '</strong> rolls <strong>' + message + '</strong>:<br/> [' + 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(' + ') + '] = <strong>' + result.total + '</strong> '
}) })
document.getElementById('results').showPopover() document.getElementById('results').showPopover()
setTimeout(() => { setTimeout(() => {
diceBox.clear(); diceBox.clearDice();
document.getElementById('results').hidePopover() document.getElementById('results').hidePopover()
}, {clearAfter} * 1000) }, {clearAfter} * 1000)
} }

View File

@ -23,7 +23,7 @@
<div class="w3-panel w3-theme-l4 w3-card w3-display-container" <div class="w3-panel w3-theme-l4 w3-card w3-display-container"
style="padding: 25px; text-align: center; margin-bottom: auto;"> style="padding: 25px; text-align: center; margin-bottom: auto;">
<label for="theme">Theme </label> <label for="theme">Theme </label>
<select name="theme" id="theme" style="margin: 25px"></select> <select name="theme" id="theme" style="margin: 0 25px"></select>
<div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline"> <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline">
<div style="flex-grow: 1; padding: 0 10px"> <div style="flex-grow: 1; padding: 0 10px">

View File

@ -29,6 +29,11 @@
<meta property="twitter:domain" content="{http:request.authority}"> <meta property="twitter:domain" content="{http:request.authority}">
</head> </head>
<body class="w3-theme-l1"> <body class="w3-theme-l1">
<script>
if (!localStorage.getItem("userId")) {
localStorage.setItem("userId", self.crypto.randomUUID());
}
</script>
<div class="w3-container w3-content" <div class="w3-container w3-content"
style="height: 95vh; display: flex; flex-direction: column; justify-content: space-between; padding: 25px"> style="height: 95vh; display: flex; flex-direction: column; justify-content: space-between; padding: 25px">
<h1 style="text-align: center"><i class="fa-solid fa-dice-d20"></i> Dice-Tower <i class="fa-solid fa-dice-d20"></i> <h1 style="text-align: center"><i class="fa-solid fa-dice-d20"></i> Dice-Tower <i class="fa-solid fa-dice-d20"></i>