✨ (all) Add faction option to player game settings

Author: coyotte508

admin-app/src/components/GameEdit.vue

@@ -71,6 +71,12 @@
                 :label="`${variable[0].toUpperCase()}${variable.slice(1, -1)} name`"
               />
             </v-col>
+            <v-col v-if="variable === 'settings'">
+              <v-text-field
+                v-model.trim="info[variable][i].faction"
+                :label="`${variable[0].toUpperCase()}${variable.slice(1, -1)} faction`"
+              />
+            </v-col>
             <v-col cols="auto" v-if="variable !== 'expansions'">
               <v-select
                 :items="[
@@ -202,6 +208,13 @@ export default class GameEdit extends Vue {
     this.info.rules = (this.$refs.rules as any).invoke("getMarkdown");
     this.info.description = (this.$refs.description as any).invoke("getMarkdown");
 
+    // Remove empty faction strings
+    for (const setting of this.info.settings ?? []) {
+      if (!setting.faction) {
+        delete setting.faction;
+      }
+    }
+
     this.$emit("game:update", this.info);
   }
 

site-lib/gameinfo.d.ts

@@ -24,7 +24,7 @@ export interface ViewerInfo {
   replayable: boolean;
 }
 
-type GameInfoOptions = Array<{
+type GameInfoOption = {
   label: string;
   type: "checkbox" | "select";
   name: string;
@@ -36,7 +36,7 @@ type GameInfoOptions = Array<{
         }
       ]
     | null;
-}>;
+};
 export interface GameInfo {
   _id: {
     game: string;
@@ -58,13 +58,13 @@ export interface GameInfo {
   };
 
   // [{label: "Do not fill planets with faction color", name: 'noFactionFill', type: 'checkbox'}]
-  preferences: GameInfoOptions;
+  preferences: GameInfoOption[];
 
   // Player settings that affect the engine - like autocharge
-  settings: GameInfoOptions;
+  settings: Array<GameInfoOption & { faction?: string }>;
 
   // [{label: "Last player <i>rotates</i> sectors before faction selection", name: "advancedRules", type: 'checkbox'}]
-  options: GameInfoOptions;
+  options: GameInfoOption[];
 
   // [2, 3, 4]
   players: number[];

site-lib/schemas/gameinfo.ts

@@ -92,7 +92,7 @@ const repr = {
     entryPoint: String,
   },
   preferences: optionSchema,
-  settings: optionSchema,
+  settings: [{ ...optionSchema[0], faction: String }],
   options: optionSchema,
   players: [Number],
   expansions: [

webapp-vue/src/components/GameSidebar.vue

@@ -62,7 +62,12 @@
 
       <div class="mt-75" v-if="gameInfo && gameInfo.settings.length > 0 && game.status === 'active' && settings">
         <h3>Settings</h3>
-        <div v-for="pref in gameInfo.settings" :key="pref.name">
+        <div
+          v-for="pref in gameInfo.settings.filter(
+            (setting) => !setting.faction || setting.faction === playerUser.faction
+          )"
+          :key="pref.name"
+        >
           <template v-if="pref.type === 'checkbox'">
             <b-checkbox v-model="settings[pref.name]" @change="postSettings">
               {{ pref.label }}