From ac0583501c650a9cd3eb28881d08383cc8ff2c66 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 7 Aug 2024 19:38:01 -0700 Subject: [PATCH 1/2] sc2: Adding Corsair war council upgrade -- network disruption --- .../Base.SC2Data/GameData/ActorData.xml | 1 + .../Base.SC2Data/GameData/ButtonData.xml | 4 ++++ .../Base.SC2Data/GameData/EffectData.xml | 2 +- .../Base.SC2Data/GameData/RequirementData.xml | 4 ++++ .../Base.SC2Data/GameData/RequirementNodeData.xml | 4 ++++ .../Base.SC2Data/GameData/UnitData.xml | 1 + .../Base.SC2Data/GameData/UpgradeData.xml | 4 ++++ .../Base.SC2Data/GameData/ValidatorData.xml | 7 +++++++ .../enUS.SC2Data/LocalizedData/GameStrings.txt | 3 +++ 9 files changed, 29 insertions(+), 1 deletion(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml index 7f4f88ba5..24720ca1a 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml @@ -16018,6 +16018,7 @@ + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml index 06f164dda..8592294a1 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml @@ -4834,6 +4834,10 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml index c260dfbe5..594d3a82d 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml @@ -10637,7 +10637,7 @@ - + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml index 8522b7cdf..e68c428d2 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml @@ -2867,6 +2867,10 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index 5469f538f..3f59dd943 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -5260,6 +5260,10 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index 430a4548a..1f69db5de 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -15482,6 +15482,7 @@ + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index cd35b89d1..ab97ee585 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -11339,6 +11339,10 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml index 6051da3cf..826815b75 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml @@ -3168,6 +3168,13 @@ + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt index 5faad537c..622de2f27 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -957,6 +957,7 @@ Button/Name/AP_CorruptorPassive=Corruptor Button/Name/AP_Corsair=Warp in Corsair Button/Name/AP_CorsairArgusJewel=Argus Jewel Button/Name/AP_CorsairMPDisruptionWeb=Disruption Web +Button/Name/AP_CorsairNetworkDisruption=Network Disruption Button/Name/AP_CorsairShieldUpgrade=Neutron Shields Button/Name/AP_CorsairSustainingDisruption=Sustaining Disruption Button/Name/AP_CreepTumorPassive=Creep Generator @@ -2056,6 +2057,7 @@ Button/Tooltip/AP_CorsairArgusJewel=Corsair can store 2 charges of Disruption We Button/Tooltip/AP_CorsairMP=Nerazim FactionAir superiority starfighter. Can use Disruption Web.Can attack air units. Button/Tooltip/AP_CorsairMPDisruptionWeb=Creates a web of energy on the ground that prevents enemy structures and ground units from attacking for . Button/Tooltip/AP_CorsairMPDisruptionWebUpgraded=Creates a web of energy on the ground that prevents enemy structures and ground units from attacking for . +Button/Tooltip/AP_CorsairNetworkDisruption=Triples the radius of Disruption Web. Button/Tooltip/AP_CorsairShieldUpgrade=Increases the Corsair's shields by 20. Button/Tooltip/AP_CorsairSustainingDisruption=Disruption Webs last longer. Button/Tooltip/AP_CreepTumor=A burrowed creep generator. Creep feeds nearby Zerg structures. A Creep Tumor can spawn additional Creep Tumors.Bonus: Zerg move faster on creep. @@ -4718,6 +4720,7 @@ RequirementNode/Tooltip/AP_CountUpgradeAdeptDisruptiveTransferCompleteOnly=Find RequirementNode/Tooltip/AP_CountUpgradeAnnihilatorAerialTrackingCompleteOnly=Find Aerial Tracking (Annihilator) RequirementNode/Tooltip/AP_CountUpgradeAvengerCloakCompleteOnly=Find Kryhas Cloak (Avenger) RequirementNode/Tooltip/AP_CountUpgradeBloodHunterBrutalEfficiencyCompleteOnly=Find Brutal Efficiency (Blood Hunter) +RequirementNode/Tooltip/AP_CountUpgradeCorsairNetworkDisruptionCompleteOnly=Find Network Disruption (Corsair) RequirementNode/Tooltip/AP_CountUpgradeDarkArchonIndomitableWillCompleteOnly=Find Indomitable Will (Dark Archon) RequirementNode/Tooltip/AP_CountUpgradeDarkTemplarShadowFuryGreaterCompleteOnly=Find Greater Shadow Fury (Dark Templar) RequirementNode/Tooltip/AP_CountUpgradeDarkTemplarShadowFuryLesserCompleteOnly=Find Lesser Shadow Fury (Dark Templar) From 24cec3ef9fc0616a748d7f7618744e019928e3e4 Mon Sep 17 00:00:00 2001 From: Matthew Date: Wed, 7 Aug 2024 19:49:25 -0700 Subject: [PATCH 2/2] sc2: Adding unlock triggers for corsair network disruption --- .../Base.SC2Data/LibABFE498B.galaxy | 8 +++- .../Base.SC2Data/LibABFE498B_h.galaxy | 1 + Mods/ArchipelagoTriggers.SC2Mod/Triggers | 40 ++++++++++++++++++- .../LocalizedData/TriggerStrings.txt | 2 + 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy index efd428782..0afa336d4 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy @@ -1583,7 +1583,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil2 (int lp_player, int lp_ lp_player, lp_bitArrayValue, libABFE498B_gf_AP_Triggers_Protoss_unlockPhoenixDoubleGravitonBeam, // 0 - ap_triggers_PlayerConsumer_sig, // 1 + libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairNetworkDisruption, // 1 libABFE498B_gf_AP_Triggers_Protoss_unlockMirageGravitonBeam, // 2 libABFE498B_gf_AP_Triggers_Protoss_unlockSkirmisherPeerContempt, // 3 ap_triggers_PlayerConsumer_sig, // 4 @@ -7123,6 +7123,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairNeutronShields (int lp_play libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CorsairShieldUpgrade", 1); } +void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairNetworkDisruption (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CorsairNetworkDisruption", 1); +} + void libABFE498B_gf_AP_Triggers_Protoss_unlockOracleStealthDrive (int lp_player) { // Automatic Variable Declarations // Implementation diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy index 0acda692e..e603551a5 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy @@ -722,6 +722,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairStealthDrive (int lp_player void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairArgusJewel (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairSustainingDisruption (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairNeutronShields (int lp_player); +void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairNetworkDisruption (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockOracleStealthDrive (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockOracleStasisCalibration (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockOracleTemporalAccelerationBeam (int lp_player); diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers index 6b25fce56..17c2a2fd1 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers +++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers @@ -4617,7 +4617,7 @@ lp_player, lp_bitArrayValue, libABFE498B_gf_AP_Triggers_Protoss_unlockPhoenixDoubleGravitonBeam, // 0 - ap_triggers_PlayerConsumer_sig, // 1 + libABFE498B_gf_AP_Triggers_Protoss_unlockCorsairNetworkDisruption, // 1 libABFE498B_gf_AP_Triggers_Protoss_unlockMirageGravitonBeam, // 2 libABFE498B_gf_AP_Triggers_Protoss_unlockSkirmisherPeerContempt, // 3 ap_triggers_PlayerConsumer_sig, // 4 @@ -59348,6 +59348,7 @@ + @@ -60583,6 +60584,43 @@ + + AP_Triggers_Protoss_unlockCorsairNetworkDisruption + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + AP_CorsairNetworkDisruption + + + + + + 1 + + diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 9a6a86320..23d7f6dfe 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -277,6 +277,7 @@ FunctionDef/Name/lib_ABFE498B_3D9164AE=AP_Triggers_Terran_unlockMarineProgressiv FunctionDef/Name/lib_ABFE498B_3E5FE33C=AP_Triggers_Zerg_UltraliskResourceEfficiency FunctionDef/Name/lib_ABFE498B_3E64398E=AP_Triggers_Terran_unlockMedivacScatterVeil FunctionDef/Name/lib_ABFE498B_3E695C38=AP_Triggers_Zerg_unlockScourge +FunctionDef/Name/lib_ABFE498B_3E6E7E95=AP_Triggers_Protoss_unlockCorsairNetworkDisruption FunctionDef/Name/lib_ABFE498B_3EBD86A4=AP_Triggers_Protoss_unlockZealotWhirlwind FunctionDef/Name/lib_ABFE498B_3ECDB091=AP_Triggers_Protoss_unlockAscendantPowerChaoticAttunement FunctionDef/Name/lib_ABFE498B_3EE41709=AP_Triggers_Zerg_RoachCorpser @@ -1357,6 +1358,7 @@ ParamDef/Name/lib_ABFE498B_9BD1EB64=player ParamDef/Name/lib_ABFE498B_9C22FD60=player ParamDef/Name/lib_ABFE498B_9CC96E37=player ParamDef/Name/lib_ABFE498B_9CCD3E05=player +ParamDef/Name/lib_ABFE498B_9D72F60F=player ParamDef/Name/lib_ABFE498B_9DCAB020=player ParamDef/Name/lib_ABFE498B_9E166274=player ParamDef/Name/lib_ABFE498B_9EC8A002=player