feat: new dropdown entries & refactor dropdown

src/App.tsx

@@ -20,7 +20,7 @@ import ReactCountryFlag from "react-country-flag";
 
 // App Components
 import { TextInput } from "./components/textInput";
-import { DeathPenaltyDropDown } from "./components/deathPenaltyDropdown";
+import { DropDown } from "./components/dropdown";
 import { SliderInput } from "./components/sliderInput";
 import { SwitchInput } from "./components/switchInput";
 import { Input } from "./components/ui/input";
@@ -36,7 +36,7 @@ import { AdvancedSettings, InGameSettings, ServerSettings } from "./consts/setti
 
 // Types
 import { Gvas } from "./types/gvas";
-import { DeathPenaltyLabel } from "./components/deathPenaltyDropdown";
+import { LabelValue } from "./components/dropdown";
 
 interface ChangeEvent<T> {
   target: {
@@ -203,6 +203,20 @@ function App() {
               enum_type: "EPalOptionWorldDifficulty",
             },
           };
+        } else if (entry.id === "AllowConnectPlatform") {
+          dictValue = {
+            Enum: {
+              value: `EPalOptionWorldAllowConnectPlatform::${entryValue}`,
+              enum_type: "EPalOptionWorldAllowConnectPlatform",
+            },
+          };
+        } else if (entry.id === "LogFormatType") {
+          dictValue = {
+            Enum: {
+              value: `EPalOptionWorldLogFormatType::${entryValue}`,
+              enum_type: "EPalOptionWorldLogFormatType",
+            },
+          };
         }
       } else if (entry.type === "boolean") {
         dictValue = {
@@ -373,13 +387,13 @@ function App() {
     }
     const entryName = t(`entry.name.${entry.id}`);
     const entryValue = entries[entry.id] ?? entry.defaultValue;
-    if (entry.id === "DeathPenalty") {
+    if (entry.type === "select") {
       return (
-        <DeathPenaltyDropDown
-          key={id}
-          label={entryValue as DeathPenaltyLabel}
+        <DropDown
+          dKey={entry.id as "DeathPenalty" | "AllowConnectPlatform" | "LogFormatType"}
+          label={entryValue as LabelValue}
           onLabelChange={(labelName: string) => {
-            onStateChanged("DeathPenalty")({
+            onStateChanged(entry.id)({
               target: { value: labelName },
             });
           }}

src/assets/i18n/en-US.json

@@ -89,6 +89,8 @@
         "PalEggDefaultHatchingTime": "Pal Egg Default Hatching Time",
         "WorkSpeedRate": "Work Speed Rate",
         "AutoSaveSpan": "Auto Save Span",
+        "AllowConnectPlatform": "Allow Connect Platform",
+        "LogFormatType": "Log Format Type",
         "bIsMultiplay": "Is Multiplay",
         "bIsPvP": "Is PvP",
         "bCanPickupOtherGuildDeathPenaltyDrop": "Can Pickup Other Guild Death Penalty Drop",
@@ -121,6 +123,14 @@
           "Item": "Lost item without equipment",
           "ItemAndEquipment": "Lost item and equipment",
           "All": "Lost All item, equipment, pal (in inventory)"
+        },
+        "AllowConnectPlatform": {
+          "Steam": "Only allow Steam to connect",
+          "Xbox": "Only allow Xbox to connect"
+        },
+        "LogFormatType": {
+          "Text": "Use Text format to log",
+          "Json": "Use Json format to log"
         }
       }
     }

src/components/deathPenaltyDropdown.tsx → src/components/dropdown.tsx

@@ -2,6 +2,7 @@ import { useState } from "react"
 import { useTranslation, Trans } from 'react-i18next';
 import { ChevronDown } from "lucide-react"
 
+import { DeathPenaltyLabels, AllowConnectPlatformLabels, LogFormatTypeLabels } from "@/consts/dropdownLabels"
 import { Button } from "@/components/ui/button"
 import { Label } from "@/components/ui/label"
 import {
@@ -25,49 +26,43 @@ import {
 } from "@/components/ui/tooltip"
 import { I18nStr } from "@/i18n";
 
-const labels = [
-    {
-        name: "None",
-        desc: "No lost",
-    },
-    {
-        name: "Item",
-        desc: "Lost item without equipment",
-    },
-    {
-        name: "ItemAndEquipment",
-        desc: "Lost item and equipment",
-    },
-    {
-        name: "All",
-        desc: "Lost All item, equipment, pal(in inventory)",
-    },
-]
+type Labels = typeof DeathPenaltyLabels | typeof AllowConnectPlatformLabels | typeof LogFormatTypeLabels;
+export type LabelValue = Labels[number]['name'];
+type Key =  'DeathPenalty' | 'AllowConnectPlatform' | 'LogFormatType';
 
-export type DeathPenaltyLabel = "None" | "Item" | "ItemAndEquipment" | "All";
+function get<T>(dict: Record<string, T>, key: string, defaultValue: T): T {
+    return Object.prototype.hasOwnProperty.call(dict, key) ? dict[key] : defaultValue;
+}
 
-export const DeathPenaltyDropDown = (props: {
-    label: DeathPenaltyLabel,
-    onLabelChange: (label: string) => void,
-}) => {
+export function DropDown(props: {
+    dKey: Key;
+    label: LabelValue;
+    onLabelChange: (label: string) => void;
+}) {
+    const { dKey, label, onLabelChange } = props;
+    const labels = {
+      DeathPenalty: DeathPenaltyLabels,
+      AllowConnectPlatform: AllowConnectPlatformLabels,
+      LogFormatType: LogFormatTypeLabels
+    }[dKey] as Labels;
     const { t } = useTranslation();
+    const [open, setOpen] = useState(false);
+    const i18nLabelDesc = get(I18nStr.entry.description[dKey] as Record<string, string>, label, "");
 
-    const { label, onLabelChange } = props;
-    const [open, setOpen] = useState(false)
-
-    const labelDesc = t(I18nStr.entry.description.DeathPenalty[label], {
+    const labelDesc = t(i18nLabelDesc, {
         defaultValue: labels.find((l) => l.name === label)?.desc ?? "",
     });
 
+
     return (
         <div className="space-y-1">
             <Label>
                 <TooltipProvider>
                     <Tooltip>
                         <TooltipTrigger className="cursor-default">
-                            <Trans i18nKey={I18nStr.entry.name.DeathPenalty} />
+                            <Trans i18nKey={get(I18nStr.entry.name, dKey, "")} />
                             <TooltipContent>
-                                <p>DeathPenalty</p>
+                                <p>{dKey}</p>
                             </TooltipContent>
                         </TooltipTrigger>
                     </Tooltip>

src/consts/dropdownLabels.tsx

@@ -0,0 +1,40 @@
+export const DeathPenaltyLabels = [
+    {
+        name: "None",
+        desc: "No lost",
+    },
+    {
+        name: "Item",
+        desc: "Lost item without equipment",
+    },
+    {
+        name: "ItemAndEquipment",
+        desc: "Lost item and equipment",
+    },
+    {
+        name: "All",
+        desc: "Lost All item, equipment, pal(in inventory)",
+    },
+] as const;
+
+export const AllowConnectPlatformLabels = [
+    {
+        name: "Steam",
+        desc: "Only allow Steam to connect",
+    },
+    {
+        name: "Xbox",
+        desc: "Only allow Xbox to connect",
+    },
+] as const;
+
+export const LogFormatTypeLabels = [
+    {
+        name: "Text",
+        desc: "Use Text format to log",
+    },
+    {
+        name: "Json",
+        desc: "Use Json format to log",
+    },
+] as const;

src/consts/entries.tsx

@@ -413,6 +413,22 @@ export const ENTRIES: Record<string, Entry> = {
     range: [30, 3600],
     desc: "Auto save span",
   },
+  AllowConnectPlatform: {
+    name: "Allow Connect Platform",
+    id: "AllowConnectPlatform",
+    defaultValue: "Steam",
+    type: "select",
+    options: ["Steam", "Xbox"],
+    desc: "Allow connect platform",
+  },
+  LogFormatType: {
+    name: "Log Format Type",
+    id: "LogFormatType",
+    defaultValue: "Text",
+    type: "select",
+    options: ["Text", "Json"],
+    desc: "Log format type",
+  },
   bIsMultiplay: {
     name: "Is Multiplay",
     id: "bIsMultiplay",

src/consts/settings.tsx

@@ -7,7 +7,9 @@ export const ServerSettings = [
   "PublicPort",
   "ServerPlayerMaxNum",
   "bIsUseBackupSaveData",
-  "AutoSaveSpan"
+  "AutoSaveSpan",
+  "AllowConnectPlatform",
+  "LogFormatType"
 ];
 
 export const InGameSettings = [

src/consts/worldoption.tsx

@@ -445,6 +445,18 @@ export const DEFAULT_WORLDOPTION = {
                             enum_type: "EPalOptionWorldDeathPenalty",
                           },
                         },
+                        AllowConnectPlatform: {
+                          Enum: {
+                            value: "EPalOptionWorldAllowConnectPlatform::Steam",
+                            enum_type: "EPalOptionWorldAllowConnectPlatform",
+                          },
+                        },
+                        LogFormatType: {
+                          Enum: {
+                            value: "EPalOptionWorldLogFormatType::Text",
+                            enum_type: "EPalOptionWorldLogFormatType",
+                          },
+                        },
                         bEnableInvaderEnemy: {
                           Bool: {
                             value: false,