Merge pull request #262 from MatthewMarinets/mm/war_council_prism

sc2: Adding Warp Prism war council upgrade -- Warp Refraction
Ziktofel · Aug 15, 2024 · bebd3c5 · bebd3c5
2 parents 898d586 + 3808af2
commit bebd3c5
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 8 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -4943,6 +4943,10 @@
         <Icon value="Assets\Textures\btn-upgrade-protoss-alarak-graviticdrive.dds"/>
         <AlertIcon value="Assets\Textures\btn-upgrade-protoss-alarak-graviticdrive.dds"/>
     </CButton>
+    <CButton id="AP_WarpPrismWarpRefraction">
+        <Icon value="Assets\Textures\btn-ability-zeratul-warpprism-infinitevoid.dds"/>
+        <AlertIcon value="Assets\Textures\btn-ability-zeratul-warpprism-infinitevoid.dds"/>
+    </CButton>
     <CButton id="AP_HaveGraviticBoosters">
         <Icon value="Assets\Textures\btn-upgrade-protoss-graviticbooster.dds"/>
         <AlertIcon value="Assets\Textures\btn-upgrade-protoss-graviticbooster.dds"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -2977,6 +2977,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_NotCountUpgradeWarpPrismWarConfigurationCompleteOnly"/>
     </CRequirement>
+    <CRequirement id="AP_HaveWarpPrismWarpRefraction">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeWarpPrismWarpRefractionCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveObserverGraviticBooster">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeObserverGraviticBoosterCompleteOnly"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5335,6 +5335,10 @@
     <CRequirementNot id="AP_NotCountUpgradeWarpPrismWarConfigurationCompleteOnly">
         <OperandArray index="0" value="AP_CountUpgradeWarpPrismWarConfigurationCompleteOnly"/>
     </CRequirementNot>
+    <CRequirementCountUpgrade id="AP_CountUpgradeWarpPrismWarpRefractionCompleteOnly">
+        <Count Link="AP_WarpPrismWarpRefraction" State="CompleteOnly"/>
+        <Flags index="TechTreeCheat" value="0"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeObserverGraviticBoosterCompleteOnly">
         <Count Link="AP_ObserverGraviticBooster" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -23091,9 +23091,10 @@
             <LayoutButtons Face="AP_WarpPrismLoad" Type="AbilCmd" AbilCmd="AP_WarpPrismTransport,0" Row="2" Column="2"/>
             <LayoutButtons Face="AP_WarpPrismUnloadAll" Type="AbilCmd" AbilCmd="AP_WarpPrismTransport,2" Row="2" Column="3"/>
             <LayoutButtons Face="AP_PhasingMode" Type="AbilCmd" AbilCmd="AP_PhasingMode,0" Row="2" Column="0"/>
-            <LayoutButtons Face="AP_GraviticDrive" Type="Passive" Requirements="AP_HaveGraviticDrive" Row="1" Column="0"/>
-            <LayoutButtons Face="AP_PhaseBlaster" Type="Passive" Requirements="AP_HaveWarpPrismPhaseBlaster" Row="1" Column="1"/>
-            <LayoutButtons Face="AP_TaldarimWarpConduit" Type="Passive" Requirements="AP_HaveWarpPrismWarConfiguration" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_WarpPrismWarpRefraction" Type="Passive" Requirements="AP_HaveWarpPrismWarpRefraction" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_GraviticDrive" Type="Passive" Requirements="AP_HaveGraviticDrive" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_PhaseBlaster" Type="Passive" Requirements="AP_HaveWarpPrismPhaseBlaster" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_TaldarimWarpConduit" Type="Passive" Requirements="AP_HaveWarpPrismWarConfiguration" Row="1" Column="3"/>
         </CardLayouts>
         <Radius value="0.875"/>
         <SeparationRadius value="0.875"/>
@@ -23165,9 +23166,10 @@
             <LayoutButtons Face="AP_WarpPrismUnloadAll" Type="AbilCmd" AbilCmd="AP_WarpPrismTransport,UnloadAt" Row="2" Column="3"/>
             <LayoutButtons Face="AP_TransportMode" Type="AbilCmd" AbilCmd="AP_TransportMode,0" Row="2" Column="1"/>
             <LayoutButtons Face="AP_MatrixOverload" Type="Passive" Requirements="AP_HaveSOAMatrixOverload" Row="2" Column="0"/>
-            <LayoutButtons Face="AP_GraviticDrive" Type="Passive" Requirements="AP_HaveGraviticDrivePhasingMode" Row="1" Column="0"/>
-            <LayoutButtons Face="AP_PhaseBlaster" Type="Passive" Requirements="AP_HaveWarpPrismPhaseBlasterPhasingMode" Row="1" Column="1"/>
-            <LayoutButtons Face="AP_TaldarimWarpConduit" Type="Passive" Requirements="AP_HaveWarpPrismWarConfiguration" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_WarpPrismWarpRefraction" Type="Passive" Requirements="AP_HaveWarpPrismWarpRefraction" Row="1" Column="0"/>
+            <LayoutButtons Face="AP_GraviticDrive" Type="Passive" Requirements="AP_HaveGraviticDrivePhasingMode" Row="1" Column="1"/>
+            <LayoutButtons Face="AP_PhaseBlaster" Type="Passive" Requirements="AP_HaveWarpPrismPhaseBlasterPhasingMode" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_TaldarimWarpConduit" Type="Passive" Requirements="AP_HaveWarpPrismWarConfiguration" Row="1" Column="3"/>
         </CardLayouts>
         <Radius value="0.875"/>
         <SeparationRadius value="0.875"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -11548,6 +11548,12 @@
         <AffectedUnitArray value="AP_WarpPrismPhasing"/>
         <AffectedUnitArray value="AP_WarpPrism"/>
     </CUpgrade>
+    <CUpgrade id="AP_WarpPrismWarpRefraction">
+        <EffectArray Reference="Abil,AP_WarpPrismTransport,Range" Value="5"/>
+        <EffectArray Operation="SubtractBaseMultiply" Reference="Abil,AP_WarpPrismTransport,UnloadPeriod" Value="0.9"/>
+        <AffectedUnitArray value="AP_WarpPrismPhasing"/>
+        <AffectedUnitArray value="AP_WarpPrism"/>
+    </CUpgrade>
     <CUpgrade id="AP_ObserverGraviticBooster">
         <Alert value="ResearchComplete"/>
         <Race value="Prot"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1805,6 +1805,7 @@ Button/Name/AP_WarpPrism=Warp in Warp Prism
 Button/Name/AP_WarpPrismHallucination=Summon Warp Prism Hallucination
 Button/Name/AP_WarpPrismLoad=Load
 Button/Name/AP_WarpPrismUnloadAll=Unload All
+Button/Name/AP_WarpPrismWarpRefraction=Warp Refraction
 Button/Name/AP_WeaponsFree=Weapons Free
 Button/Name/AP_WidowMine=Build Widow Mine
 Button/Name/AP_WidowMineAttack=Attack
@@ -3017,6 +3018,7 @@ Button/Tooltip/AP_WarpPrismHallucination=These hallucinated copies function like
 Button/Tooltip/AP_WarpPrismLoad=Loads units into the Warp Prism's matrix.
 Button/Tooltip/AP_WarpPrismPhasing=Immobile power provider. Can load and unload units. Can switch to a mobile Transport Mode.
 Button/Tooltip/AP_WarpPrismUnloadAll=Unloads all units.
+Button/Tooltip/AP_WarpPrismWarpRefraction=Warp Prisms can load units from +<d ref="$UpgradeEffectArrayValue:AP_WarpPrismWarpRefraction:Abil,AP_WarpPrismTransport,Range$"/> range and unload units <d ref="1/(1 - $UpgradeEffectArrayValue:AP_WarpPrismWarpRefraction:Abil,AP_WarpPrismTransport,UnloadPeriod$)"/> times faster.
 Button/Tooltip/AP_WeaponsFree=Orders selected units to fire at will. They will engage enemy units within range and chase them as normal.
 Button/Tooltip/AP_WidowMine=Robotic mine. Launches missiles at nearby enemy units while burrowed. Attacks deal splash damage in a small area around the target. Widow Mine is revealed when Sentinel Missile is on cooldown. <n/><n/><c val="#ColorAttackInfo">Can attack ground and air units.</c>
 Button/Tooltip/AP_WidowMineAttack=Attacks any nearby enemy unit.
@@ -4796,6 +4798,7 @@ RequirementNode/Tooltip/AP_CountUpgradeVoidPhoenixDoubleGravitonCompleteOnly=Fin
 RequirementNode/Tooltip/AP_CountUpgradeVoidRayPrismaticRangeCompleteOnly=Find Prismatic Range (Void Ray)
 RequirementNode/Tooltip/AP_CountUpgradeDisruptorRestructuredThrustersCompleteOnly=Find Restructured Thrusters (Disruptor)
 RequirementNode/Tooltip/AP_CountUpgradeVoidZealotWhirlwindCompleteOnly=Find Whirlwind (Zealot)
+RequirementNode/Tooltip/AP_CountUpgradeWarpPrismWarpRefractionCompleteOnly=Find Warp Refraction (Warp Prism)
 RequirementNode/Tooltip/AP_CountUpgradeWrathwalkerAerialTrackingCompleteOnly=Find Aerial Tracking (Wrathwalker)
 RequirementNode/Tooltip/AP_EnergizerTransformToPhasingMode=Transform to Phasing Mode
 RequirementNode/Tooltip/AP_EqCountUnitSOAMothershipv4QueuedOrBetter0=No Mothership

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -1570,7 +1570,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil (int lp_player, int lp_b
         libABFE498B_gf_AP_Triggers_Protoss_unlockWrathwalkerAerialTracking, //25
         libABFE498B_gf_AP_Triggers_Protoss_unlockReaverKhalaiReplicators, //26
         libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters, //27
-        ap_triggers_PlayerConsumer_sig, //28
+        libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismWarpRefraction, //28
         ap_triggers_PlayerConsumer_sig //29
     );
 }
@@ -7261,6 +7261,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismWarConfiguration (int lp_
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_WarpPrismWarConfiguration", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismWarpRefraction (int lp_player) {
+    // Automatic Variable Declarations
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_WarpPrismWarpRefraction", 1);
+}
+
 void libABFE498B_gf_AP_Triggers_Protoss_unlockObserverGraviticBoosters (int lp_player) {
     // Automatic Variable Declarations
     // Implementation

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -745,6 +745,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerResourceEfficiency (int l
 void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismGraviticDrive (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismPhaseBlaster (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismWarConfiguration (int lp_player);
+void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismWarpRefraction (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockObserverGraviticBoosters (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockObserverSensorArray (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockReaverScarabDamage (int lp_player);

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -4577,7 +4577,7 @@
                     libABFE498B_gf_AP_Triggers_Protoss_unlockWrathwalkerAerialTracking, //25
                     libABFE498B_gf_AP_Triggers_Protoss_unlockReaverKhalaiReplicators, //26
                     libABFE498B_gf_AP_Triggers_Protoss_unlockDisruptorRestructuredThrusters, //27
-                    ap_triggers_PlayerConsumer_sig, //28
+                    libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismWarpRefraction, //28
                     ap_triggers_PlayerConsumer_sig //29
                 );
             </ScriptCode>
@@ -59371,6 +59371,7 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="DD51D531"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="D97A7F35"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="B3FFF76C"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="40AC7B9E"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="5ECF64F0"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="24E434DB"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="D9445E73"/>
@@ -61431,6 +61432,43 @@
             <ValueType Type="gamelink"/>
             <ValueGameType Type="Upgrade"/>
         </Element>
+        <Element Type="FunctionDef" Id="40AC7B9E">
+            <Identifier>AP_Triggers_Protoss_unlockWarpPrismWarpRefraction</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="99018E61"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="FB531E82"/>
+        </Element>
+        <Element Type="ParamDef" Id="99018E61">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="ACF0CE82"/>
+        </Element>
+        <Element Type="Param" Id="ACF0CE82">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="FB531E82">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="C4558039"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="5C1CDA3D"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="BDFF927B"/>
+        </Element>
+        <Element Type="Param" Id="C4558039">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="99018E61"/>
+        </Element>
+        <Element Type="Param" Id="5C1CDA3D">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_WarpPrismWarpRefraction</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="BDFF927B">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="FunctionDef" Id="5ECF64F0">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="285F3328"/>

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -287,6 +287,7 @@ FunctionDef/Name/lib_ABFE498B_3F28D2CD=AP_Triggers_Zerg_unlockMissileAttacks
 FunctionDef/Name/lib_ABFE498B_3F5DBF15=AP_Triggers_Terran_unlockInfantryWeapon
 FunctionDef/Name/lib_ABFE498B_402B9D80=AP_Triggers_Terran_unlockGoliathResourceEfficiency
 FunctionDef/Name/lib_ABFE498B_40A6FF53=AP_Triggers_Protoss_unlockDisruptor
+FunctionDef/Name/lib_ABFE498B_40AC7B9E=AP_Triggers_Protoss_unlockWarpPrismWarpRefraction
 FunctionDef/Name/lib_ABFE498B_418B0A62=AP_Triggers_Zerg_unlockGuardian
 FunctionDef/Name/lib_ABFE498B_41E0100A=AP_Triggers_Terran_unlockVultureAutoLaunchers
 FunctionDef/Name/lib_ABFE498B_4245BB6A=AP_Triggers_Terran_unlockWarhoundReinforcedPlating
@@ -1369,6 +1370,7 @@ ParamDef/Name/lib_ABFE498B_9850DAE7=player
 ParamDef/Name/lib_ABFE498B_987142D7=player
 ParamDef/Name/lib_ABFE498B_98B03A56=player
 ParamDef/Name/lib_ABFE498B_98D91428=player
+ParamDef/Name/lib_ABFE498B_99018E61=player
 ParamDef/Name/lib_ABFE498B_99C5AFE4=player
 ParamDef/Name/lib_ABFE498B_9A210C36=bitArrayValue
 ParamDef/Name/lib_ABFE498B_9A8FE258=player