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

sc2: replaced skylord interceptors with a laser #174

Merged
merged 4 commits into from
Jul 16, 2024
Merged

sc2: replaced skylord interceptors with a laser #174

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd1fca9
sc2: replaced skylord interceptors with a laser
MatthewMarinets Jul 8, 2024
3a6d95f
sc2: Final skylord weapon pass before letting others play with it; tu…
MatthewMarinets Jul 14, 2024
03f6e46
sc2: Fixing skylord not displaying with squad sight; slightly adjusti…
MatthewMarinets Jul 15, 2024
76b7785
sc2: Skylord lasers with squadsight can now target and hit friendlies
MatthewMarinets Jul 15, 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
37 changes: 37 additions & 0 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 @@ -32859,6 +32859,43 @@
<CActorModel id="AP_CarrierHyperjumpTeleportOut" parent="ModelAnimationStyleOneShotNoOrphan">
<Model value="AP_AirUnits_TeleportOut_COOP"/>
</CActorModel>
<CActorModel id="AP_CarrierTaldarimLaserAttackAreaEffect" parent="ModelAnimationStyleOneShot">
<Model value="AP_HighArchonPsiStormImpact"/>
<On Terms="Effect.AP_CarrierTaldarimLaserDamageArea.Start" Send="Create"/>
<On Terms="ActorCreation" Send="AnimPlay Attack Attack"/>
<On Terms="ActorCreation" Send="TimerSet 0.550000 DelayDestroy"/>
<On Terms="ActorCreation" Send="SetScale 1.000000"/>
<On Terms="TimerExpired; TimerName DelayDestroy" Send="Destroy"/>
<On Terms="ActorCreation" Send="TimerSet 0.300000 DelayShrink"/>
<On Terms="TimerExpired; TimerName DelayShrink" Send="SetScale 0.400000"/>
<HostSiteOps Ops="SOpShadow"/>
</CActorModel>
<CActorAction id="AP_CarrierTaldarimLaserAttack" parent="GenericAttackBase">
<On Terms="ActorCreation" Send="SetTintColor 255,70,70"/>
<On Terms="Effect.AP_CarrierTaldarimLaserDamage.Start; At Caster; FromEffectTreeDescendant" Send="ActionDamage"/>
<On Terms="Effect.AP_CarrierTaldarimLaserCP.Start; At Caster" Send="Create"/>
MatthewMarinets marked this conversation as resolved.
Show resolved Hide resolved
<On Terms="Effect.AP_CarrierTaldarimLaserCPSquadsight.Start; At Caster" Send="Create"/>
<LaunchAssets Model="" Sound="AP_SiegeBreaker_SiegedAttackLaunch"/>
<BeamScope value="Caster"/>
<ShieldFlashType value="Header"/>
</CActorAction>
<CActorBeamSimple id="AP_CarrierTaldarimLaserAttackBeam" parent="GenericAttackBeam">
<On Terms="Effect.AP_CarrierTaldarimLaserDamageArea.Start; EffectExecuteIndex 12" Send="RefSet ::HostImpact AP_CarrierTaldarimLaserAttackBeamImpactSite"/>
<On Terms="ActorCreation" Send="SetScale 3.400000,1.000000,1.000000"/>
<On Terms="ActorCreation" Send="TimerSet 0.550000 DelayDestroy"/>
<On Terms="TimerExpired; TimerName DelayDestroy" Send="Destroy"/>
<Model value="AP_KhaydarinBeamAttackBeam"/>
</CActorBeamSimple>
<CActorSite id="AP_CarrierTaldarimLaserAttackBeamImpactSite">
<On Terms="Effect.AP_CarrierTaldarimLaserDamageArea.Start; EffectExecuteIndex 12; At Caster" Send="Create"/>
<HostSiteOps Ops="SOpTargetPoint SOpShadow SOpHeightLaunch"/>
</CActorSite>
<CActorModel id="AP_CarrierTaldarimLaserAttackDamageReaction" parent="ModelAnimationStyleOneShot">
<On Terms="Effect.AP_CarrierTaldarimLaserDamage.Start; At Target" Send="Create"/>
<Host Subject="_Unit"/>
<HostSiteOps Ops="SOpAttachHead SOpForwardCasterCenter"/>
<Model value="AP_HighArchonPsiStormImpact"/>
</CActorModel>
<CActorModel id="AP_PrimalIgniterConeAttackImpact" parent="ModelAnimationStyleOneShot">
<On Terms="Effect.AP_PrimalIgniterAttackDamage.Start; At Target; !ValidateEffect AP_HavePrimalIgniterFireBreath" Send="Create"/>
<Host Subject="_Unit"/>
Expand Down
51 changes: 51 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 @@ -7772,6 +7772,57 @@
<Player Value="Caster"/>
<Target Effect="AP_ReleaseInterceptorsSet" Value="TargetPoint"/>
</CEffectIssueOrder>
<CEffectDamage id="AP_CarrierTaldarimLaserDamage" parent="DU_WEAP">
<ValidatorArray value="noMarkers"/>
<EditorCategories value="Race:Protoss"/>
<Kind value="Ranged"/>
<KindSplash value="Splash"/>
<Amount value="55"/>
<Death value="Fire"/>
</CEffectDamage>
<CEffectEnumArea id="AP_CarrierTaldarimLaserDamageArea">
<EditorCategories value="Race:Protoss"/>
<ExcludeArray Value="Target"/>
<IncludeArray Effect="AP_CarrierTaldarimLaserCP" Value="Target"/>
MatthewMarinets marked this conversation as resolved.
Show resolved Hide resolved
<SearchFilters value="-;Player,Ally,Missile,Stasis,Dead,Hidden,Invulnerable"/>
<AreaArray Radius="0.8" Effect="AP_CarrierTaldarimLaserDamage"/>
<SearchFlags index="CallForHelp" value="1"/>
<Marker Link="Effect/AP_CarrierTaldarimLaserDamage">
<MatchFlags index="Link" value="1"/>
</Marker>
</CEffectEnumArea>
<CEffectSwitch id="AP_CarrierTaldarimLaserEffect">
<CaseArray Validator="AP_HasHavocSquadSightBehavior" Effect="AP_CarrierTaldarimLaserCPSquadsight"/>
<CaseDefault value="AP_CarrierTaldarimLaserCP"/>
</CEffectSwitch>
<CEffectCreatePersistent id="AP_CarrierTaldarimLaserCP">
<EditorCategories value="Race:Terran"/>
<WhichLocation Value="SourcePoint"/>
<InitialEffect value="AP_CarrierTaldarimLaserDamage"/>
<PeriodCount value="13"/>
<PeriodicEffectArray value="AP_CarrierTaldarimLaserDamageArea"/>
<PeriodicOffsetArray value="0,-0.85,0"/>
<PeriodicOffsetArray value="0,-1.7,0"/>
<PeriodicOffsetArray value="0,-2.55,0"/>
<PeriodicOffsetArray value="0,-3.4,0"/>
<PeriodicOffsetArray value="0,-4.25,0"/>
<PeriodicOffsetArray value="0,-5.1,0"/>
<PeriodicOffsetArray value="0,-5.95,0"/>
<PeriodicOffsetArray value="0,-6.8,0"/>
<PeriodicOffsetArray value="0,-7.65,0"/>
<PeriodicOffsetArray value="0,-8.5,0"/>
<PeriodicOffsetArray value="0,-9.35,0"/>
<PeriodicOffsetArray value="0,-10.2,0"/>
<PeriodicOffsetArray value="0,-11.05,0"/>
<PeriodicOffsetArray value="0,-11.9,0"/>
<PeriodicOffsetArray value="0,-12.75,0"/>
<PeriodicOffsetArray value="0,-13.6,0"/>
<PeriodicOffsetArray value="0,-14.45,0"/>
<PeriodicPeriodArray value="0"/>
</CEffectCreatePersistent>
<CEffectCreatePersistent id="AP_CarrierTaldarimLaserCPSquadsight" parent="AP_CarrierTaldarimLaserCP">
<PeriodCount value="16"/>
</CEffectCreatePersistent>
<CEffectApplyBehavior id="AP_DisableCasterEnergyRegenApplyBehavior">
<WhichUnit Value="Caster"/>
<Behavior value="AP_DisableEnergyRegen"/>
Expand Down
11 changes: 3 additions & 8 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11528,8 +11528,8 @@
<Attributes index="Armored" value="1"/>
<Attributes index="Mechanical" value="1"/>
<Attributes index="Massive" value="1"/>
<LifeStart value="300"/>
<LifeMax value="300"/>
<LifeStart value="400"/>
<LifeMax value="400"/>
<LifeArmor value="2"/>
<LifeArmorName value="Unit/LifeArmorName/ProtossPlating"/>
<ShieldsStart value="150"/>
Expand All @@ -11556,24 +11556,20 @@
<AbilArray Link="stop"/>
<AbilArray Link="attack"/>
<AbilArray Link="move"/>
<AbilArray Link="AP_CarrierTaldarimHanger"/>
<AbilArray Link="AP_HangarQueue5"/>
<AbilArray Link="Warpable"/>
<AbilArray Link="ProgressRally"/>
<AbilArray Link="AP_CarrierHyperjump"/>
<BehaviorArray Link="AP_SOAHeroicShieldProcBuff"/>
<WeaponArray Link="AP_InterceptorAiurLaunch"/>
<WeaponArray Link="AP_CarrierTaldarimLaser"/>
<CardLayouts>
<LayoutButtons Face="Move" Type="AbilCmd" AbilCmd="move,Move" Row="0" Column="0"/>
<LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
<LayoutButtons Face="MoveHoldPosition" Type="AbilCmd" AbilCmd="move,HoldPos" Row="0" Column="2"/>
<LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
<LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
<LayoutButtons Face="AP_InterceptorTaldarim" Type="AbilCmd" AbilCmd="AP_CarrierTaldarimHanger,0" Row="2" Column="0"/>
<LayoutButtons Face="AP_CarrierHyperjump" Type="AbilCmd" AbilCmd="AP_CarrierHyperjump,0" Row="2" Column="1"/>
<LayoutButtons Face="Cancel" Type="AbilCmd" AbilCmd="AP_HangarQueue5,0" Row="2" Column="4"/>
<LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
<LayoutButtons Face="AP_GravitonCatapult" Type="Passive" Requirements="AP_HaveCarrierAiurLaunchSpeedUpgrade" Row="1" Column="0"/>
<LayoutButtons Face="AP_CarrierStructuralIntegrityReinforcements" Type="Passive" Requirements="AP_HaveCarrierStructuralIntegrityReinforcements" Row="1" Column="1"/>
</CardLayouts>
<Radius value="1.25"/>
Expand All @@ -11586,7 +11582,6 @@
<EditorCategories value="ObjectType:Unit,ObjectFamily:Campaign"/>
<TacticalAI value="Carrier"/>
<Mass value="0.6"/>
<EquipmentArray Weapon="AP_InterceptorsTaldarimDummy"/>
<GlossaryCategory value="Unit/Category/AP_ProtossUnitsAir"/>
<GlossaryPriority value="170"/>
<GlossaryStrongArray value="Thor"/>
Expand Down
8 changes: 8 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,6 +929,9 @@
<EffectArray Reference="Effect,AP_CarrierPurifierChargeBeamDamageCharge1,Amount" Value="1"/>
<EffectArray Reference="Effect,AP_CarrierPurifierChargeBeamDamageCharge2,Amount" Value="1"/>
<EffectArray Reference="Effect,AP_CarrierPurifierChargeBeamDamageCharge3,Amount" Value="1"/>
<!-- Skylord -->
<EffectArray Reference="Weapon,AP_CarrierTaldarimLaser,Level" Value="1"/>
<EffectArray Reference="Effect,AP_CarrierTaldarimLaserDamage,Amount" Value="5"/>
<!-- Mothership -->
<EffectArray Reference="Weapon,AP_MothershipBeam,Level" Value="1"/>
<EffectArray Reference="Effect,AP_MothershipBeamDamage,Amount" Value="1.000000"/>
Expand Down Expand Up @@ -7813,6 +7816,7 @@
<!-- <EffectArray Operation="Set" Reference="Weapon,MothershipBeam,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>-->
<EffectArray Operation="Set" Reference="Weapon,AP_InterceptorAiurLaunch,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_InterceptorAiurBeam,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_CarrierTaldarimLaser,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ArbiterMPWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ScoutMPGround,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ScoutMPAir,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel1.dds"/>
Expand All @@ -7837,6 +7841,7 @@
<!-- <EffectArray Operation="Set" Reference="Weapon,MothershipBeam,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>-->
<EffectArray Operation="Set" Reference="Weapon,AP_InterceptorAiurLaunch,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_InterceptorAiurBeam,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_CarrierTaldarimLaser,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ArbiterMPWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ScoutMPGround,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ScoutMPAir,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel2.dds"/>
Expand All @@ -7861,6 +7866,7 @@
<!-- <EffectArray Operation="Set" Reference="Weapon,MothershipBeam,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>-->
<EffectArray Operation="Set" Reference="Weapon,AP_InterceptorAiurLaunch,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_InterceptorAiurBeam,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_CarrierTaldarimLaser,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ArbiterMPWeapon,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ScoutMPGround,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ScoutMPAir,Icon" Value="Assets\Textures\btn-upgrade-protoss-airweaponslevel3.dds"/>
Expand All @@ -7884,6 +7890,7 @@
<!-- <EffectArray Operation="Set" Reference="Weapon,MothershipBeam,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>-->
<EffectArray Operation="Set" Reference="Weapon,AP_InterceptorAiurLaunch,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_InterceptorAiurBeam,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_CarrierTaldarimLaser,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ArbiterMPWeapon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ScoutMPGround,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ScoutMPAir,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel4.dds"/>
Expand All @@ -7907,6 +7914,7 @@
<!-- <EffectArray Operation="Set" Reference="Weapon,MothershipBeam,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>-->
<EffectArray Operation="Set" Reference="Weapon,AP_InterceptorAiurLaunch,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_InterceptorAiurBeam,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_CarrierTaldarimLaser,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ArbiterMPWeapon,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ScoutMPGround,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
<EffectArray Operation="Set" Reference="Weapon,AP_ScoutMPAir,Icon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-airweaponslevel5.dds"/>
Expand Down
11 changes: 11 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1647,6 +1647,17 @@
<CWeaponLegacy id="AP_InterceptorsPurifierDummy" parent="AP_InterceptorsDummy">
<Icon value="Assets\Textures\btn-unit-collection-purifier-interceptor.dds"/>
</CWeaponLegacy>
<CWeaponLegacy id="AP_CarrierTaldarimLaser">
<EditorCategories value="Race:Protoss"/>
<Icon value="Assets\Textures\btn-upgrade-protoss-airweaponslevel0.dds"/>
<DisplayEffect value="AP_CarrierTaldarimLaserDamage"/>
<TargetFilters value="Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
<Range value="10"/>
<Period value="3.25"/>
<DamagePoint value="0.25"/>
<Backswing value="0.75"/>
<Effect value="AP_CarrierTaldarimLaserEffect"/>
</CWeaponLegacy>
<CWeaponLegacy id="AP_IonCannons">
<EditorCategories value="Race:Protoss"/>
<Options index="OnlyFireWhileInAttackOrder" value="0"/>
Expand Down
1 change: 1 addition & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Preload.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<Actor id="AP_SOAGravitonBombTargetSound"/>
<Actor id="AP_SOAOrbitalStrikeTargetModel"/>
<Actor id="AP_SOATargetingModeConfirmationSound"/>
<Actor id="AP_Stargate"/>
<Behavior id="AP_ZerglingRespawnPrimary"/>
<Behavior id="AP_SiegeTankSiegeModeProgressiveRangeIncease"/>
<Behavior id="AP_CreepTumorExhausted"/>
Expand Down
3 changes: 2 additions & 1 deletion Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5566,6 +5566,8 @@ Weapon/Name/AP_BrynhildAssaultA=Hellfire Missiles
Weapon/Name/AP_BrynhildAssaultG=Twin Autocannons
Weapon/Name/AP_BrynhildFighterAirWeapon=H.A.L.O. Cluster Rockets
Weapon/Name/AP_C10CanisterRifle=C-10 Canister Rifle
Weapon/Name/AP_CarrierPurifierPrismaticBeamDummy=Solar Beam
Weapon/Name/AP_CarrierTaldarimLaser=Void Laser
Weapon/Name/AP_CenturionWarpBlades=Warp Blades
Weapon/Name/AP_Claws=Claws
Weapon/Name/AP_ColossusPurifierThermalLances=Incendiary Lance
Expand Down Expand Up @@ -5749,7 +5751,6 @@ Weapon/Name/AP_WreckingCrewAssault=Gatling Cannon
Weapon/Name/AP_WreckingCrewFighter=Lanzer Torpedoes
Weapon/Name/AP_PrismaticBeam=Prismatic Beam
Weapon/Name/AP_VoidRaySwarm=Prismatic Beam
Weapon/Name/AP_CarrierPurifierPrismaticBeamDummy=Solar Beam
Weapon/Tip/AP_AcidSpines=
Weapon/Tip/AP_D8Charge=Only used against structures.
Weapon/Tip/AP_Impaler=<c val="#ColorAttackInfo">Must be burrowed to attack.</c>
Expand Down