From db67d2e54264f4bc2cef11214050034558800d1d Mon Sep 17 00:00:00 2001
From: Steffen <steffen@baumgart.biz>
Date: Sun, 26 Apr 2020 20:11:29 +0200
Subject: [PATCH] curved token names edition icons added refactored token icons

---
 src/App.vue                                   |  18 +++-
 src/assets/{ => editions}/bmr-demon.png       | Bin
 src/assets/{ => editions}/bmr-minion.png      | Bin
 src/assets/{ => editions}/bmr-outsider.png    | Bin
 src/assets/{ => editions}/bmr-townsfolk.png   | Bin
 .../{edition-bmr.png => editions/bmr.png}     | Bin
 .../{edition-luf.png => editions/luf.png}     | Bin
 src/assets/{ => editions}/snv-demon.png       | Bin
 src/assets/{ => editions}/snv-minion.png      | Bin
 src/assets/{ => editions}/snv-outsider.png    | Bin
 src/assets/{ => editions}/snv-townsfolk.png   | Bin
 .../{edition-snv.png => editions/snv.png}     | Bin
 src/assets/{ => editions}/tb-demon.png        | Bin
 src/assets/{ => editions}/tb-minion.png       | Bin
 src/assets/{ => editions}/tb-outsider.png     | Bin
 src/assets/{ => editions}/tb-townsfolk.png    | Bin
 .../{edition-tb.png => editions/tb.png}       | Bin
 src/components/Player.vue                     |  14 ++-
 src/components/Token.vue                      |  80 ++++++++++----
 src/components/TownSquare.vue                 |  26 ++---
 src/vars.scss                                 | 101 +-----------------
 21 files changed, 100 insertions(+), 139 deletions(-)
 rename src/assets/{ => editions}/bmr-demon.png (100%)
 rename src/assets/{ => editions}/bmr-minion.png (100%)
 rename src/assets/{ => editions}/bmr-outsider.png (100%)
 rename src/assets/{ => editions}/bmr-townsfolk.png (100%)
 rename src/assets/{edition-bmr.png => editions/bmr.png} (100%)
 rename src/assets/{edition-luf.png => editions/luf.png} (100%)
 rename src/assets/{ => editions}/snv-demon.png (100%)
 rename src/assets/{ => editions}/snv-minion.png (100%)
 rename src/assets/{ => editions}/snv-outsider.png (100%)
 rename src/assets/{ => editions}/snv-townsfolk.png (100%)
 rename src/assets/{edition-snv.png => editions/snv.png} (100%)
 rename src/assets/{ => editions}/tb-demon.png (100%)
 rename src/assets/{ => editions}/tb-minion.png (100%)
 rename src/assets/{ => editions}/tb-outsider.png (100%)
 rename src/assets/{ => editions}/tb-townsfolk.png (100%)
 rename src/assets/{edition-tb.png => editions/tb.png} (100%)

diff --git a/src/App.vue b/src/App.vue
index c76295a..14d3670 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -373,9 +373,23 @@ ul {
 }
 
 // Editions
-@each $img in $editions {
+@each $img, $skipIcons in $editions {
   .edition-#{$img} {
-    background-image: url("./assets/edition-#{$img}.png");
+    background-image: url("./assets/editions/#{$img}.png");
+  }
+  @if $skipIcons != true {
+    .edition-#{$img}.townsfolk {
+      background-image: url("./assets/editions/#{$img}-townsfolk.png");
+    }
+    .edition-#{$img}.outsider {
+      background-image: url("./assets/editions/#{$img}-outsider.png");
+    }
+    .edition-#{$img}.minion {
+      background-image: url("./assets/editions/#{$img}-minion.png");
+    }
+    .edition-#{$img}.demon {
+      background-image: url("./assets/editions/#{$img}-demon.png");
+    }
   }
 }
 
diff --git a/src/assets/bmr-demon.png b/src/assets/editions/bmr-demon.png
similarity index 100%
rename from src/assets/bmr-demon.png
rename to src/assets/editions/bmr-demon.png
diff --git a/src/assets/bmr-minion.png b/src/assets/editions/bmr-minion.png
similarity index 100%
rename from src/assets/bmr-minion.png
rename to src/assets/editions/bmr-minion.png
diff --git a/src/assets/bmr-outsider.png b/src/assets/editions/bmr-outsider.png
similarity index 100%
rename from src/assets/bmr-outsider.png
rename to src/assets/editions/bmr-outsider.png
diff --git a/src/assets/bmr-townsfolk.png b/src/assets/editions/bmr-townsfolk.png
similarity index 100%
rename from src/assets/bmr-townsfolk.png
rename to src/assets/editions/bmr-townsfolk.png
diff --git a/src/assets/edition-bmr.png b/src/assets/editions/bmr.png
similarity index 100%
rename from src/assets/edition-bmr.png
rename to src/assets/editions/bmr.png
diff --git a/src/assets/edition-luf.png b/src/assets/editions/luf.png
similarity index 100%
rename from src/assets/edition-luf.png
rename to src/assets/editions/luf.png
diff --git a/src/assets/snv-demon.png b/src/assets/editions/snv-demon.png
similarity index 100%
rename from src/assets/snv-demon.png
rename to src/assets/editions/snv-demon.png
diff --git a/src/assets/snv-minion.png b/src/assets/editions/snv-minion.png
similarity index 100%
rename from src/assets/snv-minion.png
rename to src/assets/editions/snv-minion.png
diff --git a/src/assets/snv-outsider.png b/src/assets/editions/snv-outsider.png
similarity index 100%
rename from src/assets/snv-outsider.png
rename to src/assets/editions/snv-outsider.png
diff --git a/src/assets/snv-townsfolk.png b/src/assets/editions/snv-townsfolk.png
similarity index 100%
rename from src/assets/snv-townsfolk.png
rename to src/assets/editions/snv-townsfolk.png
diff --git a/src/assets/edition-snv.png b/src/assets/editions/snv.png
similarity index 100%
rename from src/assets/edition-snv.png
rename to src/assets/editions/snv.png
diff --git a/src/assets/tb-demon.png b/src/assets/editions/tb-demon.png
similarity index 100%
rename from src/assets/tb-demon.png
rename to src/assets/editions/tb-demon.png
diff --git a/src/assets/tb-minion.png b/src/assets/editions/tb-minion.png
similarity index 100%
rename from src/assets/tb-minion.png
rename to src/assets/editions/tb-minion.png
diff --git a/src/assets/tb-outsider.png b/src/assets/editions/tb-outsider.png
similarity index 100%
rename from src/assets/tb-outsider.png
rename to src/assets/editions/tb-outsider.png
diff --git a/src/assets/tb-townsfolk.png b/src/assets/editions/tb-townsfolk.png
similarity index 100%
rename from src/assets/tb-townsfolk.png
rename to src/assets/editions/tb-townsfolk.png
diff --git a/src/assets/edition-tb.png b/src/assets/editions/tb.png
similarity index 100%
rename from src/assets/edition-tb.png
rename to src/assets/editions/tb.png
diff --git a/src/components/Player.vue b/src/components/Player.vue
index e6bc5c2..7d1df81 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -47,10 +47,20 @@
         v-bind:class="[reminder.role]"
         @click="removeReminder(reminder)"
       >
+        <span
+          class="icon"
+          v-bind:style="{
+            backgroundImage: `url(${require('../assets/icons/' +
+              reminder.role +
+              '.png')})`
+          }"
+        ></span>
         {{ reminder.name }}
       </div>
     </template>
-    <div class="reminder add" @click="$emit('add-reminder', player)"></div>
+    <div class="reminder add" @click="$emit('add-reminder', player)">
+      <span class="icon"></span>
+    </div>
   </li>
 </template>
 
@@ -441,7 +451,7 @@ export default {
   transition: all 200ms;
   cursor: pointer;
 
-  &:before,
+  .icon,
   &:after {
     content: " ";
     position: absolute;
diff --git a/src/components/Token.vue b/src/components/Token.vue
index 654e950..ee34579 100644
--- a/src/components/Token.vue
+++ b/src/components/Token.vue
@@ -1,5 +1,14 @@
 <template>
   <div class="token" @click="setRole" :class="[role.id]">
+    <span
+      class="icon"
+      v-if="role.id"
+      v-bind:style="{
+        backgroundImage: `url(${require('../assets/icons/' +
+          role.id +
+          '.png')})`
+      }"
+    ></span>
     <span class="leaf-left" v-if="role.firstNight"></span>
     <span class="leaf-right" v-if="role.otherNight"></span>
     <span
@@ -7,7 +16,28 @@
       v-bind:class="['leaf-top' + role.reminders.length]"
     ></span>
     <span class="leaf-orange" v-if="role.setup"></span>
-    <div class="name">{{ role.name }}</div>
+    <svg viewBox="0 0 150 150" class="name">
+      <path
+        d="M 13 75 C 13 160, 138 160, 138 75"
+        id="curve"
+        fill="transparent"
+      />
+      <text
+        width="150"
+        x="66.6%"
+        text-anchor="middle"
+        class="label"
+        v-bind:font-size="role.name | nameToFontSize"
+      >
+        <textPath xlink:href="#curve">
+          {{ role.name }}
+        </textPath>
+      </text>
+    </svg>
+    <div
+      class="edition"
+      v-bind:class="[`edition-${role.edition}`, role.team]"
+    ></div>
     <div class="ability" v-if="role.ability">
       {{ role.ability }}
     </div>
@@ -26,6 +56,9 @@ export default {
   data() {
     return {};
   },
+  filters: {
+    nameToFontSize: name => (name && name.length > 10 ? "20px" : "24px")
+  },
   methods: {
     setRole() {
       this.$emit("set-role");
@@ -47,15 +80,14 @@ export default {
   cursor: pointer;
   display: flex;
   align-items: center;
+  justify-content: center;
 
-  &:before {
-    content: " ";
+  .icon {
     background-size: 100%;
     position: absolute;
     width: 100%;
     height: 100%;
-    left: 0;
-    top: 0;
+    margin-top: 3%;
   }
 
   span {
@@ -63,8 +95,6 @@ export default {
     width: 100%;
     height: 100%;
     background-size: 100%;
-    left: 0;
-    top: 0;
     pointer-events: none;
 
     &.leaf-left {
@@ -100,6 +130,31 @@ export default {
     }
   }
 
+  .name {
+    width: 100%;
+    height: 100%;
+    .label {
+      fill: black;
+      stroke: white;
+      stroke-width: 2px;
+      paint-order: stroke;
+      font-family: "Papyrus", serif;
+      font-weight: bold;
+      text-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
+      letter-spacing: 1px;
+    }
+  }
+
+  .edition {
+    position: absolute;
+    right: 0;
+    bottom: 5px;
+    width: 30px;
+    height: 30px;
+    background-size: 100%;
+    display: none;
+  }
+
   .ability {
     display: flex;
     position: absolute;
@@ -136,17 +191,6 @@ export default {
     }
   }
 
-  .name {
-    color: black;
-    font-weight: 600;
-    text-shadow: -1px -1px 0 #fff, 1px -1px 0 #fff, -1px 1px 0 #fff,
-      1px 1px 0 #fff, 0 0 5px rgba(0, 0, 0, 0.75);
-    font-family: "Papyrus", serif;
-    position: absolute;
-    top: 73%;
-    width: 100%;
-    line-height: 100%;
-  }
   &:hover .ability {
     opacity: 1;
   }
diff --git a/src/components/TownSquare.vue b/src/components/TownSquare.vue
index 3a4c1d7..97bf454 100644
--- a/src/components/TownSquare.vue
+++ b/src/components/TownSquare.vue
@@ -47,6 +47,14 @@
           v-bind:key="reminder.role + ' ' + reminder.name"
           @click="addReminder(reminder)"
         >
+          <span
+            class="icon"
+            v-bind:style="{
+              backgroundImage: `url(${require('../assets/icons/' +
+                reminder.role +
+                '.png')})`
+            }"
+          ></span>
           {{ reminder.name }}
         </li>
       </ul>
@@ -160,21 +168,6 @@ export default {
 <style lang="scss">
 @import "../vars.scss";
 
-@each $img, $fontsize in $roles {
-  .token.#{$img} {
-    &:before {
-      background-image: url("../assets/icons/#{$img}.png");
-    }
-    .name {
-      font-size: $fontsize;
-    }
-  }
-
-  .reminder.#{$img}:before {
-    background-image: url("../assets/icons/#{$img}.png");
-  }
-}
-
 .circle {
   padding: 0;
   width: 100%;
@@ -353,8 +346,7 @@ ul.reminders .reminder {
   line-height: 100%;
   transition: transform 500ms ease;
 
-  &:before {
-    content: " ";
+  .icon {
     position: absolute;
     left: 0;
     top: 0;
diff --git a/src/vars.scss b/src/vars.scss
index 26bce44..c11f441 100644
--- a/src/vars.scss
+++ b/src/vars.scss
@@ -9,104 +9,5 @@ $editions:
   'tb',
   'bmr',
   'snv',
-  'luf'
-;
-
-$roles:
-  'apprentice',
-  'artist',
-  'assassin',
-  'barber',
-  'barista',
-  'baron',
-  'beggar',
-  'bishop',
-  'bonecollector' 75%,
-  'bureaucrat',
-  'butcher',
-  'butler',
-  'cerenovus',
-  'chambermaid' 90%,
-  'chef',
-  'clockmaker',
-  'courtier',
-  'deviant',
-  'devilsadvocate' 70%,
-  'dreamer',
-  'drunk',
-  'empath',
-  'evil',
-  'eviltwin',
-  'exorcist',
-  'fanggu',
-  'flowergirl',
-  'fool',
-  'fortuneteller' 80%,
-  'gambler',
-  'godfather',
-  'good',
-  'goon',
-  'gossip',
-  'grandmother' 90%,
-  'gunslinger',
-  'harlot',
-  'imp',
-  'innkeeper',
-  'investigator',
-  'judge',
-  'juggler',
-  'klutz',
-  'librarian',
-  'lunatic',
-  'mastermind',
-  'mathematician' 80%,
-  'matron',
-  'mayor',
-  'minstrel',
-  'monk',
-  'moonchild',
-  'mutant',
-  'nodashii',
-  'oracle',
-  'pacifist',
-  'philosopher',
-  'pithag',
-  'po',
-  'poisoner',
-  'professor',
-  'pukka',
-  'ravenkeeper' 80%,
-  'recluse',
-  'sage',
-  'sailor',
-  'saint',
-  'savant',
-  'scapegoat',
-  'scarletwoman' 75%,
-  'seamstress',
-  'shabaloth',
-  'slayer',
-  'snakecharmer' 75%,
-  'soldier',
-  'spy',
-  'sweetheart',
-  'tealady',
-  'thief',
-  'tinker',
-  'towncrier',
-  'undertaker' 85%,
-  'vigormortis',
-  'virgin',
-  'vortox',
-  'voudon',
-  'washerwoman' 75%,
-  'witch',
-  'zombuul',
-  'amnesiac',
-  'cannibal',
-  'fisherman',
-  'balloonist',
-  'goblin',
-  'widow',
-  'leviathan'
+  'luf' true
 ;