Merge branch 'develop' into feature/cardid-string

brdgm · May 11, 2024 · 3b4e5d4 · 3b4e5d4
2 parents 6280e65 + f5a049a
commit 3b4e5d4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/components/turn/botAction/ActionBuildMine.vue b/src/components/turn/botAction/ActionBuildMine.vue
@@ -16,7 +16,7 @@
           <span class="fst-italic" v-html="t(`botFaction.${botFaction}`)"></span>:
           <span class="fw-bold" v-html="t(`botAction.buildMine.tiebreaker.faction.${botFaction}`)"></span>
         </li>
-        <li v-if="isFactionActionTiebreaker">
+        <li v-if="scoringFinalTileTiebreaker">
           <span v-html="t('botAction.buildMine.tiebreaker.finalScoring')"></span>:
           <span class="fw-bold" v-html="t(`botAction.buildMine.tiebreaker.scoringFinalTile.${scoringFinalTileTiebreaker}`)"></span>
         </li>

diff --git a/src/views/RoundTurn.vue b/src/views/RoundTurn.vue
@@ -5,7 +5,10 @@
   </div>
   <h1>
     <template v-if="roundTurn?.player">{{t('roundTurn.titlePlayer', {player:roundTurn?.player}, playerCount)}}</template>
-    <template v-if="roundTurn?.bot">{{t('roundTurn.titleBot', {bot:roundTurn?.bot, faction:t('botFaction.'+botFaction)}, botCount)}}</template>
+    <template v-if="roundTurn?.bot">
+      {{t('roundTurn.titleBot', {bot:roundTurn?.bot, faction:t('botFaction.'+botFaction)}, botCount)}}
+      <AppIcon v-if="navigationState.botFaction" type="faction" :name="navigationState.botFaction" class="factionIcon"/>
+    </template>
     <img v-if="startPlayer" src="@/assets/icons/start-player-token.png" class="startPlayerIcon" alt=""/>
     <template v-if="endOfGame">{{t('endOfGame.title')}}</template>
     <template v-else-if="endOfRound">{{t('endOfRound.title')}}</template>
@@ -32,6 +35,7 @@ import FooterButtons from '@/components/structure/FooterButtons.vue'
 import EndOfRound from '@/components/turn/EndOfRound.vue'
 import EndOfGame from '@/components/turn/EndOfGame.vue'
 import DebugInfo from '@/components/turn/DebugInfo.vue'
+import AppIcon from '@/components/structure/AppIcon.vue'
 
 export default defineComponent({
   name: 'RoundTurn',
@@ -41,7 +45,8 @@ export default defineComponent({
     FooterButtons,
     EndOfRound,
     EndOfGame,
-    DebugInfo
+    DebugInfo,
+    AppIcon
   },
   setup() {
     const { t } = useI18n()
@@ -86,4 +91,8 @@ export default defineComponent({
   margin-left: 0.75rem;
   margin-top: -0.5rem;
 }
+.factionIcon {
+  height: 2.25rem;
+  margin-top: -0.5rem;
+}
 </style>