Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Roach morphs, Enemy Within, Conviction #216

Merged
merged 1 commit into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="us-ascii"?>
<Catalog>
<CAbilMerge id="AP_PrimalIgniterMerge">
<CmdButtonArray index="SelectedUnits" Requirements=""/>
<CmdButtonArray index="WithTarget" Requirements=""/>
<Info Time="5"/>
</CAbilMerge>
<CAbilMorph id="PerditionTurretBurrow">
<CmdButtonArray index="Execute" DefaultButtonFace="BurrowDown"/>
</CAbilMorph>
Expand Down
Binary file not shown.
Binary file not shown.
124 changes: 81 additions & 43 deletions Maps/ArchipelagoCampaign/HotS/ap_conviction.SC2Map/PreloadAssetDB.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,58 @@
</SectionArray>
</InfoArray>
</CAbilMorph>
<CAbilTrain id="AP_MorphlingToBaneling">
<Flags index="IgnoreUnitCost" value="1"/>
<InfoArray index="Train1" Time="5">
<Button Requirements=""/>
</InfoArray>
</CAbilTrain>
<CAbilTrain id="AP_MorphlingToImpaler">
<Flags index="IgnoreUnitCost" value="1"/>
<InfoArray index="Train1" Time="5">
<Button Requirements=""/>
</InfoArray>
</CAbilTrain>
<CAbilTrain id="AP_MorphlingToLurker">
<Flags index="IgnoreUnitCost" value="1"/>
<InfoArray index="Train1" Time="5">
<Button Requirements=""/>
</InfoArray>
</CAbilTrain>
<CAbilMerge id="AP_MorphlingToPrimalIgniterMerge">
<CmdButtonArray index="SelectedUnits" Requirements=""/>
<CmdButtonArray index="WithTarget" Requirements=""/>
<Info Time="5">
<Resource index="Minerals" value="0"/>
<Resource index="Vespene" value="0"/>
</Info>
</CAbilMerge>
<CAbilTrain id="AP_MorphlingToRavager">
<Flags index="IgnoreUnitCost" value="1"/>
<InfoArray index="Train1" Time="5">
<Button Requirements=""/>
</InfoArray>
</CAbilTrain>
<CAbilMerge id="AP_PrimalIgniterMerge">
<CmdButtonArray index="SelectedUnits" Requirements=""/>
<CmdButtonArray index="WithTarget" Requirements=""/>
<Info Time="5"/>
</CAbilMerge>
<CAbilTrain id="SwarmQueenTrain">
<InfoArray index="Train1">
<Resource index="Minerals" value="0"/>
<Button State="Restricted"/>
<Unit index="0" value="AP_Zergling"/>
<Unit index="1" value="AP_Zergling"/>
</InfoArray>
<InfoArray index="Train2">
<Resource index="Minerals" value="0"/>
<Button State="Restricted" Requirements="AP_HaveRaptor"/>
<Unit index="0" value="AP_Zergling"/>
<Unit index="1" value="AP_Zergling"/>
</InfoArray>
<InfoArray index="Train3">
<Resource index="Minerals" value="0"/>
<Button State="Restricted" Requirements="AP_HaveSwarmling"/>
<Unit index="0" value="AP_Zergling"/>
<Unit index="1" value="AP_Zergling"/>
Expand All @@ -77,19 +117,24 @@
<Unit index="0" value="AP_Roach"/>
</InfoArray>
<InfoArray index="Train7">
<Resource index="Minerals" value="0"/>
<Resource index="Vespene" value="0"/>
<Button State="Restricted"/>
<Unit index="0" value="AP_Hydralisk"/>
</InfoArray>
<InfoArray index="Train8">
<Resource index="Minerals" value="0"/>
<Resource index="Vespene" value="0"/>
<Button State="Restricted" Requirements="AP_HaveLurker"/>
<Unit index="0" value="AP_Hydralisk"/>
</InfoArray>
<InfoArray index="Train9">
<Resource index="Minerals" value="0"/>
<Resource index="Vespene" value="0"/>
<Button State="Restricted" Requirements="AP_HaveImpaler"/>
<Unit index="0" value="AP_Hydralisk"/>
</InfoArray>
<InfoArray index="Train10" Time="2.4" Rotation="Source">
<Resource index="Minerals" value="-75"/>
<Display index="Custom" value="1"/>
<Button DefaultButtonFace="AP_MorphToRaptor" State="Restricted" Requirements="AP_HaveRaptorSwarmling"/>
<Unit value="AP_Zergling"/>
Expand All @@ -98,10 +143,14 @@
</InfoArray>
<InfoArray index="Train11" Time="2.4" Rotation="Source">
<Display index="Custom" value="1"/>
<Resource index="Minerals" value="-100"/>
<Resource index="Vespene" value="-150"/>
<Button DefaultButtonFace="AP_Infestor" State="Restricted"/>
<Unit value="AP_Infestor"/>
</InfoArray>
<InfoArray index="Train12" Time="5">
<Display index="Custom" value="1"/>
<Button DefaultButtonFace="AP_BirthMorphling" State="Restricted" Requirements="AP_MorphlingEnabled"/>
<Unit value="AP_Morphling"/>
</InfoArray>
<Flags index="IgnoreUnitCost" value="1"/>
</CAbilTrain>
</Catalog>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Catalog>
<CButton id="AP_BirthMorphling">
<Icon value="Assets\Textures\BTN-Unit-Zerg-changeling.dds"/>
<AlertIcon value="Assets\Textures\BTN-Unit-Zerg-changeling.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
</Catalog>
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Catalog>
<CUnit id="AP_Morphling">
<CardLayouts index="0">
<LayoutButtons index="4" AbilCmd="255,255"/>
<LayoutButtons index="5" AbilCmd="255,255"/>
</CardLayouts>
<CardLayouts index="1">
<LayoutButtons index="0" AbilCmd="AP_MorphlingToBaneling,Train1"/>
<LayoutButtons index="1" AbilCmd="AP_MorphlingToRavager,Train1"/>
<LayoutButtons index="2" AbilCmd="AP_MorphlingToLurker,Train1"/>
<LayoutButtons index="3" AbilCmd="AP_MorphlingToImpaler,Train1"/>
<LayoutButtons index="4" Face="Cancel" Type="CancelSubmenu" AbilCmd="" Column="4"/>
<LayoutButtons index="5" removed="1"/>
<LayoutButtons index="6" removed="1"/>
<LayoutButtons index="7" removed="1"/>
<LayoutButtons index="8" removed="1"/>
</CardLayouts>
<CardLayouts index="2">
<LayoutButtons index="0" AbilCmd="AP_MorphlingToPrimalIgniterMerge,SelectedUnits"/>
</CardLayouts>
</CUnit>
<CUnit id="Anteplott">
<AbilArray index="2" Link="Consume"/>
<BehaviorArray index="0" removed="1"/>
Expand Down Expand Up @@ -31,6 +51,7 @@
<LayoutButtons index="17" Face="SwarmQueenHydraliskImpaler" AbilCmd="SwarmQueenTrain,Train9" Row="1" Column="3"/>
<LayoutButtons Face="SwarmQueenHydralisk" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train7" Row="1" Column="3"/>
<LayoutButtons Face="AP_Infestor" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train11" Row="1" Column="4"/>
<LayoutButtons Face="AP_BirthMorphling" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train12" Row="2" Column="3"/>
</CardLayouts>
</CUnit>
<CUnit id="AP_Roach">
Expand Down Expand Up @@ -81,6 +102,7 @@
<LayoutButtons Face="SwarmQueenHydralisk" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train7" Row="1" Column="3"/>
<LayoutButtons Face="AP_Infestor" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train11" Row="1" Column="4"/>
<LayoutButtons Face="GrowHugeQueen" Type="AbilCmd" AbilCmd="MorphToHugeSwarmQueen,Execute" Row="2" Column="1"/>
<LayoutButtons Face="AP_BirthMorphling" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train12" Row="2" Column="3"/>
</CardLayouts>
</CUnit>
<CUnit id="Lyote">
Expand Down Expand Up @@ -115,6 +137,7 @@
<LayoutButtons Face="SwarmQueenHydralisk" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train7" Row="1" Column="3"/>
<LayoutButtons Face="AP_Infestor" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train11" Row="1" Column="4"/>
<LayoutButtons Face="GrowLargeQueen" Type="AbilCmd" AbilCmd="MorphToLargeSwarmQueen,Execute" Row="2" Column="1"/>
<LayoutButtons Face="AP_BirthMorphling" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train12" Row="2" Column="3"/>
</CardLayouts>
</CUnit>
<CUnit id="SwarmQueenEgg">
Expand All @@ -131,6 +154,7 @@
<LayoutButtons Face="SwarmQueenHydralisk" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train7" Row="1" Column="3"/>
<LayoutButtons Face="AP_Infestor" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train11" Row="1" Column="4"/>
<LayoutButtons Face="Cancel" Type="CancelSubmenu" Row="2" Column="4"/>
<LayoutButtons Face="AP_BirthMorphling" Type="AbilCmd" AbilCmd="SwarmQueenTrain,Train12" Row="2" Column="3"/>
</CardLayouts>
</CUnit>
<CUnit id="UrsadakFemale">
Expand Down
Binary file not shown.
Binary file not shown.
Loading