Disruptor Upgrade Templates

SirChuckOfTheChuckles · Aug 8, 2024 · a29c1a0 · a29c1a0
1 parent 578f277
commit a29c1a0
Show file tree

Hide file tree

Showing 9 changed files with 237 additions and 3 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -3756,6 +3756,22 @@
             <Flags index="ToSelection" value="1"/>
         </CmdButtonArray>
     </CAbilEffectTarget>
+    <CAbilEffectTarget id="AP_DisruptorBlink">
+        <AbilSetId value="Blnk"/>
+        <EditorCategories value="Race:Protoss,AbilityorEffectType:Units"/>
+        <Effect index="0" value="AP_VoidStalkerBlinkMultiple"/>
+        <Flags index="BestUnit" value="0"/>
+        <Flags index="RequireTargetVision" value="0"/>
+        <Cost>
+            <Charge TimeStart="8" TimeUse="8"/>
+            <Cooldown Link="Blink" TimeUse="8"/>
+        </Cost>
+        <Range value="500"/>
+        <Arc value="360"/>
+        <CmdButtonArray index="Execute" DefaultButtonFace="AP_StalkerBlinkMultiple" Requirements="AP_UseRestructThrust">
+            <Flags index="ToSelection" value="1"/>
+        </CmdButtonArray>
+    </CAbilEffectTarget>
     <CAbilEffectTarget id="AP_BlinkDummy">
         <!-- Dummy Ability for CActorRange -->
         <!-- See Effect AP_Blink -->

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -4092,6 +4092,15 @@
         <EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
         <Duration value="3"/>
         <Modification MoveSpeedBonus="-2.2382"/>
+        <DisableValidatorArray value="AP_NoRestructedThrusters"/>
+    </CBehaviorBuff>
+    <CBehaviorBuff id="AP_PurificationNovaTargettedCasterUseThrust">
+        <Alignment value="Positive"/>
+        <InfoFlags index="Hidden" value="1"/>
+        <InfoIcon value="Assets\Textures\btn-ability-protoss-arcshield.dds"/>
+        <EditorCategories value="AbilityorEffectType:Units,Race:Protoss"/>
+        <DisableValidatorArray value="AP_UseRestructedThrusters"/>
+        <Duration value="3"/>
     </CBehaviorBuff>
     <CBehaviorBuff id="AP_PurificationNovaTargettedTarget">
         <Alignment value="Positive"/>
@@ -4109,7 +4118,7 @@
         <PeriodicEffect value="AP_PurificationNovaNotificationSearch"/>
         <FinalEffect value="Suicide"/>
         <ExpireEffect value="AP_PurificationNovaTargettedSearchSet"/>
-        <Modification MoveSpeedBonus="2">
+        <Modification>
             <StateFlags index="Invulnerable" value="1"/>
             <StateFlags index="Benign" value="1"/>
             <StateFlags index="Passive" value="1"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -12,6 +12,27 @@
         <AlertIcon value="Assets\Textures\btn-upgrade-protoss-fenix-disruptorpermanentcloak.dds"/>
         <EditorCategories value="Race:Protoss"/>
     </CButton>
+    <CButton id="AP_RestructuredThrusters">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-alarak-stalkerphasingarmor.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-protoss-alarak-stalkerphasingarmor.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
+    <CButton id="AP_DisruptorBlink">
+        <Icon value="Assets\Textures\BTN-Ability-Protoss-BlinkCharges.dds"/>
+        <AlertIcon value="Assets\Textures\BTN-Ability-Protoss-BlinkCharges.dds"/>
+        <HotkeyAlias value="AP_Blink"/>
+        <Universal value="1"/>
+    </CButton>
+    <CButton id="AP_PerfectedPower">
+        <Icon value="Assets\Textures\btn-ability-spearofadun-purifierbeam.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-spearofadun-purifierbeam.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
+    <CButton id="AP_RestrainedDestruction">
+        <Icon value="Assets\Textures\btn-upgrade-stetmann-banelingmanashieldefficiency.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-stetmann-banelingmanashieldefficiency.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
     <CButton id="Attack">
         <!-- Override -->
         <SimpleDisplayText value=""/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -11394,6 +11394,29 @@
         <ShieldBonus value="55"/>
         <Amount value="145"/>
         <Death value="Electrocute"/>
+        <ValidatorArray value="AP_NoRestrainedDestruction"/>
+    </CEffectDamage>
+    <CEffectDamage id="AP_PurificationNovaEnemyDamage">
+        <ValidatorArray value="AP_DisruptorDamageFilter"/>
+        <ValidatorArray value="AP_HaveRestrainedDestruction"/>
+        <EditorCategories value=""/>
+        <ResponseFlags index="Acquire" value="1"/>
+        <ResponseFlags index="Flee" value="1"/>
+        <ShieldBonus value="55"/>
+        <Amount value="145"/>
+        <Death value="Electrocute"/>
+        <SearchFilters value="-;Player,Ally,Neutral"/>
+    </CEffectDamage>
+    <CEffectDamage id="AP_PurificationNovaFriendlyDamage">
+        <ValidatorArray value="AP_DisruptorDamageFilter"/>
+        <ValidatorArray value="AP_HaveRestrainedDestruction"/>
+        <EditorCategories value=""/>
+        <ResponseFlags index="Acquire" value="1"/>
+        <ResponseFlags index="Flee" value="1"/>
+        <ShieldBonus value="27.5"/>
+        <Amount value="72.5"/>
+        <Death value="Electrocute"/>
+        <SearchFilters value="-;Enemy"/>
     </CEffectDamage>
     <CEffectIssueOrder id="AP_PurificationNovaMorph">
         <EditorCategories value="Race:Protoss"/>
@@ -11422,6 +11445,8 @@
         <EditorCategories value=""/>
         <SearchFilters value="Ground;Self,Missile,Item,Dead,Hidden,Invulnerable"/>
         <AreaArray Radius="2.5" Effect="AP_PurificationNovaDamage"/>
+        <AreaArray Radius="2.5" Effect="AP_PurificationNovaEnemyDamage"/>
+        <AreaArray Radius="2.5" Effect="AP_PurificationNovaFriendlyDamage"/>
         <SearchFlags index="SameCliff" value="1"/>
     </CEffectEnumArea>
     <CEffectSet id="AP_PurificationNovaSearchSet">
@@ -11453,9 +11478,15 @@
         <WhichUnit Value="Caster"/>
         <Behavior value="AP_PurificationNovaTargettedCaster"/>
     </CEffectApplyBehavior>
+    <CEffectApplyBehavior id="AP_PurificationNovaTargettedCasterBC">
+        <EditorCategories value="Race:Protoss"/>
+        <WhichUnit Value="Caster"/>
+        <Behavior value="AP_PurificationNovaTargettedCasterUseThrust"/>
+    </CEffectApplyBehavior>
     <CEffectSet id="AP_PurificationNovaTargettedInitialSet">
         <EditorCategories value="Race:Protoss"/>
         <EffectArray value="AP_PurificationNovaTargettedCasterAB"/>
+        <EffectArray value="AP_PurificationNovaTargettedCasterBC"/>
         <EffectArray value="AP_PurificationNovaTargettedCU"/>
         <TargetLocationType value="Point"/>
     </CEffectSet>
@@ -11471,11 +11502,68 @@
         <ImpactLocation Value="TargetUnit"/>
         <SearchFilters value="Ground;Self,Missile,Item,Dead,Hidden,Invulnerable"/>
         <AreaArray Radius="1.5" Effect="AP_PurificationNovaDamage"/>
+        <ValidatorArray value="AP_NoDisruptorPerfectedPower"/>
+        <ValidatorArray value="AP_NoRestrainedDestruction"/>
+        <SearchFlags index="SameCliff" value="1"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurificationNovaTargettedSearchGroundEnemy">
+        <ValidatorArray value="AP_NoDisruptorPerfectedPower"/>
+        <ValidatorArray value="AP_HaveRestrainedDestruction"/>
+        <EditorCategories value=""/>
+        <LaunchLocation Value="TargetUnit"/>
+        <ImpactLocation Value="TargetUnit"/>
+        <SearchFilters value="Ground;Self,Player,Ally,Neutral,Missile,Item,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.5" Effect="AP_PurificationNovaEnemyDamage"/>
+        <SearchFlags index="SameCliff" value="1"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurificationNovaTargettedSearchAir">
+        <ValidatorArray value="AP_HaveDisruptorPerfectedPower"/>
+        <ValidatorArray value="AP_NoRestrainedDestruction"/>
+        <EditorCategories value=""/>
+        <LaunchLocation Value="TargetUnit"/>
+        <ImpactLocation Value="TargetUnit"/>
+        <SearchFilters value="-;Self,Missile,Item,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.5" Effect="AP_PurificationNovaDamage"/>
+        <SearchFlags index="SameCliff" value="1"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurificationNovaTargettedSearchAirFriend">
+        <ValidatorArray value="AP_HaveDisruptorPerfectedPower"/>
+        <ValidatorArray value="AP_HaveRestrainedDestruction"/>
+        <EditorCategories value=""/>
+        <LaunchLocation Value="TargetUnit"/>
+        <ImpactLocation Value="TargetUnit"/>
+        <SearchFilters value="-;Self,Enemy,Missile,Item,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.5" Effect="AP_PurificationNovaFriendlyDamage"/>
+        <SearchFlags index="SameCliff" value="1"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurificationNovaTargettedSearchAirEnemy">
+        <ValidatorArray value="AP_HaveDisruptorPerfectedPower"/>
+        <ValidatorArray value="AP_HaveRestrainedDestruction"/>
+        <EditorCategories value=""/>
+        <LaunchLocation Value="TargetUnit"/>
+        <ImpactLocation Value="TargetUnit"/>
+        <SearchFilters value="-;Self,Player,Ally,Neutral,Missile,Item,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.5" Effect="AP_PurificationNovaEnemyDamage"/>
+        <SearchFlags index="SameCliff" value="1"/>
+    </CEffectEnumArea>
+    <CEffectEnumArea id="AP_PurificationNovaTargettedSearchGroundFriendly">
+        <ValidatorArray value="AP_NoDisruptorPerfectedPower"/>
+        <ValidatorArray value="AP_HaveRestrainedDestruction"/>
+        <EditorCategories value=""/>
+        <LaunchLocation Value="TargetUnit"/>
+        <ImpactLocation Value="TargetUnit"/>
+        <SearchFilters value="Ground;Self,Enemy,Missile,Item,Dead,Hidden,Invulnerable"/>
+        <AreaArray Radius="1.5" Effect="AP_PurificationNovaFriendlyDamage"/>
         <SearchFlags index="SameCliff" value="1"/>
     </CEffectEnumArea>
     <CEffectSet id="AP_PurificationNovaTargettedSearchSet">
         <EditorCategories value="Race:Protoss"/>
         <EffectArray value="AP_PurificationNovaTargettedSearch"/>
+        <EffectArray value="AP_PurificationNovaTargettedSearchAir"/>
+        <EffectArray value="AP_PurificationNovaTargettedSearchGroundEnemy"/>
+        <EffectArray value="AP_PurificationNovaTargettedSearchGroundFriendly"/>
+        <EffectArray value="AP_PurificationNovaTargettedSearchAirFriend"/>
+        <EffectArray value="AP_PurificationNovaTargettedSearchAirEnemy"/>
         <EffectArray value="Kill"/>
     </CEffectSet>
     <CEffectApplyBehavior id="AP_PurificationNovaTargettedSpawnAB">

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -62,6 +62,30 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeAP_DisruptorPermanentCloakCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveDisruptorPerfectedPower">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeAP_DisruptorPerfectedPowerCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_HaveRestrainedDestruction">
+        <EditorCategories value="Race:Protoss,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeAP_DisruptorRestrainedDestructionCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_NoRestrainedDestruction">
+        <EditorCategories value="Race:Protoss,TechType:Upgrade"/>
+        <NodeArray index="Use" Link="AP_NotCountUpgradeAP_DisruptorRestrainedDestructionCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_NoRestructThrust">
+        <EditorCategories value="Race:Protoss,TechType:Upgrade"/>
+        <NodeArray index="Use" Link="AP_NotCountUpgradeAP_DisruptorRestructuredThrustersCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_NoDisruptorPerfectedPower">
+        <EditorCategories value="Race:Protoss,TechType:Upgrade"/>
+        <NodeArray index="Use" Link="AP_NotCountUpgradeAP_DisruptorPerfectedPowerCompleteOnly"/>
+    </CRequirement>
+    <CRequirement id="AP_UseRestructThrust">
+        <EditorCategories value="Race:Protoss,TechType:Upgrade"/>
+        <NodeArray index="Show" Link="AP_CountUpgradeAP_DisruptorRestructuredThrustersCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_UseCombatShield">
         <EditorCategories value="Race:Terran,TechType:Upgrade"/>
         <NodeArray index="Show" Link="AP_CountUpgradeCombatShieldCompleteOnly"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6206,4 +6206,31 @@
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="AP_DisruptorPermanentCloak" State="CompleteOnly"/>
     </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeAP_DisruptorRestructuredThrustersCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Tooltip value="RequirementNode/Tooltip/##id##"/>
+        <Count Link="AP_DisruptorRestructuredThrusters" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
+    <CRequirementNot id="AP_NotCountUpgradeAP_DisruptorRestructuredThrustersCompleteOnly">
+        <Tooltip value="RequirementNode/Tooltip/##id##"/>
+        <OperandArray index="0" value="AP_CountUpgradeAP_DisruptorRestructuredThrustersCompleteOnly"/>
+    </CRequirementNot>
+    <CRequirementCountUpgrade id="AP_CountUpgradeAP_DisruptorPerfectedPowerCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Tooltip value="RequirementNode/Tooltip/##id##"/>
+        <Count Link="AP_DisruptorPerfectedPower" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
+    <CRequirementCountUpgrade id="AP_CountUpgradeAP_DisruptorRestrainedDestructionCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Tooltip value="RequirementNode/Tooltip/##id##"/>
+        <Count Link="AP_DisruptorRestrainedDestruction" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
+    <CRequirementNot id="AP_NotCountUpgradeAP_DisruptorPerfectedPowerCompleteOnly">
+        <Tooltip value="RequirementNode/Tooltip/##id##"/>
+        <OperandArray index="0" value="AP_CountUpgradeAP_DisruptorPerfectedPowerCompleteOnly"/>
+    </CRequirementNot>
+    <CRequirementNot id="AP_NotCountUpgradeAP_DisruptorRestrainedDestructionCompleteOnly">
+        <Tooltip value="RequirementNode/Tooltip/##id##"/>
+        <OperandArray index="0" value="AP_CountUpgradeAP_DisruptorRestrainedDestructionCompleteOnly"/>
+    </CRequirementNot>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -15789,6 +15789,7 @@
         <AbilArray Link="Warpable"/>
         <AbilArray Link="AP_PurificationNovaTargeted"/>
         <AbilArray Link="ProgressRally"/>
+        <AbilArray Link="AP_DisruptorBlink"/>
         <BehaviorArray Link="AP_SOAHeroicShieldProcBuff"/>
         <BehaviorArray Link="AP_DisruptorPermanentCloak"/>
         <CardLayouts>
@@ -15801,6 +15802,10 @@
             <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
             <LayoutButtons Face="AP_PurificationNovaTargeted" Type="AbilCmd" AbilCmd="AP_PurificationNovaTargeted,0" Row="2" Column="0"/>
             <LayoutButtons Face="AP_PermanentlyCloakedDisruptor" Type="Passive" Requirements="AP_HaveDisruptorPermanentCloak" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_DisruptorBlink" Type="AbilCmd" AbilCmd="AP_DisruptorBlink,Execute" Row="2" Column="1"/>
+            <LayoutButtons Face="AP_RestructuredThrusters" Type="Passive" Requirements="AP_UseRestructThrust" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_PerfectedPower" Type="Passive" Requirements="AP_HaveDisruptorPerfectedPower" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_RestrainedDestruction" Type="Passive" Requirements="AP_HaveRestrainedDestruction" Row="1" Column="3"/>
         </CardLayouts>
         <SeparationRadius value="0.375"/>
         <InnerRadius value="0.5"/>
@@ -15854,7 +15859,7 @@
         <ShieldRegenDelay value="10"/>
         <ShieldRegenRate value="2"/>
         <ShieldArmorName value="Unit/ShieldArmorName/ProtossPlasmaShields"/>
-        <Speed value="2.25"/>
+        <Speed value="4.25"/>
         <Acceleration value="1000"/>
         <LateralAcceleration value="46.0625"/>
         <StationaryTurningRate value="999.8437"/>
@@ -15881,7 +15886,6 @@
             <LayoutButtons Face="AcquireMove" Type="AbilCmd" AbilCmd="move,AcquireMove" Row="0" Column="4"/>
             <LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
             <LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
-            <LayoutButtons Face="AP_PurificationNova" Type="AbilCmd" AbilCmd="AP_PurificationNova,Execute" Row="2" Column="0"/>
         </CardLayouts>
         <SeparationRadius value="0.375"/>
         <InnerRadius value="0.5"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -8991,6 +8991,27 @@
         <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
         <AffectedUnitArray value="AP_Disruptor"/>
     </CUpgrade>
+    <CUpgrade id="AP_DisruptorRestructuredThrusters">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-alarak-stalkerphasingarmor.dds"/>
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_Disruptor"/>
+    </CUpgrade>
+    <CUpgrade id="AP_DisruptorRestrainedDestruction">
+        <Icon value="Assets\Textures\btn-upgrade-stetmann-banelingmanashieldefficiency.dds"/>
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <AffectedUnitArray value="AP_Disruptor"/>
+    </CUpgrade>
+    <CUpgrade id="AP_DisruptorPerfectedPower">
+        <Flags index="UpgradeCheat" value="0"/>
+        <EffectArray Reference="Effect,AP_PurificationNovaDamage,Amount" Value="55"/>
+        <EffectArray Operation="Subtract" Reference="Effect,AP_PurificationNovaEnemyDamage,ShieldBonus" Value="55"/>
+        <EffectArray Reference="Effect,AP_PurificationNovaEnemyDamage,Amount" Value="55"/>
+        <EffectArray Reference="Effect,AP_PurificationNovaFriendlyDamage,Amount" Value="27.5"/>
+        <EffectArray Operation="Subtract" Reference="Effect,AP_PurificationNovaDamage,ShieldBonus" Value="55"/>
+        <EffectArray Operation="Subtract" Reference="Effect,AP_PurificationNovaFriendlyDamage,ShieldBonus" Value="27.5"/>
+        <EditorCategories value="Race:Protoss,UpgradeType:Talents"/>
+        <Icon value="Assets\Textures\btn-ability-spearofadun-purifierbeam.dds"/>
+    </CUpgrade>
     <CUpgrade id="AP_K5Apocalypse">
         <EditorCategories value="Race:Zerg,UpgradeType:Talents"/>
     </CUpgrade>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -3527,6 +3527,30 @@
         <CombineArray value="AP_DisruptorPhasedDamageFilter"/>
         <CombineArray value="AP_IsNotFriendly"/>
     </CValidatorCombine>
+    <CValidatorPlayerRequirement id="AP_HaveDisruptorPerfectedPower">
+        <Find value="1"/>
+        <Value value="AP_HaveDisruptorPerfectedPower"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_NoDisruptorPerfectedPower">
+        <Find value="1"/>
+        <Value value="AP_NoDisruptorPerfectedPower"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_HaveRestrainedDestruction">
+        <Find value="1"/>
+        <Value value="AP_HaveRestrainedDestruction"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_NoRestructedThrusters">
+        <Find value="1"/>
+        <Value value="AP_NoRestructThrust"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_NoRestrainedDestruction">
+        <Find value="1"/>
+        <Value value="AP_NoRestrainedDestruction"/>
+    </CValidatorPlayerRequirement>
+    <CValidatorPlayerRequirement id="AP_UseRestructedThrusters">
+        <Find value="1"/>
+        <Value value="AP_UseRestructThrust"/>
+    </CValidatorPlayerRequirement>
     <CValidatorUnitType id="AP_IsNotAPDisruptor">
         <Value value="AP_Disruptor"/>
         <Find value="0"/>