Skip to content

Commit

Permalink
Add Infested Liberator Defender Mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziktofel
Ziktofel committed Nov 26, 2024
1 parent 203ae11 commit 47f7cca
Show file tree
Hide file tree
Showing 17 changed files with 489 additions and 4 deletions.
66 changes: 66 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1820,6 +1820,14 @@
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectInstant>
<CAbilEffectInstant id="AP_SILiberatorAATarget">
<AbilSetId value="AP_LiberatorAATarget"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
<Effect index="0" value="AP_SILiberatorTargetAAMorphOrderSet"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_LiberatorAAMode">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectInstant>
<CAbilEffectInstant id="AP_MercLiberatorAATarget">
<AbilSetId value="AP_LiberatorAATarget"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
Expand All @@ -1846,6 +1854,16 @@
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectTarget>
<CAbilEffectTarget id="AP_SILiberatorAGTarget">
<AbilSetId value="AP_LiberatorAGTarget"/>
<EditorCategories value="AbilityorEffectType:Units"/>
<Effect index="0" value="AP_SILiberatorTargetMorphOrderInitialSet"/>
<Range value="9"/>
<Arc value="360"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_LiberatorAGMode" Requirements="AP_HaveSILiberatorDefenderMode">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectTarget>
<CAbilEffectTarget id="AP_MercLiberatorAGTarget">
<AbilSetId value="AP_LiberatorAGTarget"/>
<EditorCategories value="AbilityorEffectType:Units"/>
Expand Down Expand Up @@ -1891,6 +1909,31 @@
</SectionArray>
</InfoArray>
</CAbilMorph>
<CAbilMorph id="AP_SILiberatorMorphtoAA">
<AbilSetId value="LiberatorAA"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_LiberatorAAMode">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
<Flags index="IgnoreFacing" value="1"/>
<CancelUnit value="AP_SILiberator"/>
<InfoArray Unit="AP_SILiberator">
<SectionArray index="Abils">
<DurationArray index="Delay" value="0.5"/>
</SectionArray>
<SectionArray index="Actor">
<DurationArray index="Delay" value="0.5"/>
<DurationArray index="Duration" value="1.5417"/>
</SectionArray>
<SectionArray index="Mover">
<DurationArray index="Duration" value="0.5"/>
</SectionArray>
<SectionArray index="Stats">
<DurationArray index="Delay" value="0.5"/>
<DurationArray index="Duration" value="1.5417"/>
</SectionArray>
</InfoArray>
</CAbilMorph>
<CAbilMorph id="AP_MercLiberatorMorphtoAA">
<AbilSetId value="LiberatorAA"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
Expand Down Expand Up @@ -1965,6 +2008,29 @@
</SectionArray>
</InfoArray>
</CAbilMorph>
<CAbilMorph id="AP_SILiberatorMorphtoAG">
<AbilSetId value="LiberatorAG"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_LiberatorAGMode"/>
<Flags index="IgnoreFacing" value="1"/>
<Flags index="WaitUntilStopped" value="0"/>
<InfoArray Unit="AP_SILiberatorAG">
<SectionArray index="Abils">
<DurationArray index="Delay" value="0.5"/>
</SectionArray>
<SectionArray index="Actor">
<DurationArray index="Delay" value="0.5"/>
<DurationArray index="Duration" value="3.5417"/>
</SectionArray>
<SectionArray index="Facing">
<DurationArray index="Duration" value="0.5"/>
</SectionArray>
<SectionArray index="Stats">
<DurationArray index="Delay" value="0.5"/>
<DurationArray index="Duration" value="3.5417"/>
</SectionArray>
</InfoArray>
</CAbilMorph>
<CAbilMorph id="AP_MercLiberatorMorphtoAG">
<AbilSetId value="LiberatorAG"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
Expand Down
181 changes: 181 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
View file

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6945,4 +6945,12 @@
<AlertIcon value="Assets\Textures\btn-ability-kerrigan-broodlingnest.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_SILiberatorAAMode" parent="AP_LiberatorAAMode">
<Hotkey value="Button/Hotkey/AP_SILiberatorAAMode"/>
<HotkeySet value="SILiberatorModes"/>
</CButton>
<CButton id="AP_SILiberatorAGMode" parent="AP_LiberatorAGMode">
<Hotkey value="Button/Hotkey/AP_SILiberatorAGMode"/>
<HotkeySet value="SILiberatorModes"/>
</CButton>
</Catalog>
72 changes: 72 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2249,6 +2249,14 @@
<Amount value="85"/>
<Death value="Fire"/>
</CEffectDamage>
<CEffectDamage id="AP_SILiberatorAGDamage" parent="DU_WEAP">
<EditorCategories value="Race:Terran"/>
<ImpactLocation Value="TargetUnit"/>
<Visibility value="Visible"/>
<Kind value="Ranged"/>
<Amount value="85"/>
<Death value="Fire"/>
</CEffectDamage>
<CEffectDamage id="AP_LiberatorMengskAGDamage" parent="DU_WEAP">
<EditorCategories value="Race:Terran"/>
<ImpactLocation Value="TargetUnit"/>
Expand All @@ -2274,6 +2282,11 @@
<ImpactEffect value="AP_LiberatorAGDamage"/>
<AmmoUnit value="AP_LiberatorAGMissile"/>
</CEffectLaunchMissile>
<CEffectLaunchMissile id="AP_SILiberatorAGMissileLM">
<EditorCategories value="Race:Terran"/>
<ImpactEffect value="AP_SILiberatorAGDamage"/>
<AmmoUnit value="AP_LiberatorAGMissile"/>
</CEffectLaunchMissile>
<CEffectLaunchMissile id="AP_LiberatorMengskAGMissileLM">
<EditorCategories value="Race:Terran"/>
<ImpactEffect value="AP_LiberatorMengskAGDamage"/>
Expand All @@ -2284,6 +2297,11 @@
<EditorCategories value="Race:Terran"/>
<EffectArray value="AP_LiberatorAGMissileLM"/>
</CEffectSet>
<CEffectSet id="AP_SILiberatorAGMissileLMSet">
<ValidatorArray value="AP_LiberatorAGTargets"/>
<EditorCategories value="Race:Terran"/>
<EffectArray value="AP_SILiberatorAGMissileLM"/>
</CEffectSet>
<CEffectSet id="AP_LiberatorMengskAGMissileLMSet">
<ValidatorArray value="AP_LiberatorMengskAGTargets"/>
<EditorCategories value="Race:Terran"/>
Expand All @@ -2307,6 +2325,12 @@
<PeriodCount value="1"/>
<PeriodicPeriodArray value="0.125"/>
</CEffectCreatePersistent>
<CEffectCreatePersistent id="AP_SILiberatorInterruptedMorphDelayPersistent">
<EditorCategories value="Race:Terran"/>
<ExpireEffect value="AP_SILiberatorTargetAAMorphOrderSet"/>
<PeriodCount value="1"/>
<PeriodicPeriodArray value="0.125"/>
</CEffectCreatePersistent>
<CEffectCreatePersistent id="AP_LiberatorMengskInterruptedMorphDelayPersistent">
<EditorCategories value="Race:Terran"/>
<ExpireEffect value="AP_LiberatorMengskTargetAAMorphOrderSet"/>
Expand Down Expand Up @@ -2499,6 +2523,12 @@
<Abil value="AP_LiberatorMorphtoAA"/>
<Player Value="Source"/>
</CEffectIssueOrder>
<CEffectIssueOrder id="AP_SILiberatorTargetAAMorphOrder">
<EditorCategories value="Race:Terran"/>
<WhichUnit Value="Source"/>
<Abil value="AP_SILiberatorMorphtoAA"/>
<Player Value="Source"/>
</CEffectIssueOrder>
<CEffectIssueOrder id="AP_LiberatorMengskTargetAAMorphOrder">
<EditorCategories value="Race:Terran"/>
<WhichUnit Value="Source"/>
Expand All @@ -2511,6 +2541,12 @@
<EffectArray value="AP_LiberatorTargetAAMorphOrder"/>
<TargetLocationType value="Point"/>
</CEffectSet>
<CEffectSet id="AP_SILiberatorTargetAAMorphOrderSet">
<EditorCategories value="Race:Zerg"/>
<EffectArray value="AP_LiberatorTargetAAMorphRB"/>
<EffectArray value="AP_SILiberatorTargetAAMorphOrder"/>
<TargetLocationType value="Point"/>
</CEffectSet>
<CEffectSet id="AP_LiberatorMengskTargetAAMorphOrderSet">
<EditorCategories value="Race:Zerg"/>
<EffectArray value="AP_LiberatorTargetAAMorphRB"/>
Expand All @@ -2533,6 +2569,13 @@
<Player Value="Creator"/>
<Target Value="CasterUnit"/>
</CEffectIssueOrder>
<CEffectIssueOrder id="AP_SILiberatorTargetMorphAGOrder">
<EditorCategories value="Race:Terran"/>
<WhichUnit Value="Caster"/>
<Abil value="AP_SILiberatorMorphtoAG"/>
<Player Value="Creator"/>
<Target Value="CasterUnit"/>
</CEffectIssueOrder>
<CEffectIssueOrder id="AP_LiberatorMengskTargetMorphAGOrder">
<EditorCategories value="Race:Terran"/>
<WhichUnit Value="Caster"/>
Expand All @@ -2547,6 +2590,13 @@
<PeriodicPeriodArray value="4"/>
<AINotifyEffect value="AP_LiberatorTargetMorphSearchArea"/>
</CEffectCreatePersistent>
<CEffectCreatePersistent id="AP_SILiberatorTargetMorphDelayPersistent">
<EditorCategories value="Race:Terran"/>
<ExpireEffect value="AP_SILiberatorTargetMorphPersistent"/>
<PeriodCount value="1"/>
<PeriodicPeriodArray value="4"/>
<AINotifyEffect value="AP_SILiberatorTargetMorphSearchArea"/>
</CEffectCreatePersistent>
<CEffectCreatePersistent id="AP_LiberatorMengskTargetMorphDelayPersistent">
<EditorCategories value="Race:Terran"/>
<ExpireEffect value="AP_LiberatorMengskTargetMorphPersistent"/>
Expand All @@ -2561,6 +2611,13 @@
<EffectArray value="AP_LiberatorTargetMorphDelayPersistent"/>
<TargetLocationType value="Point"/>
</CEffectSet>
<CEffectSet id="AP_SILiberatorTargetMorphOrderInitialSet">
<EditorCategories value="Race:Zerg"/>
<EffectArray value="AP_LiberatorTargetMorphAB"/>
<EffectArray value="AP_SILiberatorTargetMorphAGOrder"/>
<EffectArray value="AP_SILiberatorTargetMorphDelayPersistent"/>
<TargetLocationType value="Point"/>
</CEffectSet>
<CEffectSet id="AP_LiberatorMengskTargetMorphOrderInitialSet">
<EditorCategories value="Race:Zerg"/>
<EffectArray value="AP_LiberatorTargetMorphAB"/>
Expand All @@ -2577,6 +2634,15 @@
<PeriodicPeriodArray value="0.25"/>
<AINotifyEffect value="AP_LiberatorTargetMorphSearchArea"/>
</CEffectCreatePersistent>
<CEffectCreatePersistent id="AP_SILiberatorTargetMorphPersistent">
<EditorCategories value="Race:Terran"/>
<Flags index="PersistUntilDestroyed" value="1"/>
<FinalEffect value="AP_SILiberatorInterruptedMorphDelayPersistent"/>
<PeriodicValidator value="AP_LiberatorMorphValidatorCombine"/>
<PeriodicEffectArray value="AP_SILiberatorTargetMorphSearchArea"/>
<PeriodicPeriodArray value="0.25"/>
<AINotifyEffect value="AP_SILiberatorTargetMorphSearchArea"/>
</CEffectCreatePersistent>
<CEffectCreatePersistent id="AP_LiberatorMengskTargetMorphPersistent">
<EditorCategories value="Race:Terran"/>
<Flags index="PersistUntilDestroyed" value="1"/>
Expand All @@ -2595,6 +2661,11 @@
<SearchFilters value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
<AreaArray Radius="5" Effect="AP_LiberatorTargetMorphSearchAB"/>
</CEffectEnumArea>
<CEffectEnumArea id="AP_SILiberatorTargetMorphSearchArea">
<EditorCategories value="Race:Terran"/>
<SearchFilters value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
<AreaArray Radius="5" Effect="AP_LiberatorTargetMorphSearchAB"/>
</CEffectEnumArea>
<CEffectModifyUnit id="AP_LiberatorTurretFace">
<ValidatorArray value="IsNotDisguisedChangeling"/>
<ValidatorArray value="IsNotNeuralParasited"/>
Expand Down Expand Up @@ -14957,6 +15028,7 @@
<EffectArray value="AP_LiberatorTargetAAMorphOrderSet"/>
<EffectArray value="AP_MercLiberatorTargetAAMorphOrderSet"/>
<EffectArray value="AP_LiberatorMengskTargetAAMorphOrderSet"/>
<EffectArray value="AP_SILiberatorTargetAAMorphOrderSet"/>
</CEffectSet>
<CEffectApplyBehavior id="AP_SOAMassRecallInitialAB">
<ValidatorArray index="0" value="NotLarvaEgg"/>
Expand Down
14 changes: 14 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3906,6 +3906,16 @@
<EditorCategories value="Race:Zerg,TechType:Ability"/>
<NodeArray index="Show" Link="AP_CountUpgradeSILiberatorImprovedAoeAttackCompleteOnly"/>
</CRequirement>
<CRequirement id="AP_HaveSILiberatorInfestedBeesNoFighterMode">
<EditorCategories value="Race:Zerg,TechType:Ability"/>
<NodeArray index="Show" Link="AP_CountUpgradeSILiberatorInfestedBeesCompleteOnly"/>
<NodeArray index="Use" Link="AP_CountUpgradeNotPossibleFighterModeCompleteOnly"/>
</CRequirement>
<CRequirement id="AP_HaveSILiberatorImprovedAoeAttackNoFighterMode">
<EditorCategories value="Race:Zerg,TechType:Ability"/>
<NodeArray index="Show" Link="AP_CountUpgradeSILiberatorImprovedAoeAttackCompleteOnly"/>
<NodeArray index="Use" Link="AP_CountUpgradeNotPossibleFighterModeCompleteOnly"/>
</CRequirement>
<CRequirement id="AP_HaveMengskVeterancyVikingMengskGELevel3">
<NodeArray index="Use" Link="AP_GTECountBehaviorMengskVeterancyVikingMengskCompleteOnlyAtUnit3"/>
</CRequirement>
Expand Down Expand Up @@ -4271,4 +4281,8 @@
<EditorCategories value="Race:Zerg,TechType:Upgrade"/>
<NodeArray index="Show" Link="AP_CountZergBroodlingPackingCompleteOnly"/>
</CRequirement>
<CRequirement id="AP_HaveSILiberatorDefenderMode">
<EditorCategories value="Race:Zerg,TechType:Upgrade"/>
<NodeArray index="Show" Link="AP_CountSILiberatorDefenderModeCompleteOnly"/>
</CRequirement>
</Catalog>
4 changes: 4 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6976,4 +6976,8 @@
<Flags index="TechTreeCheat" value="0"/>
<Count Link="AP_ZergBroodlingPacking" State="CompleteOnly"/>
</CRequirementCountUpgrade>
<CRequirementCountUpgrade id="AP_CountSILiberatorDefenderModeCompleteOnly">
<Flags index="TechTreeCheat" value="0"/>
<Count Link="AP_SILiberatorDefenderMode" State="CompleteOnly"/>
</CRequirementCountUpgrade>
</Catalog>
Loading

0 comments on commit 47f7cca

Please sign in to comment.