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.

Sign up for GitHub

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

sc2: Adding Mothership WC and Supplicant Zenith Pitch upgrade #339

Merged
merged 7 commits into from
Dec 15, 2024
Merged

sc2: Adding Mothership WC and Supplicant Zenith Pitch upgrade #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f54ac48
sc2: Adding Supplicant Zenith Pitch upgrade
MatthewMarinets Dec 14, 2024
7169dd8
sc2: Added mothership war council upgrade -- integrated power
MatthewMarinets Dec 14, 2024
a4d7224
sc2: Added unlock triggers for zenith pitch and mothership integrated…
MatthewMarinets Dec 14, 2024
419e71d
sc2: Removing the negative flag from mothership pylon nerf
MatthewMarinets Dec 14, 2024
03e79cb
sc2: Got mothership Pylon field visualization to go away when getting…
MatthewMarinets Dec 15, 2024
ae4bb5e
sc2: Fixing only 1 mothership requirement to build mothership
MatthewMarinets Dec 15, 2024
a36e7ff
sc2: Adding alt tal'darim mothership to upgrades
MatthewMarinets Dec 15, 2024
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
11 changes: 11 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7189,6 +7189,17 @@
<Arc value="360"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_SOAMothershipLineAttack"/>
</CAbilEffectTarget>
<CAbilMorph id="AP_AutoMorphToMothershipTaldarim">
<EditorCategories value="Race:Zerg,AbilityorEffectType:Structures"/>
<CmdButtonArray index="Execute" DefaultButtonFace="Raise" Requirements="AP_HaveMothershipTaldarimIntegratedPower"/>
<CmdButtonArray index="Cancel" DefaultButtonFace="Cancel"/>
<Flags index="Automatic" value="1"/>
<Flags index="IgnorePlacement" value="1"/>
<Flags index="IgnoreFacing" value="1"/>
<Flags index="IgnoreUnitCost" value="1"/>
<Flags index="IgnoreFood" value="1"/>
<InfoArray Unit="AP_MothershipTaldarim" CollideRange="0"/>
</CAbilMorph>
<CAbilEffectTarget id="AP_InduceScopophobia">
<EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
<Effect index="0" value="AP_ScopophobiaTargetAB"/>
Expand Down
1 change: 1 addition & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23611,6 +23611,7 @@
<Macros value="TerrainSquibAnimations"/>
<Macros value="PhysicsDeathsSwarmAir"/>
<Macros value="PhysicsDeathsVoidAir"/>
<On Terms="UnitBirth.AP_MothershipTaldarim" Send="Create"/>
<!-- <On Terms="Abil.Vortex.SourceCastStart" Send="$Spell"/>-->
<On Terms="Effect.AP_SOAMothershipBlinkCP.Start" Send="SetOpacity 0.050000 0.375000"/>
<On Terms="Effect.AP_SOAMothershipBlinkTeleport.Stop" Send="SetOpacity 1.000000 0.625000"/>
Expand Down
16 changes: 16 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4688,6 +4688,22 @@
<Chance value="1"/>
</DamageResponse>-->
</CBehaviorBuff>
<CBehaviorBuff id="AP_MothershipTaldarimMovementNerfOutsidePower">
<BehaviorFlags index="Permanent" value="1"/>
<InfoIcon value="Assets\Textures\btn-ability-stetmann-stetzonegenerator-energy.dds"/>
<EditorCategories value="AbilityorEffectType:Units"/>
<DisableValidatorArray value="AP_NotHaveMothershipTaldarimIntegratedPower"/>
<DisableValidatorArray value="AP_CasterLocationNotHasPower"/>
<Modification MoveSpeedMultiplier="0.2"/>
</CBehaviorBuff>
<CBehaviorPowerUser id="AP_DisplayPowerFieldMothership">
<InfoFlags index="Hidden" value="1"/>
<InfoIcon value="Assets\Textures\btn-building-protoss-pylon.dds"/>
<EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
<PowerLink value="PowerSource"/>
<Flags index="DisplayPower" value="1"/>
<Flags index="HideUnpoweredText" value="1"/>
</CBehaviorPowerUser>
<CBehaviorBuff id="AP_SOAHeroicShieldWeakness">
<Alignment value="Negative"/>
<BehaviorFlags index="Permanent" value="1"/>
Expand Down
10 changes: 10 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5361,6 +5361,16 @@
<AlertIcon value="assets\textures\btn-ability-protoss-voidarmor.dds"/>
<EditorCategories value="Race:Protoss"/>
</CButton>
<CButton id="AP_SupplicantZenithPitch">
<Icon value="assets\textures\btn-upgrade-protoss-alarak-rangeweapon.dds"/>
<AlertIcon value="assets\textures\btn-upgrade-protoss-alarak-rangeweapon.dds"/>
<EditorCategories value="Race:Protoss"/>
</CButton>
<CButton id="AP_MothershipTaldarimIntegratedPower">
<Icon value="assets\textures\btn-ability-stetmann-garypersonalstetzone-energy.dds"/>
<AlertIcon value="assets\textures\btn-ability-stetmann-garypersonalstetzone-energy.dds"/>
<EditorCategories value="Race:Protoss"/>
</CButton>
<CButton id="AP_KaraxTurretRange">
<Icon value="Assets\Textures\btn-upgrade-karax-turretrange.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-karax-turretrange.dds"/>
Expand Down
12 changes: 12 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3264,6 +3264,18 @@
<EditorCategories value="Race:Protoss,TechType:Ability"/>
<NodeArray index="Show" Link="AP_CountUpgradeAlarakSupplicantShieldRegenCompleteOnly"/>
</CRequirement>
<CRequirement id="AP_HaveSupplicantZenithPitch">
<EditorCategories value="Race:Protoss,TechType:Ability"/>
<NodeArray index="Show" Link="AP_CountUpgradeSupplicantZenithPitchCompleteOnly"/>
</CRequirement>
<CRequirement id="AP_HaveMothershipTaldarimIntegratedPower">
<EditorCategories value="Race:Protoss,TechType:Ability"/>
<NodeArray index="Use" Link="AP_CountUpgradeMothershipTaldarimIntegratedPowerCompleteOnly"/>
</CRequirement>
<CRequirement id="AP_NotHaveMothershipTaldarimIntegratedPower">
<EditorCategories value="Race:Protoss,TechType:Ability"/>
<NodeArray index="Show" Link="AP_NotCountUpgradeMothershipTaldarimIntegratedPowerCompleteOnly"/>
</CRequirement>
<CRequirement id="AP_HaveKaraxTurretRange">
<EditorCategories value="Race:Protoss,TechType:Ability"/>
<NodeArray index="Show" Link="AP_CountUpgradeKaraxTurretRangeCompleteOnly"/>
Expand Down
22 changes: 21 additions & 1 deletion Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4694,14 +4694,23 @@
<OperandArray value="AP_EqCountUnitSOAMothershipv4QueuedOrBetter0"/>
</CRequirementAnd>
<CRequirementEq id="AP_EqCountUnitSOAMothershipv4QueuedOrBetter0">
<OperandArray index="0" value="AP_CountUnitSOAMothershipv4QueuedOrBetter"/>
<OperandArray index="0" value="AP_SumCountTaldarimMothershipTypesQueuedOrBetter"/>
<OperandArray index="1" value="0"/>
</CRequirementEq>
<CRequirementSum id="AP_SumCountTaldarimMothershipTypesQueuedOrBetter">
<OperandArray value="AP_CountUnitSOAMothershipv4QueuedOrBetter"/>
<OperandArray value="AP_CountUnitMothershipTaldarimQueuedOrBetter"/>
</CRequirementSum>
<CRequirementCountUnit id="AP_CountUnitSOAMothershipv4QueuedOrBetter">
<Flags index="TechTreeCheat" value="0"/>
<Tooltip value=""/>
<Count Link="AP_SOAMothershipv4" State="QueuedOrBetter"/>
</CRequirementCountUnit>
<CRequirementCountUnit id="AP_CountUnitMothershipTaldarimQueuedOrBetter">
<Flags index="TechTreeCheat" value="0"/>
<Tooltip value=""/>
<Count Link="AP_MothershipTaldarim" State="QueuedOrBetter"/>
</CRequirementCountUnit>
<CRequirementCountUpgrade id="AP_CountUpgradeSOADragoonReviveCompleteOnly">
<Count Link="AP_SOADragoonRevive" State="CompleteOnly"/>
<Flags index="TechTreeCheat" value="0"/>
Expand Down Expand Up @@ -5642,6 +5651,17 @@
<Count Link="AP_AlarakSupplicantShieldRegen" State="CompleteOnly"/>
<Flags index="TechTreeCheat" value="0"/>
</CRequirementCountUpgrade>
<CRequirementCountUpgrade id="AP_CountUpgradeSupplicantZenithPitchCompleteOnly">
<Count Link="AP_SupplicantZenithPitch" State="CompleteOnly"/>
<Flags index="TechTreeCheat" value="0"/>
</CRequirementCountUpgrade>
<CRequirementCountUpgrade id="AP_CountUpgradeMothershipTaldarimIntegratedPowerCompleteOnly">
<Count Link="AP_MothershipTaldarimIntegratedPower" State="CompleteOnly"/>
<Flags index="TechTreeCheat" value="0"/>
</CRequirementCountUpgrade>
<CRequirementNot id="AP_NotCountUpgradeMothershipTaldarimIntegratedPowerCompleteOnly">
<OperandArray index="0" value="AP_CountUpgradeMothershipTaldarimIntegratedPowerCompleteOnly"/>
</CRequirementNot>
<CRequirementCountUpgrade id="AP_CountUpgradeKaraxTurretRangeCompleteOnly">
<Count Link="AP_KaraxTurretRange" State="CompleteOnly"/>
<Flags index="TechTreeCheat" value="0"/>
Expand Down
15 changes: 11 additions & 4 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21341,8 +21341,11 @@
<AbilArray Link="AP_SOAMothershipBlink"/>
<AbilArray Link="Warpable"/>
<AbilArray Link="ProgressRally"/>
<AbilArray Link="AP_AutoMorphToMothershipTaldarim"/>
<BehaviorArray Link="AP_DisplayPowerFieldMothership"/>
<BehaviorArray Link="AP_MothershipTaldarimTurretDisabler"/>
<BehaviorArray Link="AP_SOAHeroicShieldProcBuff"/>
<BehaviorArray Link="AP_MothershipTaldarimMovementNerfOutsidePower"/>
<WeaponArray Link="AP_SOAMothershipv4Weapon" Turret="FreeRotate"/>
<WeaponArray Turret="AP_MothershipRotate"/>
<CardLayouts>
Expand All @@ -21351,6 +21354,7 @@
<LayoutButtons Face="MoveHoldPosition" Type="AbilCmd" AbilCmd="move,HoldPos" Row="0" Column="2"/>
<LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
<LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
<LayoutButtons Face="AP_MothershipTaldarimIntegratedPower" Type="Passive" Requirements="AP_HaveMothershipTaldarimIntegratedPower" Row="1" Column="0"/>
<LayoutButtons Face="AP_VoidSentryBlackHole" Type="AbilCmd" AbilCmd="AP_VoidSentryBlackHole,0" Row="2" Column="0"/>
<LayoutButtons Face="AP_SOAMothershipLineAttack" Type="AbilCmd" AbilCmd="AP_SOAMothershipLineAttack,0" Row="2" Column="1"/>
<LayoutButtons Face="AP_SOAMothershipBlink" Type="AbilCmd" AbilCmd="AP_SOAMothershipBlink,0" Row="2" Column="2"/>
Expand All @@ -21373,6 +21377,10 @@
<GlossaryWeakArray value="VoidRay"/>
<HotkeyCategory value="Unit/Category/AP_ProtossUnitsAir"/>
</CUnit>
<CUnit id="AP_MothershipTaldarim" parent="AP_SOAMothershipv4">
<AbilArray index="8" Link=""/>
<BehaviorArray index="0" Link=""/>
</CUnit>
<CUnit id="AP_Reaver">
<DeathRevealRadius value="3"/>
<Race value="Prot"/>
Expand Down Expand Up @@ -21557,12 +21565,11 @@
<LayoutButtons Face="MoveHoldPosition" Type="AbilCmd" AbilCmd="move,HoldPos" Row="0" Column="2"/>
<LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
<LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
<LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
<!-- <LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_AdeptPhaseShiftCancel,Execute" Row="2" Column="4"/>-->
<!-- <LayoutButtons Face="AP_AlarakACMyLifefortheHighlord" Type="Passive" Row="2" Column="0"/>-->
<LayoutButtons Face="AP_AlarakSupplicantMaxShields" Type="Passive" Requirements="AP_HaveAlarakSupplicantMaxShields" Row="1" Column="1"/>
<LayoutButtons Face="AP_PHSupplicantShieldArmor" Type="Passive" Requirements="AP_HaveSupplicantShieldArmor" Row="1" Column="0"/>
<LayoutButtons Face="AP_AlarakSupplicantMaxShields" Type="Passive" Requirements="AP_HaveAlarakSupplicantMaxShields" Row="1" Column="1"/>
<LayoutButtons Face="AP_SupplicantShieldRegeneration" Type="Passive" Requirements="AP_HaveAlarakSupplicantShieldRegen" Row="1" Column="2"/>
<LayoutButtons Face="AP_SupplicantZenithPitch" Type="Passive" Requirements="AP_HaveSupplicantZenithPitch" Row="1" Column="3"/>
<LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
</CardLayouts>
<!-- <LayoutButtons Face="AP_AlarakSupplicantSacrificeCDR" Type="Passive" Requirements="AP_HaveAlarakSupplicantSacrificeCDR" Row="2" Column="3"/>-->
<!-- <LayoutButtons Face="AP_SupplicantSacrificeCDRLocked" Type="Passive" Requirements="AlarakLevel15" Row="2" Column="3"/>-->
Expand Down
15 changes: 15 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1615,6 +1615,8 @@
<!-- <EffectArray Reference="Unit,Mothership,LifeArmor" Value="1.000000"/>-->
<EffectArray Reference="Unit,AP_SOAMothershipv4,LifeArmorLevel" Value="1"/>
<EffectArray Reference="Unit,AP_SOAMothershipv4,LifeArmor" Value="1"/>
<EffectArray Reference="Unit,AP_MothershipTaldarim,LifeArmorLevel" Value="1"/>
<EffectArray Reference="Unit,AP_MothershipTaldarim,LifeArmor" Value="1"/>
<!-- Oracle -->
<EffectArray Reference="Unit,AP_Oracle,LifeArmor" Value="1"/>
<EffectArray Reference="Unit,AP_Oracle,LifeArmorLevel" Value="1"/>
Expand Down Expand Up @@ -1786,6 +1788,8 @@
<!-- <EffectArray Reference="Unit,Mothership,ShieldArmorLevel" Value="1"/>-->
<EffectArray Reference="Unit,AP_SOAMothershipv4,ShieldArmorLevel" Value="1"/>
<EffectArray Reference="Unit,AP_SOAMothershipv4,ShieldArmor" Value="1"/>
<EffectArray Reference="Unit,AP_MothershipTaldarim,ShieldArmorLevel" Value="1"/>
<EffectArray Reference="Unit,AP_MothershipTaldarim,ShieldArmor" Value="1"/>
<!-- Oracle -->
<EffectArray Reference="Unit,AP_Oracle,ShieldArmor" Value="1"/>
<EffectArray Reference="Unit,AP_Oracle,ShieldArmorLevel" Value="1"/>
Expand Down Expand Up @@ -9518,6 +9522,15 @@
<EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
<AffectedUnitArray value="AP_Supplicant"/>
</CUpgrade>
<CUpgrade id="AP_SupplicantZenithPitch">
<Race value="Prot"/>
<EffectArray Operation="Set" Reference="Weapon,AP_SupplicantWeapon,TargetFilters" Value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
<EffectArray Operation="Set" Reference="Unit,AP_Supplicant,Description" Value="Button/Tooltip/AP_WarpInSupplicantAA"/>
<EffectArray Operation="Set" Reference="Button,AP_WarpInSupplicant,Tooltip" Value="Button/Tooltip/AP_WarpInSupplicantAA"/>
<EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
<AffectedUnitArray value="AP_Supplicant"/>
</CUpgrade>
<CUpgrade id="AP_MothershipTaldarimIntegratedPower"/>
<CUpgrade id="AP_HotSHaveInfestor">
<EditorCategories value="Race:Zerg,UpgradeType:Talents"/>
<!-- <EffectArray Operation="Set" Reference="Unit,InfestationPit,TechTreeUnlockedUnitArray[1]" Value="Infestor"/>-->
Expand Down Expand Up @@ -17053,6 +17066,7 @@
<EffectArray Reference="Unit,AP_CarrierPurifierBomber,ShieldRegenRate" Value="0.05"/>
<!-- Mothership -->
<EffectArray Reference="Unit,AP_SOAMothershipv4,ShieldRegenRate" Value="0.05"/>
<EffectArray Reference="Unit,AP_MothershipTaldarim,ShieldRegenRate" Value="0.05"/>
<!-- Oracle -->
<EffectArray Reference="Unit,AP_Oracle,ShieldRegenRate" Value="0.05"/>
<EffectArray Reference="Unit,AP_OracleStasisTrap,ShieldRegenRate" Value="0.05"/>
Expand Down Expand Up @@ -17183,6 +17197,7 @@
<EffectArray Reference="Unit,AP_CarrierPurifierBomber,ShieldRegenRate" Value="5"/>
<!-- Mothership -->
<EffectArray Reference="Unit,AP_SOAMothershipv4,ShieldRegenRate" Value="5"/>
<EffectArray Reference="Unit,AP_MothershipTaldarim,ShieldRegenRate" Value="5"/>
<!-- Oracle -->
<EffectArray Reference="Unit,AP_Oracle,ShieldRegenRate" Value="5"/>
<EffectArray Reference="Unit,AP_OracleStasisTrap,ShieldRegenRate" Value="5"/>
Expand Down
7 changes: 7 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4702,6 +4702,10 @@
<PowerLink value="PowerSource"/>
<Compare value="GT"/>
</CValidatorLocationComparePower>
<CValidatorLocationComparePower id="AP_CasterLocationNotHasPower">
<WhichLocation Value="CasterPoint"/>
<PowerLink value="PowerSource"/>
</CValidatorLocationComparePower>
<CValidatorUnitComparePowerUserLevel id="AP_TargetHasPower">
<Compare value="GE"/>
<Value value="1"/>
Expand Down Expand Up @@ -5600,6 +5604,9 @@
<Find value="1"/>
<Value value="AP_NotHaveHavocEnduringSight"/>
</CValidatorPlayerRequirement>
<CValidatorPlayerRequirement id="AP_NotHaveMothershipTaldarimIntegratedPower">
<Value value="AP_HaveMothershipTaldarimIntegratedPower"/>
</CValidatorPlayerRequirement>
<CValidatorUnitCompareBehaviorCount id="AP_NotHaveCreepFrenzy13Crawler">
<Behavior value="AP_CreepFrenzy13Crawler"/>
</CValidatorUnitCompareBehaviorCount>
Expand Down
Loading
Loading