Skip to content

Commit

Permalink
Final Disruptor Changes (for now)
Browse files Browse the repository at this point in the history
  • Loading branch information
SirChuckOfTheChuckles committed Aug 9, 2024
1 parent fb7b69d commit cab5453
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7888,7 +7888,6 @@
<Inherits index="BaseModelScale" value="1"/>
<Inherits index="Scale" value="1"/>
<On Terms="Effect.AP_VoidStalkerBlinkMultiple.Start; At Source" Send="Create"/>
<On Terms="Effect.AP_DisruptorBlink.Stop; At Source" Send="Create"/>
<Host Subject="_Selectable"/>
<HostSiteOps Ops="SOpAttachOriginStationary"/>
</CActorModel>
Expand All @@ -7897,6 +7896,7 @@
<Inherits index="BaseModelScale" value="1"/>
<Inherits index="Scale" value="1"/>
<On Terms="Effect.AP_VoidStalkerBlinkMultiple.Stop; At Source" Send="Create"/>
<On Terms="Effect.AP_DisruptorBlink.Stop; At Source" Send="Create"/>
<Host Subject="_Selectable"/>
<HostSiteOps Ops="SOpAttachOrigin"/>
</CActorModel>
Expand Down Expand Up @@ -16706,7 +16706,6 @@
<BuildModel value="ProtossUnitBirth"/>
<DeathArray index="Normal" ModelLink="Disruptor_Purifier_Collection_Death" SoundLink="AP_Disruptor_Death"/>
<DeathCustoms ModelLink="HallucinationDeath" SoundLink="Sentry_HallucinationDeathSmall" Name="Hallucination"/>
<DeathCustoms index="6" ActorModel="AP_DisruptorDeathRagdoll"/>
<DeathCustoms Name="RagdollSiegeTank" InheritsFrom="RagdollBasic"/>
<DeathCustoms Name="RagdollNuke" InheritsFrom="RagdollBasic">
<BodySquibs Name="Fire"/>
Expand Down Expand Up @@ -16743,7 +16742,7 @@
<BarOffset value="90"/>
<BarWidth value="65"/>
<GroupIcon>
<Image value="Assets\Textures\Wireframe-protoss-disruptor.dds"/>
<Image value="Assets\Textures\wireframe-collection-taldarim-disruptor.dds"/>
</GroupIcon>
<GroupSoundArray index="What" value="Zealot_GroupWhat"/>
<GroupSoundArray index="Yes" value="Zealot_GroupYes"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8998,6 +8998,7 @@
</CUpgrade>
<CUpgrade id="AP_DisruptorRestructuredThrusters">
<Icon value="Assets\Textures\btn-upgrade-protoss-alarak-stalkerphasingarmor.dds"/>
<EffectArray Operation="Set" Reference="Button,AP_PurificationNovaTargeted,Tooltip" Value="Button/Tooltip/AP_PurificationNovaTargetedUpgrade"/>
<EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
<AffectedUnitArray value="AP_Disruptor"/>
</CUpgrade>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2122,7 +2122,7 @@ Button/Tooltip/AP_DisplacementField=A detected Wraith evades 20% of incoming att
Button/Tooltip/AP_Disruptor=Robotic disruption unit. Can use Purification Nova to deal heavy area damage.
Button/Tooltip/AP_Disruptor=Robotic disruption unit. Can use Purification Nova to deal heavy area damage.
Button/Tooltip/AP_DisruptorBlink=Teleports the Disruptor to a nearby target location. This Blink will not teleport alongside other types of Blinks, such as Stalkers and Cloaked Warriors. Ability can only be used once every <d ref="Abil,AP_DisruptorBlink,Cost[0].Cooldown.TimeUse"/> seconds.
Button/Tooltip/AP_RestructuredThrusters=Allows the Disruptor to move while casting Purification Nova. Also allows the Disruptor to Blink on a longer cooldown than normal Blink abilities (15 seconds).
Button/Tooltip/AP_RestructuredThrusters=Allows the Disruptor to move while casting Purification Nova. Also allows the Disruptor to Blink.<n/>This ability does NOT Blink alongside similar casts, such as Stalker or Cloaked Warrior Blinks.
Button/Tooltip/AP_RestrainedDestruction=Purification Nova does 50% reduced damage to friendly units and structures.
Button/Tooltip/AP_PerfectedPower=Allows Purification Nova to hit air units. Purification Nova now always deals 200 damage, regardless of the target has shields or not.
Button/Tooltip/AP_DisruptorDispersion=Immortals, Annihilators, and Stalwarts deal <d ref="Effect,AP_ImmortalSplashDamage,Amount"/> (<d ref="(Effect,AP_ImmortalSplashDamage,Amount + Effect,AP_ImmortalSplashDamage,AttributeBonus[Armored])"/> to armored) splash damage.
Expand Down Expand Up @@ -2613,6 +2613,7 @@ Button/Tooltip/AP_PsiStrike=Kerrigan dashes through enemies, dealing <d ref="Eff
Button/Tooltip/AP_PsionicLift=Enemies in target area are stunned for <d ref="Behavior,AP_PsionicLift,Duration"/> seconds and take <d ref="Behavior,AP_PsionicLift,Duration * Effect,AP_PsionicLiftDamage,Amount"/> damage over time.<n/><n/><c val="ffff8a">Does not stun heroic units.</c>
Button/Tooltip/AP_PurificationNova=Gains <d ref="Behavior,AP_PurificationNovaSpeedBoost,Modification.MoveSpeedBonus/Unit,AP_Disruptor,Speed*100"/>% increased movement speed and then after <d ref="Behavior,AP_PurificationNova,Duration"/> seconds emits a powerful nova dealing <d ref="Effect,AP_PurificationNovaDamage,Amount"/> splash damage to nearby units.<n/><n/><c val="#ColorAttackInfo">Damages ground units and structures only.</c>
Button/Tooltip/AP_PurificationNovaTargeted=Shoots out a ball of energy that lasts <d ref="Behavior,AP_PurificationNovaTargettedTarget,Duration"/> seconds and emits a powerful nova dealing <d ref="Effect,AP_PurificationNovaDamage,Amount"/> splash damage and an additional <d ref="Effect,AP_PurificationNovaDamage,ShieldBonus"/> shield damage to nearby ground units and structures. The Disruptor is immobile while this is active.
Button/Tooltip/AP_PurificationNovaTargetedUpgrade=Shoots out a ball of energy that lasts <d ref="Behavior,AP_PurificationNovaTargettedTarget,Duration"/> seconds and emits a powerful nova dealing <d ref="Effect,AP_PurificationNovaDamage,Amount"/> splash damage and an additional <d ref="Effect,AP_PurificationNovaDamage,ShieldBonus"/> shield damage to nearby ground units and structures.
Button/Tooltip/AP_PurifierFaction=Allows to produce units from Purifier faction
Button/Tooltip/AP_Pylon=Provides supply.<n/>Supply allows you to warp in more units.<n/>Creates power for nearby structures.
Button/Tooltip/AP_Queen=Support unit. Can use Spawn Creep Tumor and Rapid Transfusion.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7634,25 +7634,25 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockSlayerPhaseBlink (int lp_player) {
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_SlayerBlink", 1);
}

void libABFE498B_gf_AP_Triggers_Protoss_unlockSlayerPhaseBlink2 (int lp_player) {
void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPermanentCloak (int lp_player) {
// Automatic Variable Declarations
// Implementation
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DisruptorPermanentCloak", 1);
}

void libABFE498B_gf_AP_Triggers_Protoss_unlockSlayerPhaseBlink3 (int lp_player) {
void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters (int lp_player) {
// Automatic Variable Declarations
// Implementation
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DisruptorRestructuredThrusters", 1);
}

void libABFE498B_gf_AP_Triggers_Protoss_unlockSlayerPhaseBlink4 (int lp_player) {
void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPerfectedPower (int lp_player) {
// Automatic Variable Declarations
// Implementation
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DisruptorPerfectedPower", 1);
}

void libABFE498B_gf_AP_Triggers_Protoss_unlockSlayerPhaseBlink5 (int lp_player) {
void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestrainedDestruction (int lp_player) {
// Automatic Variable Declarations
// Implementation
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DisruptorRestrainedDestruction", 1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -753,10 +753,6 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockVanguardFusionMortars (int lp_play
void libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalFamilySingularityCharge (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalFamilyAdvancedTargetingMechanics (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalFamilyDisruptorDispersion (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPermanentCloak (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPerfectedPower (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestrainedDestruction (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockImmortalImprovedBarrier (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockAnnihilatorAerialTracking (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockStalwartDualityCharge (int lp_player);
Expand Down Expand Up @@ -803,10 +799,10 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockCenturionResourceEfficiency (int l
void libABFE498B_gf_AP_Triggers_Protoss_unlockSentinelResourceEfficiency (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockStalkerPhaseReactor (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockSlayerPhaseBlink (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockSlayerPhaseBlink2 (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockSlayerPhaseBlink3 (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockSlayerPhaseBlink4 (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockSlayerPhaseBlink5 (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPermanentCloak (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorPerfectedPower (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestrainedDestruction (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockChronoSurge (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockProgressiveProxyPylon (int lp_player, int lp_level);
void libABFE498B_gf_AP_Triggers_Protoss_unlockPylonOvercharge (int lp_player);
Expand Down
Binary file modified Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader
Binary file not shown.
8 changes: 4 additions & 4 deletions Mods/ArchipelagoTriggers.SC2Mod/Triggers
Original file line number Diff line number Diff line change
Expand Up @@ -63915,7 +63915,7 @@
<ValueType Type="int"/>
</Element>
<Element Type="FunctionDef" Id="713252DF">
<Identifier>AP_Triggers_Protoss_unlockSlayerPhaseBlink2</Identifier>
<Identifier>AP_Triggers_Protoss_unlockDisruptorPermanentCloak</Identifier>
<FlagAction/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="0B8CD3EF"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="D55B6CCC"/>
Expand Down Expand Up @@ -63952,7 +63952,7 @@
<ValueType Type="int"/>
</Element>
<Element Type="FunctionDef" Id="E0B67EA0">
<Identifier>AP_Triggers_Protoss_unlockSlayerPhaseBlink3</Identifier>
<Identifier>AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters</Identifier>
<FlagAction/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="B4FD925F"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="58352099"/>
Expand Down Expand Up @@ -63989,7 +63989,7 @@
<ValueType Type="int"/>
</Element>
<Element Type="FunctionDef" Id="64F45D80">
<Identifier>AP_Triggers_Protoss_unlockSlayerPhaseBlink4</Identifier>
<Identifier>AP_Triggers_Protoss_unlockDisruptorPerfectedPower</Identifier>
<FlagAction/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="1C6DD54D"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="38CB02EA"/>
Expand Down Expand Up @@ -64026,7 +64026,7 @@
<ValueType Type="int"/>
</Element>
<Element Type="FunctionDef" Id="F996C036">
<Identifier>AP_Triggers_Protoss_unlockSlayerPhaseBlink5</Identifier>
<Identifier>AP_Triggers_Protoss_unlockDisruptorRestrainedDestruction</Identifier>
<FlagAction/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="86F314CF"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="656EA52F"/>
Expand Down
Binary file modified Mods/ArchipelagoTriggers.SC2Mod/Triggers.version
Binary file not shown.

0 comments on commit cab5453

Please sign in to comment.