Fixed clothing for Swiss Generals

merrygin · Oct 5, 2023 · 6dbf4be · 6dbf4be
1 parent 0304710
commit 6dbf4be
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/common/scripted_triggers/mr_clothing_triggers.txt b/common/scripted_triggers/mr_clothing_triggers.txt
@@ -329,10 +329,13 @@ mr_swiss_army_clothing_trigger = {
 							was_formed_from = SWI
 						}
 					}
-					is_interest_group_type = ig_armed_forces
-					AND = {
-						has_role = politician
-						is_ruler = no
+					OR = {
+						AND = {
+							has_role = politician
+							is_ruler = no
+							is_interest_group_type = ig_armed_forces
+						}
+						has_role = general
 					}
 				}
 			}
@@ -386,10 +389,13 @@ mr_swiss_officers_clothing_trigger = {
 							was_formed_from = SWI
 						}
 					}
-					is_interest_group_type = ig_armed_forces
-					AND = {
-						has_role = politician
-						is_ruler = no
+					OR = {
+						AND = {
+							has_role = politician
+							is_ruler = no
+							is_interest_group_type = ig_armed_forces
+						}
+						has_role = general
 					}
 				}
 			}

diff --git a/gfx/portraits/portrait_modifiers/01_mr_headgear.txt b/gfx/portraits/portrait_modifiers/01_mr_headgear.txt
@@ -1473,7 +1473,7 @@
         }
     }
 
-    #Swiss Officers and Soldiers should were a Swiss like uniform
+    #Swiss Officers should wear a Swiss like uniform
     mr_swiss_military_headgear = {
         dna_modifiers = {
             accessory = {