Skip to content

Commit

Permalink
Merge branch 'sky-fury' into sc2-next
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziktofel
Ziktofel committed Sep 11, 2024
2 parents 9163246 + 929669a commit 0f403e5
Show file tree
Hide file tree
Showing 26 changed files with 3,174 additions and 65 deletions.
78 changes: 76 additions & 2 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4604,6 +4604,17 @@
<CAbilMorph id="AP_StarportLiftOff" parent="TerranBuildingLiftOff" unit="AP_StarportFlying">
<Name value="Abil/Name/AP_StarportLiftOff"/>
</CAbilMorph>
<CAbilMorphPlacement id="AP_StarportMengskLand" parent="TerranBuildingLand" unit="AP_StarportMengsk">
<Name value="Abil/Name/AP_StarportMengskLand"/>
<InfoArray index="0" Unit="AP_StarportMengsk" CollideRange="0">
<SectionArray index="Abils">
<DurationArray index="Delay" value="2"/>
</SectionArray>
</InfoArray>
</CAbilMorphPlacement>
<CAbilMorph id="AP_StarportMengskLiftOff" parent="TerranBuildingLiftOff" unit="AP_StarportMengskFlying">
<Name value="Abil/Name/AP_StarportMengskLiftOff"/>
</CAbilMorph>
<CAbilArmMagazine id="AP_HeroArmNuke">
<EditorCategories value="Race:Terran,AbilityorEffectType:Structures"/>
<Launch value="ReleaseAtSource"/>
Expand Down Expand Up @@ -8948,6 +8959,9 @@
<InfoArray index="Build25" Unit="AP_DevastatorTurret" Time="30">
<Button DefaultButtonFace="AP_BuildDevastatorTurret" State="Restricted" Requirements="AP_HaveFactory"/>
</InfoArray>
<InfoArray index="Build26" Unit="AP_StarportMengsk" Time="50">
<Button DefaultButtonFace="AP_StarportMengsk" State="Restricted" Requirements="HaveCommandCenter"/>
</InfoArray>
<FidgetDelayMin value="5"/>
<FidgetDelayMax value="10"/>
<ConstructionMover value="Construction"/>
Expand Down Expand Up @@ -10629,7 +10643,7 @@
</CAbilEffectTarget>
<CAbilEffectTarget id="AP_HHVikingRockets">
<EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
<Effect index="0" value="AP_HHVikingRocketsBurstPersistent"/>
<Effect index="0" value="AP_HHVikingRocketsBurstPersistentSwitch"/>
<Flags index="AllowMovement" value="1"/>
<Flags index="AllowMovingSuppressed" value="1"/>
<Flags index="AllowTurningSuppressed" value="1"/>
Expand Down Expand Up @@ -12111,9 +12125,13 @@
<EditorCategories value="Race:Terran,AbilityorEffectType:Structures"/>
<Range value="5"/>
<InfoArray index="Train1" Time="110">
<Button DefaultButtonFace="AP_BattlecruiserMengsk" State="Restricted"/>
<Button DefaultButtonFace="AP_BattlecruiserMengsk" State="Restricted" Requirements="AP_HaveFusionCore"/>
<Unit value="AP_BattlecruiserMengsk"/>
</InfoArray>
<InfoArray index="Train2" Time="42">
<Button DefaultButtonFace="AP_VikingMengskFighter" State="Restricted"/>
<Unit value="AP_VikingMengskFighter"/>
</InfoArray>
</CAbilTrain>
<CAbilBuild id="AP_SITerranAddOns">
<EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
Expand Down Expand Up @@ -12534,4 +12552,60 @@
<Flags index="Transient" value="1"/>
<BehaviorArray value="AP_EnableBaseSILiberatorAttackSwap"/>
</CAbilBehavior>
<CAbilMorph id="AP_AssaultModeMengsk">
<OrderArray index="0">
<DisplayType value="Confirm"/>
<Color value="255,0,255,0"/>
<Model value="Assets\UI\Cursors\WayPointAttack_Void\WayPointAttack_Void.m3"/>
<LineTexture value="Assets\Textures\WayPointLine.dds"/>
</OrderArray>
<AbilSetId value="AssaultMode"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_AssaultModeMengsk">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
<Flags index="IgnoreFacing" value="1"/>
<Flags index="IgnorePlacement" value="0"/>
<Flags index="WaitUntilStopped" value="0"/>
<InfoArray Unit="AP_VikingMengskAssault" CollideRange="3.75" RandomDelayMax="0.5">
<SectionArray index="Actor">
<DurationArray index="Duration" value="2.34"/>
<EffectArray index="Finish" value="AP_VikingMengskGroundAttackDamage"/>
</SectionArray>
<SectionArray index="Mover">
<DurationArray index="Delay" value="0.533"/>
<DurationArray index="Duration" value="1.2"/>
</SectionArray>
<SectionArray index="Stats">
<DurationArray index="Duration" value="2.34"/>
<EffectArray index="Finish" value="AP_VikingMengskWeaponChange"/>
</SectionArray>
</InfoArray>
</CAbilMorph>
<CAbilMorph id="AP_FighterModeMengsk">
<AbilSetId value="FighterMode"/>
<EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_FighterModeMengsk">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
<Flags index="IgnoreFacing" value="1"/>
<Flags index="WaitUntilStopped" value="0"/>
<InfoArray Unit="AP_VikingMengskFighter" RandomDelayMax="0.5">
<SectionArray index="Actor">
<DurationArray index="Duration" value="2.333"/>
<EffectArray index="Finish" value="AP_VikingMengskAirAttackDamage"/>
</SectionArray>
<SectionArray index="Collide">
<DurationArray index="Delay" value="1.5"/>
</SectionArray>
<SectionArray index="Mover">
<DurationArray index="Delay" value="0.6"/>
<DurationArray index="Duration" value="0.85"/>
</SectionArray>
<SectionArray index="Stats">
<DurationArray index="Duration" value="2.333"/>
<EffectArray index="Finish" value="AP_VikingMengskWeaponChange"/>
</SectionArray>
</InfoArray>
</CAbilMorph>
</Catalog>
Loading

0 comments on commit 0f403e5

Please sign in to comment.