Skip to content

Commit

Permalink
Disruptor Changes/Omega to Echidna
Browse files Browse the repository at this point in the history
  • Loading branch information
@SirChuckOfTheChuckles
SirChuckOfTheChuckles committed Nov 18, 2024
1 parent 9ecb9f3 commit 79f5617
Show file tree
Hide file tree
Showing 18 changed files with 310 additions and 189 deletions.
32 changes: 24 additions & 8 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,18 @@
<Effect index="0" value="AP_330mmBarrageCannonsPersistentTargetUnit"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_330mmBarrageCannonsTargetUnit"/>
</CAbilEffectTarget>
<CAbilBuild id="AP_BuildOmegaWorm">
<CAbilBuild id="AP_BuildEchidnaWorm">
<EditorCategories value="Race:Zerg,AbilityorEffectType:MorphsandBurrows"/>
<FlagArray index="Cancelable" value="1"/>
<FlagArray index="PeonMaintained" value="0"/>
<InfoArray index="Build1" Unit="AP_OmegaWorm" Time="20">
<InfoArray index="Build1" Unit="AP_EchidnaWorm" Time="20">
<Cooldown TimeUse="60"/>
<Button DefaultButtonFace="AP_OmegaWorm" State="Restricted" Requirements="AP_HaveNydusNetwork"/>
<Button DefaultButtonFace="AP_EchidnaWorm" State="Restricted" Requirements="AP_HaveNydusNetwork"/>
</InfoArray>
<Range value="500"/>
<EffectArray index="Start" value="NydusAlertDummy"/>
</CAbilBuild>
<CAbilBuild id="AP_OmegaCreepBuild">
<CAbilBuild id="AP_EchidnaCreepBuild">
<TargetMessage value="Abil/TargetMessage/CreepTumorBuild"/>
<SharedFlags index="RegisterChargeEvent" value="1"/>
<SharedFlags index="RegisterCooldownEvent" value="1"/>
Expand All @@ -91,7 +91,7 @@
<FlagArray index="Cancelable" value="0"/>
<FlagArray index="PeonMaintained" value="0"/>
</CAbilBuild>
<CAbilTrain id="AP_OmegaTrain">
<CAbilTrain id="AP_EchidnaTrain">
<EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
<Range value="5"/>
<InfoArray index="Train1" Time="6" Rotation="Source">
Expand Down Expand Up @@ -191,9 +191,9 @@
<UnloadPeriod value="0.5"/>
<LoadValidatorArray value="NotSpawnling"/>
</CAbilTransport>
<CAbilTrain id="AP_OmegaTrainSwarmling">
<CAbilTrain id="AP_EchidnaTrainSwarmling">
<EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
<DataCollection value="AP_OmegaTrain"/>
<DataCollection value="AP_EchidnaTrain"/>
<Range value="5"/>
<InfoArray index="Train1" Time="1" Rotation="Source">
<Resource index="Minerals" value="-30"/>
Expand Down Expand Up @@ -7082,14 +7082,30 @@
<Flags index="RequireTargetVision" value="0"/>
<Cost>
<Charge Link="Abil/PurificationNovaTargetted"/>
<Cooldown Link="Abil/PurificationNovaTargetted" TimeUse="30"/>
<Cooldown Link="Abil/PurificationNovaTargetted" TimeUse="25"/>
</Cost>
<Range value="500"/>
<Arc value="360"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_PurificationNovaTargeted">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectTarget>
<CAbilEffectInstant id="AP_PurificationNovaEarly">
<EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
<SharedFlags index="RegisterChargeEvent" value="1"/>
<SharedFlags index="RegisterCooldownEvent" value="1"/>
<Effect index="0" value="Kill"/>
<Flags index="Transient" value="1"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_PurificationNovaEarly"/>
</CAbilEffectInstant>
<CAbilEffectInstant id="AP_PurificationNovaCaster">
<EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
<SharedFlags index="RegisterChargeEvent" value="1"/>
<SharedFlags index="RegisterCooldownEvent" value="1"/>
<Effect index="0" value="AP_PurificationNovaRemoveCasterSet"/>
<Flags index="Transient" value="1"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_PurificationNovaEarly" Requirements="AP_HaveDisruptorPurificationNova"/>
</CAbilEffectInstant>
<CAbilEffectTarget id="AP_ChargedBlastTargeted">
<Alignment value="Negative"/>
<EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
Expand Down
67 changes: 34 additions & 33 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1547,36 +1547,36 @@
<CActorSound id="AP_NydusWormTransportUnloadSound" parent="SoundOneShot">
<On Terms="AbilTransport.AP_NydusWormTransport.TransportLoad" Send="Create"/>
<On Terms="AbilTransport.AP_NydusWormTransport.TransportUnload" Send="Create"/>
<On Terms="AbilTrain.AP_OmegaTrain.Finish" Send="Create"/>
<On Terms="AbilTrain.AP_OmegaTrainSwarmling.Finish" Send="Create"/>
<On Terms="AbilTrain.AP_EchidnaTrain.Finish" Send="Create"/>
<On Terms="AbilTrain.AP_EchidnaTrainSwarmling.Finish" Send="Create"/>
<Host Subject="_Selectable"/>
<HostSiteOps Ops="SOpAttachOriginStationary"/>
<Sound value="NydusWorm_Unload"/>
</CActorSound>
<CActorUnit id="AP_OmegaWorm" parent="GenericUnitMorph" unitName="AP_OmegaWorm">
<CActorUnit id="AP_EchidnaWorm" parent="GenericUnitMorph" unitName="AP_EchidnaWorm">
<Aliases value="_UnitHuge"/>
<Macros value="BuildingFlattenTerrainMacro"/>
<On Terms="Abil.AP_OmegaTrain.Start" Send="AnimClear Birth"/>
<On Terms="Abil.AP_OmegaTrain.Start" Send="AnimBracketStart Train Work,Start Work Work,End"/>
<On Terms="Abil.AP_OmegaTrain.Stop" Send="AnimBracketStop Train"/>
<On Terms="AbilTrain.AP_OmegaTrain.Finish" Send="$Spell"/>
<On Terms="Abil.AP_EchidnaTrain.Start" Send="AnimClear Birth"/>
<On Terms="Abil.AP_EchidnaTrain.Start" Send="AnimBracketStart Train Work,Start Work Work,End"/>
<On Terms="Abil.AP_EchidnaTrain.Stop" Send="AnimBracketStop Train"/>
<On Terms="AbilTrain.AP_EchidnaTrain.Finish" Send="$Spell"/>
<On Terms="Behavior.NydusWormInvuln.On" Send="SetScale 0.300000"/>
<On Terms="Behavior.NydusWormInvuln.On" Send="SetScale 1.000000 20.000000"/>
<On Terms="UnitDeathCustomize; ValidateUnit AP_HasZergGenericDeath" Send="DeathCustomize Detached"/>
<On Terms="Behavior.AP_SalvageNydus.On" Send="AnimPlay Unburrow Unburrow"/>
<On Terms="Behavior.AP_SalvageNydus.Off" Send="Destroy"/>
<On Terms="AbilMorph.AP_OmegaCreepBuild.Start" Send="$Spell"/>
<On Terms="AbilTrain.AP_OmegaTrainSwarmling.Finish" Send="$Spell"/>
<On Terms="AbilMorph.AP_EchidnaCreepBuild.Start" Send="$Spell"/>
<On Terms="AbilTrain.AP_EchidnaTrainSwarmling.Finish" Send="$Spell"/>
<ModelFlags index="OutlineOccluder" value="1"/>
<BuildModel value="NydusRumble"/>
<DeathArray index="Normal" ModelLink="AP_OmegaWormDeath" SoundLink=""/>
<DeathArray index="Disintegrate" ModelLink="AP_OmegaWormDeathAcid" SoundLink="Uni_DeathFXAcid"/>
<DeathArray index="Fire" ModelLink="AP_OmegaWormDeathFire" SoundLink="Uni_DeathFXFireLarge"/>
<DeathArray index="Normal" ModelLink="AP_EchidnaWormDeath" SoundLink=""/>
<DeathArray index="Disintegrate" ModelLink="AP_EchidnaWormDeathAcid" SoundLink="Uni_DeathFXAcid"/>
<DeathArray index="Fire" ModelLink="AP_EchidnaWormDeathFire" SoundLink="Uni_DeathFXFireLarge"/>
<DeathArray index="UnderConstruction" ModelLink="ZergBuildingDeath" SoundLink="Zerg_ExplosionLarge"/>
<PlacementModel value="AP_OmegaWormPlacement"/>
<PlacementModel value="AP_EchidnaWormPlacement"/>
<PlacementSound value="Zerg_BuildingPlacement"/>
<PlaceholderActorModel value="PlacementModel"/>
<PortraitModel value="AP_OmegaWormPortrait"/>
<PortraitModel value="AP_EchidnaWormPortrait"/>
<BarOffset value="190"/>
<BarWidth value="260"/>
<GroupIcon>
Expand All @@ -1597,13 +1597,13 @@
<Image value="Assets\Textures\wireframe-zerg-nydusdragon.dds"/>
</Wireframe>
</CActorUnit>
<CActorModel id="AP_OmegaRumble" parent="ModelAddition">
<CActorModel id="AP_EchidnaRumble" parent="ModelAddition">
<On Terms="ActorOrphan" Send="Destroy"/>
<On Terms="UnitConstruction.AP_OmegaWorm.Start" Send="Create"/>
<On Terms="UnitConstruction.AP_OmegaWorm.Finish" Send="Destroy"/>
<On Terms="UnitConstruction.AP_OmegaWorm.Cancel" Send="Destroy"/>
<On Terms="AbilMorph.AP_SalvageOmegaWormBase.Start" Send="Create"/>
<On Terms="AbilMorph.AP_SalvageOmegaWormBase.Finish" Send="Destroy"/>
<On Terms="UnitConstruction.AP_EchidnaWorm.Start" Send="Create"/>
<On Terms="UnitConstruction.AP_EchidnaWorm.Finish" Send="Destroy"/>
<On Terms="UnitConstruction.AP_EchidnaWorm.Cancel" Send="Destroy"/>
<On Terms="AbilMorph.AP_SalvageEchidnaWormBase.Start" Send="Create"/>
<On Terms="AbilMorph.AP_SalvageEchidnaWormBase.Finish" Send="Destroy"/>
<Model value="NydusRumble"/>
<Scale value="1.800000"/>
</CActorModel>
Expand Down Expand Up @@ -1685,7 +1685,7 @@
<CActorSimple id="AP_NydusWormBuild">
<On Terms="ActorCreation" Send="Destroy"/>
</CActorSimple>
<CActorSimple id="AP_OmegaWormBuild">
<CActorSimple id="AP_EchidnaWormBuild">
<On Terms="ActorCreation" Send="Destroy"/>
</CActorSimple>
<CActorModel id="AP_NydusRumble" parent="ModelAddition">
Expand All @@ -1697,29 +1697,29 @@
</CActorModel>
<CActorSound id="AP_NydusWorm_Birth">
<On Terms="UnitBirth.AP_NydusWorm.Normal" Send="Create"/>
<On Terms="UnitBirth.AP_OmegaWorm.Normal" Send="Create"/>
<On Terms="UnitBirth.AP_EchidnaWorm.Normal" Send="Create"/>
<Sound value="NydusWorm_Birth"/>
</CActorSound>
<CActorSound id="AP_NydusWorm_DeathCry">
<On Terms="UnitDeathCustomize.AP_NydusWorm; PassChance 100.000000" Send="Create"/>
<On Terms="UnitDeathCustomize.AP_OmegaWorm; PassChance 100.000000" Send="Create"/>
<On Terms="UnitDeathCustomize.AP_OmegaWorm; Death Salvage" Send="Destroy"/>
<On Terms="UnitDeathCustomize.AP_EchidnaWorm; PassChance 100.000000" Send="Create"/>
<On Terms="UnitDeathCustomize.AP_EchidnaWorm; Death Salvage" Send="Destroy"/>
<On Terms="UnitDeathCustomize.AP_NydusWorm; Death Salvage" Send="Destroy"/>
<Sound value="NydusWorm_DeathCry"/>
</CActorSound>
<CActorSound id="AP_Nydus_ConstructionFinish">
<On Terms="UnitConstruction.AP_NydusWorm.Finish" Send="Create"/>
<On Terms="UnitConstruction.AP_OmegaWorm.Finish" Send="Create"/>
<On Terms="UnitConstruction.AP_EchidnaWorm.Finish" Send="Create"/>
<Sound value="Nydus_ConstructionFinish"/>
</CActorSound>
<CActorSound id="AP_Nydus_ConstructionStart">
<On Terms="UnitConstruction.AP_NydusWorm.Start" Send="Create"/>
<On Terms="UnitConstruction.AP_OmegaWorm.Start" Send="Create"/>
<On Terms="UnitConstruction.AP_EchidnaWorm.Start" Send="Create"/>
<Sound value="Nydus_ConstructionStart"/>
</CActorSound>
<CActorSound id="AP_Nydus_Unburrow">
<On Terms="UnitBirth.AP_NydusWorm.Normal" Send="Create"/>
<On Terms="UnitBirth.AP_OmegaWorm.Normal" Send="Create"/>
<On Terms="UnitBirth.AP_EchidnaWorm.Normal" Send="Create"/>
<On Terms="Behavior.AP_SalvageNydus.On" Send="Create"/>
<On Terms="Behavior.AP_SalvageNydus.Off" Send="Destroy"/>
<Sound value="Nydus_Unburrow"/>
Expand Down Expand Up @@ -17102,10 +17102,10 @@
<CActorRange id="AP_CreepTumorBuildRange" parent="RangeAbil" abil="AP_CreepTumorBuild">
<Icon value="Assets\Textures\RadarIcon2.dds"/>
<IconArcLength value="3.250000"/>
<On Terms="Abil.AP_OmegaCreepBuild.TargetOn" Send="Create"/>
<On Terms="Abil.AP_OmegaCreepBuild.TargetOff" Send="Destroy"/>
<On Terms="Abil.AP_OmegaCreepBuild.ButtonHoverOn" Send="Create"/>
<On Terms="Abil.AP_OmegaCreepBuild.ButtonHoverOff" Send="Destroy"/>
<On Terms="Abil.AP_EchidnaCreepBuild.TargetOn" Send="Create"/>
<On Terms="Abil.AP_EchidnaCreepBuild.TargetOff" Send="Destroy"/>
<On Terms="Abil.AP_EchidnaCreepBuild.ButtonHoverOn" Send="Create"/>
<On Terms="Abil.AP_EchidnaCreepBuild.ButtonHoverOff" Send="Destroy"/>
</CActorRange>
<CActorAction id="AP_DarkArchonAttack" parent="GenericAttack" effectAttack="AP_DarkArchonWeaponDamage">
<LaunchAssets Sound="Archon_AttackLaunch"/>
Expand Down Expand Up @@ -23803,6 +23803,7 @@
<On Terms="Behavior.AP_PurificationNova.Off" Send="Destroy"/>
<On Terms="Behavior.AP_PurificationNovaTargettedTarget.On" Send="Create"/>
<On Terms="Behavior.AP_PurificationNovaTargettedTarget.Off" Send="Destroy"/>
<On Terms="Behavior.AP_PurificationNovaTargettedTarget.On" Send="SetScale 1.166667"/>\
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachOrigin"/>
<Model value="PurificationNovaRangeIndicator"/>
Expand Down Expand Up @@ -32420,7 +32421,7 @@
<On Terms="UnitCreation.AP_Lair" Send="Create"/>
<On Terms="UnitCreation.AP_Hive" Send="Create"/>
<On Terms="UnitCreation.AP_NydusNetwork" Send="Create"/>
<On Terms="UnitCreation.AP_OmegaWorm" Send="Create"/>
<On Terms="UnitCreation.AP_EchidnaWorm" Send="Create"/>
</CActorStateMonitor>
<CActorStateMonitor id="ZergBloodMediumBuilding">
<!-- Override -->
Expand Down Expand Up @@ -32476,7 +32477,7 @@
<On Terms="UnitCreation.AP_Lair" Send="Create"/>
<On Terms="UnitCreation.AP_Hive" Send="Create"/>
<On Terms="UnitCreation.AP_NydusNetwork" Send="Create"/>
<On Terms="UnitCreation.AP_OmegaWorm" Send="Create"/>
<On Terms="UnitCreation.AP_EchidnaWorm" Send="Create"/>
</CActorStateMonitor>
<CActorMissile id="AP_GhostSCBWLockdown@Missile" parent="GenericAttackMissile" unitName="AP_GhostSCBWLockdown@Missile"/>
<CActorRange id="AP_GhostSCBWLockdown@Range" parent="RangeAbil" abil="AP_GhostSCBWLockdown"/>
Expand Down
7 changes: 4 additions & 3 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4140,8 +4140,9 @@
<InfoIcon value="Assets\Textures\btn-ability-protoss-arcshield.dds"/>
<EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
<Duration value="3"/>
<Modification MoveSpeedBonus="-2.2382"/>
<Modification MoveSpeedBonus="-10"/>
<DisableValidatorArray value="AP_NoRestructedThrusters"/>
<DisableValidatorArray value="AP_CasterHasPurificationNovaNoThrust"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_PurificationNovaTargettedCasterUseThrust">
<Alignment value="Positive"/>
Expand All @@ -4162,11 +4163,11 @@
<DisplayDuration index="Enemy" value="1"/>
<RemoveValidatorArray value="CasterNotDead"/>
<RemoveValidatorArray value="CasterIsNotHidden"/>
<RemoveValidatorArray value="AP_CasterHasPurificationNovaCombined"/>
<Duration value="3"/>
<Period value="0.125"/>
<PeriodicEffect value="AP_PurificationNovaNotificationSearch"/>
<FinalEffect value="Suicide"/>
<ExpireEffect value="AP_PurificationNovaTargettedSearchSet"/>
<FinalEffect value="AP_PurificationNovaTargettedSearchSet"/>
<Modification>
<StateFlags index="Invulnerable" value="1"/>
<StateFlags index="Benign" value="1"/>
Expand Down
11 changes: 8 additions & 3 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
<AlertIcon value="Assets\Textures\btn-upgrade-protoss-alarak-stalkerphasingarmor.dds"/>
<EditorCategories value="Race:Protoss"/>
</CButton>
<CButton id="AP_PurificationNovaEarly">
<Icon value="Assets\Textures\btn-upgrade-protoss-fenix-purificationblast.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-protoss-fenix-purificationblast.dds"/>
<EditorCategories value="Race:Protoss"/>
</CButton>
<CButton id="AP_DisruptorBlink">
<Icon value="Assets\Textures\BTN-Ability-Protoss-BlinkCharges.dds"/>
<AlertIcon value="Assets\Textures\BTN-Ability-Protoss-BlinkCharges.dds"/>
Expand Down Expand Up @@ -4043,12 +4048,12 @@
<AlertIcon value="Assets\Textures\btn-upgrade-zerg-enduringcorruption.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_OmegaWormOuroborosStrain">
<CButton id="AP_EchidnaWormOuroborosStrain">
<Icon value="Assets\Textures\talent-zagara-level12-unlockswarmling.dds"/>
<AlertIcon value="Assets\Textures\talent-zagara-level12-unlockswarmling.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_OmegaWorm">
<CButton id="AP_EchidnaWorm">
<Icon value="Assets\Textures\btn-unit-zerg-nydusdragon.dds"/>
<AlertIcon value="Assets\Textures\btn-unit-zerg-nydusdragon.dds"/>
<EditorCategories value="Race:Zerg"/>
Expand All @@ -4058,7 +4063,7 @@
<AlertIcon value="Assets\Textures\btn-unit-zerg-roach.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_SummonOmegaWorm">
<CButton id="AP_SummonEchidnaWorm">
<Icon value="Assets\Textures\btn-unit-zerg-nydusdragon.dds"/>
<AlertIcon value="Assets\Textures\btn-unit-zerg-nydusdragon.dds"/>
<EditorCategories value="Race:Zerg"/>
Expand Down
Loading

0 comments on commit 79f5617

Please sign in to comment.