From 4ac4686b6b51966ed660763c27fc5527831703b2 Mon Sep 17 00:00:00 2001 From: Ziktofel Date: Wed, 11 Dec 2024 16:57:47 +0100 Subject: [PATCH] Allow Colossi to trigger broadcast towers in Media Blitz --- .../WoL/ap_media_blitz.SC2Map/DocumentHeader | Bin 6501 -> 6501 bytes .../ap_media_blitz.SC2Map/MapScript.galaxy | 10 +- .../WoL/ap_media_blitz.SC2Map/Triggers | 165 +++++++++--------- .../ap_media_blitz.SC2Map/Triggers.version | Bin 44 -> 44 bytes 4 files changed, 88 insertions(+), 87 deletions(-) diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/DocumentHeader index 8b1874139757ed8185a0429dafaa6f55c956e88f..19f5b89ab1b5a45754cfbe7cd5c0f9ed0f51beb7 100644 GIT binary patch delta 19 YcmaEA^wemA3`gvFwsH{OsNyII08z>ZWB>pF delta 19 YcmaEA^wemA42N{!2R#tpsNyII08VHJCIA2c diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/MapScript.galaxy index 19b5f0486..54ae1d017 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/MapScript.galaxy @@ -514,7 +514,6 @@ void gf_UploadData (unit lp_unit, int lp_index) { lv_count = 1; // Implementation - lv_numberOfPlayerUnitsByCOP = UnitGroupCount(UnitGroup(null, gv_p01_USER, RegionCircle(UnitGetPosition(lp_unit), 2.0), UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterStructure) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0), c_unitCountAlive); lv_realInterval = 1.0; lv_realCurrent = (lv_realInterval * IntToFixed(gv_transmissionProgress[lp_index])); lv_text1 = StringExternal("Param/Value/C2EAFB32"); @@ -524,6 +523,7 @@ void gf_UploadData (unit lp_unit, int lp_index) { autoE4CDAE9A_n = (100 - gv_transmissionProgress[lp_index]); for (autoE4CDAE9A_i = 1; autoE4CDAE9A_i <= autoE4CDAE9A_n; autoE4CDAE9A_i += 1) { gf_CheckKillTeams(lp_index, lv_realCurrent); + lv_numberOfPlayerUnitsByCOP = UnitGroupCount(UnitGroup(null, gv_p01_USER, RegionCircle(UnitGetPosition(lp_unit), 2.0), UnitFilter((1 << c_targetFilterGround), 0, (1 << c_targetFilterStructure) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0), c_unitCountAlive); if ((lv_realCurrent >= 100.0)) { break; } @@ -547,7 +547,7 @@ void gf_UploadData (unit lp_unit, int lp_index) { Wait((gv_uploadTime / 100.0), c_timeGame); lv_realCurrent = (lv_realCurrent + lv_realInterval); lv_text2 = FixedToText(lv_realCurrent, 0); - lv_numberOfPlayerUnitsByCOP = UnitGroupCount(UnitGroup(null, gv_p01_USER, RegionCircle(UnitGetPosition(lp_unit), 2.0), UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterStructure) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive); + lv_numberOfPlayerUnitsByCOP = UnitGroupCount(UnitGroup(null, gv_p01_USER, RegionCircle(UnitGetPosition(lp_unit), 2.0), UnitFilter((1 << c_targetFilterGround), 0, (1 << c_targetFilterStructure) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive); if ((lv_numberOfPlayerUnitsByCOP == 0)) { gv_transmissionProgress[lp_index] = (gv_transmissionProgress[lp_index] + lv_count); return ; @@ -3502,7 +3502,7 @@ bool gt_ObjectiveMisterUniverseUpdateAAirBaseTowerQ_Func (bool testConds, bool r return false; } - if (!((UnitFilterMatch(EventUnit(), gv_p01_USER, UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterStructure) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32)))) == true))) { + if (!((UnitFilterMatch(EventUnit(), gv_p01_USER, UnitFilter((1 << c_targetFilterGround), 0, (1 << c_targetFilterStructure) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32)))) == true))) { return false; } @@ -3562,7 +3562,7 @@ bool gt_ObjectiveMisterUniverseUpdateBSiegeBaseTowerQ_Func (bool testConds, bool return false; } - if (!((UnitFilterMatch(EventUnit(), gv_p01_USER, UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterStructure) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32)))) == true))) { + if (!((UnitFilterMatch(EventUnit(), gv_p01_USER, UnitFilter((1 << c_targetFilterGround), 0, (1 << c_targetFilterStructure) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32)))) == true))) { return false; } @@ -3622,7 +3622,7 @@ bool gt_ObjectiveMisterUniverseUpdateCRaiderBaseTowerQ_Func (bool testConds, boo return false; } - if (!((UnitFilterMatch(EventUnit(), gv_p01_USER, UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterStructure) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32)))) == true))) { + if (!((UnitFilterMatch(EventUnit(), gv_p01_USER, UnitFilter((1 << c_targetFilterGround), 0, (1 << c_targetFilterStructure) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32)))) == true))) { return false; } diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers index 717c39e96..2c5e65162 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers @@ -28718,7 +28718,6 @@ - @@ -28819,83 +28818,6 @@ 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2.0 - - - - - -;Air,Structure,Missile,Dead,Hidden,Invulnerable - - - - - - @@ -29045,6 +28967,7 @@ + @@ -29104,6 +29027,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.0 + + + + + Ground;Structure,Missile,Dead,Hidden,Invulnerable + + + + + + @@ -29549,7 +29550,7 @@ - -;Air,Structure,Missile,Dead,Hidden + Ground;Structure,Missile,Dead,Hidden @@ -29993,7 +29994,7 @@ - -;Air,Structure,Missile,Dead,Hidden,Invulnerable + Ground;Structure,Missile,Dead,Hidden,Invulnerable @@ -30406,7 +30407,7 @@ - -;Air,Structure,Missile,Dead,Hidden,Invulnerable + Ground;Structure,Missile,Dead,Hidden,Invulnerable @@ -30819,7 +30820,7 @@ - -;Air,Structure,Missile,Dead,Hidden,Invulnerable + Ground;Structure,Missile,Dead,Hidden,Invulnerable diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers.version index a03d1bf8c9471f2f79dfe0b13f8a58b3fb96e07d..1b47c5d5515e57c4e9e3aeb22ddec9339ce9c131 100644 GIT binary patch delta 17 XcmdPVnV`UPih+S4X