diff --git a/PlayableSelector/Configs/System/chimeraInputCommon.conf b/PlayableSelector/Configs/System/chimeraInputCommon.conf index 85558fc1..b7b6281f 100644 --- a/PlayableSelector/Configs/System/chimeraInputCommon.conf +++ b/PlayableSelector/Configs/System/chimeraInputCommon.conf @@ -174,7 +174,8 @@ ActionManager { "MapMultiSelectGamepad" "MapWheelUp" "MapWheelDown" - "MapZoom" + "MapZoomIn" + "MapZoomOut" "MapPanDrag" "MapPanH" "MapPanV" @@ -212,7 +213,8 @@ ActionManager { "MapMultiSelectGamepad" "MapWheelUp" "MapWheelDown" - "MapZoom" + "MapZoomIn" + "MapZoomOut" "MapPanDrag" "MapPanH" "MapPanV" @@ -262,4 +264,4 @@ ActionManager { } } } -} \ No newline at end of file +} diff --git a/PlayableSelector/PrefabsEditable/MissionDescription/EditableMissionDescription.et b/PlayableSelector/PrefabsEditable/MissionDescription/EditableMissionDescription.et index d1df35af..38246f47 100644 --- a/PlayableSelector/PrefabsEditable/MissionDescription/EditableMissionDescription.et +++ b/PlayableSelector/PrefabsEditable/MissionDescription/EditableMissionDescription.et @@ -34,6 +34,6 @@ PS_MissionDescription { } } m_sTitle "Description title" - m_sDescriptionLayout "{41DAF7B7061DC0BC}UI/MissionDescription/DescriptionEditable.layout" + m_sDescriptionLayout "{B6DE04F7CF7A95DA}UI/MissionDescription/DescriptionEditableScrollable.layout" m_sTextData "Description text" -} \ No newline at end of file +} diff --git a/PlayableSelector/UI/MissionDescription/DescriptionEditableScrollable.layout b/PlayableSelector/UI/MissionDescription/DescriptionEditableScrollable.layout index b6d29157..b1c212c6 100644 --- a/PlayableSelector/UI/MissionDescription/DescriptionEditableScrollable.layout +++ b/PlayableSelector/UI/MissionDescription/DescriptionEditableScrollable.layout @@ -25,7 +25,10 @@ FrameWidgetClass { Name "RichTextEditable" Slot AlignableSlot "{609140F0AFDAAA55}" { Padding 0 0 0 15 + HorizontalAlign 3 + VerticalAlign 3 } + Pivot 0 0 Text "" "Font Size" 20 "Min Font Size" 20 @@ -34,4 +37,4 @@ FrameWidgetClass { } } } -} \ No newline at end of file +} diff --git a/PlayableSelector/scripts/game/Modded/PS_M_SCR_AIGroup.c b/PlayableSelector/scripts/game/Modded/PS_M_SCR_AIGroup.c index 0fa21871..18351444 100644 --- a/PlayableSelector/scripts/game/Modded/PS_M_SCR_AIGroup.c +++ b/PlayableSelector/scripts/game/Modded/PS_M_SCR_AIGroup.c @@ -18,8 +18,8 @@ modded class SCR_AIGroup : ChimeraAIGroup m_iNameAuthorID = -1; } - if (m_bSetPlayable) - Event_OnInit.Insert(MakePlayable); + if (m_bSetPlayable && GetGame().InPlayMode()) + GetOnInit().Insert(MakePlayable); super.EOnInit(owner); } @@ -65,4 +65,4 @@ modded class SCR_AIGroup : ChimeraAIGroup callsignComponent.GetCallsignIndexes(company, platoon, squad); return 1000000 * company + 1000 * platoon + 1 * squad; } -} \ No newline at end of file +}