From de29b3845f80f6677c5e95e0cd3e355eea6dd2e9 Mon Sep 17 00:00:00 2001 From: Cody Evans <1123code@gmail.com> Date: Mon, 4 Sep 2023 19:28:42 -0700 Subject: [PATCH] Renamed travelers to travellers This change is to make it so all instances have the same spelling, spelling was chosen based off of https://wiki.bloodontheclocktower.com/Main_Page --- CHANGELOG.md | 12 ++++----- README.md | 4 +-- src/components/Player.vue | 8 +++--- src/components/TownInfo.vue | 22 ++++++++-------- src/components/TownSquare.vue | 2 +- src/components/Vote.vue | 6 ++--- src/components/modals/NightOrderModal.vue | 4 +-- src/components/modals/ReferenceModal.vue | 4 +-- src/components/modals/ReminderModal.vue | 4 +-- src/components/modals/RoleModal.vue | 24 ++++++++--------- src/components/modals/RolesModal.vue | 22 ++++++++-------- src/editions.json | 2 +- src/roles.json | 32 +++++++++++------------ src/store/index.js | 14 +++++----- src/store/modules/players.js | 10 +++---- src/store/modules/session.js | 2 +- src/store/socket.js | 16 ++++++------ 17 files changed, 94 insertions(+), 94 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d523292..0e5cbb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ Updated character night order to be consistent with script tool ### Version 2.15.2 - added mobile web application support - show correct number of leaves on roles with global reminders -- fixed a bug with traveler list showing up when assigning demon bluffs +- fixed a bug with traveller list showing up when assigning demon bluffs - fixed a bug with homebrew scripts that contained negative night order positions --- @@ -124,14 +124,14 @@ Updated character night order to be consistent with script tool --- ## Version 2.5.0 -- all travelers from the base editions are now optionally available (thanks @davotronic5000) +- all travellers from the base editions are now optionally available (thanks @davotronic5000) - night order shows player names near roles now --- ## Version 2.4.0 - added spoiler role (Pixie!) -- fixed bug with ST sending out roles that are not part of the current edition / script (ie. travelers or base set roles) +- fixed bug with ST sending out roles that are not part of the current edition / script (ie. travellers or base set roles) - better Lycanthrope icon (thanks @AWConant) --- @@ -181,20 +181,20 @@ Updated character night order to be consistent with script tool --- ## Version 2.0.4 -- fix bug with live sessions that contain travelers from a different set +- fix bug with live sessions that contain travellers from a different set - fix server channel cleanup --- ## Version 2.0.3 -- load roles that belong to different editions (like travelers) from gamestate +- load roles that belong to different editions (like travellers) from gamestate - close session when missing custom roles and open edition modal - added a few more metrics --- ## Version 2.0.2 -- fix nomination history type not detecting travelers +- fix nomination history type not detecting travellers - fix live session domain whitelist - fix build path - fix changelog version numbering diff --git a/README.md b/README.md index b7babc4..3dab015 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ If you want to learn more about how to use the app as a player, [JayBotC](https: - Public Town Square and Storyteller Grimoire (toggle with **shortcut \[G\]**) - Supports custom script JSON generated by the [Script Tool](https://bloodontheclocktower.com/script) - Live Session for Storyteller / Players including live voting and character distribution! -- Includes all 3 base editions, Travelers and Fabled plus all officially spoiled characters so far! +- Includes all 3 base editions, Travellers and Fabled plus all officially spoiled characters so far! - Night sheet and reminder text for each character ability to help storytellers - Full homebrew support for hosting and playing games with your own sets of characters - Many other customization options! @@ -99,7 +99,7 @@ For base game characters, it is sufficient to only provide the ID, similar to wh - **remindersGlobal**: global reminder tokens that will always be available, no matter if the character is assigned to a player or not - **setup**: whether this token affects setup (orange leaf), like the Drunk or Baron - **name**: the displayed name of this character -- **team**: the team of the character, has to be one of `townsfolk`, `outsider`, `minion`, `demon`, `traveler` or `fabled`
+- **team**: the team of the character, has to be one of `townsfolk`, `outsider`, `minion`, `demon`, `traveller` or `fabled`
_Note_: if you create a custom Fabled character, it will be automatically added to the game when the custom script is loaded - **ability**: the displayed ability text of the character diff --git a/src/components/Player.vue b/src/components/Player.vue index 65bdf61..5defd14 100644 --- a/src/components/Player.vue +++ b/src/components/Player.vue @@ -472,7 +472,7 @@ export default { } } - &.traveler .life { + &.traveller .life { filter: grayscale(100%); } } @@ -487,13 +487,13 @@ export default { transform: perspective(400px) rotateY(0deg); } - &.traveler:not(.dead) .token { + &.traveller:not(.dead) .token { transform: perspective(400px) scale(0.8); pointer-events: none; transition-delay: 0s; } - &.traveler.dead .token { + &.traveller.dead .token { transition-delay: 0s; } } @@ -636,7 +636,7 @@ li.move:not(.from) .player .overlay svg.move { @include glow("outsider", $outsider); @include glow("demon", $demon); @include glow("minion", $minion); -@include glow("traveler", $traveler); +@include glow("traveller", $traveller); .player.you .token { animation: townsfolk-glow 5s ease-in-out infinite; diff --git a/src/components/TownInfo.vue b/src/components/TownInfo.vue index 52ebaa3..99a2331 100644 --- a/src/components/TownInfo.vue +++ b/src/components/TownInfo.vue @@ -11,7 +11,7 @@ })` }" > -
  • +
  • Please add more players!
  • @@ -30,7 +30,7 @@ {{ teams.votes }}
  • -
  • +
  • {{ teams.townsfolk }} @@ -56,11 +56,11 @@ :icon="teams.demon > 1 ? 'user-friends' : 'user'" /> - - {{ teams.traveler }} + + {{ teams.traveller }} @@ -79,11 +79,11 @@ export default { computed: { teams: function() { const { players } = this.$store.state.players; - const nonTravelers = this.$store.getters["players/nonTravelers"]; + const nonTravellers = this.$store.getters["players/nonTravellers"]; const alive = players.filter(player => player.isDead !== true).length; return { - ...gameJSON[nonTravelers - 5], - traveler: players.length - nonTravelers, + ...gameJSON[nonTravellers - 5], + traveller: players.length - nonTravellers, alive, votes: alive + @@ -160,8 +160,8 @@ export default { .demon { color: $demon; } - .traveler { - color: $traveler; + .traveller { + color: $traveller; } } diff --git a/src/components/TownSquare.vue b/src/components/TownSquare.vue index 4c34249..34bac9c 100644 --- a/src/components/TownSquare.vue +++ b/src/components/TownSquare.vue @@ -146,7 +146,7 @@ export default { }, openRoleModal(playerIndex) { const player = this.players[playerIndex]; - if (this.session.isSpectator && player && player.role.team === "traveler") + if (this.session.isSpectator && player && player.role.team === "traveller") return; this.selectedPlayer = playerIndex; this.$store.commit("toggleModal", "role"); diff --git a/src/components/Vote.vue b/src/components/Vote.vue index c37df21..be670b2 100644 --- a/src/components/Vote.vue +++ b/src/components/Vote.vue @@ -14,7 +14,7 @@ {{ voters.length }} vote{{ voters.length !== 1 ? "s" : "" }} in favor - + (majority is {{ Math.ceil(alive / 2) }}) (majority is {{ Math.ceil(players.length / 2) }}) @@ -55,7 +55,7 @@
    Close
    -
    +
    { const players = this.players.filter(p => p.role.id === role.id); - if (role.firstNight && (role.team !== "traveler" || players.length)) { + if (role.firstNight && (role.team !== "traveller" || players.length)) { rolesFirstNight.push(Object.assign({ players }, role)); } }); @@ -153,7 +153,7 @@ export default { const rolesOtherNight = []; this.roles.forEach(role => { const players = this.players.filter(p => p.role.id === role.id); - if (role.otherNight && (role.team !== "traveler" || players.length)) { + if (role.otherNight && (role.team !== "traveller" || players.length)) { rolesOtherNight.push(Object.assign({ players }, role)); } }); diff --git a/src/components/modals/ReferenceModal.vue b/src/components/modals/ReferenceModal.vue index 1dd7af1..73025dc 100644 --- a/src/components/modals/ReferenceModal.vue +++ b/src/components/modals/ReferenceModal.vue @@ -125,13 +125,13 @@ export default { } rolesGrouped[role.team].push(role); }); - delete rolesGrouped["traveler"]; + delete rolesGrouped["traveller"]; return rolesGrouped; }, playersByRole: function() { const players = {}; this.players.forEach(({ name, role }) => { - if (role && role.id && role.team !== "traveler") { + if (role && role.id && role.team !== "traveller") { if (!players[role.id]) { players[role.id] = []; } diff --git a/src/components/modals/ReminderModal.vue b/src/components/modals/ReminderModal.vue index b781b7b..a3ecae9 100644 --- a/src/components/modals/ReminderModal.vue +++ b/src/components/modals/ReminderModal.vue @@ -75,8 +75,8 @@ export default { reminders = [...reminders, ...role.reminders.map(mapReminder(role))]; }); - // add out of script traveler reminders - this.$store.state.otherTravelers.forEach(role => { + // add out of script traveller reminders + this.$store.state.otherTravellers.forEach(role => { if (players.some(p => p.role.id === role.id)) { reminders = [...reminders, ...role.reminders.map(mapReminder(role))]; } diff --git a/src/components/modals/RoleModal.vue b/src/components/modals/RoleModal.vue index eadde8c..cc61ede 100644 --- a/src/components/modals/RoleModal.vue +++ b/src/components/modals/RoleModal.vue @@ -8,7 +8,7 @@ : "bluffing" }} -
      +
      -
        +
        • Other TravelersOther Travellers
          @@ -75,7 +75,7 @@ export default { }, ...mapState(["modals", "roles", "session"]), ...mapState("players", ["players"]), - ...mapState(["otherTravelers"]) + ...mapState(["otherTravellers"]) }, data() { return { @@ -91,7 +91,7 @@ export default { role }); } else { - if (this.session.isSpectator && role.team === "traveler") return; + if (this.session.isSpectator && role.team === "traveller") return; // assign to player const player = this.$store.state.players.players[this.playerIndex]; this.$store.commit("players/update", { @@ -133,8 +133,8 @@ ul.tokens li { &.demon { box-shadow: 0 0 10px $demon, 0 0 10px $demon; } - &.traveler { - box-shadow: 0 0 10px $traveler, 0 0 10px $traveler; + &.traveller { + box-shadow: 0 0 10px $traveller, 0 0 10px $traveller; } &:hover { transform: scale(1.2); @@ -142,7 +142,7 @@ ul.tokens li { } } -#townsquare.spectator ul.tokens li.traveler { +#townsquare.spectator ul.tokens li.traveller { display: none; } diff --git a/src/components/modals/RolesModal.vue b/src/components/modals/RolesModal.vue index 27833b0..b87556e 100644 --- a/src/components/modals/RolesModal.vue +++ b/src/components/modals/RolesModal.vue @@ -1,14 +1,14 @@