feat(DiceTool): Resolve #1327, #1328

CHANGELOG.md

@@ -33,6 +33,7 @@ tech changes will usually be stripped from release notes for the public
     -   If the text area of a note is still in focus after 5 seconds and an edit was made, a server save is done
     -   _see the release notes for all the changes_
 -   [tech] ModalStack now supports dynamically inserted modals
+-   Dice history now contains user and details
 
 ### Fixed
 

client/src/apiTypes.ts

@@ -451,7 +451,7 @@ export interface Viewport {
 export interface DiceRollResult {
   player: string;
   roll: string;
-  result: number;
+  result: string;
   shareWithAll: boolean;
 }
 export interface FloorBackgroundSet {

client/src/game/dice/state.ts

@@ -63,6 +63,26 @@ class DiceStore extends Store<DiceState> {
         return result;
     }
 
+    getResultString(key: string): string {
+        const result = this._state.results.get(key)?.results[0];
+        if (result === undefined) {
+            return "";
+        }
+        return (
+            "(" +
+            result.details
+                .map((part) =>
+                    part.type === "dice"
+                        ? part.output.join("+")
+                        : part.type === "fixed"
+                        ? part.output
+                        : `) ${part.value} (`,
+                )
+                .join("") +
+            `) = ${result.total}`
+        );
+    }
+
     setResults(key: string, results: DndResult[], position?: [number, number]): void {
         this._state.results.set(key, { position, results });
     }

client/src/game/tools/variants/dice.ts

@@ -24,7 +24,7 @@ class DiceTool extends Tool implements ITool {
     state = reactive<{
         shareWithAll: boolean;
         autoRoll: boolean;
-        history: { roll: string; result: number; player: string }[];
+        history: { roll: string; result: string; player: string }[];
         timeouts: Record<string, number>;
     }>({
         shareWithAll: false,

client/src/game/ui/tools/DiceTool.vue

@@ -52,7 +52,7 @@ const diceText = computed(() => {
 
 async function reroll(roll: string): Promise<void> {
     const key = await diceTool.roll(roll);
-    const result = diceStore.getTotal(key);
+    const result = diceStore.getResultString(key);
     diceTool.state.history.push({ roll, result, player: coreStore.state.username });
     sendDiceRollResult({
         player: coreStore.state.username,
@@ -70,7 +70,7 @@ async function go(): Promise<void> {
     button.value?.classList.remove("transition");
     const roll = diceText.value;
     const key = await diceTool.roll(roll);
-    const result = diceStore.getTotal(key);
+    const result = diceStore.getResultString(key);
     diceTool.state.history.push({ roll, result, player: coreStore.state.username });
     sendDiceRollResult({
         player: coreStore.state.username,
@@ -86,7 +86,14 @@ async function go(): Promise<void> {
     <div id="dice" class="tool-detail">
         <div id="dice-history" ref="historyDiv">
             <template v-for="r of diceTool.state.history" :key="r.roll">
-                <div class="roll" :title="r.player" @click="reroll(r.roll)">{{ r.roll }}</div>
+                <div
+                    class="player"
+                    :title="r.player"
+                    style="margin-right: 1em; overflow: hidden; text-overflow: ellipsis"
+                >
+                    {{ r.player }}
+                </div>
+                <div class="roll" :title="r.player" style="margin-right: 1em" @click="reroll(r.roll)">{{ r.roll }}</div>
                 <div class="result" :title="r.player">{{ r.result }}</div>
             </template>
         </div>
@@ -128,7 +135,7 @@ async function go(): Promise<void> {
 
     #dice-history {
         display: grid;
-        grid-template-columns: 1fr 2em;
+        grid-template-columns: 1fr 2fr 2fr;
 
         max-height: 3em;
         overflow-y: auto;

server/src/api/models/dice/roll.py

@@ -4,5 +4,5 @@
 class DiceRollResult(BaseModel):
     player: str
     roll: str
-    result: int
+    result: str
     shareWithAll: bool