Skip to content

Commit

Permalink
Merge pull request #274 from itsjustbones/add-hunterling
Browse files Browse the repository at this point in the history 
Add hunterling merc
  • Loading branch information
@Ziktofel
Ziktofel authored Sep 3, 2024
2 parents da23251 + c7a8429 commit 1eccd6b
Show file tree
Hide file tree
Showing 27 changed files with 851 additions and 26 deletions.
Binary file added ...ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Custom/Textures/btn-unit-hunterling.dds
View file
Binary file not shown.
Binary file added .../ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/evolutions_karak_jumpattack.wav
View file
Binary file not shown.
Binary file added ...pelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/evolutions_karak_jumpland_foley_a.wav
View file
Binary file not shown.
Binary file added ...pelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/evolutions_karak_jumpland_foley_b.wav
View file
Binary file not shown.
31 changes: 31 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10773,6 +10773,25 @@
<Button DefaultButtonFace="AP_MercUltraliskSummon" State="Restricted" Requirements="AP_ZergMercCompoundBroodWar"/>
<Unit value="AP_MercUltralisk"/>
</InfoArray>
<InfoArray index="Train7" Effect="AP_MercGroundDrop">
<Resource index="Minerals" value="200"/>
<Resource index="Vespene" value="75"/>
<Charge>
<CountMax value="3"/>
<CountStart value="3"/>
<CountUse value="1"/>
<Link value="AP_HunterlingSummon"/>
<Location value="Player"/>
</Charge>
<Cooldown>
<Link value="AP_HunterlingSummon"/>
<Location value="Player"/>
<TimeStart value="300"/>
<TimeUse value="300"/>
</Cooldown>
<Button DefaultButtonFace="AP_HunterlingSummon" State="Restricted" Requirements="AP_ZergMercCompoundSC2"/>
<Unit value="AP_Hunterling"/>
</InfoArray>
</CAbilTrain>
<CAbilEffectTarget id="AP_DarkTemplarShadowDash">
<AbilSetId value="Blnk"/>
Expand Down Expand Up @@ -11929,4 +11948,16 @@
<AutoCastRange value="2"/>
<AutoCastCountMin value="1"/>
</CAbilMorph>
<CAbilEffectTarget id="AP_LeapAttack">
<EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
<Effect index="0" value="AP_HunterlingLeapLaunchMissile"/>
<Cost>
<Charge Link=""/>
<Cooldown TimeUse="10"/> <!-- increased from 4 vanilla-->
</Cost>
<Range value="10"/>
<!--ErrorAlert value="Error/AP_LeapAttackError"/-->
<CmdButtonArray index="Execute" DefaultButtonFace="AP_LeapAttack"/>
<CursorEffect value="AP_HunterlingLeapImpactDamageSearch"/>
</CAbilEffectTarget>
</Catalog>
119 changes: 119 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35256,4 +35256,123 @@
<On Terms="ActorCreation; !Selected" Send="SetVisibility"/>
<Icon value="Assets\Textures\RadarIcon2.dds"/>
</CActorRange>
<CActorUnit id="AP_HunterlingPlaceholder" parent="GenericUnitStandard" unitName="AP_HunterlingPlaceholder">
<Model value="AP_Hunterling"/>
<StatusBarFlags index="Shields" value="0"/>
<StatusBarFlags index="Life" value="0"/>
<StatusBarFlags index="Energy" value="0"/>
<StatusBarFlags index="Cargo" value="0"/>
<StatusBarFlags index="Progress" value="0"/>
<Wireframe>
<Image value="Assets\Textures\wireframe-mod-l2d_zerg-hunterling.dds"/>
</Wireframe>
</CActorUnit>
<CActorMissile id="AP_Hunterling" parent="GenericUnitBase" unitName="AP_Hunterling">
<PortraitModel value="AP_HunterlingPortrait"/>
<WalkAnimMoveSpeed value="3.1328"/>
<BarWidth value="50"/>
<BarOffset value="30"/>
<DeathArray index="Normal" ModelLink="AP_HunterlingDeath" SoundLink="AP_Hunterling_Explode"/>
<DeathArray index="Disintegrate" ModelLink="AP_HunterlingDeathAcid" SoundLink="Uni_DeathFXAcid"/>
<DeathArray index="Eviscerate" ModelLink="AP_HunterlingDeathEviscerate" SoundLink="AP_Hunterling_DeathFXEviscerate"/>
<DeathArray index="Fire" ModelLink="AP_HunterlingDeathFire" SoundLink="AP_Hunterling_DeathFXFire"/>
<Aliases value="_MissileHybrids"/>
<UnitIcon value="AP\Assets\Custom\Textures\btn-unit-hunterling.dds"/>
<GroupIcon>
<Image value="Assets\Textures\wireframe-mod-l2d_zerg-hunterling.dds"/>
</GroupIcon>
<Wireframe>
<Image value="Assets\Textures\wireframe-mod-l2d_zerg-hunterling.dds"/>
</Wireframe>
<LifeArmorIcon value="Assets\Textures\btn-upgrade-zerg-groundcarapace-level0.dds"/>
<SoundArray index="Birth" value="Zergling_Birth"/>
<SoundArray index="Ready" value="Zergling_Ready"/>
<SoundArray index="Help" value="Zergling_Help"/>
<SoundArray index="What" value="Zergling_What"/>
<SoundArray index="Yes" value="Zergling_Yes"/>
<SoundArray index="Attack" value="Zergling_Attack"/>
<SoundArray index="Pissed" value="Zergling_Pissed"/>
<SoundArray index="Movement" value="Zergling_Movement"/>
<DeathCustoms ModelLink="AP_HunterlingAirDeath" Name="Flying"/>
<On Terms="Behavior.AP_MercGroundDrop.Create" Send="Create AP_HunterlingDropModel"/>
<On Terms="UnitDeathCustomize; AnimPlaying Jump" Send="DeathCustomize Flying"/>
<On Terms="UnitDeathCustomize; IsStatus InAir 1" Send="DeathCustomize Flying"/>
<!--On Terms="ActorCreation" Send="TimerSet 5.000000 Ambience"/-->
<!--On Terms="TimerExpired; TimerName Ambience; PassChance 50.000000" Send="Create AP_Left2Die_Hunterling_Ambience"/-->
<!--On Terms="TimerExpired; TimerName Ambience" Send="TimerSet 5.000000 Ambience"/-->
<On Terms="UnitDeathCustomize; ValidateUnit AP_HunterlingLeaping" Send="DeathCustomize Flying"/>
<On Terms="Behavior.AP_HunterlingJump.Launch" Send="AnimBracketStart Jump Jump,Start Jump Jump,End,A"/>
<On Terms="Behavior.AP_HunterlingJump.Launch" Send="AnimBlendTimeApply 0.000000"/>
<On Terms="Behavior.AP_HunterlingJump.LandDown" Send="AnimBracketStop Jump"/>
<On Terms="Behavior.AP_HunterlingJump.LandDown" Send="AnimBlendTimeApply"/>
<On Terms="Behavior.AP_HunterlingJump.LandUp" Send="AnimBracketStop Jump"/>
<On Terms="Behavior.AP_HunterlingJump.LandUp" Send="AnimBlendTimeApply"/>
<On Terms="WeaponStart.*.AttackStart" Send="AnimBracketStart Attack Attack"/>
<On Terms="WeaponStop.*.AttackStop" Send="AnimBracketStop Attack"/>
<On Terms="Abil.AP_LeapAttack.SourceCastStart" Send="AnimClear Jump"/>
<On Terms="Abil.AP_LeapAttack.SourceCastStart" Send="AnimBracketStart LeapAttack Jump,Start Jump IGNORE"/>
<On Terms="Effect.AP_HunterlingLeapImpactDamageSearch.Start; At Caster" Send="AnimBracketStop LeapAttack"/>
<On Terms="Effect.AP_LeapHunterlingDamage.Start; At Caster" Send="AnimPlay PounceAttacking Spell"/>
<On Terms="UnitHeightUpdate.*.Land" Send="Create AP_HunterlingJumpLandSound"/>
</CActorMissile>
<CActorModel id="AP_HunterlingJumpLandDownModel" parent="ModelAnimationStyleOneShot">
<Host Subject="_Selectable"/>
<HostSiteOps Ops="SOpAttachCenter SOpShadow"/>
<On Terms="Behavior.AP_HunterlingJump.LandDown" Send="Create"/>
<On Terms="Behavior.AP_HunterlingJump.LandUp" Send="Create"/>
<On Terms="Behavior.AP_HunterlingJump.LandDown" Send="TimerSet 0.300000 TriggerSound"/>
<On Terms="TimerExpired; TimerName TriggerSound" Send="Create AP_HunterlingJumpLandSound"/>
<Inherits index="CloakEffect" value="1"/>
</CActorModel>
<CActorSound id="AP_HunterlingJumpLandSound" parent="SoundOneShot">
<On Terms="Behavior.AP_HunterlingJump.LandUp" Send="Create"/>
<Sound value="AP_Hunterling_JumpLand"/>
</CActorSound>
<CActorModel id="AP_HunterlingJumpLaunchModel" parent="ModelAnimationStyleOneShot">
<On Terms="Behavior.AP_HunterlingJump.Launch" Send="Create"/>
<Host Subject="_Selectable"/>
<HostSiteOps Ops="SOpAttachCenter SOpShadow" HoldPosition="1" HoldRotation="1"/>
<Inherits index="CloakEffect" value="1"/>
</CActorModel>
<CActorSound id="AP_HunterlingJumpLaunchSound" parent="SoundOneShot">
<On Terms="Behavior.AP_HunterlingJump.Launch" Send="Create"/>
<Sound value="AP_Hunterling_JumpLaunch"/>
</CActorSound>
<CActorRange id="AP_LeapAttackRange" parent="RangeAbil" abil="AP_LeapAttack">
<Icon value="Assets\Textures\RadarIcon2.dds"/>
<IconArcLength value="3.250000"/>
</CActorRange>
<CActorSplat id="AP_LeapAttackCursorSplat" parent="ZergCursorSplat" abil="AP_LeapAttack"/>
<CActorModel id="AP_LeapAttackStun" parent="ModelAnimationStyleContinuous">
<On Terms="Behavior.AP_LeapHunterlingStun.On" Send="Create"/>
<On Terms="Behavior.AP_LeapHunterlingStun.Off" Send="AnimBracketStop BSD"/>
<ModelFlags index="AllowHitTest" value="0"/>
<ModelFlags index="AutomateGlobalLoops" value="1"/>
<Host Subject="_Selectable"/>
<HostSiteOps Ops="SOpAttachOverhead"/>
<Model value="AP_ArtanisAreaStunModel"/>
</CActorModel>
<CActorModel id="AP_HunterlingDropModel" parent="AP_ZergMercDropModelBase">
<On Terms="ActorCreation" Send="SetScale 1.000000"/>
</CActorModel>
<CActorAction id="AP_HunterlingAttack" parent="GenericAttack" effectAttack="AP_HunterlingClawsDamage">
<ImpactAttachQuery Methods="AMFilterTargetVolumes"/>
<ImpactMap index="None" Sound="AP_Hunterling_AttackImpact"/>
<ShieldFlashType value="Header"/>
</CActorAction>
<CActorSound id="AP_HunterlingAttackStart" parent="SoundOneShot">
<On Terms="WeaponStart.AP_HunterlingClaws.AttackStart" Send="Create"/>
<Sound value="AP_Hunterling_AttackLaunch"/>
</CActorSound>
<CActorSound id="AP_LeapLaunchSound" parent="SoundOneShot">
<Sound value="AP_Left2Die_Hunterling_Attack_Vx"/>
<On Terms="Abil.AP_LeapAttack.SourceCastStart" Send="Create"/>
</CActorSound>
<CActorSound id="AP_LeapImpactSound" parent="SoundOneShot">
<On Terms="Effect.AP_LeapHunterlingImpactSearchSet.Start; At Caster" Send="Create"/>
</CActorSound>
<CActorSound id="AP_LeapAttackDamageSound" parent="SoundOneShot">
<Sound value="AP_Hunterling_AttackImpact"/>
<On Terms="Effect.LeapHunterlingDamage.Start; At Target" Send="Create"/>
</CActorSound>
</Catalog>
48 changes: 48 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7565,4 +7565,52 @@
<Name value="Button/Name/AP_BattlecruiserRangeAura"/>
<Tooltip value="Button/Tooltip/AP_BattlecruiserRangeAura"/>
</CBehaviorBuff>
<CBehaviorJump id="AP_HunterlingJump">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
<TriggerHeightDeltaMin value="1.5"/>
<TriggerHeightDeltaMax value="4.5"/>
<InitiateRangeUp value="1.5"/>
<InitiateRangeDown value="0.5"/>
<JumpRangeMax value="12"/>
<Mover value="CliffJumper"/>
<MoverUp value="ReaperJumpDown"/>
<MoverDown value="ReaperJumpDown"/>
<DurationPreLaunch value="0.05"/>
<DurationPostLand value="0.075"/>
<DurationMoveOut value="0.08"/>
<Placeholder value="AP_HunterlingPlaceholder"/>
<LandAdjustmentDown value="1"/>
<LandArrivalRange value="0.05"/>
<LandCheckRadius value="5"/>
</CBehaviorJump>
<CBehaviorBuff id="AP_Leaping">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
<Modification Height="3" MoveSpeedBonus="3">
<StateFlags index="SuppressCollision" value="1"/>
<HeightTime index="Start" value="0.25"/>
<HeightTime index="Stop" value="0.375"/>
</Modification>
<FinalEffect value="AP_LeapApplyLandingBehavior"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_Landing">
<InfoFlags index="Hidden" value="1"/>
<EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
<Duration value="0.375"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_LeapHunterlingStun">
<Alignment value="Negative"/>
<InfoIcon value="Assets\Textures\btn-ability-terran-ultrasonicpulse.dds"/>
<EditorCategories value="Race:Zerg,AbilityorEffectType:Units"/>
<BehaviorCategories index="Stun" value="1"/>
<Duration value="3"/> <!-- reduced from 5 vanilla-->
<Modification>
<ModifyFlags index="Reveal" value="1"/>
<ModifyFlags index="Detected" value="1"/>
<StateFlags index="Stun" value="1"/>
<StateFlags index="SuppressAttack" value="1"/>
<AbilClassDisableArray index="CAbilAttack" value="1"/>
</Modification>
</CBehaviorBuff>
</Catalog>
9 changes: 9 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6024,4 +6024,13 @@
<EditorCategories value="Race:Terran"/>
<AlertIcon value="Assets\Textures\btn-ability-mengsk-battlecruiser-decksights.dds"/>
</CButton>
<CButton id="AP_LeapAttack">
<Icon value="Assets\Textures\btn-upgrade-zerg-stukov-infestedciviliansleap.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
<CButton id="AP_HunterlingSummon">
<Icon value="AP\Assets\Custom\Textures\btn-unit-hunterling.dds"/>
<AlertIcon value="AP\Assets\Custom\Textures\btn-unit-hunterling.dds"/>
<EditorCategories value="Race:Zerg"/>
</CButton>
</Catalog>
63 changes: 63 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18055,4 +18055,67 @@
<SearchFilters value="Ground;Self,Neutral,Enemy,Structure,Missile,Destructible,Dead,Hidden"/>
<AreaArray Radius="10" Effect="AP_BattlecruiserBonusRangeAB"/>
</CEffectEnumArea>
<CEffectDamage id="AP_HunterlingClawsDamage">
<EditorCategories value="Race:Zerg"/>
<ArmorReduction value="1"/>
<Amount value="15"/>
<Kind value="Melee"/>
<ResponseFlags index="Acquire" value="1"/>
<ResponseFlags index="Flee" value="1"/>
<Flags index="Notification" value="1"/>
<Death value="Eviscerate"/>
<SearchFlags index="CallForHelp" value="1"/>
</CEffectDamage>
<CEffectApplyBehavior id="AP_LeapApplyLandingBehavior">
<EditorCategories value="Race:Zerg"/>
<Behavior value="AP_Landing"/>
</CEffectApplyBehavior>
<CEffectLaunchMissile id="AP_HunterlingLeapLaunchMissile">
<DeathType value="Unknown"/>
<EditorCategories value="Race:Zerg"/>
<LaunchLocation Value="CasterUnit"/>
<Movers Link="AP_HunterlingLeapAttackMover"/>
<Flags index="2D" value="1"/>
<Flags index="Placement" value="1"/>
<Flags index="PlacementIgnoreBlockers" value="1"/>
<PlacementRange value="1"/>
<ImpactLocation Value="TargetPoint"/>
<ImpactEffect value="AP_LeapHunterlingImpactSearchSet"/>
<ValidatorArray value="Pathable"/>
<ValidatorArray value="AP_InRangeOfLeapTargetPoint"/>
</CEffectLaunchMissile>
<CEffectSet id="AP_LeapHunterlingImpactSearchSet">
<EditorCategories value="Race:Zerg"/>
<EffectArray value="AP_HunterlingLeapImpactDamageSearch"/>
<EffectArray value="AP_HunterlingLeapImpactStunSearch"/>
<TargetLocationType value="Point"/>
</CEffectSet>
<CEffectEnumArea id="AP_HunterlingLeapImpactDamageSearch">
<EditorCategories value="Race:Zerg"/>
<ImpactLocation Value="TargetPoint"/>
<SearchFilters value="Ground;Self,Player,Ally,Neutral,Missile,Stasis,Dead,Hidden,Invulnerable"/>
<AreaArray Radius="1.5" Effect="AP_LeapHunterlingDamage"/>
</CEffectEnumArea>
<CEffectEnumArea id="AP_HunterlingLeapImpactStunSearch">
<EditorCategories value="Race:Zerg"/>
<ImpactLocation Value="TargetPoint"/>
<SearchFilters value="Ground;Self,Player,Ally,Neutral,Structure,Missile,Stasis,Dead,Hidden,Invulnerable"/>
<AreaArray Radius="1.5" Effect="AP_LeapHunterlingStun"/>
</CEffectEnumArea>
<CEffectDamage id="AP_LeapHunterlingDamage">
<EditorCategories value="Race:Zerg"/>
<Amount value="20"/> <!--reduced from 100 vanilla-->
</CEffectDamage>
<CEffectApplyBehavior id="AP_LeapHunterlingStun">
<EditorCategories value="Race:Zerg"/>
<ValidatorArray index="0" value="NotFrenzied"/>
</CEffectApplyBehavior>
<CEffectSet id="AP_HunterlingClawsSet">
<EditorCategories value="Race:Zerg"/>
<EffectArray value="AP_ZerglingFrenzy"/>
<EffectArray value="AP_ZerglingFurySwitch"/>
<EffectArray value="AP_ZerglingSunder"/>
<EffectArray value="AP_HunterlingClawsDamage"/>
<EffectArray value="AP_ZerglingArmorShredTargetAB"/>
</CEffectSet>
</Catalog>
21 changes: 21 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/LightData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1572,4 +1572,25 @@
</ToDInfoArray>
<EditorCategories value="LightGroup:PortraitsUnitsZerg"/>
</CLight>
<CLight id="AP_HunterlingPortrait" parent="default">
<ToDInfoArray index="0" AmbientColor="0.321569,0.141176,0.129412" Colorize="1">
<Param index="HDRExposure" value="0.550000"/>
<Param index="HDRSpecMultiplier" value="8.750000"/>
<Param index="CreepSpecularExp" value="40.000000"/>
<Param index="CreepHDRSpecMultiplier" value="5.900000"/>
<Param index="ColorizationHue" value="-0.110000"/>
<Param index="ColorizationSaturation" value="-0.200000"/>
<Param index="ColorizationBlend" value="0.200000"/>
<DirectionalLight index="Key">
<Color value="0.984314,0.937255,0.776471"/>
<ColorMultiplier value="1.799000"/>
<SpecularColor value="0.286275,0.584314,0.819608"/>
<SpecColorMultiplier value="1.995000"/>
<Direction value="-0.886645,0.175561,-0.427831"/>
</DirectionalLight>
<DirectionalLight index="Fill" Color="0.000000,0.682353,1.000000" ColorMultiplier="9.226000" Direction="0.907182,-0.273031,0.320117"/>
<DirectionalLight index="Back" Color="0.149020,0.341176,0.356863" ColorMultiplier="9.772000" Direction="0.961995,-0.102128,0.253251"/>
</ToDInfoArray>
<EditorCategories value="LightGroup:PortraitsUnitsZerg"/>
</CLight>
</Catalog>
Loading

0 comments on commit 1eccd6b

Please sign in to comment.