Makers update.

maniaplanet · Nov 19, 2018 · bfad9af · bfad9af
1 parent b90c184
commit bfad9af
Show file tree

Hide file tree

Showing 49 changed files with 4,893 additions and 220 deletions.
diff --git a/Common/Scripts/_TMTitleMaker_LocalSoloBase.Script.txt b/Common/Scripts/_TMTitleMaker_LocalSoloBase.Script.txt
diff --git a/Makers/base/Scripts/Libs/Nadeo/Common/ManialinkTools/2DArrayCardBuilder.Script.txt b/Makers/base/Scripts/Libs/Nadeo/Common/ManialinkTools/2DArrayCardBuilder.Script.txt
@@ -266,16 +266,14 @@ Text SecondDeclares()
 	Void Private_TwoDArrayCardBuilder_SelectCard(CMlFrame _Card)
 	{
 		declare CardContainer <=> Private_TwoDArrayCardBuilder_GetCardContainerFromFrameInstance(_Card);
-		//CardContainer.ZIndex = 1.;
-		// HACK : Décommenter ces lignes quand le bug de ZIndexes dynamique sera résolu
+		CardContainer.ZIndex = 1.;
 		TwoDArrayCardBuilder_SelectCard(_Card);
 	}
 
 	Void Private_TwoDArrayCardBuilder_UnSelectCard(CMlFrame _Card)
 	{
 		declare CardContainer <=> Private_TwoDArrayCardBuilder_GetCardContainerFromFrameInstance(_Card);
-		//CardContainer.ZIndex = 0.;
-		// HACK : Décommenter ces lignes quand le bug de ZIndexes dynamique sera résolu
+		CardContainer.ZIndex = 0.;
 		TwoDArrayCardBuilder_UnSelectCard(_Card);
 	}
 

diff --git a/Makers/base/Scripts/Libs/Nadeo/MP4/Common/Components/AssetMaker/LBAssetMaker.Script.txt b/Makers/base/Scripts/Libs/Nadeo/MP4/Common/Components/AssetMaker/LBAssetMaker.Script.txt
@@ -17,6 +17,8 @@
 #Const C_DefaultLogo			"file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/Logo_Editor.dds"
 #Const C_DefaultAssetLogo		"file://Media/MEDIABROWSER_HiddenResources/Maker/Images/Editor/Editor_Logo.dds"
 #Const C_ScrollButton			"file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/Button_Scroll_Smallv.dds"
+#Const C_ScrollTenButton			"file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/Button_ScrollTen_Smallv.dds"
+#Const C_ScrollLastButton			"file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/Button_ScrollLast_Smallv.dds"
 #Const C_MaxAssetNb				9
 #Const C_AllAssetPositions		[<0., -5.0>, <0., -15.65>, <0., -26.3>, <0., -36.95>, <0., -47.6>, <0., -58.25>, <0., -68.9>, <0., -79.55>, <0., -90.2>]
 
@@ -94,7 +96,7 @@ Text ManialinkFrameModels()
 Text ScrollIfCanScroll()
 {
 	if (G_CanScroll) {
-		return DesignManialinks::ManialinkScrollFrame(<-5., -50.>, C_ScrollButton, 3.6, "", "AssetScroll");
+		return DesignManialinks::ManialinkScrollFrame(<-5., -50.>, C_ScrollButton, C_ScrollTenButton, C_ScrollLastButton, 3.6, "", "AssetScroll");
 	}
 	return "";
 }

diff --git a/Makers/base/Scripts/Libs/Nadeo/MP4/Common/Components/FileBrowser/FileBrowserAPI.Script.txt b/Makers/base/Scripts/Libs/Nadeo/MP4/Common/Components/FileBrowser/FileBrowserAPI.Script.txt
@@ -92,7 +92,7 @@ Void FetchData(Text _BrowserName, Text _Path, Boolean _Flatten)
 	if (G_ListTaskResult[_BrowserName] != Null) {
 		DataFileMgr.TaskResult_Release(G_ListTaskResult[_BrowserName].Id);
 	}
-	G_ListTaskResult[_BrowserName] = DataFileMgr.Media_GetGameList(G_FileType[_BrowserName], _Path, _Flatten);
+	G_ListTaskResult[_BrowserName] = DataFileMgr.Media_GetGameList(G_FileType[_BrowserName], _Path, _Flatten,!G_IsSortingFromDescendingOrder[_BrowserName], !G_IsSortingFromDateRatherThanName[_BrowserName]);
 }
 
 Void FetchData(Text _BrowserName, Text _Path)
@@ -312,4 +312,30 @@ Void InputPageDown(Text _BrowserName)
 	if (G_CurrentPage[_BrowserName] < G_MaxPages[_BrowserName]) {
 		G_CurrentPage[_BrowserName] += 1;
 	}
+}
+
+Void InputPageUpTen(Text _BrowserName)
+{
+	G_CurrentPage[_BrowserName] += 10;
+	if (G_CurrentPage[_BrowserName] > G_MaxPages[_BrowserName]) {
+		G_CurrentPage[_BrowserName] = G_MaxPages[_BrowserName];
+	}
+}
+
+Void InputPageDownTen(Text _BrowserName)
+{
+	G_CurrentPage[_BrowserName] -= 10;
+	if (G_CurrentPage[_BrowserName] < 0) {
+		G_CurrentPage[_BrowserName] = 0;
+	}
+}
+
+Void InputFirstPage(Text _BrowserName)
+{
+	G_CurrentPage[_BrowserName] = 0;
+}
+
+Void InputLastPage(Text _BrowserName)
+{
+	G_CurrentPage[_BrowserName] = G_MaxPages[_BrowserName];
 }
diff --git a/Makers/base/Scripts/Libs/Nadeo/MP4/Common/Components/ImageBrowser/ImageBrowserAPI.Script.txt b/Makers/base/Scripts/Libs/Nadeo/MP4/Common/Components/ImageBrowser/ImageBrowserAPI.Script.txt
@@ -73,17 +73,36 @@ Boolean HasFetched()
 	return FileBrowserAPI::HasFetched(C_BrowserName);
 }
 
-
 Void InputPageUp()
 {
 	FileBrowserAPI::InputPageUp(C_BrowserName);
 }
 
+Void InputPageUpTen()
+{
+	FileBrowserAPI::InputPageUpTen(C_BrowserName);
+}
+
 Void InputPageDown()
 {
 	FileBrowserAPI::InputPageDown(C_BrowserName);
 }
 
+Void InputPageDownTen()
+{
+	FileBrowserAPI::InputPageDownTen(C_BrowserName);
+}
+
+Void InputFirstPage()
+{
+	FileBrowserAPI::InputFirstPage(C_BrowserName);
+}
+
+Void InputLastPage()
+{
+	FileBrowserAPI::InputLastPage(C_BrowserName);
+}
+
 Integer GetCurrentPageIndex()
 {
 	return FileBrowserAPI::GetCurrentPageIndex(C_BrowserName);

diff --git a/...e/Scripts/Libs/Nadeo/MP4/Common/Components/ImageBrowser/ImageBrowserController.Script.txt b/...e/Scripts/Libs/Nadeo/MP4/Common/Components/ImageBrowser/ImageBrowserController.Script.txt
@@ -175,10 +175,26 @@ Void Loop() {
 		ImageBrowserAPI::InputPageUp();
 		MediaBrowserController::UpdateData(C_BrowserName, ImageBrowserAPI::FullPath(G_FolderPath), ImageBrowserAPI::GetMainData(), GetLineData(), ImageBrowserAPI::GetCurrentPageIndex(), ImageBrowserAPI::GetMaxPages());
 	}
+	if (MediaBrowserController::IsRequestingInputPageUpTen(C_BrowserName)) {
+		ImageBrowserAPI::InputPageUpTen();
+		MediaBrowserController::UpdateData(C_BrowserName, ImageBrowserAPI::FullPath(G_FolderPath), ImageBrowserAPI::GetMainData(), GetLineData(), ImageBrowserAPI::GetCurrentPageIndex(), ImageBrowserAPI::GetMaxPages());
+	}
 	if (MediaBrowserController::IsRequestingInputPageDown(C_BrowserName)) {
 		ImageBrowserAPI::InputPageDown();
 		MediaBrowserController::UpdateData(C_BrowserName, ImageBrowserAPI::FullPath(G_FolderPath), ImageBrowserAPI::GetMainData(), GetLineData(), ImageBrowserAPI::GetCurrentPageIndex(), ImageBrowserAPI::GetMaxPages());
 	}
+	if (MediaBrowserController::IsRequestingInputPageDownTen(C_BrowserName)) {
+		ImageBrowserAPI::InputPageDownTen();
+		MediaBrowserController::UpdateData(C_BrowserName, ImageBrowserAPI::FullPath(G_FolderPath), ImageBrowserAPI::GetMainData(), GetLineData(), ImageBrowserAPI::GetCurrentPageIndex(), ImageBrowserAPI::GetMaxPages());
+	}
+	if (MediaBrowserController::IsRequestingInputFirstPage(C_BrowserName)) {
+		ImageBrowserAPI::InputFirstPage();
+		MediaBrowserController::UpdateData(C_BrowserName, ImageBrowserAPI::FullPath(G_FolderPath), ImageBrowserAPI::GetMainData(), GetLineData(), ImageBrowserAPI::GetCurrentPageIndex(), ImageBrowserAPI::GetMaxPages());
+	}
+	if (MediaBrowserController::IsRequestingInputLastPage(C_BrowserName)) {
+		ImageBrowserAPI::InputLastPage();
+		MediaBrowserController::UpdateData(C_BrowserName, ImageBrowserAPI::FullPath(G_FolderPath), ImageBrowserAPI::GetMainData(), GetLineData(), ImageBrowserAPI::GetCurrentPageIndex(), ImageBrowserAPI::GetMaxPages());
+	}
 	if (MediaBrowserController::IsRequestingSteamWorkshop(C_BrowserName)) {
 		TitleControl.PublishFile(ImageBrowserAPI::FullPath(MediaBrowserController::RequestingSteamWorkshopMediaName(C_BrowserName)));
 	}

diff --git a/...rs/base/Scripts/Libs/Nadeo/MP4/Common/Components/ListDisplayer/LBListDisplayer.Script.txt b/...rs/base/Scripts/Libs/Nadeo/MP4/Common/Components/ListDisplayer/LBListDisplayer.Script.txt
@@ -574,7 +574,7 @@ Text Declares() {
 		{
 			declare CMlFrame ListDisplayer_Frame_Sort <=> (Page.MainFrame.GetFirstChild("ListDisplayer_Frame_Sort-"^I)	as CMlFrame);
 			declare CMlLabel ListDisplayer_Label_Sort <=> (ListDisplayer_Frame_Sort.GetFirstChild("ListDisplayer_Label_Sort")	as CMlLabel);
-			declare CMlQuad ListDisplayer_Arrow_Sort              <=> (ListDisplayer_Frame_Sort.GetFirstChild("ListDisplayer_Arrow_Sort")	as CMlQuad);
+			declare CMlQuad ListDisplayer_Arrow_Sort  <=> (ListDisplayer_Frame_Sort.GetFirstChild("ListDisplayer_Arrow_Sort")	as CMlQuad);
 			if(I == _QuadId)
 			{
 				switch(G_Private_ListDisplayer_SortStatePerButton[I])
@@ -584,6 +584,16 @@ Text Declares() {
 						ListDisplayer_Arrow_Sort.Show();
 						ListDisplayer_Arrow_Sort.RelativeRotation = 180.;
 					}
+					case C_ARRAY_INCREASINGORDER: {
+						G_Private_ListDisplayer_SortStatePerButton[I] = C_ARRAY_DECREASINGORDER;
+						ListDisplayer_Arrow_Sort.Show();
+						ListDisplayer_Arrow_Sort.RelativeRotation = 0.;
+					}
+					case C_ARRAY_DECREASINGORDER: {
+						G_Private_ListDisplayer_SortStatePerButton[I] = C_ARRAY_INCREASINGORDER;
+						ListDisplayer_Arrow_Sort.Show();
+						ListDisplayer_Arrow_Sort.RelativeRotation = 180.;
+					}
 				}
 			}
 			else

diff --git a/.../Libs/Nadeo/MP4/Common/Components/ListDisplayer/ListDisplayerController_Ingame.Script.txt b/.../Libs/Nadeo/MP4/Common/Components/ListDisplayer/ListDisplayerController_Ingame.Script.txt
@@ -0,0 +1,10 @@
+// ListDisplayerController_Ingame.Script.txt
+
+Void ChangeListData(Text _LayerName, Text[Text][] _NewDataList)
+{
+	declare UI <=> UIManager.GetUI(Players[0]);
+	declare netwrite Text[Text][]	NewDataList		for UI;
+	declare netwrite Integer 		UpdateListData	for UI;
+	NewDataList    = _NewDataList;
+	UpdateListData = Now;
+}
diff --git a/...pts/Libs/Nadeo/MP4/Common/Components/MatchSettingsEditor/LBMatchSettingsEditor.Script.txt b/...pts/Libs/Nadeo/MP4/Common/Components/MatchSettingsEditor/LBMatchSettingsEditor.Script.txt
@@ -11,6 +11,8 @@
 #Const C_IMG_Cross_Move			"file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/MoveCross.dds"
 #Const C_IMG_Cross_MoveOver		"file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/MoveCrossOver.dds"
 #Const C_ScrollButton			"file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/Button_Scroll_Smallv.dds"
+#Const C_ScrollTenButton		"file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/Button_ScrollTen_Smallv.dds"
+#Const C_ScrollLastButton		"file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/Button_ScrollLast_Smallv.dds"
 
 #Const C_ScaleFactor	1.005
 
@@ -131,7 +133,7 @@ Text Build() {
 			</frame>
 			<frame id="CardsFrame">
 {{{MediaCardDisplayer::ManialinkMainBody()}}}
-{{{DesignManialinks::ManialinkScrollFrame(ScrollPos, C_ScrollButton, 3.6, "z-index=\"1\"", "MatchSettings_Scroll")}}}
+{{{DesignManialinks::ManialinkScrollFrame(ScrollPos, C_ScrollButton, C_ScrollTenButton, C_ScrollLastButton, 3.6, "z-index=\"1\"", "MatchSettings_Scroll")}}}
 <quad halign="center" valign="center" size="{{{SizeMaps.X}}} 10" pos="{{{ScrollPos.X}}} {{{ScrollPos.Y - 3.}}}" bgcolor="000" opacity="0.3"/>
 			</frame>
 		</frame>

diff --git a/...s/Libs/Nadeo/MP4/Common/Components/MatchSettingsEditor/MatchSettingsBrowserAPI.Script.txt b/...s/Libs/Nadeo/MP4/Common/Components/MatchSettingsEditor/MatchSettingsBrowserAPI.Script.txt
@@ -212,17 +212,36 @@ Boolean HasFetched()
 	return FileBrowserAPI::HasFetched(C_BrowserName);
 }
 
-
 Void InputPageUp()
 {
 	FileBrowserAPI::InputPageUp(C_BrowserName);
 }
 
+Void InputPageUpTen()
+{
+	FileBrowserAPI::InputPageUpTen(C_BrowserName);
+}
+
 Void InputPageDown()
 {
 	FileBrowserAPI::InputPageDown(C_BrowserName);
 }
 
+Void InputPageDownTen()
+{
+	FileBrowserAPI::InputPageDownTen(C_BrowserName);
+}
+
+Void InputFirstPage()
+{
+	FileBrowserAPI::InputFirstPage(C_BrowserName);
+}
+
+Void InputLastPage()
+{
+	FileBrowserAPI::InputLastPage(C_BrowserName);
+}
+
 Integer GetCurrentPageIndex()
 {
 	return FileBrowserAPI::GetCurrentPageIndex(C_BrowserName);

diff --git a/.../Nadeo/MP4/Common/Components/MatchSettingsEditor/MatchSettingsEditorController.Script.txt b/.../Nadeo/MP4/Common/Components/MatchSettingsEditor/MatchSettingsEditorController.Script.txt
@@ -332,10 +332,26 @@ Void Loop() {
 		MatchSettingsBrowserAPI::InputPageUp();
 		MediaBrowserController::UpdateData(C_BrowserName, MatchSettingsBrowserAPI::FullPath(G_FolderPath), MatchSettingsBrowserAPI::GetMainData(), GetLineData(), MatchSettingsBrowserAPI::GetCurrentPageIndex(), MatchSettingsBrowserAPI::GetMaxPages());
 	}
+	if (MediaBrowserController::IsRequestingInputPageUpTen(C_BrowserName)) {
+		MatchSettingsBrowserAPI::InputPageUpTen();
+		MediaBrowserController::UpdateData(C_BrowserName, MatchSettingsBrowserAPI::FullPath(G_FolderPath), MatchSettingsBrowserAPI::GetMainData(), GetLineData(), MatchSettingsBrowserAPI::GetCurrentPageIndex(), MatchSettingsBrowserAPI::GetMaxPages());
+	}
 	if (MediaBrowserController::IsRequestingInputPageDown(C_BrowserName)) {
 		MatchSettingsBrowserAPI::InputPageDown();
 		MediaBrowserController::UpdateData(C_BrowserName, MatchSettingsBrowserAPI::FullPath(G_FolderPath), MatchSettingsBrowserAPI::GetMainData(), GetLineData(), MatchSettingsBrowserAPI::GetCurrentPageIndex(), MatchSettingsBrowserAPI::GetMaxPages());
 	}
+	if (MediaBrowserController::IsRequestingInputPageDownTen(C_BrowserName)) {
+		MatchSettingsBrowserAPI::InputPageDownTen();
+		MediaBrowserController::UpdateData(C_BrowserName, MatchSettingsBrowserAPI::FullPath(G_FolderPath), MatchSettingsBrowserAPI::GetMainData(), GetLineData(), MatchSettingsBrowserAPI::GetCurrentPageIndex(), MatchSettingsBrowserAPI::GetMaxPages());
+	}
+	if (MediaBrowserController::IsRequestingInputFirstPage(C_BrowserName)) {
+		MatchSettingsBrowserAPI::InputFirstPage();
+		MediaBrowserController::UpdateData(C_BrowserName, MatchSettingsBrowserAPI::FullPath(G_FolderPath), MatchSettingsBrowserAPI::GetMainData(), GetLineData(), MatchSettingsBrowserAPI::GetCurrentPageIndex(), MatchSettingsBrowserAPI::GetMaxPages());
+	}
+	if (MediaBrowserController::IsRequestingInputLastPage(C_BrowserName)) {
+		MatchSettingsBrowserAPI::InputLastPage();
+		MediaBrowserController::UpdateData(C_BrowserName, MatchSettingsBrowserAPI::FullPath(G_FolderPath), MatchSettingsBrowserAPI::GetMainData(), GetLineData(), MatchSettingsBrowserAPI::GetCurrentPageIndex(), MatchSettingsBrowserAPI::GetMaxPages());
+	}
 	if (MediaBrowserController::IsRequestingSteamWorkshop(C_BrowserName)) {
 		TitleControl.PublishFile(MatchSettingsBrowserAPI::FullPath(MediaBrowserController::RequestingSteamWorkshopMediaName(C_BrowserName)));
 	}
@@ -443,7 +459,7 @@ Void Loop() {
 				MatchSettingsBrowserAPI::HardFetchMaps();
 			}
 			case "DynamicFormDisplayer_Event": {
-				if (!MatchSettingsBrowserAPI::CanChangeMode()) {
+				if (!MatchSettingsBrowserAPI::CanChangeMode() || !IsRunning()) {
 					continue;
 				}
 				ScriptBrowserController::Show("ScriptToGameModeInMatchSettings", [//L16N |Infinitive| In a popup, a button to select