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

sc2: Added Pygalisks #321

Merged
merged 10 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from 7 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
65 changes: 65 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,11 @@
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectInstant>
<CAbilEffectInstant id="AP_StimpackPygalisk" parent="AP_StimpackSmallBase">
<CmdButtonArray index="Execute" DefaultButtonFace="AP_Stim" State="Restricted" Requirements="AP_HavePygaliskStim">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectInstant>
<CAbilEffectInstant id="AP_StimpackMarauder" parent="AP_StimpackLargeBase">
<CmdButtonArray index="Execute" DefaultButtonFace="AP_StimLarge" State="Restricted" Requirements="AP_UseStimpackMarauder">
<Flags index="ToSelection" value="1"/>
Expand Down Expand Up @@ -3611,6 +3616,51 @@
<AutoCastRange value="2"/>
<AutoCastCountMin value="1"/>
</CAbilMorph>
<CAbilMorph id="AP_BurrowPygaliskDown">
<AbilSetId value="BrwD"/>
<EditorCategories value="Race:Zerg,AbilityorEffectType:MorphsandBurrows"/>
<CmdButtonArray index="Execute" DefaultButtonFace="BurrowDown">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
<ActorKey value="BurrowDown"/>
<Flags index="IgnoreFacing" value="1"/>
<Flags index="IgnorePlacement" value="0"/>
<Flags index="SuppressMovement" value="1"/>
<InfoArray Unit="AP_PygaliskBurrowed" RandomDelayMax="0.1">
<SectionArray index="Actor">
<DurationArray index="Duration" value="0.5556"/>
</SectionArray>
<SectionArray index="Collide">
<DurationArray index="Delay" value="0.5556"/>
</SectionArray>
<SectionArray index="Stats">
<DurationArray index="Delay" value="0.5556"/>
</SectionArray>
</InfoArray>
</CAbilMorph>
<CAbilMorph id="AP_BurrowPygaliskUp">
<AbilSetId value="BrwU"/>
<EditorCategories value="Race:Zerg,AbilityorEffectType:MorphsandBurrows"/>
<CmdButtonArray index="Execute" DefaultButtonFace="BurrowUp">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
<ActorKey value="BurrowUp"/>
<Flags index="AutoCast" value="1"/>
<Flags index="IgnoreFacing" value="1"/>
<Flags index="SuppressMovement" value="1"/>
<InfoArray Unit="AP_Pygalisk" RandomDelayMax="0.1">
<SectionArray index="Actor">
<DurationArray index="Duration" value="0.4443"/>
</SectionArray>
<SectionArray index="Stats">
<DurationArray index="Duration" value="0.4443"/>
</SectionArray>
</InfoArray>
<AutoCastFilters value="Ground,Visible;Player,Ally,Neutral,Structure,Missile,Stasis,Dead,Hidden"/>
<AutoCastValidatorArray value="TargetNotChangeling"/>
<AutoCastRange value="2"/>
<AutoCastCountMin value="1"/>
</CAbilMorph>
<CAbilEffectTarget id="AP_BurrowChargeRevD">
<Alignment value="Negative"/>
<EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
Expand Down Expand Up @@ -11334,6 +11384,21 @@
<Button DefaultButtonFace="AP_SummonYggdrasil" State="Restricted" Requirements="AP_ZergMercCompoundBroodWar"/>
<Unit value="AP_Yggdrasil"/>
</InfoArray>
<InfoArray index="Train10" Effect="AP_MercGroundDrop">
<Cooldown>
<Link value="AP_Pygalisk"/>
<Location value="Unit"/>
<TimeStart value="30"/>
<TimeUse value="30"/>
</Cooldown>
<Button DefaultButtonFace="AP_PygaliskSummon" State="Restricted" Requirements="AP_ZergMercCompoundSC2"/>
<Unit value="AP_Pygalisk"/>
<Unit value="AP_Pygalisk"/>
<Unit value="AP_Pygalisk"/>
<Unit value="AP_Pygalisk"/>
<Unit value="AP_Pygalisk"/>
<Unit value="AP_Pygalisk"/>
</InfoArray>
</CAbilTrain>
<CAbilEffectTarget id="AP_DarkTemplarShadowDash">
<AbilSetId value="Blnk"/>
Expand Down
74 changes: 74 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2993,6 +2993,7 @@
<Sound value="Marine_Stimpack"/>
<On Terms="Abil.AP_Stimpack.SourceCastStart" Send="Create"/>
<On Terms="Abil.AP_StimpackReaper.SourceCastStart" Send="Create"/>
<On Terms="Abil.AP_StimpackPygalisk.SourceCastStart" Send="Create"/>
</CActorSound>
<CActorSound id="AP_Marauder_Stimpack" parent="SoundOneShot">
<Sound value="Marauder_Stimpack"/>
Expand All @@ -3006,6 +3007,7 @@
<On Terms="Abil.AP_StimpackMarauder.SourceCastStart" Send="Create"/>
<On Terms="Abil.AP_StimpackFirebat.SourceCastStart" Send="Create"/>
<On Terms="Abil.AP_StimpackHellbat.SourceCastStart" Send="Create"/>
<On Terms="Abil.AP_StimpackPygalisk.SourceCastStart" Send="Create"/>
<Model value="StimpackStartImpact"/>
<Host Subject="_Selectable"/>
<HostSiteOps Ops="SOpAttachOverhead"/>
Expand All @@ -3017,6 +3019,7 @@
<On Terms="Behavior.AP_StimpackMarauder.Off; ValidateUnit NotDead" Send="Create"/>
<On Terms="Behavior.AP_StimpackFirebat.Off; ValidateUnit NotDead" Send="Create"/>
<On Terms="Behavior.AP_StimpackHellbat.Off; ValidateUnit NotDead" Send="Create"/>
<On Terms="Behavior.AP_StimpackPygalisk.Off; ValidateUnit NotDead" Send="Create"/>
<Model value="StimpackEndImpact"/>
<Host Subject="_Selectable"/>
<HostSiteOps Ops="SOpAttachOverhead"/>
Expand Down Expand Up @@ -27537,6 +27540,76 @@
<On Terms="AbilTransport.AP_WarpPrismTransport.CargoLoadSuppressed" Send="AnimBracketStart Unload IGNORE Unload Unload,End DontResetOnUnhide"/>
<On Terms="AbilTransport.AP_WarpPrismTransport.CargoUnload" Send="AnimBracketStop Unload"/>
</CActorEventMacro>
<!-- -->
<!-- Pygalisk .............................................................................. -->
<!-- -->
<CActorUnit id="AP_Pygalisk" parent="GenericUnitBase" unitName="AP_Pygalisk">
<PortraitModel value="UltraliskPortrait"/>
<DeathArray index="Normal" ModelLink="UltraliskDeath" SoundLink="Ultralisk_Explode" VoiceLink=""/>
<DeathArray index="Blast" ModelLink="ZergLargeUnitDeath"/>
<DeathArray index="Disintegrate" ModelLink="UltraliskDeathAcid" SoundLink="Uni_DeathFXAcid"/>
<DeathArray index="Fire" ModelLink="UltraliskDeathFire" SoundLink="Uni_DeathFXFireLarge"/>
<AnimBlendTime value="0.300000"/>
<On Terms="Behavior.AP_MercGroundDrop.Create" Send="Create AP_PygaliskDropModel"/>
<On Terms="UnitBirth.AP_PygaliskBurrowed" Send="Create"/>
<On Terms="UnitBirth.AP_PygaliskBurrowed" Send="AnimBracketStart Burrow Burrow IGNORE Unburrow ClosingFull,OpeningPlayForever,Instant"/>
<On Terms="AbilMorph.*.Cancel; MorphFrom AP_Pygalisk; MorphTo AP_PygaliskBurrowed" Send="AnimClear Burrow"/>
<On Terms="AbilMorph.*.Finish; MorphTo AP_Pygalisk; MorphFrom AP_PygaliskBurrowed" Send="AnimBracketStop Burrow"/>
<On Terms="AbilMorph.*.Finish; MorphTo AP_Pyaglisk; MorphFrom AP_PygaliskBurrowed" Send="AnimClear Burrow"/>
<On Terms="AbilMorph.*.Finish; MorphTo AP_Pygalisk; MorphFrom AP_PygaliskBurrowed" Send="TerrainSquibActivateGroup RippleStandard"/>
<On Terms="AbilMorph.*.Start; AbilKey BurrowDown" Send="Create BurrowDownMedium"/>
<On Terms="WeaponStart.AP_Pygalisk.AttackStart" Send="AnimBracketStart Attack Attack"/>
<On Terms="WeaponStop.AP_Pygalisk.AttackStop" Send="AnimBracketStop Attack"/>
<On Terms="WeaponStart.AP_PygaliskHeadAttack.AttackStart" Send="AnimBracketStart Spell Spell"/>
<On Terms="WeaponStop.AP_PygaliskHeadAttack.AttackStop" Send="AnimBracketStop Spell"/>
<On Terms="ActorCreation; ValidateUnit AP_IsAPPygaliskBurrowed" Send="AnimBracketStart Burrow Burrow IGNORE Unburrow ClosingFull,OpeningPlayForever,Instant"/>
<On Terms="AbilMorph.*.Finish; MorphTo AP_PygaliskBurrowed; MorphFrom AP_Pygalisk" Send="TerrainSquibDeactivate"/>
<Macros value="ZergBurrowStandardAnimMacro"/>
<Macros value="ZergMediumBurrowEffects"/>
<Macros value="UnloadDropAnim"/>
<EventDataSound Name="UltraliskHeadAttack" Actor="UnitSound" Sound="Ultralisk_HeadAttackImpact"/>
<WalkAnimMoveSpeed value="2.9375"/>
<BarWidth value="80"/>
<BarOffset value="20"/>
<UnitIcon value="Assets\Textures\btn-unit-zerg-omegalisk.dds"/>
<HeroIcon value="Assets\Textures\btn-unit-zerg-omegalisk.dds"/>
Copy link
Owner

Choose a reason for hiding this comment

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

Snímek obrazovky pořízený 2024-11-28 21-33-21

Set it to match the button "Assets\Textures\btn-unit-collection-primal-ultralisk.dds
The current one looks the same as the standard Ultra

<GroupIcon>
<Image value="Assets\Textures\wireframe-collection-primal-ultralisk.dds"/>
</GroupIcon>
<Wireframe>
<Image value="Assets\Textures\wireframe-collection-primal-ultralisk.dds"/>
</Wireframe>
<SoundArray index="Birth" value="UltraliskBirth"/>
<SoundArray index="Help" value="Ultralisk_Help"/>
<SoundArray index="Ready" value="AP_Pygalisk_Ready"/>
<SoundArray index="What" value="AP_Pygalisk_What"/>
<SoundArray index="Yes" value="AP_Pygalisk_Yes"/>
<SoundArray index="Attack" value="AP_Pygalisk_Attack"/>
<SoundArray index="Pissed" value="AP_Pygalisk_Pissed"/>
<LifeArmorIcon value="Assets\Textures\btn-upgrade-zerg-groundcarapace-level0.dds"/>
<ShieldArmorIcon value="Assets\Textures\btn-upgrade-zerg-swarmfrenzy.dds"/>
<VitalColors index="Shields">
<ColorArray value="255,0,128,0"/>
</VitalColors>
<VitalNames index="Shields" value="Vital/ZergShields"/>
<WireframeShieldColor value="255,0,128,0"/>
<Aliases value="_UnitMedium"/>
</CActorUnit>
<CActorSplat id="AP_PygaliskBurrowedSplat" parent="BurrowedSplat" unitName="AP_Pygalisk">
<AutoScaleFactor value="3.000000"/>
</CActorSplat>
<CActorModel id="AP_PygaliskDropModel" parent="AP_ZergMercDropModelBase">
<On Terms="ActorCreation" Send="SetScale 1.000000"/>
</CActorModel>
<CActorSound id="AP_PygaliskAttackStart" parent="SoundOneShot">
<On Terms="WeaponStart.AP_Pygalisk.AttackStart" Send="Create"/>
<Sound value="Ultralisk_AttackLaunch"/>
</CActorSound>
<CActorAction id="AP_PygaliskAttack" parent="GenericAttack" effectLaunch="AP_Pygalisk">
<ImpactMap index="None" Sound="Ultralisk_AttackImpact"/>
<ShieldFlashType value="Header"/>
</CActorAction>
<!-- End of Pygalisk -->
<CActorUnit id="AP_ValkyrieSCBW" parent="GenericUnitBase" unitName="AP_ValkyrieSCBW">
<Aliases value="_UnitLarge"/>
<!-- <Macros value="AP_GimbalZMacro"/>-->
Expand Down Expand Up @@ -35741,6 +35814,7 @@
<Aliases value="_UnitHuge"/>
<Model value="AP_ZergMercenaryCompound"/>
<On Terms="UnitDeathCustomize; ValidateUnit AP_HasZergGenericDeath" Send="DeathCustomize Detached"/>
<On Terms="UnitBirth" Send="SetOpacity 1"/>
<DeathArray index="Normal" ModelLink="AP_ZergMercenaryCompoundDeath" SoundLink="Spire_Explode"/>
<DeathArray index="UnderConstruction" ModelLink="ZergBuildingDeath" SoundLink="Spire_Explode"/>
<PlacementSound value="Zerg_BuildingPlacement"/>
Expand Down
20 changes: 20 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6935,6 +6935,26 @@
<EditorCategories value="Race:Zerg"/>
<HotkeyAlias value="AP_YggdrasilAssimilate"/>
</CButton>
<CButton id="AP_Pygalisk">
<Icon value="Assets\Textures\btn-unit-collection-primal-ultralisk.dds"/>
<AlertIcon value="Assets\Textures\btn-unit-collection-primal-ultralisk.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_PygaliskSummon">
<Icon value="Assets\Textures\btn-unit-collection-primal-ultralisk.dds"/>
<AlertIcon value="Assets\Textures\btn-unit-collection-primal-ultralisk.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_PygaliskDucalBlades">
<Icon value="Assets\Textures\btn-ability-zerg-dehaka-ultralisk-brutalcharge.dds"/>
<AlertIcon value="Assets\Textures\btn-ability-zerg-dehaka-ultralisk-brutalcharge.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_PygaliskCombatCarapace">
<Icon value="Assets\Textures\btn-upgrade-stetmann-mechachitinousplating.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-stetmann-mechachitinousplating.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_BioMechanicalStockpiling">
<Icon value="Assets\Textures\btn-upgrade-zerg-stukov-queenenergyregen.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-zerg-stukov-queenenergyregen.dds"/>
Expand Down
29 changes: 29 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5029,6 +5029,35 @@
<Amount value="25"/>
<Death value="Eviscerate"/>
</CEffectDamage>
<CEffectSet id="AP_PygaliskSet">
<EditorCategories value="Race:Zerg"/>
<EffectArray value="AP_PygaliskDamage"/>
<!-- Upgraded to AP_PygaliskAttackSearch by AP_PygaliskDucalBlades -->
<EffectArray value=""/>
</CEffectSet>
<CEffectDamage id="AP_PygaliskDamage" parent="DU_WEAP">
<EditorCategories value="Race:Zerg"/>
<Amount value="8"/>
<Death value="Eviscerate"/>
</CEffectDamage>
<CEffectDamage id="AP_PygaliskSplashDamage" parent="DU_WEAP">
<EditorCategories value="Race:Zerg"/>
<Amount value="4"/>
<Death value="Eviscerate"/>
</CEffectDamage>
<CEffectEnumArea id="AP_PygaliskAttackSearch">
<EditorCategories value="Race:Zerg"/>
<ImpactLocation Value="TargetUnit"/>
<ExcludeArray Effect="AP_PygaliskDamage" Value="Target"/>
<SearchFilters value="Ground,Visible;Self,Player,Ally,Missile,Stasis,Dead,Hidden,Invulnerable"/>
<AreaArray Arc="180" Radius="1" Effect="AP_PygaliskSplashDamage"/>
<SearchFlags index="OffsetByUnitRadius" value="1"/>
</CEffectEnumArea>
<CEffectDamage id="AP_PygaliskHeadAttack" parent="DU_WEAP">
<EditorCategories value="Race:Zerg"/>
<Amount value="25"/>
<Death value="Eviscerate"/>
</CEffectDamage>
<CEffectDamage id="AP_SuicideRemove">
<ImpactLocation Value="SourceUnit"/>
<Flags index="Kill" value="1"/>
Expand Down
10 changes: 10 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2657,6 +2657,16 @@
<LowQualityModel value="ZergLargeUnitDeathLow"/>
<Occlusion value="Show"/>
</CModel>
<CModel id="AP_Pygalisk" parent="UltraliskBase" Race="Zerg">
<Model value="Assets\Units\Zerg\Ultralisk\Ultralisk.m3"/>
<Occlusion value="Show"/>
<ScaleMax value="0.382500,0.382500,0.382500"/>
<ScaleMin value="0.382500,0.382500,0.382500"/>
<Radius value="0.375000"/>
<Flags index="AutoUnload" value="1"/>
<SelectionRadius value="1.307100"/>
<ShadowRadius value="1.307100"/>
</CModel>
<CModel id="AP_HealingDrone" parent="Unit" Race="Terran">
<Model value="Assets\Units\Terran\BioMechanical_RepairDrone\BioMechanical_RepairDrone.m3"/>
<PlanetPanelCamera value="Star2CameraLow05"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3383,6 +3383,15 @@
<CRequirement id="AP_HaveResourceEfficiencyUltralisk">
<NodeArray index="Show" Link="AP_CountUpgradeResourceEfficiencyUltraliskCompleteOnly"/>
</CRequirement>
<CRequirement id="AP_HavePygaliskStim">
<NodeArray index="Show" Link="AP_CountUpgradePygaliskStimCompleteOnly"/>
</CRequirement>
<CRequirement id="AP_HavePygaliskDucalBlades">
<NodeArray index="Show" Link="AP_CountUpgradePygaliskDucalBladesCompleteOnly"/>
</CRequirement>
<CRequirement id="AP_HavePygaliskCombatCarapace">
<NodeArray index="Show" Link="AP_CountUpgradePygaliskCombatCarapaceCompleteOnly"/>
</CRequirement>
<CRequirement id="AP_HatcherySpawnLarva">
<EditorCategories value="Race:Zerg,TechType:Unit"/>
<NodeArray index="Show" Link="AP_LTCountUnitLarvaCompleteOnlyAtUnit3"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5782,6 +5782,18 @@
<Count Link="AP_ResourceEfficiencyUltralisk" State="CompleteOnly"/>
<Flags index="TechTreeCheat" value="0"/>
</CRequirementCountUpgrade>
<CRequirementCountUpgrade id="AP_CountUpgradePygaliskStimCompleteOnly">
<Count Link="AP_PygaliskStim" State="CompleteOnly"/>
<Flags index="TechTreeCheat" value="0"/>
</CRequirementCountUpgrade>
<CRequirementCountUpgrade id="AP_CountUpgradePygaliskDucalBladesCompleteOnly">
<Count Link="AP_PygaliskDucalBlades" State="CompleteOnly"/>
<Flags index="TechTreeCheat" value="0"/>
</CRequirementCountUpgrade>
<CRequirementCountUpgrade id="AP_CountUpgradePygaliskCombatCarapaceCompleteOnly">
<Count Link="AP_PygaliskCombatCarapace" State="CompleteOnly"/>
<Flags index="TechTreeCheat" value="0"/>
</CRequirementCountUpgrade>
<CRequirementCountBehavior id="AP_CountBehaviorQueenSpawnLarvaCompleteOnlyAtUnit">
<Count Link="AP_QueenSpawnLarva" State="CompleteOnlyAtUnit"/>
<Flags index="TechTreeCheat" value="0"/>
Expand Down
15 changes: 15 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12292,6 +12292,21 @@
<Volume value="-3.000000,-1.000000"/>
<EditorCategories value="Race:Zerg"/>
</CSound>
<CSound id="AP_Pygalisk_Attack" parent="Ultralisk_Attack">
<Pitch value="18.000000,20.000000"/>
</CSound>
<CSound id="AP_Ultralisk_Pissed" parent="Ultralisk_Pissed">
<Pitch value="18.000000,20.000000"/>
</CSound>
<CSound id="AP_Ultralisk_Ready" parent="Ultralisk_Ready">
<Pitch value="18.000000,20.000000"/>
</CSound>
<CSound id="AP_Ultralisk_What" parent="Ultralisk_What">
<Pitch value="18.000000,20.000000"/>
</CSound>
<CSound id="AP_Ultralisk_Yes" parent="Ultralisk_Yes">
<Pitch value="18.000000,20.000000"/>
</CSound>
<CSound id="AP_Tyrannozor_AttackImpact" parent="Combat">
<EditorCategories value="Race:Zerg"/>
<AssetArray File="Assets\Sounds\Zerg\Ultralisk\Ultralisk_AttackImpact0.wav"/>
Expand Down
Loading