From 9e8a22cd628bc1d259ff23d0502abac9d2a3ad09 Mon Sep 17 00:00:00 2001
From: Russell Champoux <russellchamp@gmail.com>
Date: Sat, 21 Aug 2021 16:02:35 -0400
Subject: [PATCH] add lots of cool features add side nav add clipboard add
 remove

---
 TODO.txt                              |   1 +
 src/App.svelte                        | 112 +++++++++++++++-----------
 src/components/ClipboardHelper.svelte |  26 ++++++
 src/components/CreatureCard.svelte    |  50 ++++++++++--
 src/components/CreatureRoller.svelte  |  15 +---
 src/components/DangerCard.svelte      |  41 ++++++++++
 src/components/DangerRoller.svelte    |  28 +------
 src/components/DetailsCard.svelte     |  28 +++++++
 src/components/DetailsRoller.svelte   |  96 ++++++----------------
 src/components/DiscoveryRoller.svelte |  27 +------
 src/components/DungeonCard.svelte     |   4 +-
 src/components/DungeonRoller.svelte   |  23 +-----
 src/components/FollowerRoller.svelte  |  23 +-----
 src/components/KingdomCard.svelte     |  31 +++++++
 src/components/KingdomRoller.svelte   |  37 ++++-----
 src/components/MultiCard.svelte       |  55 +++++++++++++
 src/components/NpcRoller.svelte       |  23 +-----
 src/components/PlaceCard.svelte       |  24 ++++++
 src/components/PlaceRoller.svelte     |  14 +---
 src/components/RegionCard.svelte      |  24 ++++++
 src/components/RegionRoller.svelte    |  14 +---
 src/components/SoundOptions.svelte    |   2 +-
 src/rollers/details.ts                |   6 ++
 src/rollers/dungeons.ts               |  12 +--
 src/rollers/kingdoms.ts               |   4 +
 src/rollers/places.ts                 |   4 +-
 src/rollers/regions.ts                |   2 +
 src/types/RollCard.ts                 |   5 ++
 28 files changed, 428 insertions(+), 303 deletions(-)
 create mode 100644 src/components/ClipboardHelper.svelte
 create mode 100644 src/components/DangerCard.svelte
 create mode 100644 src/components/DetailsCard.svelte
 create mode 100644 src/components/KingdomCard.svelte
 create mode 100644 src/components/MultiCard.svelte
 create mode 100644 src/components/PlaceCard.svelte
 create mode 100644 src/components/RegionCard.svelte
 create mode 100644 src/types/RollCard.ts

diff --git a/TODO.txt b/TODO.txt
index abd4ae2..8517217 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -2,4 +2,5 @@ Add Steadings tables
 Change steadings and mounts to not show English names by default
 Make everything look nicer
 Maybe put roller button in a left nav bar and the results in the middle?
+Add a copy-to-clipboard option
 Add a 3d dice rolling visualizer
\ No newline at end of file
diff --git a/src/App.svelte b/src/App.svelte
index 4c6d8a7..f815295 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-  import { Accordion, AccordionHeader, AccordionItem } from "sveltestrap";
+  import { format as formatDate } from "date-fns";
+  import { Accordion, AccordionHeader, AccordionItem, Container, Row, Col } from "sveltestrap";
 
   import SoundOptions from "./components/SoundOptions.svelte";
   import CreatureRoller from "./components/CreatureRoller.svelte";
@@ -14,16 +15,26 @@
   import RegionRoller from "./components/RegionRoller.svelte";
   import SteadingRoller from "./components/SteadingRoller.svelte";
   import Footer from "./components/Footer.svelte";
+  import MultiCard from "./components/MultiCard.svelte";
+  import { RollCard } from "./types/RollCard";
 
   let rollThemBones = new Audio("https://soundbible.com/mp3/Shake And Roll Dice-SoundBible.com-591494296.mp3");
-  let playSounds = true;
+  let playSounds = localStorage?.getItem("playSounds") != "false";
   let timeout: NodeJS.Timeout;
+  let cards: RollCard[] = [];
 
-  function setSoundOptions(event: any) {
+  function setSoundOptions(event: CustomEvent<{ soundEnabled: boolean }>) {
     playSounds = event.detail.soundEnabled;
+    localStorage?.setItem("playSounds", String(playSounds));
   }
 
-  function handleRoll(event: any) {
+  function handleRoll(event: CustomEvent<{ type: string; value: any }>) {
+    let timestamp = formatDate(new Date(), "P kk:mm:ss");
+    cards = [new RollCard(event?.detail?.type, event?.detail?.value, timestamp), ...cards];
+    playAudio();
+  }
+
+  function playAudio() {
     clearTimeout(timeout);
     rollThemBones.pause();
     rollThemBones.currentTime = 0;
@@ -40,50 +51,57 @@
       }, playTime);
     }
   }
+
+  function remove(event: CustomEvent<RollCard>) {
+    cards = cards.filter((c) => c.timestamp != event.detail.timestamp);
+  }
 </script>
 
 <main>
-  <h1>The Perilous Wilds</h1>
-  <h2>A web-app for rolling on tables and getting funny results</h2>
-  <hr />
-  <SoundOptions on:soundToggle={setSoundOptions} />
-  <hr />
-  <Accordion>
-    <AccordionItem active header="Creatures">
-      <CreatureRoller on:roll={handleRoll} />
-    </AccordionItem>
-    <AccordionItem header="Dangers">
-      <DangerRoller on:roll={handleRoll} />
-    </AccordionItem>
-    <AccordionItem header="Details">
-      <DetailsRoller on:roll={handleRoll} />
-    </AccordionItem>
-    <AccordionItem header="Discoveries">
-      <DiscoveryRoller on:roll={handleRoll} />
-    </AccordionItem>
-    <AccordionItem header="Dungeons">
-      <DungeonRoller on:roll={handleRoll} />
-    </AccordionItem>
-    <AccordionItem header="Followers">
-      <FollowerRoller on:roll={handleRoll} />
-    </AccordionItem>
-    <AccordionItem header="Kingdoms">
-      <KingdomRoller on:roll={handleRoll} />
-    </AccordionItem>
-    <AccordionItem header="NPCs">
-      <NpcRoller on:roll={handleRoll} />
-    </AccordionItem>
-    <AccordionItem header="Places">
-      <PlaceRoller on:roll={handleRoll} />
-    </AccordionItem>
-    <AccordionItem header="Regions">
-      <RegionRoller on:roll={handleRoll} />
-    </AccordionItem>
-    <AccordionItem header="Steadings">
-      <SteadingRoller on:roll={handleRoll} />
-    </AccordionItem>
-  </Accordion>
-  <Footer />
+  <Container fluid={true}>
+    <Row>
+      <h1>The Perilous Wilds</h1>
+      <h2>A web-app for rolling on tables and getting funny results</h2>
+      <hr />
+    </Row>
+    <Row>
+      <Col sm="3">
+        <div class="sidebar">
+          <h3>Rollers:</h3>
+          <hr />
+          <CreatureRoller on:roll={handleRoll} />
+          <DangerRoller on:roll={handleRoll} />
+          <DiscoveryRoller on:roll={handleRoll} />
+          <DungeonRoller on:roll={handleRoll} />
+          <FollowerRoller on:roll={handleRoll} />
+          <NpcRoller on:roll={handleRoll} />
+          <PlaceRoller on:roll={handleRoll} />
+          <RegionRoller on:roll={handleRoll} />
+          <SteadingRoller on:roll={handleRoll} />
+
+          <h3>Kingdom:</h3>
+          <KingdomRoller on:roll={handleRoll} />
+
+          <h3>Details:</h3>
+          <DetailsRoller on:roll={handleRoll} />
+
+          <hr />
+
+          <h3>Options</h3>
+          <SoundOptions soundEnabled={playSounds} on:soundToggle={setSoundOptions} />
+        </div>
+      </Col>
+      <Col sm="9">
+        <h3>Results:</h3>
+        {#each cards as card}
+          <MultiCard {card} on:remove={remove} />
+        {/each}
+      </Col>
+    </Row>
+    <Row>
+      <Footer />
+    </Row>
+  </Container>
 </main>
 
 <style>
@@ -101,6 +119,10 @@
     font-weight: 100;
   }
 
+  .sidebar {
+    background-color: rgba(0, 0, 0, 0.03);
+  }
+
   @media (min-width: 640px) {
     main {
       max-width: none;
diff --git a/src/components/ClipboardHelper.svelte b/src/components/ClipboardHelper.svelte
new file mode 100644
index 0000000..d82bcf9
--- /dev/null
+++ b/src/components/ClipboardHelper.svelte
@@ -0,0 +1,26 @@
+<script lang="ts">
+  import { capitalize } from "lodash";
+  import { Button, Icon, Tooltip } from "sveltestrap";
+
+  export let dataType: string;
+  export let data: any;
+
+  function handleClick() {
+    if (data) {
+      prompt(`${capitalize(dataType)} data`, JSON.stringify(data));
+
+      // This won't work until I support a https connection
+      // navigator.clipboard.writeText(JSON.stringify(data));
+    }
+  }
+</script>
+
+<main>
+  <Button id="copyHelper" color="secondary" on:click={handleClick}>
+    <Icon name="clipboard-data" />
+  </Button>
+  <Tooltip target="copyHelper" placement="top">Copy to Clipboard</Tooltip>
+</main>
+
+<style>
+</style>
diff --git a/src/components/CreatureCard.svelte b/src/components/CreatureCard.svelte
index 9e83414..ddbc94d 100644
--- a/src/components/CreatureCard.svelte
+++ b/src/components/CreatureCard.svelte
@@ -1,23 +1,55 @@
 <script lang="ts">
+  import { createEventDispatcher } from "svelte";
   import { capitalize } from "lodash";
-  import { Card, CardHeader, CardTitle, CardBody, CardSubtitle, CardText, CardFooter, Container, Row } from "sveltestrap";
+  import {
+    Card,
+    CardHeader,
+    CardTitle,
+    CardBody,
+    CardSubtitle,
+    CardText,
+    CardFooter,
+    Container,
+    Row,
+    Button,
+    Icon,
+    Tooltip,
+  } from "sveltestrap";
 
+  import ClipboardHelper from "./ClipboardHelper.svelte";
   import NpcCard from "./NpcCard.svelte";
   import DieIcon from "./DieIcon.svelte";
   import type { Creature } from "../rollers/creatures";
 
+  const dispatch = createEventDispatcher();
+
   export let creature: Creature;
   export let timestamp: string;
+
+  function remove() {
+    dispatch("remove");
+  }
 </script>
 
 <main>
   <Card class="mb-3">
     <CardHeader>
       <CardTitle>
-        {capitalize(creature.type)}<DieIcon value={creature.roll} />
-        {#if creature.subtype !== ""}({creature.subtype})<DieIcon value={creature.subroll} />{/if}: {capitalize(
-          creature.description
-        )}<DieIcon value={creature.specificroll} />
+        <div class="title">
+          <div class="description">
+            {capitalize(creature.type)}<DieIcon value={creature.roll} />
+            {#if creature.subtype !== ""}({creature.subtype})<DieIcon value={creature.subroll} />{/if}: {capitalize(
+              creature.description
+            )}<DieIcon value={creature.specificroll} />
+          </div>
+          <div class="buttons">
+            <ClipboardHelper data={creature} dataType="creature" />
+            <Button id="remove" outline color="danger" on:click={remove}>
+              <Icon name="x" />
+            </Button>
+            <Tooltip target="remove" placement="top">Remove Item</Tooltip>
+          </div>
+        </div>
       </CardTitle>
     </CardHeader>
     <CardBody>
@@ -72,8 +104,12 @@
   main {
     text-align: left;
   }
-  .card-subtitle {
-    padding-bottom: 1em;
+  .title {
+    display: flex;
+    justify-content: space-between;
+  }
+  .title .buttons {
+    display: flex;
   }
   ul {
     margin-left: 2em;
diff --git a/src/components/CreatureRoller.svelte b/src/components/CreatureRoller.svelte
index d206224..bff0819 100644
--- a/src/components/CreatureRoller.svelte
+++ b/src/components/CreatureRoller.svelte
@@ -1,30 +1,19 @@
 <script lang="ts">
-  import { format as formatDate } from "date-fns";
   import { createEventDispatcher } from "svelte";
   import { Button } from "sveltestrap";
-  import CreatureCard from "./CreatureCard.svelte";
-  import { Creature, rollCreature } from "../rollers/creatures";
+  import { rollCreature } from "../rollers/creatures";
 
   const dispatch = createEventDispatcher();
-  let rollResults: { creature: Creature; timestamp: string }[] = [];
 
   function roll(event: Event) {
     let creature = rollCreature();
-    rollResults = [{ creature, timestamp: formatDate(new Date(), "P kk:mm:ss") }, ...rollResults];
-    dispatch("roll");
+    dispatch("roll", { type: "creature", value: creature });
   }
 </script>
 
 <main>
   <Button color="primary" on:click={roll}>Roll Creature</Button>
-
-  {#each rollResults as { creature, timestamp }}
-    <CreatureCard {creature} {timestamp} />
-  {/each}
 </main>
 
 <style>
-  main {
-    text-align: left;
-  }
 </style>
diff --git a/src/components/DangerCard.svelte b/src/components/DangerCard.svelte
new file mode 100644
index 0000000..1502857
--- /dev/null
+++ b/src/components/DangerCard.svelte
@@ -0,0 +1,41 @@
+<script lang="ts">
+  import { capitalize } from "lodash";
+  import { Card, CardHeader, CardTitle, CardBody, CardText, CardFooter, Icon } from "sveltestrap";
+  import type { Danger } from "../rollers/dangers";
+  import DieIcon from "./DieIcon.svelte";
+
+  export let danger: Danger;
+  export let timestamp: string;
+
+  let icon = "";
+  $: icon =
+    danger.category == "unnatural entity"
+      ? "person-square"
+      : danger.category == "hazard"
+      ? "lightning-fill"
+      : danger.category == "creature"
+      ? "emoji-neutral"
+      : "";
+</script>
+
+<main>
+  <Card class="mb-3">
+    <CardHeader>
+      <CardTitle>
+        {capitalize(danger.category)}<DieIcon value={danger.roll} />
+        {#if danger.subcategory !== ""}({danger.subcategory})<DieIcon value={danger.subroll} />{/if}: {capitalize(
+          danger.description
+        )}<DieIcon value={danger.specificroll} />
+      </CardTitle>
+    </CardHeader>
+    <CardBody>
+      <CardText>
+        <Icon name={icon} />: {danger.description}
+      </CardText>
+    </CardBody>
+    <CardFooter>{timestamp}</CardFooter>
+  </Card>
+</main>
+
+<style>
+</style>
diff --git a/src/components/DangerRoller.svelte b/src/components/DangerRoller.svelte
index 828dfb8..f47408b 100644
--- a/src/components/DangerRoller.svelte
+++ b/src/components/DangerRoller.svelte
@@ -1,38 +1,18 @@
 <script lang="ts">
-  import { format as formatDate } from "date-fns";
   import { createEventDispatcher } from "svelte";
-  import { Button, Icon } from "sveltestrap";
-  import { Danger, rollDanger } from "../rollers/dangers";
+  import { Button } from "sveltestrap";
+  import { rollDanger } from "../rollers/dangers";
 
   const dispatch = createEventDispatcher();
 
-  export let rollResults: { danger: Danger; icon: string; timestamp: string }[] = [];
-
   function roll(event: Event) {
     let danger = rollDanger();
-    let icon =
-      danger.category == "unnatural entity"
-        ? "person-square"
-        : danger.category == "hazard"
-        ? "lightning-fill"
-        : danger.category == "creature"
-        ? "emoji-neutral"
-        : "";
-    rollResults = [{ danger, icon, timestamp: formatDate(new Date(), "P kk:mm:ss") }, ...rollResults];
-    dispatch("roll");
+    dispatch("roll", { type: "danger", value: danger });
   }
 </script>
 
 <main>
-  <span class="btn">
-    <Button color="primary" on:click={roll}>Roll Danger</Button>
-  </span>
-
-  {#each rollResults as { danger, icon, timestamp }}
-    <h4>
-      {timestamp}: {danger.category} ({danger.subcategory}) <Icon name={icon} />: {danger.description}
-    </h4>
-  {/each}
+  <Button color="primary" on:click={roll}>Roll Danger</Button>
 </main>
 
 <style>
diff --git a/src/components/DetailsCard.svelte b/src/components/DetailsCard.svelte
new file mode 100644
index 0000000..64a0b4b
--- /dev/null
+++ b/src/components/DetailsCard.svelte
@@ -0,0 +1,28 @@
+<script lang="ts">
+  import { capitalize } from "lodash";
+  import { Card, CardHeader, CardTitle, CardBody, CardText, CardFooter } from "sveltestrap";
+  import type { Detail } from "../rollers/details";
+  import DieIcon from "./DieIcon.svelte";
+
+  export let detail: Detail;
+  export let timestamp: string;
+</script>
+
+<main>
+  <Card class="mb-3">
+    <CardHeader>
+      <CardTitle>
+        {capitalize(detail.type)}
+      </CardTitle>
+    </CardHeader>
+    <CardBody>
+      <CardText>
+        {detail.description}<DieIcon value={detail.roll} />
+      </CardText>
+    </CardBody>
+    <CardFooter>{timestamp}</CardFooter>
+  </Card>
+</main>
+
+<style>
+</style>
diff --git a/src/components/DetailsRoller.svelte b/src/components/DetailsRoller.svelte
index 7b5fa40..fc96305 100644
--- a/src/components/DetailsRoller.svelte
+++ b/src/components/DetailsRoller.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import { format as formatDate } from "date-fns";
   import { createEventDispatcher } from "svelte";
-  import { Button, Icon } from "sveltestrap";
+  import { Button } from "sveltestrap";
   import {
+    Detail,
     rollAbility,
     rollActivity,
     rollAdjective,
@@ -24,83 +24,33 @@
     rollVisibility,
   } from "../rollers/details";
 
-  import DieIcon from "./DieIcon.svelte";
-
   const dispatch = createEventDispatcher();
 
-  let rollResults: { type: string; roll: number; value: string; timestamp: string }[] = [];
-
-  function roll(item: { type: string; description: string; roll: number }) {
-    rollResults = [
-      { type: item.type, roll: item.roll, value: item.description, timestamp: formatDate(new Date(), "P kk:mm:ss") },
-      ...rollResults,
-    ];
-    dispatch("roll");
+  function roll(value: Detail) {
+    dispatch("roll", { type: "detail", value });
   }
 </script>
 
 <main>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollAbility())}>Roll Ability</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollActivity())}>Roll Activity</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollAdjective())}>Roll Adjective</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollAge())}>Roll Age</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollAlignment())}>Roll Alignment</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollAspect())}>Roll Aspect</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollCondition())}>Roll Condition</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollDisposition())}>Roll Disposition</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollElement())}>Roll Element</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollFeature())}>Roll Feature</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollMagicType())}>Roll MagicType</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollNumAppearing())}>Roll NumAppearing</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollOddity())}>Roll Oddity</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollOrientation())}>Roll Orientation</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollRuination())}>Roll Ruination</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollSize())}>Roll Size</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollTag())}>Roll Tag</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollTerrain())}>Roll Terrain</Button>
-  </span>
-  <span class="btn">
-    <Button color="primary" on:click={() => roll(rollVisibility())}>Roll Visibility</Button>
-  </span>
-
-  {#each rollResults as { type, roll, value, timestamp }}
-    <h4>{timestamp}: ({type}): {value}<DieIcon value={roll} /></h4>
-  {/each}
+  <Button color="primary" on:click={() => roll(rollAbility())}>Roll Ability</Button>
+  <Button color="primary" on:click={() => roll(rollActivity())}>Roll Activity</Button>
+  <Button color="primary" on:click={() => roll(rollAdjective())}>Roll Adjective</Button>
+  <Button color="primary" on:click={() => roll(rollAge())}>Roll Age</Button>
+  <Button color="primary" on:click={() => roll(rollAlignment())}>Roll Alignment</Button>
+  <Button color="primary" on:click={() => roll(rollAspect())}>Roll Aspect</Button>
+  <Button color="primary" on:click={() => roll(rollCondition())}>Roll Condition</Button>
+  <Button color="primary" on:click={() => roll(rollDisposition())}>Roll Disposition</Button>
+  <Button color="primary" on:click={() => roll(rollElement())}>Roll Element</Button>
+  <Button color="primary" on:click={() => roll(rollFeature())}>Roll Feature</Button>
+  <Button color="primary" on:click={() => roll(rollMagicType())}>Roll MagicType</Button>
+  <Button color="primary" on:click={() => roll(rollNumAppearing())}>Roll NumAppearing</Button>
+  <Button color="primary" on:click={() => roll(rollOddity())}>Roll Oddity</Button>
+  <Button color="primary" on:click={() => roll(rollOrientation())}>Roll Orientation</Button>
+  <Button color="primary" on:click={() => roll(rollRuination())}>Roll Ruination</Button>
+  <Button color="primary" on:click={() => roll(rollSize())}>Roll Size</Button>
+  <Button color="primary" on:click={() => roll(rollTag())}>Roll Tag</Button>
+  <Button color="primary" on:click={() => roll(rollTerrain())}>Roll Terrain</Button>
+  <Button color="primary" on:click={() => roll(rollVisibility())}>Roll Visibility</Button>
 </main>
 
 <style>
diff --git a/src/components/DiscoveryRoller.svelte b/src/components/DiscoveryRoller.svelte
index 48171a1..5bdbdfc 100644
--- a/src/components/DiscoveryRoller.svelte
+++ b/src/components/DiscoveryRoller.svelte
@@ -1,40 +1,19 @@
 <script lang="ts">
   import { Button } from "sveltestrap";
-  import { format as formatDate } from "date-fns";
   import { createEventDispatcher } from "svelte";
-  import DiscoveryCard from "./DiscoveryCard.svelte";
-  import { Discovery, rollDiscovery } from "../rollers/discoveries";
+  import { rollDiscovery } from "../rollers/discoveries";
 
   const dispatch = createEventDispatcher();
 
-  export let rollResults: { discovery: Discovery; timestamp: string }[] = [];
-
   function roll(event: Event) {
     let discovery = rollDiscovery();
-    rollResults = [{ discovery, timestamp: formatDate(new Date(), "P kk:mm:ss") }, ...rollResults];
-    dispatch("roll");
-  }
-
-  function getIcon(t: string, c: string): string {
-    return "";
+    dispatch("roll", { type: "discovery", value: discovery });
   }
 </script>
 
 <main>
-  <span class="btn">
-    <Button color="primary" on:click={roll}>Roll Discovery</Button>
-  </span>
-
-  {#each rollResults as { discovery, timestamp }}
-    <DiscoveryCard {discovery} {timestamp} />
-  {/each}
+  <Button color="primary" on:click={roll}>Roll Discovery</Button>
 </main>
 
 <style>
-  main {
-    text-align: left;
-  }
-  .btn {
-    text-align: center;
-  }
 </style>
diff --git a/src/components/DungeonCard.svelte b/src/components/DungeonCard.svelte
index 19e76e6..b95cfab 100644
--- a/src/components/DungeonCard.svelte
+++ b/src/components/DungeonCard.svelte
@@ -25,9 +25,7 @@
 <main>
   <Card class="mb-3">
     <CardHeader>
-      <CardTitle
-        >{capitalize(dungeon.size.description)} {dungeon.function.description} built by (a/an) {dungeon.builder.description}</CardTitle
-      >
+      <CardTitle>{capitalize(dungeon.size.description)} {dungeon.function.description} built by {dungeon.builder.description}</CardTitle>
     </CardHeader>
     <CardBody>
       <CardSubtitle>
diff --git a/src/components/DungeonRoller.svelte b/src/components/DungeonRoller.svelte
index 9a27f29..085bd45 100644
--- a/src/components/DungeonRoller.svelte
+++ b/src/components/DungeonRoller.svelte
@@ -1,37 +1,20 @@
 <script lang="ts">
   import { Button } from "sveltestrap";
-  import { format as formatDate } from "date-fns";
   import { createEventDispatcher } from "svelte";
 
-  import DungeonCard from "./DungeonCard.svelte";
-  import { Dungeon, rollDungeon } from "../rollers/dungeons";
+  import { rollDungeon } from "../rollers/dungeons";
 
   const dispatch = createEventDispatcher();
 
-  export let rollResults: { dungeon: Dungeon; timestamp: string }[] = [];
-
   function roll(event: Event) {
     let dungeon = rollDungeon();
-    rollResults = [{ dungeon, timestamp: formatDate(new Date(), "P kk:mm:ss") }, ...rollResults];
-    dispatch("roll");
+    dispatch("roll", { type: "dungeon", value: dungeon });
   }
 </script>
 
 <main>
-  <span class="btn">
-    <Button color="primary" on:click={roll}>Roll Dungeon</Button>
-  </span>
-
-  {#each rollResults as { dungeon, timestamp }}
-    <DungeonCard {dungeon} {timestamp} />
-  {/each}
+  <Button color="primary" on:click={roll}>Roll Dungeon</Button>
 </main>
 
 <style>
-  main {
-    text-align: left;
-  }
-  .btn {
-    text-align: center;
-  }
 </style>
diff --git a/src/components/FollowerRoller.svelte b/src/components/FollowerRoller.svelte
index 088565c..6b08db6 100644
--- a/src/components/FollowerRoller.svelte
+++ b/src/components/FollowerRoller.svelte
@@ -1,37 +1,20 @@
 <script lang="ts">
   import { Button } from "sveltestrap";
-  import { format as formatDate } from "date-fns";
   import { createEventDispatcher } from "svelte";
 
-  import FollowerCard from "./FollowerCard.svelte";
-  import { rollFollower, Follower } from "../rollers/followers";
+  import { rollFollower } from "../rollers/followers";
 
   const dispatch = createEventDispatcher();
 
-  export let rollResults: { follower: Follower; timestamp: string }[] = [];
-
   function roll(event: Event) {
     let follower = rollFollower();
-    rollResults = [{ follower, timestamp: formatDate(new Date(), "P kk:mm:ss") }, ...rollResults];
-    dispatch("roll");
+    dispatch("roll", { type: "follower", value: follower });
   }
 </script>
 
 <main>
-  <span class="btn">
-    <Button color="primary" on:click={roll}>Roll Followers</Button>
-  </span>
-
-  {#each rollResults as { follower, timestamp }}
-    <FollowerCard {follower} {timestamp} />
-  {/each}
+  <Button color="primary" on:click={roll}>Roll Follower</Button>
 </main>
 
 <style>
-  main {
-    text-align: left;
-  }
-  .btn {
-    text-align: center;
-  }
 </style>
diff --git a/src/components/KingdomCard.svelte b/src/components/KingdomCard.svelte
new file mode 100644
index 0000000..d9c0577
--- /dev/null
+++ b/src/components/KingdomCard.svelte
@@ -0,0 +1,31 @@
+<script lang="ts">
+  import { capitalize } from "lodash";
+  import { Card, CardHeader, CardTitle, CardBody, CardText, CardFooter, Icon } from "sveltestrap";
+  import type { Kingdom, KingdomItem } from "../rollers/kingdoms";
+
+  export let item: KingdomItem;
+  export let timestamp: string;
+  let icon = "";
+
+  $: icon = String({ male: "person-fill", female: "person", steading: "house-door-fill", mount: "bicycle" }[item?.category] || "");
+</script>
+
+<main>
+  <Card class="mb-3">
+    <CardHeader>
+      <CardTitle>
+        {capitalize(item.category)} from {item.kingdom.description}
+      </CardTitle>
+    </CardHeader>
+    <CardBody>
+      <CardText>
+        <Icon name={icon} />
+        {item.description}
+      </CardText>
+    </CardBody>
+    <CardFooter>{timestamp}</CardFooter>
+  </Card>
+</main>
+
+<style>
+</style>
diff --git a/src/components/KingdomRoller.svelte b/src/components/KingdomRoller.svelte
index 19fb9dc..9d60d6f 100644
--- a/src/components/KingdomRoller.svelte
+++ b/src/components/KingdomRoller.svelte
@@ -1,47 +1,40 @@
 <script lang="ts">
   import { capitalize } from "lodash";
-  import { format as formatDate } from "date-fns";
   import { createEventDispatcher } from "svelte";
-  import { Button, Icon } from "sveltestrap";
+  import { Button } from "sveltestrap";
 
-  import { kingdoms, rollCategory } from "../rollers/kingdoms";
+  import { KingdomItem, kingdoms, rollCategory } from "../rollers/kingdoms";
 
   const dispatch = createEventDispatcher();
 
-  let rollResults: { value: string; icon: string; timestamp: string }[] = [];
   let kingdom = "arpad";
   let categories: string[];
 
   function roll(category: string) {
     let value = rollCategory(kingdom, category);
-    let icon = { male: "person-fill", female: "person", steading: "house-door-fill", mount: "bicycle" }[category] || "";
-    rollResults = [{ value, icon, timestamp: formatDate(new Date(), "P kk:mm:ss") }, ...rollResults];
-    dispatch("roll");
+
+    dispatch("roll", { type: "kingdom", value: new KingdomItem(kingdoms[kingdom], category, value) });
   }
 
   $: categories = kingdoms[kingdom].categories;
 </script>
 
 <main>
-  <h2>
-    <select bind:value={kingdom}>
-      {#each Object.keys(kingdoms) as k}
-        <option value={k}>{kingdoms[k].description}</option>
-      {/each}
-    </select>
-  </h2>
-  <h3>{kingdoms[kingdom].subtitle}</h3>
+  <select bind:value={kingdom}>
+    {#each Object.keys(kingdoms) as k}
+      <option value={k}>{kingdoms[k].description}</option>
+    {/each}
+  </select>
+
+  <div>{kingdoms[kingdom].subtitle}</div>
 
   {#each categories as category}
-    <span class="btn">
-      <Button color="primary" on:click={() => roll(category)}>Roll {capitalize(category)}</Button>
-    </span>
-  {/each}
-
-  {#each rollResults as { value, icon, timestamp }}
-    <h4>{timestamp}: <Icon name={icon} /> {value}</h4>
+    <Button color="primary" on:click={() => roll(category)}>Roll {capitalize(category)}</Button>
   {/each}
 </main>
 
 <style>
+  select {
+    font-size: 0.8em;
+  }
 </style>
diff --git a/src/components/MultiCard.svelte b/src/components/MultiCard.svelte
new file mode 100644
index 0000000..2d8b942
--- /dev/null
+++ b/src/components/MultiCard.svelte
@@ -0,0 +1,55 @@
+<script lang="ts">
+  import { createEventDispatcher } from "svelte";
+
+  import CreatureCard from "./CreatureCard.svelte";
+  import DangerCard from "./DangerCard.svelte";
+  import DetailsCard from "./DetailsCard.svelte";
+  import DiscoveryCard from "./DiscoveryCard.svelte";
+  import DungeonCard from "./DungeonCard.svelte";
+  import FollowerCard from "./FollowerCard.svelte";
+  import KingdomCard from "./KingdomCard.svelte";
+  import NpcCard from "./NpcCard.svelte";
+  import PlaceCard from "./PlaceCard.svelte";
+  import RegionCard from "./RegionCard.svelte";
+  import SteadingCard from "./SteadingCard.svelte";
+
+  import type { RollCard } from "../types/RollCard";
+
+  const dispatch = createEventDispatcher();
+  export let card: RollCard;
+
+  function remove() {
+    dispatch("remove", card);
+  }
+</script>
+
+<main>
+  {#if card.type == "creature"}
+    <CreatureCard creature={card.value} timestamp={card.timestamp} on:remove={remove} />
+  {:else if card.type == "danger"}
+    <DangerCard danger={card.value} timestamp={card.timestamp} />
+  {:else if card.type == "detail"}
+    <DetailsCard detail={card.value} timestamp={card.timestamp} />
+  {:else if card.type == "discovery"}
+    <DiscoveryCard discovery={card.value} timestamp={card.timestamp} />
+  {:else if card.type == "dungeon"}
+    <DungeonCard dungeon={card.value} timestamp={card.timestamp} />
+  {:else if card.type == "follower"}
+    <FollowerCard follower={card.value} timestamp={card.timestamp} />
+  {:else if card.type == "kingdom"}
+    <KingdomCard item={card.value} timestamp={card.timestamp} />
+  {:else if card.type == "npc"}
+    <NpcCard npc={card.value} timestamp={card.timestamp} />
+  {:else if card.type == "place"}
+    <PlaceCard place={card.value} timestamp={card.timestamp} />
+  {:else if card.type == "region"}
+    <RegionCard region={card.value} timestamp={card.timestamp} />
+  {:else if card.type == "steading"}
+    <SteadingCard steading={card.value} timestamp={card.timestamp} />
+  {:else}
+    <h3>Card type not supported: {card.type}</h3>
+  {/if}
+</main>
+
+<style>
+</style>
diff --git a/src/components/NpcRoller.svelte b/src/components/NpcRoller.svelte
index e2a6b20..d055740 100644
--- a/src/components/NpcRoller.svelte
+++ b/src/components/NpcRoller.svelte
@@ -1,37 +1,20 @@
 <script lang="ts">
   import { Button } from "sveltestrap";
-  import { format as formatDate } from "date-fns";
   import { createEventDispatcher } from "svelte";
 
-  import NpcCard from "./NpcCard.svelte";
-  import { Npc, rollNpc } from "../rollers/npcs";
+  import { rollNpc } from "../rollers/npcs";
 
   const dispatch = createEventDispatcher();
 
-  export let rollResults: { npc: Npc; timestamp: string }[] = [];
-
   function roll(event: Event) {
     let npc = rollNpc();
-    rollResults = [{ npc, timestamp: formatDate(new Date(), "P kk:mm:ss") }, ...rollResults];
-    dispatch("roll");
+    dispatch("roll", { type: "npc", value: npc });
   }
 </script>
 
 <main>
-  <span class="btn">
-    <Button color="primary" on:click={roll}>Roll Npc</Button>
-  </span>
-
-  {#each rollResults as { npc, timestamp }}
-    <NpcCard {npc} {timestamp} />
-  {/each}
+  <Button color="primary" on:click={roll}>Roll Npc</Button>
 </main>
 
 <style>
-  main {
-    text-align: left;
-  }
-  .btn {
-    text-align: center;
-  }
 </style>
diff --git a/src/components/PlaceCard.svelte b/src/components/PlaceCard.svelte
new file mode 100644
index 0000000..11604fc
--- /dev/null
+++ b/src/components/PlaceCard.svelte
@@ -0,0 +1,24 @@
+<script lang="ts">
+  import { Card, CardHeader, CardTitle, CardBody, CardText, CardFooter } from "sveltestrap";
+  import type { Place } from "../rollers/places";
+
+  export let place: Place;
+  export let timestamp: string;
+</script>
+
+<main>
+  <Card class="mb-3">
+    <CardHeader>
+      <CardTitle>Place</CardTitle>
+    </CardHeader>
+    <CardBody>
+      <CardText>
+        {place}
+      </CardText>
+    </CardBody>
+    <CardFooter>{timestamp}</CardFooter>
+  </Card>
+</main>
+
+<style>
+</style>
diff --git a/src/components/PlaceRoller.svelte b/src/components/PlaceRoller.svelte
index cee8754..be569a0 100644
--- a/src/components/PlaceRoller.svelte
+++ b/src/components/PlaceRoller.svelte
@@ -1,28 +1,18 @@
 <script lang="ts">
-  import { format as formatDate } from "date-fns";
   import { createEventDispatcher } from "svelte";
   import { Button } from "sveltestrap";
   import { rollPlace } from "../rollers/places";
 
   const dispatch = createEventDispatcher();
 
-  export let rollResults: { place: string; timestamp: string }[] = [];
-
   function roll(event: Event) {
     let place = rollPlace();
-    rollResults = [{ place, timestamp: formatDate(new Date(), "P kk:mm:ss") }, ...rollResults];
-    dispatch("roll");
+    dispatch("roll", { type: "place", value: place });
   }
 </script>
 
 <main>
-  <span class="btn">
-    <Button color="primary" on:click={roll}>Roll Place</Button>
-  </span>
-
-  {#each rollResults as { place, timestamp }}
-    <h4>{timestamp}: {place}</h4>
-  {/each}
+  <Button color="primary" on:click={roll}>Roll Place</Button>
 </main>
 
 <style>
diff --git a/src/components/RegionCard.svelte b/src/components/RegionCard.svelte
new file mode 100644
index 0000000..2117600
--- /dev/null
+++ b/src/components/RegionCard.svelte
@@ -0,0 +1,24 @@
+<script lang="ts">
+  import { Card, CardHeader, CardTitle, CardBody, CardText, CardFooter } from "sveltestrap";
+  import type { Region } from "../rollers/regions";
+
+  export let region: Region;
+  export let timestamp: string;
+</script>
+
+<main>
+  <Card class="mb-3">
+    <CardHeader>
+      <CardTitle>Region</CardTitle>
+    </CardHeader>
+    <CardBody>
+      <CardText>
+        {region}
+      </CardText>
+    </CardBody>
+    <CardFooter>{timestamp}</CardFooter>
+  </Card>
+</main>
+
+<style>
+</style>
diff --git a/src/components/RegionRoller.svelte b/src/components/RegionRoller.svelte
index 7c8b2ba..04ee1df 100644
--- a/src/components/RegionRoller.svelte
+++ b/src/components/RegionRoller.svelte
@@ -1,28 +1,18 @@
 <script lang="ts">
-  import { format as formatDate } from "date-fns";
   import { createEventDispatcher } from "svelte";
   import { Button } from "sveltestrap";
   import { rollRegion } from "../rollers/regions";
 
   const dispatch = createEventDispatcher();
 
-  export let rollResults: { region: string; timestamp: string }[] = [];
-
   function roll(event: Event) {
     let region = rollRegion();
-    rollResults = [{ region, timestamp: formatDate(new Date(), "P kk:mm:ss") }, ...rollResults];
-    dispatch("roll");
+    dispatch("roll", { type: "region", value: region });
   }
 </script>
 
 <main>
-  <span class="btn">
-    <Button color="primary" on:click={roll}>Roll Region</Button>
-  </span>
-
-  {#each rollResults as { region, timestamp }}
-    <h4>{timestamp}: {region}</h4>
-  {/each}
+  <Button color="primary" on:click={roll}>Roll Region</Button>
 </main>
 
 <style>
diff --git a/src/components/SoundOptions.svelte b/src/components/SoundOptions.svelte
index 7b632a5..4f62f2c 100644
--- a/src/components/SoundOptions.svelte
+++ b/src/components/SoundOptions.svelte
@@ -2,8 +2,8 @@
   import { createEventDispatcher } from "svelte";
   import { Button, Icon } from "sveltestrap";
 
+  export let soundEnabled: boolean;
   const dispatch = createEventDispatcher();
-  let soundEnabled = true;
 
   function toggleSound() {
     soundEnabled = !soundEnabled;
diff --git a/src/rollers/details.ts b/src/rollers/details.ts
index 783555d..557dd26 100644
--- a/src/rollers/details.ts
+++ b/src/rollers/details.ts
@@ -1,5 +1,11 @@
 import { random, replace, sample, sampleSize } from "lodash";
 
+// This is the general implemenetation of details.
+// We are not doing strict class inheritance because that way leads to pain
+export class Detail {
+  constructor(public type: string, public roll: number, public description: string) { }
+}
+
 export class Ability {
   type: string = "ability";
   constructor(public roll: number = 0, public description = "") { };
diff --git a/src/rollers/dungeons.ts b/src/rollers/dungeons.ts
index 4bca270..a617df0 100644
--- a/src/rollers/dungeons.ts
+++ b/src/rollers/dungeons.ts
@@ -102,21 +102,21 @@ function rollBuilder(roll: number = random(1, 12)): Builder {
   if (roll <= 1) {
     return new Builder(roll, sample(["aliens", "precursors"]));
   } else if (roll <= 2) {
-    return new Builder(roll, sample(["demigod", "demon"]));
+    return new Builder(roll, sample(["a demigod", "a demon"]));
   } else if (roll <= 3) {
-    return new Builder(roll, "natural(caves, etc.)");
+    return new Builder(roll, "natural means (caves, etc.)");
   } else if (roll <= 5) {
-    return new Builder(roll, sample(["religious order", "cult"]));
+    return new Builder(roll, sample(["a religious order", "a cult"]));
   } else if (roll <= 6) {
-    return new Builder(roll, rollHumanoid().description);
+    return new Builder(roll, `a ${rollHumanoid().description}`);
   } else if (roll <= 8) {
     return new Builder(roll, sample(["dwarves", "gnomes"]));
   } else if (roll <= 10) {
     return new Builder(roll, "elves");
   } else if (roll <= 11) {
-    return new Builder(roll, sample(["wizard", "madman"]));
+    return new Builder(roll, sample(["a wizard", "a madman"]));
   } else if (roll <= 12) {
-    return new Builder(roll, sample(["monarch", "warlord"]));
+    return new Builder(roll, sample(["a monarch", "a warlord"]));
   }
 
   return new Builder(roll);
diff --git a/src/rollers/kingdoms.ts b/src/rollers/kingdoms.ts
index 58e1288..ce3b2a2 100644
--- a/src/rollers/kingdoms.ts
+++ b/src/rollers/kingdoms.ts
@@ -9,6 +9,10 @@ export class Kingdom {
   mount: string[];
 }
 
+export class KingdomItem {
+  constructor(public kingdom: Kingdom, public category: string = "", public description: string = "") { };
+}
+
 export const kingdoms: { [kingdom: string]: Kingdom } = {
   arpad: {
     description: 'The Kingdom of Arpad',
diff --git a/src/rollers/places.ts b/src/rollers/places.ts
index e37ee65..f23fdd3 100644
--- a/src/rollers/places.ts
+++ b/src/rollers/places.ts
@@ -1,6 +1,8 @@
 import { sample } from "lodash";
 import { bodgeString } from "./utils";
 
+export type Place = string;
+
 export const places = {
   templates: [
     'The [PLACE]',
@@ -15,7 +17,7 @@ export const places = {
   noun: ['[Name]', 'Arm', 'Ash', 'Blood', 'Child', 'Cinder', 'Corpse', 'Crystal', 'Dagger', 'Death', 'Demon', 'Devil', 'Doom', 'Eye', 'Fear', 'Finger', 'Fire', 'Foot', 'Ghost', 'Giant', 'Goblin', 'God', 'Gold', 'Hand', 'Head', 'Heart', 'Hero', 'Hope', 'King', 'Knave', 'Knight', 'Muck', 'Mud', 'Priest', 'Queen', 'Sailor', 'Silver', 'Skull', 'Smoke', 'Souls', 'Spear', 'Spirit', 'Stone', 'Sword', 'Thief', 'Troll', 'Warrior', 'Water', 'Witch', 'Wizard',],
 };
 
-export function rollPlace(): string {
+export function rollPlace(): Place {
   let template = sample(places.templates);
   let place = bodgeString(template, places);
 
diff --git a/src/rollers/regions.ts b/src/rollers/regions.ts
index e1339ba..c39e255 100644
--- a/src/rollers/regions.ts
+++ b/src/rollers/regions.ts
@@ -1,6 +1,8 @@
 import { sample } from "lodash";
 import { bodgeString } from "./utils";
 
+export type Region = string;
+
 export const regions = {
   templates: [
     '[ADJECTIVE] [TERRAIN]',
diff --git a/src/types/RollCard.ts b/src/types/RollCard.ts
new file mode 100644
index 0000000..2afedad
--- /dev/null
+++ b/src/types/RollCard.ts
@@ -0,0 +1,5 @@
+// Generic type to hold data for multiple different card types
+// Maybe down the road I'll just make the other types inherit this
+export class RollCard {
+  constructor(public type: string, public value: any, public timestamp: string) { };
+}
\ No newline at end of file