minor additions

Warcraft-GoA-Development-Team · Dec 16, 2024 · 834eced · 834eced
1 parent 359c9fb
commit 834eced
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 18 deletions.
diff --git a/common/character_interactions/wc_crisis_interactions.txt b/common/character_interactions/wc_crisis_interactions.txt
@@ -11,6 +11,7 @@
 		scope:recipient = {
 			is_crisis_trigger = yes
 		}
+		NOT = { scope:recipient = scope:actor }
 	}
 
 	is_valid_showing_failures_only = {

diff --git a/common/scripted_triggers/wc_crisis_triggers.txt b/common/scripted_triggers/wc_crisis_triggers.txt
@@ -91,6 +91,11 @@ ai_has_coalition_reason_trigger = {
 				value = ai_compassion
 				multiply = 0.5
 			}
+			# Generally won't join if they have the same faith
+			add = {
+				value = "faith.faith_hostility_level($CRISIS_HOLDER$.faith)"
+				multiply = -20
+			}
 		}
 	}
 	scope:coalition_reason > 0

diff --git a/events/story_cycles/wc_story_cycle_scourge_invasion_events.txt b/events/story_cycles/wc_story_cycle_scourge_invasion_events.txt
@@ -271,10 +271,12 @@ WCCSC.5 = {
 	option = {
 		name = WCCSC_5_OPT_B
 		trigger = {
-			is_independent_ruler = yes
-			NOR = {
-				faith.religion = { is_in_family = rf_death }
-				faith.religion = { is_in_family = rf_disorder }
+			OR = {
+				is_ai = no 
+				AND = {
+					ai_has_coalition_reason_trigger = { CRISIS_HOLDER = title:e_scourge.holder }
+					can_be_in_coalition_trigger = yes
+				}
 			}
 		}
 		join_crisis_coalition_effect = { CRISIS_HOLDER = title:e_scourge.holder }

diff --git a/gui/wc_widget_crises.gui b/gui/wc_widget_crises.gui
@@ -39,7 +39,7 @@
 
         vbox = {
             using = Window_Margins
-
+            margin_bottom = 75
             widget_header_with_picture = {
                 layoutpolicy_horizontal = expanding
                 blockoverride "header_text"
@@ -277,6 +277,7 @@
 
                         # MEMBER LIST
                         vbox_character_row_item = {
+                            name = "crisis_members"
                             spacing = 5
                             layoutpolicy_vertical = expanding
                             layoutpolicy_horizontal = expanding
@@ -285,25 +286,45 @@
                                 datamodel = "[GetPlayer.MakeScope.Var('crisis_character').GetCharacter.MakeScope.GetList('coalition_members')]"
                             }
 
-                            blockoverride "grid_item" {
-                                item = {
-                                    container = {
-                                        datacontext = "[Scope.GetCharacter]"
+                            blockoverride "gridbox" {
+                                fixedgridbox = {
+                                    flipdirection = yes
+                                    addcolumn = 85
+                                    addrow = 90
 
-                                        portrait_head_small = {
-                                            blockoverride "portrait_button"
-                                            {
-                                                using = tooltip_ne
-                                            }
-                                            blockoverride "glow_visible"
-                                            {
-                                                visible = no
+                                    # Warcraft
+                                    block "horizontal_slots"
+                                    {
+                                        datamodel_wrap = 7
+                                    }
+
+                                    block "gridbox_slots"
+                                    {
+                                        maxverticalslots = 1
+                                    }
+
+                                    block "portrait_datamodel" {
+                                        datamodel = "[CharacterWindow.GetParents]"
+                                    }
+
+                                    item = {
+                                        container = {
+                                            datacontext = "[Scope.GetCharacter]"
+
+                                            portrait_head_small = {
+                                                blockoverride "portrait_button"
+                                                {
+                                                    using = tooltip_ne
+                                                }
+                                                blockoverride "glow_visible"
+                                                {
+                                                    visible = no
+                                                }
                                             }
                                         }
                                     }
                                 }
                             }
-
                             blockoverride "gridbox_slots" {}
                             blockoverride "horizontal_slots" {
                                 datamodel_wrap = 6