Merge pull request #260 from MatthewMarinets/mm/war_council_arbiter_a…

…scendant sc2: war council ascendant, arbiter, skylord
Ziktofel · Aug 12, 2024 · d1fb597 · d1fb597
2 parents f1026c8 + 902401e
commit d1fb597
Show file tree

Hide file tree

Showing 15 changed files with 288 additions and 29 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -2831,7 +2831,7 @@
         <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
         <Effect index="0" value="AP_ArbiterMPRecallSearch"/>
         <Cost>
-            <Vital index="Energy" value="100"/>
+            <Vital index="Energy" value="150"/>
             <Charge Link=""/>
             <Cooldown Link=""/>
         </Cost>
@@ -2846,12 +2846,23 @@
         <Effect index="0" value="AP_ArbiterMPStasisFieldSearch"/>
         <Flags index="AllowMovement" value="1"/>
         <Cost>
-            <Vital index="Energy" value="50"/>
+            <Vital index="Energy" value="150"/>
         </Cost>
         <Range value="9"/>
         <CursorEffect value="AP_ArbiterMPStasisFieldSearch"/>
         <CmdButtonArray index="Execute" DefaultButtonFace="AP_ArbiterMPStasisField"/>
     </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_ArbiterMPEternalStasisField">
+        <EditorCategories value="AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_ArbiterMPEternalStasisFieldSearch"/>
+        <Flags index="AllowMovement" value="1"/>
+        <Cost>
+            <Vital index="Energy" value="150"/>
+        </Cost>
+        <Range value="9"/>
+        <CursorEffect value="AP_ArbiterMPEternalStasisFieldSearch"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_ArbiterEternalStasisField" Requirements="AP_HaveArbiterSustainingStasisField"/>
+    </CAbilEffectTarget>
     <CAbilEffectTarget id="AP_AdeptPhaseShift">
         <EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
         <Effect index="0" value="AP_AdeptPhaseShiftInitialSet"/>
@@ -3538,7 +3549,7 @@
             <Cooldown TimeUse="120"/>
         </Cost>
         <Range value="500"/>
-        <CmdButtonArray index="Execute" DefaultButtonFace="AP_CarrierHyperjump"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_CarrierHyperjump" Requirements="AP_HaveSkylordHyperjump"/>
         <!--CmdButtonArray index="Execute" DefaultButtonFace="CarrierHyperjump" Requirements="HaveVoidCarrierHyperjump"/-->
         <CastIntroTime value="0"/>
         <CastOutroTime value="6"/>
@@ -9138,7 +9149,7 @@
         <EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
         <Effect index="0" value="AP_VoidHighTemplarMindBlastDamage"/>
         <Cost>
-            <Vital index="Energy" value="100"/>
+            <Vital index="Energy" value="125"/>
             <Cooldown TimeUse="8"/>
         </Cost>
         <TargetFilters value="Visible;Player,Ally,Structure,Missile,Stasis,Dead,Invulnerable"/>
@@ -9150,7 +9161,7 @@
         <EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
         <Effect index="0" value="AP_VoidHighTemplarPsiOrbInitialPersistent"/>
         <Cost>
-            <Vital index="Energy" value="50"/>
+            <Vital index="Energy" value="75"/>
             <Cooldown TimeUse="2"/>
         </Cost>
         <Range value="13"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -7105,6 +7105,7 @@
         <PlacementModel value="AP_ArbiterEX2Placement"/>
         <PortraitModel value="AP_ArbiterMPPortrait"/>
         <AbilSoundArray AbilCmd="AP_ArbiterMPStasisField,0" Sound="AP_Arbiter_StasisFieldVO"/>
+        <AbilSoundArray AbilCmd="AP_ArbiterMPEternalStasisField,0" Sound="AP_Arbiter_StasisFieldVO"/>
         <AbilSoundArray AbilCmd="AP_ArbiterMPRecall,0" Sound="AP_Arbiter_RecallVO"/>
         <BarOffset value="40"/>
         <BarWidth value="66"/>
@@ -7136,6 +7137,7 @@
     </CActorSound>
     <CActorModel id="AP_ArbiterMPCastModel" parent="ModelAnimationStyleOneShot">
         <On Terms="Effect.AP_ArbiterMPStasisFieldSearch.Start" Send="Create"/>
+        <On Terms="Effect.AP_ArbiterMPEternalStasisFieldSearch.Start" Send="Create"/>
     </CActorModel>
     <CActorRange id="AP_ArbiterMPCloakingFieldRange">
         <On Terms="SelectionLocalUpdate.AP_ArbiterMP.Start" Send="Create"/>
@@ -7185,22 +7187,28 @@
         <Inherits index="Scale" value="1"/>
         <EditorCategories value=""/>
         <On Terms="Behavior.AP_ArbiterMPStasisField.On" Send="Create"/>
+        <On Terms="Behavior.AP_ArbiterMPEternalStasisField.On" Send="Create"/>
         <On Terms="ActorCreation; ValidateUnit IsColossus" Send="SetScale 1.200000,1.200000,2.500000"/>
         <On Terms="Behavior.AP_ArbiterMPStasisField.Off" Send="AnimBracketStop BSD"/>
         <On Terms="Behavior.AP_ArbiterMPStasisField.On" Target="_Unit" Send="AnimSetPausedAll"/>
         <On Terms="Behavior.AP_ArbiterMPStasisField.Off" Target="_Unit" Send="AnimSetPausedAll 0"/>
+        <On Terms="Behavior.AP_ArbiterMPEternalStasisField.Off" Send="AnimBracketStop BSD"/>
+        <On Terms="Behavior.AP_ArbiterMPEternalStasisField.On" Target="_Unit" Send="AnimSetPausedAll"/>
+        <On Terms="Behavior.AP_ArbiterMPEternalStasisField.Off" Target="_Unit" Send="AnimSetPausedAll 0"/>
         <On Terms="ActorCreation; ValidateUnit AP_IsBrutalisk" Send="SetScale 2.000000"/>
         <Host Subject="_Unit"/>
         <HostSiteOps Ops="SOpAttachCenter"/>
         <AutoScaleFactor value="0.900000"/>
     </CActorModel>
     <CActorSound id="AP_ArbiterMPStasisFieldImpactSound" parent="SoundOneShot">
         <On Terms="Behavior.AP_ArbiterMPStasisField.On" Send="Create"/>
+        <On Terms="Behavior.AP_ArbiterMPEternalStasisField.On" Send="Create"/>
         <Host Subject="_Selectable"/>
         <Sound value="AP_ArbiterMP_StasisFieldOn"/>
     </CActorSound>
     <CActorSound id="AP_ArbiterMPStasisFieldOffSound" parent="SoundOneShot">
         <On Terms="Behavior.AP_ArbiterMPStasisField.Off" Send="Create"/>
+        <On Terms="Behavior.AP_ArbiterMPEternalStasisField.Off" Send="Create"/>
         <Host Subject="_Selectable"/>
         <Sound value="AP_ArbiterMP_StasisFieldOff"/>
     </CActorSound>
@@ -7224,17 +7232,23 @@
     </CActorSound>
     <CActorSound id="AP_ArbiterMP_StasisFieldShockwave" parent="SoundOneShot">
         <On Terms="Effect.AP_ArbiterMPStasisFieldSearch.Start" Send="Create"/>
+        <On Terms="Effect.AP_ArbiterMPEternalStasisFieldSearch.Start" Send="Create"/>
     </CActorSound>
     <CActorSplat id="AP_ArbiterMPRecallCursorSplat" parent="ProtossCursorSplat" abil="AP_ArbiterMPRecall"/>
     <CActorRange id="AP_ArbiterMPRecallRange" parent="RangeAbil" abil="AP_ArbiterMPRecall">
         <Icon value="Assets\Textures\RadarIcon2.dds"/>
         <IconArcLength value="3.250000"/>
     </CActorRange>
     <CActorSplat id="AP_ArbiterMPStasisFieldCursorSplat" parent="ProtossCursorSplat" abil="AP_ArbiterMPStasisField"/>
+    <CActorSplat id="AP_ArbiterMPEternalStasisFieldCursorSplat" parent="ProtossCursorSplat" abil="AP_ArbiterMPEternalStasisField"/>
     <CActorRange id="AP_ArbiterMPStasisFieldRange" parent="RangeAbil" abil="AP_ArbiterMPStasisField">
         <Icon value="Assets\Textures\RadarIcon2.dds"/>
         <IconArcLength value="3.250000"/>
     </CActorRange>
+    <CActorRange id="AP_ArbiterMPEternalStasisFieldRange" parent="RangeAbil" abil="AP_ArbiterMPEternalStasisField">
+        <Icon value="Assets\Textures\RadarIcon2.dds"/>
+        <IconArcLength value="3.250000"/>
+    </CActorRange>
     <CActorModel id="AP_AlarakLightningStrike" parent="BuffContinuous">
         <On Terms="Behavior.AP_AlarakLightningStrikes.On" Send="Create"/>
         <On Terms="Behavior.AP_AlarakLightningStrikes.Off" Send="AnimBracketStop BSD"/>
@@ -33978,12 +33992,17 @@
         <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="SetTintColor 0,192,255 6.000000 OneShot HyperjumpingTint"/>
+        <On Terms="Behavior.AP_HyperjumpTeleportOut.On" Send="SetOpacity 0.100000 0.600000 HyperjumpingOpacity"/>
+        <On Terms="Behavior.AP_HyperjumpTeleport.On" Send="ClearTintColor 0.000000 HyperjumpingTint"/>
+        <On Terms="Behavior.AP_HyperjumpTeleport.On" Send="ClearOpacity 0.000000 HyperjumpingOpacity"/>
+        <On Terms="Behavior.AP_HyperjumpTeleport.On" Send="ModelSwap AP_CarrierTaldarimWarpInStargate"/>
+        <On Terms="Behavior.AP_HyperjumpTeleport.Off" Send="$Spell"/>
         <On Terms="Behavior.AP_HyperjumpTeleportOut.On" Send="Create AP_CarrierHyperjumpTeleportOut"/>
         <On Terms="Behavior.AP_HyperjumpTeleportIn.On" Send="Create AP_CarrierHyperjumpTeleportIn"/>
+        <On Terms="Behavior.WarpInEffect.On" Send="ModelSwap AP_CarrierTaldarimWarpInStargate"/>
+        <On Terms="Behavior.WarpInEffect.On" Send="$Spell"/>
+        <On Terms="AnimDone; AnimName Spell" Send="ModelSwap Carrier_Taldarim_Collection"/>
         <Baselines index="Walk" BlendIn="1.500000" BlendOut="2.000000"/>
         <PortraitModel value="Carrier_Taldarim_Collection_Portrait"/>
         <Model value="Carrier_Taldarim_Collection"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -3519,6 +3519,9 @@
         <DisplayDuration index="Enemy" value="1"/>
         <Duration value="15"/>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_ArbiterMPEternalStasisFieldTimedLife" parent="AP_ArbiterMPStasisFieldTimedLife">
+        <Duration value="65.5"/>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_ArbiterMPStasisField">
         <InfoIcon value="Assets\Textures\btn-ability-protoss-forcefield-color.dds"/>
         <Duration value="15"/>
@@ -3536,6 +3539,9 @@
             <BehaviorLinkDisableArray value="Detector12"/>
         </Modification>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_ArbiterMPEternalStasisField" parent="AP_ArbiterMPStasisField">
+        <Duration value="65.5"/>
+    </CBehaviorBuff>
     <CBehaviorBuff id="AP_CorsairDisableFakeWeapon">
         <InfoFlags index="Hidden" value="1"/>
         <DisableValidatorArray value="AP_CorsairFakeWeaponBehaviorDisable"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -2638,6 +2638,10 @@
         <Icon value="Assets\Textures\btn-ability-protoss-stasisfield.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-protoss-stasisfield.dds"/>
     </CButton>
+    <CButton id="AP_ArbiterAbilityEfficiency">
+        <Icon value="Assets\Textures\btn-ability-stetmann-stetelliteoverloadenergy.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-stetmann-stetelliteoverloadenergy.dds"/>
+    </CButton>
     <CButton id="AP_CorsairMPDisruptionWeb">
         <Icon value="Assets\Textures\btn-ability-protoss-disruptionweb.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-protoss-disruptionweb.dds"/>
@@ -4877,9 +4881,10 @@
         <AlertIcon value="Assets\Textures\btn-upgrade-protoss-adeptshieldupgrade.dds"/>
         <EditorCategories value="Race:Protoss"/>
     </CButton>
-    <CButton id="AP_ArbiterSustainingStasisField">
-        <Icon value="Assets\Textures\btn-ability-protoss-stasisfield.dds"/>
-        <AlertIcon value="Assets\Textures\btn-ability-protoss-stasisfield.dds"/>
+    <CButton id="AP_ArbiterEternalStasisField">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-fenix-stasisfield.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-protoss-fenix-stasisfield.dds"/>
+        <HidesForSimpleText value="0"/>
     </CButton>
     <CButton id="AP_CarrierStructuralIntegrityReinforcements">
         <Icon value="assets\textures\btn-progression-protoss-fenix-14-colossusandcarrierchampionsresearch.dds"/>
@@ -5056,6 +5061,10 @@
         <Icon value="Assets\Textures\btn-upgrade-protoss-wrathwalker-chargetimeimproved.dds"/>
         <AlertIcon value="Assets\Textures\btn-upgrade-protoss-wrathwalker-chargetimeimproved.dds"/>
     </CButton>
+    <CButton id="AP_AscendantAbilityEfficiency">
+        <Icon value="Assets\Textures\btn-ability-stetmann-stetelliteoverloadenergy.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-stetmann-stetelliteoverloadenergy.dds"/>
+    </CButton>
     <CButton id="AP_Hallucination">
         <Icon value="Assets\Textures\btn-ability-protoss-hallucination-color.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-protoss-hallucination-color.dds"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -10586,22 +10586,52 @@
         <EditorCategories value="Race:Protoss"/>
         <Behavior value="AP_ArbiterMPStasisField"/>
     </CEffectApplyBehavior>
+    <CEffectRemoveBehavior id="AP_ArbiterMPStasisFieldRB">
+        <BehaviorLink value="AP_ArbiterMPStasisField"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_ArbiterMPEternalStasisFieldApply" parent="AP_ArbiterMPStasisFieldApply">
+        <Behavior value="AP_ArbiterMPEternalStasisField"/>
+    </CEffectApplyBehavior>
+    <CEffectRemoveBehavior id="AP_ArbiterMPEternalStasisFieldRB">
+        <BehaviorLink value="AP_ArbiterMPEternalStasisField"/>
+    </CEffectRemoveBehavior>
     <CEffectEnumArea id="AP_ArbiterMPStasisFieldSearch">
         <EditorCategories value="Race:PrimalZerg"/>
         <ImpactLocation Value="TargetPoint"/>
         <SearchFilters value="-;Self,Player,Ally,Neutral,Structure,Missile,Item,Dead,Hidden"/>
         <AreaArray Radius="5" Effect="AP_ArbiterMPStasisFieldSet"/>
     </CEffectEnumArea>
+    <CEffectEnumArea id="AP_ArbiterMPEternalStasisFieldSearch" parent="AP_ArbiterMPStasisFieldSearch">
+        <AreaArray index="0" Radius="5" Effect="AP_ArbiterMPEternalStasisFieldSet"/>
+    </CEffectEnumArea>
     <CEffectSet id="AP_ArbiterMPStasisFieldSet">
         <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_ArbiterMPEternalStasisFieldRB"/>
+        <EffectArray value="AP_ArbiterMPEternalStasisFieldTimerRB"/>
         <EffectArray value="AP_ArbiterMPStasisFieldApply"/>
         <EffectArray value="AP_ArbiterMPStasisFieldTimerApply"/>
     </CEffectSet>
+    <CEffectSet id="AP_ArbiterMPEternalStasisFieldSet">
+        <EditorCategories value="Race:Protoss"/>
+        <EffectArray value="AP_ArbiterMPStasisFieldRB"/>
+        <EffectArray value="AP_ArbiterMPStasisFieldTimerRB"/>
+        <EffectArray value="AP_ArbiterMPEternalStasisFieldApply"/>
+        <EffectArray value="AP_ArbiterMPEternalStasisFieldTimerApply"/>
+    </CEffectSet>
     <CEffectApplyBehavior id="AP_ArbiterMPStasisFieldTimerApply">
         <ValidatorArray value="NotFrenzied"/>
         <EditorCategories value="Race:Protoss"/>
         <Behavior value="AP_ArbiterMPStasisFieldTimedLife"/>
     </CEffectApplyBehavior>
+    <CEffectRemoveBehavior id="AP_ArbiterMPStasisFieldTimerRB">
+        <BehaviorLink value="AP_ArbiterMPStasisFieldTimedLife"/>
+    </CEffectRemoveBehavior>
+    <CEffectApplyBehavior id="AP_ArbiterMPEternalStasisFieldTimerApply" parent="AP_ArbiterMPStasisFieldTimerApply">
+        <Behavior value="AP_ArbiterMPEternalStasisFieldTimedLife"/>
+    </CEffectApplyBehavior>
+    <CEffectRemoveBehavior id="AP_ArbiterMPEternalStasisFieldTimerRB">
+        <BehaviorLink value="AP_ArbiterMPEternalStasisFieldTimedLife"/>
+    </CEffectRemoveBehavior>
     <CEffectDamage id="AP_ArbiterMPWeaponDamage" parent="DU_WEAP">
         <EditorCategories value="Race:Protoss"/>
         <Visibility value="Visible"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -2899,6 +2899,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeCarrierStructuralIntegrityReinforcementsCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveSkylordHyperjump">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeSkylordHyperjumpCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveVoidRaySpeedUpgrade">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeVoidRaySpeedUpgradeCompleteOnly"/>
@@ -2915,6 +2919,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeArbiterCloakFieldRangeCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveArbiterAbilityEfficiency">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeArbiterAbilityEfficiencyCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveGraviticDrive">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeGraviticDriveCompleteOnly"/>
@@ -3134,6 +3142,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeBloodAmuletCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveAscendantAbilityEfficiency">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeAscendantAbilityEfficiencyCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveSentryHallucination">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeSentryHallucinationCompleteOnly"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5292,6 +5292,10 @@
         <Count Link="AP_CarrierStructuralIntegrityReinforcements" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeSkylordHyperjumpCompleteOnly">
+        <Count Link="AP_SkylordHyperjump" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeVoidRaySpeedUpgradeCompleteOnly">
         <Count Link="AP_VoidRaySpeedUpgrade" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
@@ -5308,6 +5312,10 @@
         <Count Link="AP_ArbiterCloakFieldRange" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeArbiterAbilityEfficiencyCompleteOnly">
+        <Count Link="AP_ArbiterAbilityEfficiency" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeGraviticDriveCompleteOnly">
         <Count Link="AP_GraviticDrive" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
@@ -5523,6 +5531,10 @@
         <Count Link="AP_BloodAmulet" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeAscendantAbilityEfficiencyCompleteOnly">
+        <Count Link="AP_AscendantAbilityEfficiency" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeSentryHallucinationCompleteOnly">
         <Count Link="AP_SentryHallucination" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>