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

Adding Primal Igniter + 2 upgrades #160

Merged
merged 7 commits into from
Jul 7, 2024
Merged

Adding Primal Igniter + 2 upgrades #160

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
474ef0b
Adding Primal Igniter + upgrades
EnvyDragon Jul 4, 2024
a0dda0b
fixing galaxy triggers
EnvyDragon Jul 4, 2024
6c0df0c
adding tooltip for button converted to buff icon
EnvyDragon Jul 4, 2024
3462f9d
fixing death actors
EnvyDragon Jul 4, 2024
37b9b8c
fixing bugs
EnvyDragon Jul 5, 2024
f2c5f3a
adding creep bonuses and removing extra upg
EnvyDragon Jul 6, 2024
240477a
deleting unnecessary actor swap
EnvyDragon Jul 6, 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
72 changes: 72 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 @@ -10749,4 +10749,76 @@
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectTarget>
<CAbilMorph id="AP_PrimalIgniterBurrowDown">
<AbilSetId value="BrwD"/>
<EditorCategories value="Race:Zerg,AbilityorEffectType:MorphsandBurrows"/>
<CmdButtonArray index="Execute" DefaultButtonFace="BurrowDown">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
<CmdButtonArray index="Cancel" DefaultButtonFace="Cancel"/>
<ActorKey value="BurrowDown"/>
<Flags index="Interruptible" value="1"/>
<Flags index="IgnoreFacing" value="1"/>
<Flags index="IgnorePlacement" value="0"/>
<InfoArray Unit="AP_PrimalIgniterBurrowed" 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_PrimalIgniterBurrowUp">
<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_PrimalIgniter" 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,Air,Missile,Stasis,Dead,Hidden"/>
<AutoCastValidatorArray value="TargetNotChangeling"/>
<AutoCastRange value="2"/>
<AutoCastCountMin value="1"/>
</CAbilMorph>
<CAbilMerge id="AP_PrimalIgniterMerge">
<EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
<CmdButtonArray index="SelectedUnits" DefaultButtonFace="AP_PrimalIgniterMerge" State="Restricted" Requirements="AP_HaveRoachWarren">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
<CmdButtonArray index="WithTarget" DefaultButtonFace="AP_PrimalIgniterMerge" State="Restricted" Requirements="AP_HaveRoachWarren"/>
<Flags index="IgnoreUnitCost" value="1"/>
<Info Unit="AP_PrimalIgniter" Time="8"/>
</CAbilMerge>
<CAbilMerge id="AP_MorphlingToPrimalIgniterMerge">
<EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
<CmdButtonArray index="SelectedUnits" DefaultButtonFace="AP_MorphlingToPrimalIgniterMerge" State="Restricted" Requirements="AP_HaveRoachWarren">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
<CmdButtonArray index="WithTarget" DefaultButtonFace="AP_MorphlingToPrimalIgniterMerge" State="Restricted" Requirements="AP_HaveRoachWarren"/>
<Flags index="IgnoreUnitCost" value="1"/>
<Info Unit="AP_PrimalIgniter" Time="35">
<Resource index="Minerals" value="50"/>
<Resource index="Vespene" value="50"/>
</Info>
</CAbilMerge>
<CAbilMergeable id="AP_PrimalIgniterMergeable">
<EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
<Cancelable value="0"/>
<StateBehavior value="AP_UnmovableMerge"/>
</CAbilMergeable>
</Catalog>
124 changes: 122 additions & 2 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 @@ -7748,8 +7748,6 @@
<On Terms="Upgrade.AP_RoachCorpser.Add" Send="Destroy"/>
<On Terms="ActorCreation; ValidateUnit AP_HaveRoachCorpser" Send="Create AP_RoachCorpser"/>
<On Terms="ActorCreation; ValidateUnit AP_HaveRoachCorpser" Send="Destroy"/>
<On Terms="Upgrade.AP_TunnelingClaws.Add" Send="ModelSwap RoachUpgrade"/>
<On Terms="Upgrade.AP_TunnelingClaws.Add; ValidateUnit IsBuried" Send="AnimGroupApply Burrow Burrow Unburrow ClosingFull,Instant"/>
</CActorUnit>
<CActorUnit id="AP_RoachVile" parent="AP_RoachBase" unitName="AP_RoachVile">
<Model value="AP_RoachVile"/>
Expand Down Expand Up @@ -32254,4 +32252,126 @@
<On Terms="Behavior.AP_FleetwideJumpTeleport.On" Send="Create"/>
<Sound value="Battlecruiser_TacticalJumpWireframe"/>
</CActorSound>
<CActorModel id="AP_PrimalIgniterConeAttackImpact" parent="ModelAnimationStyleOneShot">
<On Terms="Effect.AP_PrimalIgniterAttackDamage.Start; At Target; !ValidateEffect AP_HavePrimalIgniterFireBreath" Send="Create"/>
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachOverhead"/>
<ModelFlags index="AutomateGlobalLoops" value="1"/>
</CActorModel>
<CActorSound id="AP_PrimalIgniterConeAttackImpactSound" parent="SoundOneShot">
<On Terms="Effect.AP_PrimalIgniterAttackDamage.Start; At Target" Send="Create"/>
<Sound value="Hellion_AttackImpact"/>
</CActorSound>
<CActorModel id="AP_PrimalIgniterConeAttackImpactUpgraded" parent="ModelAnimationStyleOneShot">
<On Terms="Effect.AP_PrimalIgniterAttackDamage.Start; At Target; ValidateEffect AP_HavePrimalIgniterFireBreath" Send="Create"/>
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachOverhead"/>
<ModelFlags index="AutomateGlobalLoops" value="1"/>
</CActorModel>
<CActorModel id="AP_PrimalIgniterConeAttackLaunch" parent="ModelAnimationStyleOneShot">
<On Terms="Effect.AP_PrimalIgniterConeAttackSet.Start; At Caster; !ValidateEffect AP_HavePrimalIgniterFireBreath" Send="Create"/>
<On Terms="ActorCreation" Send="SetScaleFromWeaponRange 0.000000,1.000000,0.000000"/>
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachWeapon00 SOp2DRotation"/>
<ModelFlags index="AutomateGlobalLoops" value="1"/>
</CActorModel>
<CActorSound id="AP_PrimalIgniterConeAttackLaunchSound" parent="SoundOneShot">
<On Terms="Effect.AP_PrimalIgniterConeAttackSet.Start; At Caster" Send="Create"/>
<Sound value="HellionTank_AttackLaunch"/>
</CActorSound>
<CActorModel id="AP_PrimalIgniterConeAttackLaunchUpgraded" parent="ModelAnimationStyleOneShot">
<On Terms="Effect.AP_PrimalIgniterConeAttackSet.Start; At Caster; ValidateEffect AP_HavePrimalIgniterFireBreath" Send="Create"/>
<On Terms="ActorCreation" Send="SetScaleFromWeaponRange 0.000000,1.000000,0.000000"/>
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachWeapon00 SOp2DRotation"/>
<ModelFlags index="AutomateGlobalLoops" value="1"/>
</CActorModel>
<CActorModel id="AP_PrimalIgniterMergeEgg">
<On Terms="ActorCreation" Send="$Birth 0 0.000000 -1.000000 0.500000 AsTimeScale"/>
<On Terms="AnimDone; AnimName Birth" Send="$Stand PlayForever"/>
<On Terms="Signal.*.MergeStop" Send="ModelSwap AP_PrimalIgniterMergeEggDeath"/>
<On Terms="Signal.*.MergeStop" Send="RefClear ::Host"/>
<On Terms="Signal.*.MergeStop" Send="$Death"/>
<On Terms="AnimDone; AnimName Death" Send="Destroy"/>
<Host Subject="::Creator"/>
</CActorModel>
<CActorUnit id="AP_PrimalIgniter" parent="GenericUnitBase" unitName="AP_PrimalIgniter">
<Aliases value="_UnitLarge"/>
<Macros value="UnloadDropAnim"/>
<Macros value="TerrainSquibAnimations"/>
<Macros value="ZergBurrowStandardAnimMacro"/>
<Macros value="ZergMediumBurrowEffects"/>
<On index="64" Terms="UnitHeightUpdate.*.Land" Send="Create Infestor_Land"/>
<On Terms="Abil.attack.ReadyStart" Send="AnimGroupApply Ready"/>
<On Terms="WeaponStart.AP_PrimalIgniter.AttackStart" Send="AnimBracketStart Attack Attack"/>
<On Terms="WeaponStop.AP_PrimalIgniter.AttackStop" Send="AnimBracketStop Attack"/>
<On Terms="WeaponStart.AP_PrimalIgniterMelee.AttackStart" Send="AnimBracketStart AttackCover Attack,Cover"/>
<On Terms="WeaponStop.AP_PrimalIgniterMelee.AttackStop" Send="AnimBracketStop AttackCover"/>
<On Terms="Abil.attack.ReadyStop" Send="AnimGroupRemove Ready"/>
<On Terms="AbilMorph.*.Start; AbilKey BurrowDown" Send="Create BurrowDownMedium"/>
<On Terms="UnitBirth.AP_PrimalIgniterBurrowed" Send="Create"/>
<On Terms="UnitBirth.AP_PrimalIgniterBurrowed" Send="AnimBracketStart Burrow Burrow IGNORE Unburrow ClosingFull,OpeningPlayForever,Instant"/>
<On Terms="AbilMorph.*.Cancel; MorphFrom AP_PrimalIgniter; MorphTo AP_PrimalIgniterBurrowed" Send="AnimClear Burrow"/>
<On Terms="AbilMorph.*.Finish; MorphTo AP_PrimalIgniter; MorphFrom AP_PrimalIgniterBurrowed" Send="AnimBracketStop Burrow"/>
<On Terms="AbilMorph.*.Finish; MorphTo AP_PrimalIgniter; MorphFrom AP_PrimalIgniterBurrowed" Send="AnimClear Burrow"/>
<On Terms="Abil.AP_PrimalIgniterMerge.Start" Send="SetOpacity"/>
<On Terms="Abil.AP_PrimalIgniterMerge.Start" Send="Create AP_PrimalIgniterMergeEgg"/>
<On Terms="Abil.AP_PrimalIgniterMerge.Stop" Target="AP_PrimalIgniterMergeEgg" Send="Signal MergeStop"/>
<On Terms="Abil.AP_PrimalIgniterMerge.Stop" Send="AnimPlay Birth Unburrow 0 0.000000"/>
<On Terms="Abil.AP_PrimalIgniterMerge.Stop" Send="SetOpacity 1.000000"/>
<On Terms="Abil.AP_MorphlingToPrimalIgniterMerge.Start" Send="SetOpacity"/>
<On Terms="Abil.AP_MorphlingToPrimalIgniterMerge.Start" Send="Create AP_PrimalIgniterMergeEgg"/>
<On Terms="Abil.AP_MorphlingToPrimalIgniterMerge.Stop" Target="AP_PrimalIgniterMergeEgg" Send="Signal MergeStop"/>
<On Terms="Abil.AP_MorphlingToPrimalIgniterMerge.Stop" Send="AnimPlay Birth Unburrow 0 0.000000"/>
<On Terms="Abil.AP_MorphlingToPrimalIgniterMerge.Stop" Send="SetOpacity 1.000000"/>
<On Terms="UnitDeath" Target="AP_PrimalIgniterMergeEgg" Send="Signal MergeStop"/>
<On Terms="WeaponStart.AP_PrimalIgniterCone.AttackStart" Send="AnimBracketStart Attack Attack"/>
<On Terms="WeaponStop.AP_PrimalIgniterCone.AttackStop" Send="AnimBracketStop Attack"/>
<!-- <On Terms="Effect.AP_PrimalIgniterAttackDamage.Start; At Caster; ValidateUnit LifeNotFullAndHaveDehakaGeneLifeLeech" Send="Create DehakaGeneLifeLeech"/> -->
<Model value="AP_PrimalIgniter"/>
<BuildModel value="AP_PrimalIgniter"/>
<DeathArray index="Normal" ModelLink="RoachUpgrade_Primal_Collection_Death" SoundLink="Roach_Explode" VoiceLink="AP_PrimalIgniter_Death"/>
<DeathArray index="Disintegrate" ModelLink="RoachDeathAcid" SoundLink="Uni_DeathFXAcid"/>
<DeathArray index="Fire" ModelLink="RoachDeathFire" SoundLink="Uni_DeathFXFire"/>
<PlacementModel value="AP_PrimalIgniter"/>
<PortraitModel value="Roach_Primal_Collection_Portrait"/>
<TerrainSquibs>
<MovementDistance value="0.150000,0.150000"/>
<IdlePeriod value="0.100000,0.250000"/>
<RangeUp value="2.000000"/>
<RangeDown value="2.000000"/>
<AttachQuery Methods="AMFilterCenter"/>
<Visuals TerrainPhysicsMaterial="Water" ActorModel="TerrainSquibHarnessContinuous" ModelLink="WaterRippleMedium25"/>
</TerrainSquibs>
<WalkAnimMoveSpeed value="2.25"/>
<BarOffset value="55"/>
<GroupIcon>
<Image value="Assets\Textures\wireframe-collection-primal-RoachUpgrade.dds"/>
</GroupIcon>
<HeroIcon value="Assets\Textures\btn-unit-collection-primal-RoachUpgrade.dds"/>
<LifeArmorIcon value="Assets\Textures\btn-upgrade-zerg-groundcarapace-level0.dds"/>
<ShieldArmorIcon value="Assets\Textures\btn-upgrade-zerg-swarmfrenzy.dds"/>
<SoundArray index="Birth" value=""/>
<SoundArray index="Ready" value="AP_PrimalIgniter_Ready"/>
<SoundArray index="What" value="AP_PrimalIgniter_What"/>
<SoundArray index="Yes" value="AP_PrimalIgniter_Yes"/>
<SoundArray index="Attack" value="AP_PrimalIgniter_Attack"/>
<SoundArray index="Pissed" value="AP_PrimalIgniter_Pissed"/>
<SoundArray index="Movement" value=""/>
<StatusColors index="Shields">
<ColorArray index="0" value="255,0,128,0"/>
</StatusColors>
<UnitIcon value="Assets\Textures\btn-unit-collection-primal-RoachUpgrade.dds"/>
<VitalColors index="Shields">
<ColorArray value="255,0,128,0"/>
</VitalColors>
<VitalNames index="Shields" value="Vital/ZergShields"/>
<Wireframe>
<Image value="Assets\Textures\wireframe-collection-primal-RoachUpgrade.dds"/>
</Wireframe>
<WireframeShieldColor value="255,0,128,0"/>
</CActorUnit>
<CActorSplat id="AP_PrimalIgniterBurrowedSplat" parent="BurrowedSplat" unitName="AP_PrimalIgniter">
<On index="2" Terms="UnitBirth.AP_PrimalIgniterBurrowed" Send="Create"/>
</CActorSplat>
</Catalog>
17 changes: 17 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 @@ -7018,4 +7018,21 @@
<StateFlags index="Untargetable" value="1"/>
</Modification>
</CBehaviorBuff>
<CBehaviorBuff id="AP_HotSRoachShieldIndicator">
<!-- Indicator of passive upgrade - full command card -->
<Alignment value="Positive"/>
<BehaviorFlags index="Permanent" value="1"/>
<InfoIcon value="Assets\Textures\BTN-Upgrade-Zerg-AdaptiveCarapace.dds"/>
<DisableValidatorArray value="AP_HaveHotSRoachShield"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_UnmovableMerge">
<!-- Overrides merging units being pushable -->
<EditorCategories value="AbilityorEffectType:Units"/>
<InfoFlags index="Hidden" value="1"/>
<BehaviorFlags index="Permanent" value="1"/>
<Modification>
<ModifyFlags index="SuppressMoving" value="1"/>
</Modification>
<DisableValidatorArray value="AP_TargetIsUnderConstruction"/>
</CBehaviorBuff>
</Catalog>
30 changes: 30 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 @@ -5437,4 +5437,34 @@
<Icon value="Assets\Textures\btn-upgrade-terran-magfieldaccelerator.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-terran-magfieldaccelerator.dds"/>
</CButton>
<CButton id="AP_PrimalIgniterFireBreath">
<Icon value="Assets\Textures\btn-ability-zerg-fireroach-increasefiredamage.dds"/>
<AlertIcon value="Assets\Textures\btn-ability-zerg-fireroach-increasefiredamage.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_PrimalIgniterToughness">
<Icon value="Assets\Textures\btn-ability-zerg-genemutation-thornsaura.dds"/>
<AlertIcon value="Assets\Textures\btn-ability-zerg-genemutation-thornsaura.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_PrimalIgniterMerge">
<Icon value="Assets\Textures\btn-unit-collection-primal-RoachUpgrade.dds"/>
<AlertIcon value="Assets\Textures\btn-unit-collection-primal-RoachUpgrade.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_MorphlingToPrimalIgniterMerge">
<Icon value="Assets\Textures\btn-unit-collection-primal-RoachUpgrade.dds"/>
<AlertIcon value="Assets\Textures\btn-unit-collection-primal-RoachUpgrade.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_MorphlingSwarmMorphs">
<Icon value="Assets\Textures\wireframe-zerg-hive.dds"/>
<AlertIcon value="Assets\Textures\wireframe-zerg-hive.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_MorphlingPrimalMorphs">
<Icon value="Assets\Textures\wireframe-zerg-primaltownhall.dds"/>
<AlertIcon value="Assets\Textures\wireframe-zerg-primaltownhall.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
</Catalog>
25 changes: 25 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16908,4 +16908,29 @@
<EffectArray value="AP_FleetwideJumpTeleport"/>
<EffectArray value="AP_FleetwideJumpTeleportAB"/>
</CEffectSet>
<CEffectSet id="AP_PrimalIgniterConeAttackSet">
<EffectArray value="AP_PrimalIgniterAttackDamage"/>
<EffectArray value="AP_PrimalIgniterAttackSearch"/>
</CEffectSet>
<CEffectDamage id="AP_PrimalIgniterAttackDamage">
<ValidatorArray value="WeaponInRange"/>
<EditorCategories value="Race:Zerg"/>
<ResponseFlags index="Acquire" value="1"/>
<ResponseFlags index="Flee" value="1"/>
<ArmorReduction value="1"/>
<Flags index="Notification" value="1"/>
<Kind value="Ranged"/>
<KindSplash value="Ranged"/>
<Amount value="25"/>
<Death value="Fire"/>
<SearchFlags index="CallForHelp" value="1"/>
</CEffectDamage>
<CEffectEnumArea id="AP_PrimalIgniterAttackSearch">
<ImpactLocation Value="SourceUnit"/>
<ExcludeArray Effect="AP_PrimalIgniterConeAttackSet" Value="Target"/>
<SearchFilters value="Ground;Self,Player,Ally,Missile,Dead,Hidden,Invulnerable"/>
<AreaArray Arc="45" Radius="5" Effect="AP_PrimalIgniterAttackDamage"/>
<SearchFlags index="ExtendByUnitRadius" value="1"/>
<SearchFlags index="OffsetByUnitRadius" value="1"/>
</CEffectEnumArea>
</Catalog>
Loading