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

Disruptor Upgrade Implement/Model Changes #257

Merged
merged 21 commits into from
Aug 12, 2024
+731 −127
Merged

Disruptor Upgrade Implement/Model Changes #257

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
beadfd8
Omega Worm Quality of Life Changes
SirChuckOfTheChuckles Aug 5, 2024
03ec129
Omega Worm Quality of Life Changes
SirChuckOfTheChuckles Aug 5, 2024
8086853
DroneTrainTimeIncrease
SirChuckOfTheChuckles Aug 5, 2024
cfd7128
Hotkey change for salvage
SirChuckOfTheChuckles Aug 5, 2024
62f9d5c
Disruptor Cloaking Upgrade
SirChuckOfTheChuckles Aug 7, 2024
67bc567
Disruptor Upgrade Templates
SirChuckOfTheChuckles Aug 8, 2024
58fc2d3
Start of Disruptor Upgrades
SirChuckOfTheChuckles Aug 9, 2024
d838d52
Tentative Trigger Changes
SirChuckOfTheChuckles Aug 9, 2024
2c05b0a
Undo other branch commits
SirChuckOfTheChuckles Aug 9, 2024
fb7b69d
Undo other branch commits
SirChuckOfTheChuckles Aug 9, 2024
cab5453
Final Disruptor Changes (for now)
SirChuckOfTheChuckles Aug 9, 2024
218b66b
small actor change
SirChuckOfTheChuckles Aug 9, 2024
b7cb8fe
RestructThrust to war council
SirChuckOfTheChuckles Aug 9, 2024
09f77d6
Tooltip fix
SirChuckOfTheChuckles Aug 9, 2024
935bbb7
Disruptor War council
SirChuckOfTheChuckles Aug 9, 2024
cd7160f
Trigger and Actor Fixes
SirChuckOfTheChuckles Aug 9, 2024
8283855
Code fixes and minor tweaks
SirChuckOfTheChuckles Aug 10, 2024
61fac00
quick actor fix
SirChuckOfTheChuckles Aug 10, 2024
ab8ff00
Removed extra files
SirChuckOfTheChuckles Aug 11, 2024
2c538c0
Tooltip and model fixes
SirChuckOfTheChuckles Aug 12, 2024
dc043bd
Add Disruptor Blink range indicator
Ziktofel Aug 12, 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
Binary file added ...ts/Protoss/DisruptorExplosions/Adept_Collection_Purifier_RicochetGlaive_Missile_Impact.m3
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once sec, didn't notice this file being added. Is this file not available through liberty.sc2mod, and hence doesn't need to be added here? Looking through the game files really quite.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it's in liberty.sc2mod at location base.sc2assets/ assets/effects/protoss/adept_collection_purifier_ricochetglaive_missile_impact/adept_collection_purifier_ricochetglaive_missile_impact.m3. Should be removed from the PR and references should use the version in the game files.

Binary file not shown.
16 changes: 16 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 @@ -3746,6 +3746,22 @@
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectTarget>
<CAbilEffectTarget id="AP_DisruptorBlink">
<AbilSetId value="DisruptorBlnk"/>
<EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
<Effect index="0" value="AP_DisruptorBlink"/>
<Flags index="BestUnit" value="0"/>
<Flags index="RequireTargetVision" value="0"/>
<Cost>
<Charge TimeStart="8" TimeUse="8"/>
<Cooldown Link="Blink" TimeUse="8"/>
</Cost>
<Range value="500"/>
<Arc value="360"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_StalkerBlinkMultiple" Requirements="AP_UseRestructThrust">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectTarget>
<CAbilEffectTarget id="AP_BlinkDummy">
<!-- Dummy Ability for CActorRange -->
<!-- See Effect AP_Blink -->
Expand Down
59 changes: 40 additions & 19 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 @@ -7896,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 @@ -7926,6 +7927,7 @@
<On Terms="Effect.AP_Blink.Stop; At Source" Send="Create"/>
<On Terms="Effect.AP_VoidStalkerBlinkShieldRestore.Stop; At Source" Send="Create"/>
<On Terms="Effect.AP_VoidStalkerBlinkMultiple.Stop; At Source" Send="Create"/>
<On Terms="Effect.AP_DisruptorBlink; At Source" Send="Create"/>
<Host Subject="_Selectable"/>
<HostSiteOps Ops="SOpAttachOrigin"/>
<Sound value="Stalker_Blink"/>
Expand Down Expand Up @@ -16694,15 +16696,15 @@
<On Terms="UnitDeathCustomize; ValidateUnit IsHallucination" Send="DeathCustomize Hallucination"/>
<On Terms="Behavior.AP_PurificationNovaCooldownVisual.On" Send="AnimBracketStop Work"/>
<On Terms="Behavior.AP_PurificationNovaCooldownVisual.Off" Send="AnimBracketStart Work Stand,Work,Start Stand,Work Stand,Work,End"/>
<On Terms="Behavior.AP_PurificationNova.On" Send="ModelSwap PurificationNovaModelSwap"/>
<On Terms="Behavior.AP_PurificationNova.On" Send="ModelSwap AP_PurificationNovaModelSwap"/>
<On Terms="Behavior.AP_PurificationNova.Off" Send="ModelSwap Disruptor"/>
<On Terms="Behavior.AP_PurificationNova.On" Send="Create PurificationNovaBirth"/>
<On Terms="Behavior.AP_PurificationNova.On" Send="Create AP_PurificationNovaBirth"/>
<On Terms="AbilCooldown.AP_PurificationNovaTargeted.Spend" Send="AnimBracketStart Cover Cover,Start Cover Cover,End"/>
<On Terms="AbilCooldown.AP_PurificationNovaTargeted.Regen" Send="AnimBracketStop Cover"/>
<Model value="Disruptor"/>
<Model value="Disruptor_Purifier_Collection"/>
<ModelFlags index="OutlineEmitter" value="1"/>
<BuildModel value="ProtossUnitBirth"/>
<DeathArray index="Normal" ModelLink="DisruptorDeath" SoundLink="AP_Disruptor_Death"/>
<DeathArray index="Normal" ModelLink="Disruptor_Purifier_Collection_Death" SoundLink="AP_Disruptor_Death"/>
<DeathCustoms ModelLink="HallucinationDeath" SoundLink="Sentry_HallucinationDeathSmall" Name="Hallucination"/>
<DeathCustoms ActorModel="DisruptorDeathRagdoll" ModelLink="DisruptorDeathRagdoll" Name="RagdollBasic">
<BodySquibs Name="BloodReduced"/>
Expand All @@ -16724,13 +16726,13 @@
<DeathCustoms Name="RagdollOverkillDPRH" InheritsFrom="RagdollBasic"/>
<DeathCustoms Name="RagdollOverkillDOI" InheritsFrom="RagdollBasic"/>
<DeathCustoms Name="RagdollMidair" InheritsFrom="RagdollBasic"/>
<DeathCustoms ActorModel="SpineCrawlerHurlDeathRagdollWithTeamColor" ModelLink="DisruptorDeathRagdoll" Name="RagdollSpineCrawlerHurl">
<DeathCustoms ActorModel="SpineCrawlerHurlDeathRagdollWithTeamColor" ModelLink="Disruptor_Purifier_DeathRagdoll" Name="RagdollSpineCrawlerHurl">
<BodySquibs Name="None"/>
</DeathCustoms>
<DeathActorModel value="DisruptorDeath"/>
<PlacementModel value="Disruptor"/>
<DeathActorModel value="AP_DisruptorDeath"/>
<PlacementModel value="Disruptor_Purifier_Collection"/>
<PlacementSound value="Protoss_BuildingPlacementSmall"/>
<PortraitModel value="AP_DisruptorPortrait"/>
<PortraitModel value="Disruptor_Purifier_Portrait"/>
<TerrainSquibs>
<MovementDistance value="0.150000,0.150000"/>
<IdlePeriod value="0.100000,0.250000"/>
Expand All @@ -16743,14 +16745,15 @@
<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"/>
<GroupSoundArray index="Attack" value="Zealot_GroupAttack"/>
<GroupSoundArray index="Movement" value="AP_Disruptor_Movement"/>
<GroupSoundArray index="Board" value="Zealot_GroupBoard"/>
<HeroIcon value="Assets\Textures\Btn-unit-protoss-disruptor.dds"/>
<HeroIcon value="Assets\Textures\btn-unit-collection-purifier-disruptor.dds"/>
<HighlightTooltip value="Unit/Name/AP_PurifierDisruptor"/>
<LifeArmorIcon value="Assets\Textures\btn-upgrade-protoss-groundarmorlevel0.dds"/>
<SoundArray index="Ready" value="AP_Pusher_Ready"/>
<SoundArray index="Help" value="AP_Pusher_Help"/>
Expand All @@ -16763,16 +16766,22 @@
<SoundArray index="Click" value="Observer_Click"/>
<SoundArray index="ClickError" value="Observer_ClickError"/>
<SoundArray index="Highlight" value="Observer_Highlight"/>
<UnitIcon value="Assets\Textures\Btn-unit-protoss-disruptor.dds"/>
<UnitIcon value="Assets\Textures\btn-unit-collection-purifier-disruptor.dds"/>
<Wireframe>
<Image value="Assets\Textures\Wireframe-protoss-disruptor.dds"/>
<Image value="Assets\Textures\wireframe-collection-taldarim-disruptor.dds"/>
</Wireframe>
<WireframeShield>
<Image value="Assets\Textures\Wireframe-protoss-disruptor-shield01.dds"/>
<Image value="Assets\Textures\Wireframe-protoss-disruptor-shield02.dds"/>
<Image value="Assets\Textures\Wireframe-protoss-disruptor-shield03.dds"/>
<Image value="Assets\Textures\wireframe-collection-taldarim-disruptor-shield01.dds"/>
<Image value="Assets\Textures\wireframe-collection-taldarim-disruptor-shield02.dds"/>
<Image value="Assets\Textures\wireframe-collection-taldarim-disruptor-shield03.dds"/>
</WireframeShield>
</CActorUnit>
<CActorModel id="AP_PurificationNovaBirth" parent="ModelAnimationStyleOneShot">
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachOrigin"/>
<Inherits index="Visibility" value="1"/>
<Model value="PurificationNovaBirth"/>
</CActorModel>
<CActorSound id="AP_Disruptor_Land" parent="SoundOneShot"/>
<CActorAction id="AP_DisruptorAttack" parent="GenericAttack" effectAttack="AP_DisruptorWeaponDamage">
<LaunchSiteOps Ops="SOpAttachCenter"/>
Expand All @@ -16790,6 +16799,14 @@
<HostImpact Subject="_Unit" Scope="Target"/>
<HostImpactSiteOps Ops="SOpAttachCenter"/>
</CActorBeamSimple>
<CActorModel id="AP_PerfectedPowerNova" parent="ModelAnimationStyleOneShot">
<FogVisibility value="Hidden"/>
<On Terms="Effect.AP_PurificationNovaSearch.Start; At Caster; ValidatePlayer AP_HaveDisruptorPerfectedPower" Send="Create"/>
<On Terms="Effect.AP_PurificationNovaTargettedSearch.Start; At Target; ValidatePlayer AP_HaveDisruptorPerfectedPower" Send="Create"/>
<On Terms="UnitDeath.AP_DisruptorPhased; ValidatePlayer AP_HaveDisruptorPerfectedPower" Send="Create"/>
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachCenter" HoldPosition="1" HoldRotation="1"/>
</CActorModel>
<CActorModel id="AP_DisruptorDeath">
<Aliases value="_Main"/>
<Aliases value="_Unit"/>
Expand Down Expand Up @@ -16817,7 +16834,7 @@
<On Terms="AnimDone; AnimName Death" Send="Destroy"/>
<Host Subject="::Creator"/>
<HostSiteOps Ops="SOpDeathMotionGround"/>
<Model value="UnitDeathModel"/>
<Model value="Disruptor_Purifier_Collection_Death"/>
<ModelFlags index="SuppressMissingAttachErrors" value="1"/>
<ModelFlags index="UpdateVisibility" value="0"/>
<ModelFlags index="UseSyncSeed" value="1"/>
Expand Down Expand Up @@ -16866,7 +16883,7 @@
<On Terms="AnimDone; AnimName Death" Send="Destroy"/>
<Host Subject="::Creator"/>
<HostSiteOps Ops="SOpDeathMotionGround"/>
<Model value="UnitDeathModelNoTeamColor"/>
<Model value="Disruptor_Purifier_Collection_DeathRagdoll"/>
<ModelFlags index="UpdateVisibility" value="0"/>
<ModelFlags index="UseSyncSeed" value="1"/>
<EventDataSound Name="NydusCanalThud" Actor="UnitSound" Sound="NydusWorm_DeathThud"/>
Expand Down Expand Up @@ -16905,7 +16922,7 @@
<Macros value="ChargingAnim"/>
<Macros value="TerrainSquibAnimations"/>
<Macros value="PhysicsDeathsSwarmGround"/>
<Model value="PurificationNovaModelSwap"/>
<Model value="AP_PurificationNovaModelSwap"/>
<DeathArray index="Normal" SoundLink="Disruptor_Death"/>
<DeathCustoms ModelLink="HallucinationDeath" SoundLink="Sentry_HallucinationDeathSmall" Name="Hallucination"/>
<DeathActorModel value="UnitDeathModelWithDeathMotionGround"/>
Expand Down Expand Up @@ -22801,9 +22818,10 @@
<FogVisibility value="Hidden"/>
<On Terms="Effect.AP_PurificationNovaSearch.Start; At Caster" Send="Create"/>
<On Terms="Effect.AP_PurificationNovaTargettedSearch.Start; At Target" Send="Create"/>
<On Terms="UnitDeath.AP_DisruptorPhased" Send="Create"/>
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachCenter" HoldPosition="1" HoldRotation="1"/>
<Model value="PurificationNova"/>
<Model value="AP_PurificationNova"/>
</CActorModel>
<CActorForceSphere id="AP_PurificationNovaForce">
<On Terms="Effect.AP_PurificationNovaDamage.Start; At Target" Send="Create"/>
Expand Down Expand Up @@ -33105,6 +33123,9 @@
<On Terms="Behavior.AP_CorsairPermanentCloak.On" Send="Create"/>
<On Terms="Behavior.AP_CorsairPermanentCloak.On" Send="StatusIncrement ActiveCount"/>
<On Terms="Behavior.AP_CorsairPermanentCloak.Off" Send="StatusDecrement ActiveCount"/>
<On Terms="Behavior.AP_DisruptorPermanentCloak.On" Send="Create"/>
<On Terms="Behavior.AP_DisruptorPermanentCloak.On" Send="StatusIncrement ActiveCount"/>
<On Terms="Behavior.AP_DisruptorPermanentCloak.Off" Send="StatusDecrement ActiveCount"/>
<On Terms="Behavior.AP_OraclePermanentCloak.On" Send="Create"/>
<On Terms="Behavior.AP_OraclePermanentCloak.On" Send="StatusIncrement ActiveCount"/>
<On Terms="Behavior.AP_OraclePermanentCloak.Off" Send="StatusDecrement ActiveCount"/>
Expand Down
19 changes: 18 additions & 1 deletion 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 @@ -45,6 +45,14 @@
<StateFlags index="Cloak" value="1"/>
</Modification>
</CBehaviorBuff>
<CBehaviorBuff id="AP_DisruptorPermanentCloak">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="AbilityorEffectType:Units"/>
<DisableValidatorArray value="AP_HaveDisruptorPermanentCloak"/>
<Modification>
<StateFlags index="Cloak" value="1"/>
</Modification>
</CBehaviorBuff>
<CBehaviorBuff id="AP_GhostPermanentCloak">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="AbilityorEffectType:Units"/>
Expand Down Expand Up @@ -4084,6 +4092,15 @@
<EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
<Duration value="3"/>
<Modification MoveSpeedBonus="-2.2382"/>
<DisableValidatorArray value="AP_NoRestructedThrusters"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_PurificationNovaTargettedCasterUseThrust">
<Alignment value="Positive"/>
<InfoFlags index="Hidden" value="1"/>
<InfoIcon value="Assets\Textures\btn-ability-protoss-arcshield.dds"/>
<EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
<DisableValidatorArray value="AP_UseRestructedThrusters"/>
<Duration value="3"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_PurificationNovaTargettedTarget">
<Alignment value="Positive"/>
Expand All @@ -4101,7 +4118,7 @@
<PeriodicEffect value="AP_PurificationNovaNotificationSearch"/>
<FinalEffect value="Suicide"/>
<ExpireEffect value="AP_PurificationNovaTargettedSearchSet"/>
<Modification MoveSpeedBonus="2">
<Modification>
<StateFlags index="Invulnerable" value="1"/>
<StateFlags index="Benign" value="1"/>
<StateFlags index="Passive" value="1"/>
Expand Down
30 changes: 28 additions & 2 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 @@ -7,6 +7,32 @@
<CButton id="AP_AcidExplosionImmunity">
<Icon value="Assets\Textures\btn-upgrade-terran-acidexplosionimmunity.dds"/>
</CButton>
<CButton id="AP_PermanentlyCloakedDisruptor">
<Icon value="Assets\Textures\btn-upgrade-protoss-fenix-disruptorpermanentcloak.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-protoss-fenix-disruptorpermanentcloak.dds"/>
<EditorCategories value="Race:Protoss"/>
</CButton>
<CButton id="AP_RestructuredThrusters">
<Icon value="Assets\Textures\btn-upgrade-protoss-alarak-stalkerphasingarmor.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-protoss-alarak-stalkerphasingarmor.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"/>
<HotkeyAlias value="AP_Blink"/>
<Universal value="1"/>
</CButton>
<CButton id="AP_PerfectedPower">
<Icon value="Assets\Textures\btn-ability-spearofadun-purifierbeam.dds"/>
<AlertIcon value="Assets\Textures\btn-ability-spearofadun-purifierbeam.dds"/>
<EditorCategories value="Race:Protoss"/>
</CButton>
<CButton id="AP_RestrainedDestruction">
<Icon value="Assets\Textures\btn-upgrade-stetmann-banelingmanashieldefficiency.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-stetmann-banelingmanashieldefficiency.dds"/>
<EditorCategories value="Race:Protoss"/>
</CButton>
<CButton id="Attack">
<!-- Override -->
<SimpleDisplayText value=""/>
Expand Down Expand Up @@ -4278,8 +4304,8 @@
<Universal value="1"/>
</CButton>
<CButton id="AP_Disruptor">
<Icon value="Assets\Textures\Btn-unit-protoss-disruptor.dds"/>
<AlertIcon value="Assets\Textures\Btn-unit-protoss-disruptor.dds"/>
<Icon value="Assets\Textures\btn-unit-collection-purifier-disruptor.dds"/>
<AlertIcon value="Assets\Textures\btn-unit-collection-purifier-disruptor.dds"/>
</CButton>
<CButton id="AP_ImmortalShakuras">
<Icon value="Assets\Textures\btn-unit-protoss-immortal-nerazim.dds"/>
Expand Down
Loading