Skip to content

Commit

Permalink
Add Bulwark Company
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziktofel
Ziktofel committed Oct 10, 2024
1 parent e6ff407 commit 5f1c590
Show file tree
Hide file tree
Showing 40 changed files with 1,369 additions and 36 deletions.
Binary file added .../Assets/Custom/Textures/ui_ingame_alliedcommander_herohealthframe_mengsk_icon_goliath.dds
View file
Binary file not shown.
0 ...er_herohealthframe_mengsk_icon_marine.dds → ...er_herohealthframe_mengsk_icon_marine.dds
View file
File renamed without changes.
Binary file added ...ipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/btn-unit-terran-goliath-mengsk.dds
View file
Binary file not shown.
Binary file added Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/goliath_mengsk_coop_diff.dds
View file
Binary file not shown.
Binary file added Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/goliath_mengsk_coop_spec.dds
View file
Binary file not shown.
Binary file added ...pelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Textures/wireframe-terran-goliath-mengsk.dds
View file
Binary file not shown.
Binary file added ...oPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Units/Terran/GoliathMengsk/Goliath_Mengsk_COOP.m3
View file
Binary file not shown.
Binary file added ...r.SC2Mod/Base.SC2Assets/AP/Assets/Units/Terran/GoliathMengsk/Goliath_Mengsk_COOP_Death.m3
View file
Binary file not shown.
21 changes: 20 additions & 1 deletion Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3937,6 +3937,21 @@
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectTarget>
<CAbilEffectTarget id="AP_GoliathMengskBlink">
<AbilSetId value="Blnk"/>
<Effect index="0" value="AP_Blink"/>
<EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
<Flags index="BestUnit" value="0"/>
<Flags index="RequireTargetVision" value="0"/>
<Cost>
<Cooldown Link="AP_BlinkBlink" TimeUse="8"/>
</Cost>
<Range value="500"/>
<Arc value="360"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_SiegeTankMengskBlink" State="Restricted" Requirements="AP_HaveGoliathJumpJets">
<Flags index="ToSelection" value="1"/>
</CmdButtonArray>
</CAbilEffectTarget>
<CAbilEffectTarget id="AP_BlinkMultiple">
<AbilSetId value="Blnk"/>
<EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
Expand Down Expand Up @@ -12342,9 +12357,13 @@
<Unit value="AP_SiegeTankMengsk"/>
</InfoArray>
<InfoArray index="Train2" Time="60">
<Button DefaultButtonFace="AP_ThorMengsk" State="Restricted"/>
<Button DefaultButtonFace="AP_ThorMengsk" State="Restricted" Requirements="AP_HaveArmory"/>
<Unit value="AP_ThorMengsk"/>
</InfoArray>
<InfoArray index="Train3" Time="40">
<Button DefaultButtonFace="AP_GoliathMengsk" State="Restricted"/>
<Unit value="AP_GoliathMengsk"/>
</InfoArray>
</CAbilTrain>
<CAbilBuild id="AP_SITerranAddOns">
<EditorCategories value="Race:Terran,AbilityorEffectType:Units"/>
Expand Down
166 changes: 140 additions & 26 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1440,6 +1440,38 @@
<Image value="Assets\Textures\Wireframe-Terran-Marine.dds"/>
</Wireframe>
</CActorUnit>
<CActorUnit id="AP_GoliathBase" default="1" parent="GenericUnitBase">
<Aliases value="_UnitLarge"/>
<Macros value="UnloadDropAnim"/>
<DeathActorModel value="AP_GoliathDeath"/>
<PortraitModel value="AP_GoliathPortrait"/>
<StandAnimTurnTime value="4"/>
<WalkAnimMoveSpeed value="3.6093"/>
<BarOffset value="75"/>
<BarWidth value="66"/>
<GroupIcon>
<Image value="AP\Assets\Textures\Wireframe-Terran-goliath.dds"/>
</GroupIcon>
<GroupSoundArray index="Birth" value="AP_Goliath_Birth"/>
<GroupSoundArray index="Ready" value="AP_Goliath_Ready"/>
<GroupSoundArray index="Help" value="AP_Goliath_Help"/>
<GroupSoundArray index="What" value="AP_Goliath_What"/>
<GroupSoundArray index="Yes" value="AP_Goliath_Yes"/>
<GroupSoundArray index="Attack" value="AP_Goliath_Attack"/>
<GroupSoundArray index="Pissed" value="AP_Goliath_Pissed"/>
<SoundArray index="Ready" value="AP_Goliath_Ready"/>
<SoundArray index="Help" value="AP_Goliath_Help"/>
<SoundArray index="What" value="AP_Goliath_What"/>
<SoundArray index="Yes" value="AP_Goliath_Yes"/>
<SoundArray index="Attack" value="AP_Goliath_Attack"/>
<SoundArray index="Pissed" value="AP_Goliath_Pissed"/>
<HeroIcon value="Assets\Textures\btn-unit-terran-goliath.dds"/>
<LifeArmorIcon value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel0.dds"/>
<UnitIcon value="Assets\Textures\btn-unit-terran-goliath.dds"/>
<Wireframe>
<Image value="AP\Assets\Textures\Wireframe-Terran-goliath.dds"/>
</Wireframe>
</CActorUnit>
<CActorSound id="AP_NydusWormTransportLoadSound" parent="SoundOneShot">
<On Terms="AbilTransport.AP_NydusWormTransport.TransportLoad" Send="Create"/>
<On Terms="AbilTransport.AP_NydusWormTransport.TransportUnload" Send="Create"/>
Expand Down Expand Up @@ -3158,9 +3190,7 @@
<Abil Link="AP_SpiderMineUnburrowRangeDummy"/>
</CActorRange>
<CActorRange id="AP_VultureSpiderMinesRange" parent="RangeAbil" abil="AP_VultureSpiderMines"/>
<CActorUnit id="AP_Goliath" parent="GenericUnitBase" unitName="AP_Goliath">
<Aliases value="_UnitLarge"/>
<Macros value="UnloadDropAnim"/>
<CActorUnit id="AP_Goliath" parent="AP_GoliathBase" unitName="AP_Goliath">
<On Terms="WeaponStart.AP_GoliathG.AttackStart" Send="AnimBracketStart Attack Attack"/>
<On Terms="WeaponStop.AP_GoliathG.AttackStop" Send="AnimBracketStop Attack"/>
<On Terms="WeaponStart.AP_GoliathA.AttackStart" Send="AnimBracketStart Spell Spell"/>
Expand All @@ -3178,30 +3208,7 @@
<On Terms="Upgrade.AP_GoliathJumpJet.Add" Send="ModelSwap AP_Goliath_BlackOps"/>
<On Terms="ActorCreation; ValidateUnit AP_HaveGoliathJumpJets" Send="ModelSwap AP_Goliath_BlackOps"/>
<On Terms="UnitDeathCustomize; ValidateUnit AP_HaveGoliathJumpJets" Send="DeathCustomize BlackOps"/>
<DeathArray index="Normal" ModelLink="AP_GoliathDeath" SoundLink="AP_Goliath_Explode"/>
<DeathCustoms ModelLink="AP_Goliath_BlackOps_Death" Name="BlackOps"/>
<DeathActorModel value="AP_GoliathDeath"/>
<PortraitModel value="AP_GoliathPortrait"/>
<StandAnimTurnTime value="4"/>
<WalkAnimMoveSpeed value="3.6093"/>
<BarOffset value="75"/>
<BarWidth value="66"/>
<GroupIcon>
<Image value="AP\Assets\Textures\Wireframe-Terran-goliath.dds"/>
</GroupIcon>
<GroupSoundArray index="Birth" value="AP_Goliath_Birth"/>
<GroupSoundArray index="Ready" value="AP_Goliath_Ready"/>
<GroupSoundArray index="Help" value="AP_Goliath_Help"/>
<GroupSoundArray index="What" value="AP_Goliath_What"/>
<GroupSoundArray index="Yes" value="AP_Goliath_Yes"/>
<GroupSoundArray index="Attack" value="AP_Goliath_Attack"/>
<GroupSoundArray index="Pissed" value="AP_Goliath_Pissed"/>
<HeroIcon value="Assets\Textures\btn-unit-terran-goliath.dds"/>
<LifeArmorIcon value="Assets\Textures\btn-upgrade-terran-vehicleplatinglevel0.dds"/>
<UnitIcon value="Assets\Textures\btn-unit-terran-goliath.dds"/>
<Wireframe>
<Image value="AP\Assets\Textures\Wireframe-Terran-goliath.dds"/>
</Wireframe>
</CActorUnit>
<CActorModel id="AP_GoliathDeath" parent="UnitDeathModel">
<AcceptedTransfers index="Textures" value="1"/>
Expand Down Expand Up @@ -8489,6 +8496,7 @@
<On Terms="Effect.AP_Blink.Start; At Source; ValidateUnit AP_NoDarkProtoss" Send="ModelSwap DarkBlinkOriginModel"/>
<On Terms="Effect.AP_VoidStalkerBlinkShieldRestore.Start; At Source" Send="Create"/>
<On Terms="ActorCreation; ValidateUnit AP_IsSiegeTankMengskAnyMode" Send="SetVisibility"/>
<On Terms="ActorCreation; ValidateUnit AP_IsGoliathMengsk" Send="SetVisibility"/>
<Host Subject="_Selectable"/>
<HostSiteOps Ops="SOpAttachOriginStationary"/>
<Model value="BlinkOriginModel"/>
Expand Down Expand Up @@ -8539,6 +8547,9 @@
<CActorRange id="AP_SiegeTankMengskBlink_Range" parent="RangeAbil" abil="AP_SiegeTankMengskBlink">
<Abil Link="AP_BlinkDummy"/>
</CActorRange>
<CActorRange id="AP_GoliathMengskBlink_Range" parent="RangeAbil" abil="AP_GoliathMengskBlink">
<Abil Link="AP_BlinkDummy"/>
</CActorRange>
<CActorUnit id="AP_Baneling" parent="AP_BanelingBase" unitName="AP_Baneling">
<On Terms="AbilMorph.*.Finish; MorphTo AP_Baneling; MorphFrom AP_BanelingCocoon" Send="Create"/>
<On Terms="AbilMorph.*.Finish; MorphTo AP_Baneling; MorphFrom AP_BanelingCocoon" Send="$Birth 0 0.000000"/>
Expand Down Expand Up @@ -40268,4 +40279,107 @@
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachCenter"/>
</CActorModel>
<CActorUnit id="AP_GoliathMengsk" parent="AP_GoliathBase" unitName="AP_GoliathMengsk">
<CustomUnitStatusFrame value="AP_Coop_UnitStatus_Mengsk/MengskGoliath_StatusFrame"/>
<StatusBarOn index="Custom" value="1"/>
<UnitFlags index="SuppressDefaultStatusBar" value="1"/>
<On Terms="WeaponStart.AP_GoliathMengskG.AttackStart" Send="AnimBracketStart Attack Attack"/>
<On Terms="WeaponStop.AP_GoliathMengskG.AttackStop" Send="AnimBracketStop Attack"/>
<On Terms="WeaponStart.AP_GoliathMengskA.AttackStart" Send="AnimBracketStart Spell Spell"/>
<On Terms="WeaponStop.AP_GoliathMengskA.AttackStop" Send="AnimBracketStop Spell"/>
<On Terms="WeaponStart.AP_GoliathMengskAUpgraded.AttackStart" Send="AnimBracketStart Spell Spell"/>
<On Terms="WeaponStop.AP_GoliathMengskAUpgraded.AttackStop" Send="AnimBracketStop Spell"/>
<Model value="AP_GoliathMengsk"/>
<DeathActorModel value="AP_GoliathMengskDeath"/>
<HeroIcon value="AP\Assets\Textures\btn-unit-terran-goliath-mengsk.dds"/>
<UnitIcon value="AP\Assets\Textures\btn-unit-terran-goliath-mengsk.dds"/>
</CActorUnit>
<CActorModel id="AP_GoliathMengskDeath" parent="UnitDeathModel">
<AcceptedTransfers index="Textures" value="1"/>
<CopySource value="AP_GoliathMengsk"/>
<Inherits index="BaseModelScale" value="0"/>
<Host Subject="_Selectable"/>
<HostSiteOps Ops="SOpAttachOriginStationary SOpShadow"/>
</CActorModel>
<CActorAction id="AP_GoliathMengskAirAttack" parent="GenericAttack" effectImpact="AP_GoliathMengskAUSwitch" effectLaunch="AP_GoliathMengskALM">
<Missile value="AP_GoliathAirAttackMissile"/>
<LaunchAttachQuery Methods="AP_AMPatternGoliathMengsk"/>
<LaunchAssets Model="AP_GoliathAirAttackLaunch" Sound="VikingFighter_AttackLaunch"/>
<ImpactMap index="None" Model="AP_GoliathAirAttackImpact" Sound="VikingFighter_AttackImpact"/>
</CActorAction>
<CActorAction id="AP_GoliathMengskLockdownAirAttack" parent="GenericAttack" effectImpact="AP_GoliathMengskAUL4Set" effectLaunch="AP_GoliathMengskALMLockdown">
<Missile value="AP_GoliathAirAttackMissile"/>
<LaunchAttachQuery Methods="AP_AMPatternGoliathMengsk"/>
<LaunchAssets Model="AP_GoliathAirAttackLaunch" Sound="VikingFighter_AttackLaunch"/>
<ImpactMap index="None" Model="AP_Goliath_Lockdown_Impact" Sound="VikingFighter_AttackImpact"/>
</CActorAction>
<CActorAction id="AP_GoliathMengskGroundAttack" parent="GenericAttack" effectAttack="AP_GoliathMengskGSwitch">
<LaunchAttachQuery Methods="AMFilterWeaponSetA0"/>
<LaunchAssets Model="AP_GoliathGroundAttackLaunch" Sound="AP_GoliathGroundAttackLaunch"/>
<ImpactMap index="None" Model="AP_GoliathGroundAttackImpact" Sound="AP_Goliath_GroundAttackImpact"/>
</CActorAction>
<CActorModel id="AP_GoliathMengskLeftLaunchSquib" parent="ModelAnimationStyleOneShot">
<Model value="AP_HHVikingAssaultAttackBeam"/>
<Flags index="SuppressCreationErrors" value="1"/>
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachWeapon01" HoldPosition="1" HoldRotation="1"/>
<On Terms="Effect.AP_GoliathMengskGFriendlySwitch.Start; At Caster" Send="Create"/>
<On Terms="Effect.AP_GoliathMengskGSplashSwitch.Start; At Caster" Send="Create"/>
<On Terms="ActorCreation" Send="TimerSet 0.062500 Pierce"/>
<On Terms="TimerExpired; TimerName Pierce" Send="Create AP_GoliathMengskLeft1LaunchSquib"/>
<On Terms="ActorCreation" Send="SetScaleFromWeaponRange 0.000000,1.000000,0.000000"/>
</CActorModel>
<CActorModel id="AP_GoliathMengskLeft1LaunchSquib" parent="ModelAnimationStyleOneShot">
<Model value="AP_HHVikingAssaultAttackBeam"/>
<Flags index="SuppressCreationErrors" value="1"/>
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachWeapon01 AP_HHVikingAssaultLeftSiteOp1" HoldPosition="1" HoldRotation="1"/>
<!--On Terms="Effect.HHTwinGatlingCannons.Start; At Caster" Send="Create"/-->
<On Terms="ActorCreation" Send="TimerSet 0.062500 Pierce"/>
<On Terms="TimerExpired; TimerName Pierce" Send="Create AP_GoliathMengskLeft2LaunchSquib"/>
<On Terms="ActorCreation" Send="SetScaleFromWeaponRange 0.000000,1.000000,0.000000"/>
</CActorModel>
<CActorModel id="AP_GoliathMengskLeft2LaunchSquib" parent="ModelAnimationStyleOneShot">
<Model value="AP_HHVikingAssaultAttackBeam"/>
<Flags index="SuppressCreationErrors" value="1"/>
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachWeapon01 AP_HHVikingAssaultLeftSiteOp2" HoldPosition="1" HoldRotation="1"/>
<On Terms="ActorCreation" Send="SetScaleFromWeaponRange 0.000000,1.000000,0.000000"/>
<!--On Terms="Effect.HHTwinGatlingCannons.Start; At Caster" Send="Create"/-->
</CActorModel>
<CActorModel id="AP_GoliathMengskRightLaunchSquib" parent="ModelAnimationStyleOneShot">
<Model value="AP_HHVikingAssaultAttackBeam"/>
<Flags index="SuppressCreationErrors" value="1"/>
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachWeapon00" HoldPosition="1" HoldRotation="1"/>
<On Terms="Effect.AP_GoliathMengskGFriendlySwitch.Start; At Caster" Send="Create"/>
<On Terms="Effect.AP_GoliathMengskGSplashSwitch.Start; At Caster" Send="Create"/>
<On Terms="ActorCreation" Send="SetScaleFromWeaponRange 0.000000,1.000000,0.000000"/>
<On Terms="ActorCreation" Send="TimerSet 0.062500 Pierce"/>
<On Terms="TimerExpired; TimerName Pierce" Send="Create AP_GoliathMengskRight1LaunchSquib"/>
</CActorModel>
<CActorModel id="AP_GoliathMengskRight1LaunchSquib" parent="ModelAnimationStyleOneShot">
<Model value="AP_HHVikingAssaultAttackBeam"/>
<Flags index="SuppressCreationErrors" value="1"/>
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachWeapon00 AP_HHVikingAssaultRightSiteOp1" HoldPosition="1" HoldRotation="1"/>
<!--On Terms="Effect.HHTwinGatlingCannons.Start; At Caster" Send="Create"/-->
<On Terms="ActorCreation" Send="TimerSet 0.062500 Pierce"/>
<On Terms="TimerExpired; TimerName Pierce" Send="Create AP_GoliathMengskRight2LaunchSquib"/>
<On Terms="ActorCreation" Send="SetScaleFromWeaponRange 0.000000,1.000000,0.000000"/>
</CActorModel>
<CActorModel id="AP_GoliathMengskRight2LaunchSquib" parent="ModelAnimationStyleOneShot">
<Model value="AP_HHVikingAssaultAttackBeam"/>
<Flags index="SuppressCreationErrors" value="1"/>
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachWeapon00 AP_HHVikingAssaultRightSiteOp2" HoldPosition="1" HoldRotation="1"/>
<On Terms="ActorCreation" Send="SetScaleFromWeaponRange 0.000000,1.000000,0.000000"/>
<!--On Terms="Effect.HHTwinGatlingCannons.Start; At Caster" Send="Create"/-->
</CActorModel>
<CActorModel id="AP_NovaUnitLockdownTarget" parent="ModelAnimationStyleContinuous">
<Model value="AP_Goliath_Lockdown"/>
<On Terms="Behavior.AP_NovaUnitLockdown.On" Send="Create"/>
<On Terms="Behavior.AP_NovaUnitLockdown.Off" Send="AnimBracketStop BSD"/>
<HostSiteOps Ops="SOpAttachCenter"/>
</CActorModel>
</Catalog>
3 changes: 2 additions & 1 deletion Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/Assets.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,5 @@ UI/AP_Coop_UnitStatus_MengskVeterancyHealthFrame_Icon_Marauder=Assets\Textures\u
UI/AP_Coop_UnitStatus_MengskVeterancyHealthFrame_Icon_SiegeTank=Assets\Textures\ui_ingame_alliedcommander_herohealthframe_mengsk_icon_siegetank.dds
UI/AP_Coop_UnitStatus_MengskVeterancyHealthFrame_Icon_Viking=Assets\Textures\ui_ingame_alliedcommander_herohealthframe_mengsk_icon_viking.dds
UI/AP_Coop_UnitStatus_MengskVeterancyHealthFrame_Icon_Thor=Assets\Textures\ui_ingame_alliedcommander_herohealthframe_mengsk_icon_thor.dds
UI/AP_Coop_UnitStatus_MengskVeterancyHealthFrame_Icon_Marine=AP\Assets\Textures\ui_ingame_alliedcommander_herohealthframe_mengsk_icon_marine.dds
UI/AP_Coop_UnitStatus_MengskVeterancyHealthFrame_Icon_Marine=AP\Assets\Custom\Textures\ui_ingame_alliedcommander_herohealthframe_mengsk_icon_marine.dds
UI/AP_Coop_UnitStatus_MengskVeterancyHealthFrame_Icon_Goliath=AP\Assets\Custom\Textures\ui_ingame_alliedcommander_herohealthframe_mengsk_icon_goliath.dds
6 changes: 6 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AttachMethodData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@
<Multiplier value="2"/>
<Driver value="AP_GoliathALM"/>
</CAttachMethodPattern>
<CAttachMethodPattern id="AP_AMPatternGoliathMengsk">
<Keyword value="SetB"/>
<Base value="::RollingIndex"/>
<Multiplier value="2"/>
<Driver value="AP_GoliathMengskALM"/>
</CAttachMethodPattern>
<CAttachMethodFilter id="AP_AMFilterDRCannons">
<Logic value="OR"/>
<Keys Keyword="Weapon" Index="10"/>
Expand Down
Loading

0 comments on commit 5f1c590

Please sign in to comment.