Skip to content

Commit

Permalink
Add Skylord
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziktofel
Ziktofel committed Jul 5, 2024
1 parent 690d35b commit f16d02d
Show file tree
Hide file tree
Showing 22 changed files with 626 additions and 26 deletions.
5 changes: 3 additions & 2 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/AP_Player_StickyProtossBuildButtons.galaxy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const int AP_Sticky_NUM_UNITS = 30;

const int AP_Sticky_NUM_GATEWAY_UNITS = 21;
const int AP_Sticky_NUM_ROBO_UNITS = 10;
const int AP_Sticky_NUM_STARGATE_UNITS = 13;
const int AP_Sticky_NUM_STARGATE_UNITS = 14;

const int AP_Sticky_BUILDING_GATEWAY = 0;
const int AP_Sticky_BUILDING_ROBO = 1;
Expand Down Expand Up @@ -105,6 +105,7 @@ void initLists() {
stargateTrainToUnitClass[10] = AP_Sticky_CLASS_ARBITER; // Oracle
stargateTrainToUnitClass[11] = AP_Sticky_CLASS_VOID_RAY; // Warp Ray
stargateTrainToUnitClass[12] = AP_Sticky_CLASS_VOID_RAY; // Scorcher
stargateTrainToUnitClass[13] = AP_Sticky_CLASS_CARRIER; // Skylord

// (class, faction) -> train ID
abilityIndices[AP_Sticky_CLASS_ZEALOT][AP_Sticky_FACTION_AIUR] = 0; // Zealot
Expand Down Expand Up @@ -154,7 +155,7 @@ void initLists() {
abilityIndices[AP_Sticky_CLASS_CARRIER][AP_Sticky_FACTION_AIUR] = 6; // Carrier
abilityIndices[AP_Sticky_CLASS_CARRIER][AP_Sticky_FACTION_PURIFIER] = -1; // -
abilityIndices[AP_Sticky_CLASS_CARRIER][AP_Sticky_FACTION_NERAZIM] = -1; // -
abilityIndices[AP_Sticky_CLASS_CARRIER][AP_Sticky_FACTION_TALDARIM] = -1; // -
abilityIndices[AP_Sticky_CLASS_CARRIER][AP_Sticky_FACTION_TALDARIM] = 13; // Skylord
abilityIndices[AP_Sticky_CLASS_TEMPEST][AP_Sticky_FACTION_AIUR] = 9; // Scout
abilityIndices[AP_Sticky_CLASS_TEMPEST][AP_Sticky_FACTION_PURIFIER] = 5; // Tempest
abilityIndices[AP_Sticky_CLASS_TEMPEST][AP_Sticky_FACTION_NERAZIM] = -1; // -
Expand Down
41 changes: 38 additions & 3 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3280,6 +3280,23 @@
<EffectArray index="Death" value="InterceptorFate"/>
<MaxCount value="8"/>
</CAbilArmMagazine>
<CAbilArmMagazine id="AP_CarrierTaldarimHanger">
<AbilSetId value="CarrierAiurHanger"/>
<EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
<Flags index="Retarget" value="1"/>
<Leash value="12"/>
<InfoArray index="Ammo1" Time="10" CountStart="4" Manage="Recall" Unit="AP_InterceptorTaldarim">
<Charge Link="CarrierInterceptor" Location="Unit"/>
<Button DefaultButtonFace="AP_InterceptorTaldarim" Requirements="AP_ArmInterceptorTaldarim">
<Flags index="ToSelection" value="1"/>
</Button>
<Flags index="AutoBuild" value="1"/>
<Flags index="AutoBuildOn" value="1"/>
</InfoArray>
<Alert value="TrainComplete"/>
<EffectArray index="Death" value="InterceptorFate"/>
<MaxCount value="8"/>
</CAbilArmMagazine>
<CAbilArmMagazine id="AP_CarrierHangar">
<AbilSetId value="CarrierHanger"/>
<EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
Expand Down Expand Up @@ -3321,21 +3338,23 @@
<MaxCount value="2"/>
</CAbilArmMagazine>
<CAbilEffectTarget id="AP_CarrierHyperjump">
<AbilSetId value="FleetwideJump"/>
<EditorCategories value="AbilityorEffectType:Units"/>
<Effect index="0" value="CarrierHyperjumpTeleportSet"/>
<Effect index="0" value="AP_HyperjumpCreatePrecursor"/>
<Flags index="AllowMovement" value="1"/>
<Flags index="BestUnit" value="0"/>
<Flags index="NoDeceleration" value="1"/>
<Flags index="RequireTargetVision" value="0"/>
<Cost>
<Cooldown TimeUse="120"/>
</Cost>
<Range value="500"/>
<CmdButtonArray index="Execute" DefaultButtonFace="CarrierHyperjump"/>
<CmdButtonArray index="Execute" DefaultButtonFace="AP_CarrierHyperjump"/>
<!--CmdButtonArray index="Execute" DefaultButtonFace="CarrierHyperjump" Requirements="HaveVoidCarrierHyperjump"/-->
<CastIntroTime value="0"/>
<CastOutroTime value="6"/>
<ShowProgressArray index="Channel" value="1"/>
<ProgressButtonArray index="Channel" value="CarrierHyperjump"/>
<ProgressButtonArray index="Channel" value="AP_CarrierHyperjump"/>
<UninterruptibleArray index="Channel" value="1"/>
</CAbilEffectTarget>
<CAbilEffectTarget id="AP_CarrierRepairDroneHeal">
Expand Down Expand Up @@ -5726,6 +5745,10 @@
<Button DefaultButtonFace="AP_VoidRayPurifier" State="Restricted"/>
<Unit value="AP_VoidRayPurifier"/>
</InfoArray>
<InfoArray index="Train14" Time="120" Effect="WarpInEffect">
<Button DefaultButtonFace="AP_CarrierTaldarim" State="Restricted" Requirements="AP_HaveFleetBeacon"/>
<Unit value="AP_CarrierTaldarim"/>
</InfoArray>
</CAbilTrain>
<CAbilTrain id="AP_StargateTrainRedirect" parent="AP_StargateTrain"/>
<CAbilWarpTrain id="AP_StargateWarpTrain">
Expand Down Expand Up @@ -5885,6 +5908,18 @@
</Charge>
<Button DefaultButtonFace="AP_VoidRayPurifier" State="Restricted"/>
</InfoArray>
<InfoArray index="Train14" Time="5" Unit="AP_CarrierTaldarim">
<Charge Location="Unit">
<CountMax value="1"/>
<CountStart value="1"/>
<CountUse value="1"/>
<Link value="WarpGateTrain"/>
<TimeStart value="30"/>
<TimeUse value="96"/>
<Flags index="EnableChargeTimeQueuing" value="1"/>
</Charge>
<Button DefaultButtonFace="AP_CarrierTaldarim" State="Restricted" Requirements="AP_HaveFleetBeacon"/>
</InfoArray>
</CAbilWarpTrain>
<CAbilWarpTrain id="AP_StargateWarpTrainRedirect" parent="AP_StargateWarpTrain"/>
<CAbilMorph id="AP_MorphBackToRoboticsFacility">
Expand Down
64 changes: 63 additions & 1 deletion Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Catalog>
<CActorGlobalConfig id="SYSTEM_ActorConfig">
<DeathCustomPriorityList value="Taldarim"/>
</CActorGlobalConfig>
<const id="$AP_LurkerSpineSiteOps" value="{AP_LurkerSOpAoEVariancer SOpShadow SOpForwardCasterPoint SOp2DRotation AP_LurkerSOpShadowSpine SOpRotVariancerUp15}"/>
<CActorUnit default="1" id="GenericUnitStandard">
<!-- Override -->
Expand Down Expand Up @@ -3408,6 +3411,7 @@
</CActorSound>
<CActorSound id="AP_Battlecruiser_TacticalJumpCursorSound" parent="SoundOneShot">
<On Terms="Abil.AP_Hyperjump.TargetApproachStart" Send="Create"/>
<On Terms="Abil.AP_CarrierHyperjump.TargetApproachStart" Send="Create"/>
<On Terms="Abil.AP_ScienceVesselTacticalJump.TargetApproachStart" Send="Create"/>
<Sound value="Battlecruiser_TacticalJumpCursor"/>
<ScopeBearingsTracking value="ForceOff"/>
Expand Down Expand Up @@ -5254,6 +5258,7 @@
<CActorSound id="AP_CarrierInterceptorLaunch" parent="SoundOneShot">
<On Terms="Abil.AP_CarrierHangar.Launch" Send="Create"/>
<On Terms="Abil.AP_CarrierAiurHanger.Launch" Send="Create"/>
<On Terms="Abil.AP_CarrierTaldarimHanger.Launch" Send="Create"/>
<!-- <On Terms="Abil.AP_CarrierHangarVoid.Launch" Send="Create"/>-->
<Sound value="Carrier_InterceptorLaunch"/>
</CActorSound>
Expand Down Expand Up @@ -11708,6 +11713,9 @@
</CActorSound>
<CActorUnit id="AP_Interceptor" parent="GenericUnitStandard" unitName="AP_Interceptor">
<Model value="Interceptor"/>
<On Terms="UnitBirth.AP_InterceptorTaldarim" Send="Create"/>
<On Terms="ActorCreation; ValidateUnit AP_IsInterceptorTaldarim" Send="ModelSwap Interceptor_Taldarim_Collection"/>
<On Terms="UnitDeathCustomize; ValidateUnit AP_IsInterceptorTaldarim" Send="DeathCustomize Taldarim"/>
<On Terms="Upgrade.AP_DarkProtoss.Add" Send="ModelSwap DarkInterceptor"/>
<On Terms="UnitBirth; ValidateUnit AP_NoDarkProtoss" Send="ModelSwap DarkInterceptor"/>
<On Terms="UnitDeathCustomize; ValidateUnit AP_NoDarkProtoss" Send="DeathCustomize DarkProtoss"/>
Expand Down Expand Up @@ -11739,7 +11747,8 @@
<DeathCustoms Name="RagdollOverkillDOI" InheritsFrom="RagdollBasic"/>
<DeathCustoms Name="RagdollMidair" InheritsFrom="RagdollBasic"/>
<DeathCustoms ModelLink="DarkInterceptorDeath" Name="DarkProtoss"/>
<DeathCustoms ModelLink="HallucinationDeath" SoundLink="Sentry_HallucinationDeathSmall" Name="Hallucination"/>
<DeathCustoms ModelLink="Interceptor_Taldarim_Collection_Death" Name="Taldarim"/>
<Hallucination ModelLink="HallucinationDeath" SoundLink="Sentry_HallucinationDeathSmall" Name="Hallucination"/>
<DeathCustoms>
<ModelLink value="DeathVoidShadowSmall"/>
<SoundLink value="ShadowUnit_Small_DeathFX"/>
Expand Down Expand Up @@ -32640,6 +32649,9 @@
<On Terms="UnitHeightUpdate.*.Land" Send="Create AP_VoidRay_Land"/>
<On Terms="Behavior.Hallucination.On" Send="Create HallucinationBirthSoundLarge"/>
<On Terms="UnitDeathCustomize; ValidateUnit IsHallucination" Send="DeathCustomize Hallucination"/>
<On Terms="Behavior.WarpInEffect.On" Send="ModelSwap AP_VoidRayPurifierWarpInStargate"/>
<On Terms="Behavior.WarpInEffect.On" Send="$Spell"/>
<On Terms="AnimDone; AnimName Spell" Send="ModelSwap AP_VoidRayPurifier"/>
<DeathArray index="Normal" ModelLink="VoidRay_Purifier_Collection_Death" SoundLink="VoidRay_Explode"/>
<DeathActorModel value="UnitDeathModelWithDeathMotionFlier"/>
<PhysicsMatchKeysOrdered value="BasicAir,Basic"/>
Expand Down Expand Up @@ -32774,4 +32786,54 @@
<Sound value="VoidRay_PrismaticAligntmentOn3"/>
<On Terms="Behavior.AP_VoidRaySwarmDamageBoost.On" Send="Create"/>
</CActorSound>
<CActorUnit id="AP_CarrierTaldarim" parent="GenericUnitStandard" unitName="AP_CarrierTaldarim">
<ModelFlags index="OutlineEmitter" value="1"/>
<On Terms="Abil.AP_CarrierHangar.Launch" Send="AnimPlay Cover Cover 0 0.500000 0.500000 3.000000 AsDuration"/>
<On Terms="UnitHeightUpdate.*.Land" Send="Create AP_Carrier_Land"/>
<On Terms="Abil.AP_CarrierHyperjump.SourceCastStart" Send="SetTintColor 0,192,255 6.000000 OneShot HyperjumpingTint"/>
<On Terms="Abil.AP_CarrierHyperjump.SourceFinishStart" Send="ClearTintColor 0.000000 HyperjumpingTint"/>
<On Terms="Abil.AP_CarrierHyperjump.SourceCastStart" Send="SetOpacity 0.100000 6.000000 HyperjumpingOpacity"/>
<On Terms="Abil.AP_CarrierHyperjump.SourceFinishStart" Send="ClearOpacity 0.000000 HyperjumpingOpacity"/>
<On Terms="Behavior.AP_HyperjumpTeleportOut.On" Send="Create AP_CarrierHyperjumpTeleportOut"/>
<On Terms="Behavior.AP_HyperjumpTeleportIn.On" Send="Create AP_CarrierHyperjumpTeleportIn"/>
<Baselines index="Walk" BlendIn="1.500000" BlendOut="2.000000"/>
<PortraitModel value="Carrier_Taldarim_Collection_Portrait"/>
<Model value="Carrier_Taldarim_Collection"/>
<BuildModel value="AP_CarrierTaldarimWarpIn"/>
<PlacementModel value="Carrier_Taldarim_Collection"/>
<DeathArray index="Normal" ModelLink="Carrier_Taldarim_Collection_Death" SoundLink=""/>
<AnimBlendTime value="0.750000"/>
<BarWidth value="156"/>
<BarOffset value="60"/>
<NameOffset value="110"/>
<UnitIcon value="Assets\Textures\btn-unit-collection-taldarim-carrier.dds"/>
<HeroIcon value="Assets\Textures\btn-unit-collection-taldarim-carrier.dds"/>
<WireframeShield>
<Image value="Assets\Textures\Wireframe-collection-taldarim-Carrier-Shield01.dds"/>
<Image value="Assets\Textures\Wireframe-collection-taldarim-Carrier-Shield02.dds"/>
<Image value="Assets\Textures\Wireframe-collection-taldarim-Carrier-Shield03.dds"/>
</WireframeShield>
<GroupIcon>
<Image value="Assets\Textures\Wireframe-collection-taldarim-Carrier.dds"/>
</GroupIcon>
<Wireframe>
<Image value="Assets\Textures\Wireframe-collection-taldarim-Carrier.dds"/>
</Wireframe>
<LifeArmorIcon value="Assets\Textures\btn-upgrade-protoss-airarmorlevel0.dds"/>
<HostSiteOps Ops="SOpBankerCarrier"/>
<SoundArray index="Ready" value="Carrier_Ready"/>
<SoundArray index="Help" value="CarrierVoid_Help"/>
<SoundArray index="What" value="Carrier_What"/>
<SoundArray index="Yes" value="CarrierVoid_Yes"/>
<SoundArray index="Attack" value="Carrier_Attack"/>
<SoundArray index="Pissed" value="Carrier_Pissed"/>
<SoundArray index="Movement" value="Carrier_Movement"/>
<Aliases value="_UnitHuge"/>
</CActorUnit>
<CActorModel id="AP_CarrierHyperjumpTeleportIn" parent="ModelAnimationStyleOneShotNoOrphan">
<Model value="AP_AirUnits_TeleportIn_COOP"/>
</CActorModel>
<CActorModel id="AP_CarrierHyperjumpTeleportOut" parent="ModelAnimationStyleOneShotNoOrphan">
<Model value="AP_AirUnits_TeleportOut_COOP"/>
</CActorModel>
</Catalog>
13 changes: 13 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 @@ -7075,4 +7075,17 @@
<InfoFlags index="Hidden" value="1"/>
<Duration value="0.5"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_CarrierHyperjumpRemovePrecursorUnit">
<EditorCategories value="AbilityorEffectType:Units"/>
<Duration value="6"/>
<ExpireEffect value="AP_CarrierHyperjumpRemovePlaceholderUnit"/>
</CBehaviorBuff>
<CBehaviorBuff id="AP_CarrierHyperjumpTeleportHide">
<EditorCategories value="AbilityorEffectType:Units"/>
<Duration value="6.6"/>
<Modification>
<StateFlags index="Invulnerable" value="1"/>
<StateFlags index="Untargetable" value="1"/>
</Modification>
</CBehaviorBuff>
</Catalog>
16 changes: 16 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 @@ -5482,4 +5482,20 @@
<AlertIcon value="Assets\Textures\BTN-Ability-Protoss-VoidRayPrismaticAlignment.dds"/>
<EditorCategories value="Race:Protoss"/>
</CButton>
<CButton id="AP_CarrierHyperjump">
<Icon value="Assets\Textures\btn-ability-hornerhan-fleethyperjump.dds"/>
<AlertIcon value="Assets\Textures\btn-ability-hornerhan-fleethyperjump.dds"/>
</CButton>
<CButton id="AP_InterceptorTaldarim">
<Icon value="Assets\Textures\btn-unit-collection-taldarim-interceptor.dds"/>
<AlertIcon value="Assets\Textures\btn-unit-collection-taldarim-interceptor.dds"/>
</CButton>
<CButton id="AP_CarrierTaldarim">
<Icon value="Assets\Textures\btn-unit-collection-taldarim-carrier.dds"/>
<AlertIcon value="Assets\Textures\btn-unit-collection-taldarim-carrier.dds"/>
<Hotkey value="Button/Hotkey/Carrier"/>
<EditorCategories value="Race:Protoss"/>
<HotkeyAlias value="Carrier"/>
<Universal value="1"/>
</CButton>
</Catalog>
4 changes: 2 additions & 2 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5869,7 +5869,7 @@
<Behavior value="AP_NovaApolloCloak"/>
</CEffectApplyBehavior>
<CEffectTeleport id="AP_NovaArmorBlinkSuitBlink">
<ValidatorArray value="CasterNotFungalGrowthed"/>
<ValidatorArray value="AP_CasterNotFungalGrowthed"/>
<EditorCategories value="Race:Terran"/>
<WhichUnit Value="Caster"/>
<ClearQueuedOrders value="0"/>
Expand Down Expand Up @@ -9855,7 +9855,7 @@
<EffectArray value="AP_VoidHighTemplarPsiOrbDestroyPersistent"/>
</CEffectSet>
<CEffectTeleport id="AP_Blink">
<ValidatorArray value="CasterNotFungalGrowthed"/>
<ValidatorArray value="AP_CasterNotFungalGrowthed"/>
<EditorCategories value="Race:Protoss"/>
<WhichUnit Value="Caster"/>
<ClearQueuedOrders value="0"/>
Expand Down
Loading

0 comments on commit f16d02d

Please sign in to comment.