merge: 최신 main을 유저 preset 아이콘 차단에 통합한다

app/game-frontend/src/views/MyPageView.vue

@@ -33,6 +33,7 @@ type SettingForm = {
     use_treatment: number;
     use_auto_nation_turn: number;
     use_auto_nation_diplomacy: number;
+    use_auto_nation_war: number;
     use_auto_nation_promotion: number;
     use_auto_nation_finance: number;
     use_auto_nation_capital: number;
@@ -69,6 +70,7 @@ const form = reactive<SettingForm>({
     use_treatment: 10,
     use_auto_nation_turn: 1,
     use_auto_nation_diplomacy: 0,
+    use_auto_nation_war: 0,
     use_auto_nation_promotion: 0,
     use_auto_nation_finance: 0,
     use_auto_nation_capital: 0,
@@ -432,7 +434,16 @@ onMounted(() => {
                             :true-value="1"
                             :false-value="0"
                         />
-                        자동 외교 (불가침 제의·선전포고)
+                        자동 외교 (불가침 제의)
+                    </label>
+                    <label>
+                        <input
+                            v-model="form.use_auto_nation_war"
+                            type="checkbox"
+                            :true-value="1"
+                            :false-value="0"
+                        />
+                        자동 선전포고
                     </label>
                     <label>
                         <input

app/game-frontend/src/views/NationPersonnelView.vue

@@ -99,7 +99,9 @@ const cityCandidates = (level: OfficerLevel): GeneralEntry[] => {
     return candidates;
 };
 const kickCandidates = computed(() =>
-    (data.value?.generals ?? []).filter((general) => general.id !== data.value?.me.id)
+    (data.value?.generals ?? []).filter(
+        (general) => general.id !== data.value?.me.id && general.officerLevel < 5 && general.permission !== 'ambassador'
+    )
 );
 const awardText = (entries: PersonnelResponse['awards']['tigers']): string =>
     entries.map((entry) => `${entry.name}【${entry.value.toLocaleString('ko-KR')}】`).join(', ');