diff --git a/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D.galaxy b/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D.galaxy index 79998b3f6..0ff227c4e 100644 --- a/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D.galaxy +++ b/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D.galaxy @@ -42,6 +42,8 @@ void lib5BD4895D_InitVariables () { lib5BD4895D_gv_aP_Core_Faction_KERRIGAN_SWARM_SWITCHABLE_TO_PRIMAL_ZERG = "ks_pz"; lib5BD4895D_gv_aP_Core_Faction_DAELAAM = "da"; lib5BD4895D_gv_aP_Core_Faction_NOVA = "nova"; + lib5BD4895D_gv_aP_Core_blackScreen_dialog = c_invalidDialogId; + lib5BD4895D_gv_aP_Core_blackScreen = c_invalidDialogControlId; lib5BD4895D_gv_chatbox.lv_mainpanel = c_invalidDialogId; lib5BD4895D_gv_chatbox.lv_chatpanel = c_invalidDialogId; lib5BD4895D_gv_chatbox.lv_hiddenpanel = c_invalidDialogId; @@ -1635,6 +1637,70 @@ bool auto_lib5BD4895D_gf_AP_Core_objectiveFadeHelper_TriggerFunc (bool testConds } // Triggers +//-------------------------------------------------------------------------------------------------- +// Trigger: AP_Core_mapLoadStart +//-------------------------------------------------------------------------------------------------- +bool lib5BD4895D_gt_AP_Core_mapLoadStart_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + // Actions + if (!runActions) { + return true; + } + + DialogCreate(4000, 3000, c_anchorCenter, 0, 0, true); + lib5BD4895D_gv_aP_Core_blackScreen_dialog = DialogLastCreated(); + DialogSetImageVisible(lib5BD4895D_gv_aP_Core_blackScreen_dialog, false); + DialogControlCreate(lib5BD4895D_gv_aP_Core_blackScreen_dialog, c_triggerControlTypeImage); + lib5BD4895D_gv_aP_Core_blackScreen = DialogControlLastCreated(); + DialogControlSetFullDialog(lib5BD4895D_gv_aP_Core_blackScreen, PlayerGroupAll(), true); + libNtve_gf_SetDialogItemImage(lib5BD4895D_gv_aP_Core_blackScreen, "Assets\\Textures\\ui_ingame_blackmask.dds", PlayerGroupAll()); + libNtve_gf_SetDialogItemBlendMode(lib5BD4895D_gv_aP_Core_blackScreen, c_triggerBlendModeAlpha, PlayerGroupAll()); + DialogSetVisible(lib5BD4895D_gv_aP_Core_blackScreen_dialog, PlayerGroupAll(), true); + return true; +} + +//-------------------------------------------------------------------------------------------------- +void lib5BD4895D_gt_AP_Core_mapLoadStart_Init () { + lib5BD4895D_gt_AP_Core_mapLoadStart = TriggerCreate("lib5BD4895D_gt_AP_Core_mapLoadStart_Func"); + TriggerAddEventMapInit(lib5BD4895D_gt_AP_Core_mapLoadStart); +} + +//-------------------------------------------------------------------------------------------------- +// Trigger: AP_Core_mapLoadEnd +//-------------------------------------------------------------------------------------------------- +bool lib5BD4895D_gt_AP_Core_mapLoadEnd_Func (bool testConds, bool runActions) { + // Variable Declarations + fixed lv_duration; + + // Automatic Variable Declarations + // Variable Initialization + lv_duration = 0.25; + + // Conditions + if (testConds) { + if (!((lib5BD4895D_gv_aP_Core_initFinished == true))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + + TriggerEnable(TriggerGetCurrent(), false); + DialogControlFadeTransparency(lib5BD4895D_gv_aP_Core_blackScreen, PlayerGroupAll(), lv_duration, 0.0); + Wait(lv_duration, c_timeReal); + DialogDestroy(lib5BD4895D_gv_aP_Core_blackScreen_dialog); + return true; +} + +//-------------------------------------------------------------------------------------------------- +void lib5BD4895D_gt_AP_Core_mapLoadEnd_Init () { + lib5BD4895D_gt_AP_Core_mapLoadEnd = TriggerCreate("lib5BD4895D_gt_AP_Core_mapLoadEnd_Func"); + TriggerAddEventTimePeriodic(lib5BD4895D_gt_AP_Core_mapLoadEnd, 0.1, c_timeGame); +} + //-------------------------------------------------------------------------------------------------- // Trigger: AP_Core_controllerInit //-------------------------------------------------------------------------------------------------- @@ -2078,6 +2144,8 @@ void lib5BD4895D_gt_AP_Core_objectiveTimerUpdate_Init () { } void lib5BD4895D_InitTriggers () { + lib5BD4895D_gt_AP_Core_mapLoadStart_Init(); + lib5BD4895D_gt_AP_Core_mapLoadEnd_Init(); lib5BD4895D_gt_AP_Core_controllerInit_Init(); lib5BD4895D_gt_AP_Core_dontHideController_Init(); lib5BD4895D_gt_AP_Core_keepControllerAlive_Init(); diff --git a/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D_h.galaxy b/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D_h.galaxy index cc94fbf82..4938a3e07 100644 --- a/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D_h.galaxy +++ b/Mods/ArchipelagoCore.SC2Mod/Base.SC2Data/Lib5BD4895D_h.galaxy @@ -94,6 +94,8 @@ string lib5BD4895D_gv_aP_Core_Faction_KERRIGAN_SWARM; string lib5BD4895D_gv_aP_Core_Faction_KERRIGAN_SWARM_SWITCHABLE_TO_PRIMAL_ZERG; string lib5BD4895D_gv_aP_Core_Faction_DAELAAM; string lib5BD4895D_gv_aP_Core_Faction_NOVA; +int lib5BD4895D_gv_aP_Core_blackScreen_dialog; +int lib5BD4895D_gv_aP_Core_blackScreen; unit lib5BD4895D_gv_aP_Core_controller; unit lib5BD4895D_gv_aP_Core_controller2; bool[lib5BD4895D_gv_aP_Core_LOCATIONS_PER_MAP + 1] lib5BD4895D_gv_aP_Core_locations_sent; @@ -166,6 +168,8 @@ void lib5BD4895D_gf_AP_Core_setObjectiveFailed (int lp_objective); void lib5BD4895D_gf_AP_Core_objectiveFadeHelper (fixed lp_time); // Trigger Declarations +trigger lib5BD4895D_gt_AP_Core_mapLoadStart; +trigger lib5BD4895D_gt_AP_Core_mapLoadEnd; trigger lib5BD4895D_gt_AP_Core_controllerInit; trigger lib5BD4895D_gt_AP_Core_dontHideController; trigger lib5BD4895D_gt_AP_Core_keepControllerAlive; diff --git a/Mods/ArchipelagoCore.SC2Mod/DocumentHeader b/Mods/ArchipelagoCore.SC2Mod/DocumentHeader index c7e9f51fc..5de81d92f 100644 Binary files a/Mods/ArchipelagoCore.SC2Mod/DocumentHeader and b/Mods/ArchipelagoCore.SC2Mod/DocumentHeader differ diff --git a/Mods/ArchipelagoCore.SC2Mod/GameText.version b/Mods/ArchipelagoCore.SC2Mod/GameText.version index d8b52ae6c..afcb9daa9 100644 Binary files a/Mods/ArchipelagoCore.SC2Mod/GameText.version and b/Mods/ArchipelagoCore.SC2Mod/GameText.version differ diff --git a/Mods/ArchipelagoCore.SC2Mod/Preload.xml b/Mods/ArchipelagoCore.SC2Mod/Preload.xml index 25a04f3c4..6b63415a7 100644 --- a/Mods/ArchipelagoCore.SC2Mod/Preload.xml +++ b/Mods/ArchipelagoCore.SC2Mod/Preload.xml @@ -1,5 +1,6 @@ + diff --git a/Mods/ArchipelagoCore.SC2Mod/Triggers b/Mods/ArchipelagoCore.SC2Mod/Triggers index 752d830b4..886e2b674 100644 --- a/Mods/ArchipelagoCore.SC2Mod/Triggers +++ b/Mods/ArchipelagoCore.SC2Mod/Triggers @@ -91,6 +91,7 @@ + @@ -626,6 +627,355 @@ nova + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Create dialog size that should cover any monitor + + + + + + + + + + + + + + 4000 + + + + + 3000 + + + + + + + + + 0 + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Make the dialog a full black screen + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + Assets\Textures\ui_ingame_blackmask.dds + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.25 + + + + + + + + + + 0.1 + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoCore.SC2Mod/Triggers.version b/Mods/ArchipelagoCore.SC2Mod/Triggers.version index 70aa3d8f7..ad726bda5 100644 Binary files a/Mods/ArchipelagoCore.SC2Mod/Triggers.version and b/Mods/ArchipelagoCore.SC2Mod/Triggers.version differ diff --git a/Mods/ArchipelagoCore.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoCore.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 93e145cee..d3ee9c959 100644 --- a/Mods/ArchipelagoCore.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoCore.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -8,6 +8,7 @@ Category/Name/lib_5BD4895D_2E944E7E=BotCommands Category/Name/lib_5BD4895D_480A0D7B=FactionUtil Category/Name/lib_5BD4895D_56C6DC4E=ObjectiveUtil Category/Name/lib_5BD4895D_5B1940FF=triggers +Category/Name/lib_5BD4895D_736F700D=MapLoadHelper Category/Name/lib_5BD4895D_74DC05F5=actions Category/Name/lib_5BD4895D_76AA9C78=Factions Category/Name/lib_5BD4895D_80F5776F=vars @@ -199,6 +200,7 @@ Structure/Name/lib_5BD4895D_0DCC271B=AP Objective Main Panel Structure/Name/lib_5BD4895D_36BCA7B1=chatbox Structure/Name/lib_5BD4895D_EB158E44=AP Objective Trigger/Name/lib_5BD4895D_052821E5=chatbox show +Trigger/Name/lib_5BD4895D_09118D7A=AP_Core_mapLoadStart Trigger/Name/lib_5BD4895D_17817B71=AP_Core_controllerInit Trigger/Name/lib_5BD4895D_4863529C=AP_Triggers_loadFinished Trigger/Name/lib_5BD4895D_648A0E6A=AP_Core_clearChat @@ -208,6 +210,7 @@ Trigger/Name/lib_5BD4895D_A0BE0CAC=chatbox buttons Trigger/Name/lib_5BD4895D_A7AF36D4=update chatbox Trigger/Name/lib_5BD4895D_AF628176=AP_Core_keepControllerAlive Trigger/Name/lib_5BD4895D_B8E7CE01=AP_Core_dontHideController +Trigger/Name/lib_5BD4895D_CB983523=AP_Core_mapLoadEnd Trigger/Name/lib_5BD4895D_E0A7D8B1=AP_Core_setFactionColorHandler Trigger/Name/lib_5BD4895D_F51822D9=AP_Core_rainbowColorsInit Trigger/Name/lib_5BD4895D_FE6C5704=AP_Core_giveStartingResources @@ -313,7 +316,9 @@ Variable/Name/lib_5BD4895D_7550FD8F=timer index Variable/Name/lib_5BD4895D_771C9F67=index Variable/Name/lib_5BD4895D_77FF591A=Hide If No Locs Variable/Name/lib_5BD4895D_792E0F93=current offset y +Variable/Name/lib_5BD4895D_7A01FE6A=AP_Core_blackScreen_dialog Variable/Name/lib_5BD4895D_7D36B5D8=color +Variable/Name/lib_5BD4895D_80482A34=duration Variable/Name/lib_5BD4895D_811EAE7D=hidden Variable/Name/lib_5BD4895D_83021644=message count Variable/Name/lib_5BD4895D_83091A9F=checks text @@ -360,6 +365,7 @@ Variable/Name/lib_5BD4895D_B3EF5411=AP_Core_controller2Status Variable/Name/lib_5BD4895D_B4782D2C=objective index Variable/Name/lib_5BD4895D_B4B3FF97=AP_Core_Faction_RAYNORS_RAIDERS Variable/Name/lib_5BD4895D_B4D40DF3=visual rolling index +Variable/Name/lib_5BD4895D_B66911A5=AP_Core_blackScreen Variable/Name/lib_5BD4895D_B7720D13=chat panel Variable/Name/lib_5BD4895D_B7A41851=currentPlayer Variable/Name/lib_5BD4895D_B7A49EF1=timer index