diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/ArchonSCBW/ArchonSCBWWeapon@Launch00.ogg b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/ArchonSCBW/ArchonSCBWWeapon@Launch00.ogg new file mode 100644 index 000000000..d53b5bb91 Binary files /dev/null and b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Assets/AP/Assets/Sounds/Protoss/ArchonSCBW/ArchonSCBWWeapon@Launch00.ogg differ diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml index fd3ecf741..4f02edd25 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml @@ -14452,4 +14452,25 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml index ae9223628..8d96e882a 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml @@ -7704,17 +7704,25 @@ - - - + + + + + + + + + + + @@ -42532,4 +42540,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml index 3f8747518..01c44d17f 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml @@ -10018,4 +10018,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml index 32571f48a..66cc74b21 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml @@ -7018,4 +7018,26 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml index f955f1bdb..3eaf5d795 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml @@ -23143,6 +23143,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml index 5a7961679..f50b07829 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ModelData.xml @@ -21038,4 +21038,12 @@ + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml index 725c9924e..0f9aa2191 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/MoverData.xml @@ -2205,4 +2205,14 @@ + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml index 0f8ac0dbd..9961a8c9d 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml @@ -4330,4 +4330,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index d4d9b0eb0..92510a8cf 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -7064,4 +7064,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml index a5b78235d..e5e9b5995 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/SoundData.xml @@ -15035,4 +15035,17 @@ + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index 6f70d7e73..c3721e83f 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -14129,21 +14129,33 @@ + + + + + + - - - - + + + + + + + + + + @@ -30052,4 +30064,10 @@ + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index 4c2552d6e..26317923e 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -1337,6 +1337,8 @@ + + @@ -10657,6 +10659,7 @@ + @@ -10692,6 +10695,7 @@ + @@ -10727,6 +10731,7 @@ + @@ -10761,6 +10766,7 @@ + @@ -10795,6 +10801,7 @@ + @@ -14821,13 +14828,17 @@ + + @@ -16936,4 +16947,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml index d0cf455cd..fe0d86f1d 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml @@ -7001,4 +7001,16 @@ + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml index fecc939ac..4a44a4bda 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml @@ -4354,4 +4354,19 @@ + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt index bab5b86e3..a2a6009ce 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt @@ -606,3 +606,4 @@ Button/Hotkey/AP_YggdrasilAssimilate=T Button/Hotkey/AP_SILiberatorAAMode=D Button/Hotkey/AP_SILiberatorAGMode=E Button/Hotkey/AP_SummonMercRoach=T +Button/Hotkey/AP_ArchonSiphon=R \ No newline at end of file diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt index c1bff32cd..6a951baa7 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -963,7 +963,11 @@ Button/Name/AP_ArbiterEternalStasisField=Eternal Stasis Field Button/Name/AP_ArbiterMPRecall=Recall Button/Name/AP_ArbiterMPStasisField=Stasis Field Button/Name/AP_ArbiterReinforcedHull=Chronostatic Reinforcement +Button/Name/AP_ArchonFloat=Transcendence +Button/Name/AP_ArchonSiphon=Power Siphon Button/Name/AP_ArchonHallucination=Summon Archon Hallucination +Button/Name/AP_ArchonSuicide=Eradicate +Button/Name/AP_ArchonWeaponUpgrade=Obliterate Button/Name/AP_AresClassWeaponsSystem=Ares-Class Targeting System Button/Name/AP_AresClassWeaponsSystemviking=Phobos-Class Weapons System Button/Name/AP_ArgusTalisman=Argus Talisman @@ -2223,7 +2227,11 @@ Button/Tooltip/AP_ArbiterMPRecall=Teleports all friendly units in the target are Button/Tooltip/AP_ArbiterMPStasisField=Places enemy units in target area into stasis for seconds. Units in stasis cannot move, attack, be attacked or be affected by abilities. Button/Tooltip/AP_ArbiterReinforcedHull=Increases Arbiter life by 50 and armor by 1. Button/Tooltip/AP_Archon=Powerful psionic attacker.Can attack ground and air units. +Button/Tooltip/AP_ArchonFloat=Archons float in the air. Allows Archons to traverse cliffs and phase through most units. Button/Tooltip/AP_ArchonHallucination=These hallucinated copies function like the original unit, but they cannot use active abilities, deal damage, warp in structures, or gather resources, and they die more easily. Hallucinations last before they disappear. +Button/Tooltip/AP_ArchonSiphon=Deals 80 damage over 2 seconds to the target unit, and recovers 2 Shields per damage dealt.Autocasts when at 50% shield or lower.Can target ground and air units. +Button/Tooltip/AP_ArchonSuicide=The Archon launches at a nearby enemy on death, dealing 75 damage in a small area. (150 against massive).Can target ground units only. +Button/Tooltip/AP_ArchonWeaponUpgrade=Psionic Shockwave has increased Area of Effect, and added damage against biological applies to all targets. Button/Tooltip/AP_AresClassWeaponsSystem=Increases missile range by 3 and Autocannon range by 1. Button/Tooltip/AP_AresClassWeaponsSystemviking=Increases missile range by 2 and Autocannon range by 1. Button/Tooltip/AP_ArgusTalisman=Increases starting energy by 150 and maximum energy by 50. @@ -6669,6 +6677,7 @@ Weapon/Name/AP_PrimalZergling=Claws Weapon/Name/AP_PrismaticBeam=Prismatic Beam Weapon/Name/AP_PsiBlades=Psi Blades Weapon/Name/AP_PsionicShockwave=Psionic Shockwave +Weapon/Name/AP_PsionicShockwaveUpgrade=Psionic Shockwave Weapon/Name/AP_PunisherGrenades=Punisher Grenades Weapon/Name/AP_PunisherGrenadesMengsk=Punisher Grenades Weapon/Name/AP_Pygalisk=Princeps Blades diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt index 012a3c1b3..4e273dd6f 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt @@ -3158,6 +3158,10 @@ Button/EditorPrefix/AP_AlarakSupplicantSacrificeCDR=Alarak - AC - Button/EditorPrefix/AP_ApolloCloakOnNova=Nova - Button/EditorPrefix/AP_ArbiterCloakField=Arbiter - Button/EditorPrefix/AP_ArbiterMPStasisField=Arbiter - +Button/EditorPrefix/AP_ArchonFloat=AP - Archon - +Button/EditorPrefix/AP_ArchonSiphon=AP - Archon - +Button/EditorPrefix/AP_ArchonSuicide=AP - Archon - +Button/EditorPrefix/AP_ArchonWeaponUpgrade=AP - Archon - Button/EditorPrefix/AP_AscendantSacrifice=Ascendant - Button/EditorPrefix/AP_BanelingLaunch=AP - Button/EditorPrefix/AP_BanelingLaunchTrain=AP - @@ -6873,6 +6877,8 @@ Unit/EditorPrefix/AP_MercMedic=AP - Unit/EditorPrefix/AP_MercReaper=AP - Merc - Unit/EditorPrefix/AP_MercReaperFlying=AP - Merc - Unit/EditorPrefix/AP_MercReaperResourceEfficiency=AP - Merc - +Unit/EditorPrefix/AP_MercRoach=AP - Merc - +Unit/EditorPrefix/AP_MercRoachBurrowed=AP - Merc - Unit/EditorPrefix/AP_MercThor=AP - Merc - Unit/EditorPrefix/AP_MercThorAP=AP - Merc - Unit/EditorPrefix/AP_MercThorWreckage=AP - Merc - @@ -7221,6 +7227,7 @@ Unit/EditorSuffix/AP_MercMedic=(Merc Medic) Unit/EditorSuffix/AP_MercReaper=(Merc) Unit/EditorSuffix/AP_MercReaperFlying=(Merc, Flying) Unit/EditorSuffix/AP_MercReaperResourceEfficiency=(Merc, Cargo size upgrade) +Unit/EditorPrefix/AP_MercRoachBurrowed=(Burrowed) Unit/EditorSuffix/AP_MercThor=(Merc) Unit/EditorSuffix/AP_MercThorAP=(Merc, Alternate air attack) Unit/EditorSuffix/AP_MercTorrasqueChrysalis=(Merc) @@ -8364,6 +8371,7 @@ Weapon/EditorPrefix/AP_PrimalZergling=AP - Weapon/EditorPrefix/AP_PrismaticBeam=AP - Weapon/EditorPrefix/AP_PsiBlades=AP - Weapon/EditorPrefix/AP_PsionicShockwave=AP - Archon - +Weapon/EditorPrefix/AP_PsionicShockwaveUpgrade=AP - Archon - Weapon/EditorPrefix/AP_PunisherGrenades=AP - Marauder - Weapon/EditorPrefix/AP_PunisherGrenadesMengsk=AP - Weapon/EditorPrefix/AP_PunisherGrenadesMengskL2=AP - @@ -8511,6 +8519,7 @@ Weapon/EditorSuffix/AP_LocustLaunch=(Ground Locust) Weapon/EditorSuffix/AP_MercKaiserBlades=(Torrasque) Weapon/EditorSuffix/AP_PhaseDisruptorsStrafe=(Strafe) Weapon/EditorSuffix/AP_PrimalZergling=(Primal Zergling) +Weapon/EditorSuffix/AP_PsionicShockwaveUpgrade=- Upgrade Weapon/EditorSuffix/AP_PunisherGrenadesMengsk=(Aegis Guard) - L1 Weapon/EditorSuffix/AP_PunisherGrenadesMengskL2=(Aegis Guard) - L2 Weapon/EditorSuffix/AP_PunisherGrenadesMengskL3=(Aegis Guard) - L3 diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy index 280889ed3..b531601fd 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy @@ -1661,10 +1661,10 @@ void libABFE498B_gf_AP_Triggers_unlockProtossForge4 (int lp_player, int lp_bitAr lp_player, lp_bitArrayValue, libABFE498B_gf_AP_Triggers_Protoss_unlockStalwartLatticedShields, // 0 - ap_triggers_PlayerConsumer_sig, // 1 - ap_triggers_PlayerConsumer_sig, // 2 - ap_triggers_PlayerConsumer_sig, // 3 - ap_triggers_PlayerConsumer_sig, // 4 + libABFE498B_gf_AP_Triggers_Protoss_unlockArchonFloat, // 1 + libABFE498B_gf_AP_Triggers_Protoss_unlockArchonSiphon, // 2 + libABFE498B_gf_AP_Triggers_Protoss_unlockArchonSuicide, // 3 + libABFE498B_gf_AP_Triggers_Protoss_unlockArchonWeaponUpgrade, // 4 ap_triggers_PlayerConsumer_sig, // 5 ap_triggers_PlayerConsumer_sig, // 6 ap_triggers_PlayerConsumer_sig, // 7 @@ -8366,6 +8366,30 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonHighArchon (int lp_player) { } } +void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonFloat (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ArchonFloat", 1); +} + +void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonSiphon (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ArchonSiphon", 1); +} + +void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonSuicide (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ArchonSuicide", 1); +} + +void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonWeaponUpgrade (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ArchonWeaponUpgrade", 1); +} + void libABFE498B_gf_AP_Triggers_Protoss_unlockSignifierFeedback (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 index 88f633ddc..a0b402951 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy @@ -876,6 +876,10 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarSignifierHallucination void libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarSignifierKhaydarinAmulet (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarPlasmaSurge (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonHighArchon (int lp_player); +void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonFloat (int lp_player); +void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonSiphon (int lp_player); +void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonSuicide (int lp_player); +void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonWeaponUpgrade (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockSignifierFeedback (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonFeedback (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonMaelstrom (int lp_player); diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader index d9ca75a97..2744fe6af 100644 Binary files a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader and b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader differ diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version index 49fa293a2..48d47b8a2 100644 Binary files a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version and b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version differ diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers index a68424a58..d5382cec4 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers +++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers @@ -4868,10 +4868,10 @@ lp_player, lp_bitArrayValue, libABFE498B_gf_AP_Triggers_Protoss_unlockStalwartLatticedShields, // 0 - ap_triggers_PlayerConsumer_sig, // 1 - ap_triggers_PlayerConsumer_sig, // 2 - ap_triggers_PlayerConsumer_sig, // 3 - ap_triggers_PlayerConsumer_sig, // 4 + libABFE498B_gf_AP_Triggers_Protoss_unlockArchonFloat, // 1 + libABFE498B_gf_AP_Triggers_Protoss_unlockArchonSiphon, // 2 + libABFE498B_gf_AP_Triggers_Protoss_unlockArchonSuicide, // 3 + libABFE498B_gf_AP_Triggers_Protoss_unlockArchonWeaponUpgrade, // 4 ap_triggers_PlayerConsumer_sig, // 5 ap_triggers_PlayerConsumer_sig, // 6 ap_triggers_PlayerConsumer_sig, // 7 @@ -65735,6 +65735,10 @@ + + + + @@ -70008,6 +70012,150 @@ 1 + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + 1 + + + + + AP_ArchonFloat + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + 1 + + + + + AP_ArchonSiphon + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + 1 + + + + + AP_ArchonSuicide + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + 1 + + + + + AP_ArchonWeaponUpgrade + + + AP_Triggers_Protoss_unlockSignifierFeedback diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version index 34ddf9e0f..19afd916f 100644 Binary files a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version and b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version differ diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 1e3fdd10f..5f489ad48 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -404,6 +404,7 @@ FunctionDef/Name/lib_ABFE498B_5DFEDB67=AP_Triggers_Terran_unlockReaperU238Rounds FunctionDef/Name/lib_ABFE498B_5E9E7461=AP_Triggers_Zerg_InfestorMicrobialShroud FunctionDef/Name/lib_ABFE498B_5EBD8CBF=AP_Triggers_Terran_unlockNovaWeaponHellfireShotgun FunctionDef/Name/lib_ABFE498B_5ECF64F0=AP_Triggers_Protoss_unlockObserverGraviticBoosters +FunctionDef/Name/lib_ABFE498B_5EF8AC09=AP_Triggers_Protoss_unlockArchonSiphon FunctionDef/Name/lib_ABFE498B_5F0D63D2=AP_Triggers_Terran_unlockBattlecruiser FunctionDef/Name/lib_ABFE498B_5F0E99F4=AP_Triggers_Protoss_unlockSkirmisher FunctionDef/Name/lib_ABFE498B_5F47DED3=AP_Triggers_Terran_unlockBansheeRocketBarrage @@ -450,6 +451,7 @@ FunctionDef/Name/lib_ABFE498B_68ABD7BA=AP_Triggers_Zerg_KerriganDropPods FunctionDef/Name/lib_ABFE498B_6922BCB5=AP_Triggers_Terran_unlockSCVHostileEnvironmentAdaptation FunctionDef/Name/lib_ABFE498B_6933E179=AP_Triggers_Protoss_unlockAdeptPhaseBulwark FunctionDef/Name/lib_ABFE498B_69559D93=AP_Triggers_Terran_unlockViking +FunctionDef/Name/lib_ABFE498B_6A22B8B0=AP_Triggers_Protoss_unlockArchonWeaponUpgrade FunctionDef/Name/lib_ABFE498B_6ABA9B1A=AP_Triggers_Protoss_unlockCorsair FunctionDef/Name/lib_ABFE498B_6AF34EBC=AP_Triggers_Terran_unlockScienceVessel FunctionDef/Name/lib_ABFE498B_6B5B1E65=AP_Triggers_Zerg_unlockAberration @@ -652,6 +654,7 @@ FunctionDef/Name/lib_ABFE498B_A047E206=AP_Triggers_Zerg_BroodQueenEnhancedMitoch FunctionDef/Name/lib_ABFE498B_A07C1E0D=AP_Triggers_Protoss_unlockAnnihilatorAerialTracking FunctionDef/Name/lib_ABFE498B_A164D27E=AP_Triggers_Protoss_unlockSignifierFeedback FunctionDef/Name/lib_ABFE498B_A232CDB3=AP_Triggers_Zerg_unlockRavager +FunctionDef/Name/lib_ABFE498B_A292214A=AP_Triggers_Protoss_unlockArchonFloat FunctionDef/Name/lib_ABFE498B_A3C2AAD9=AP_Triggers_Zerg_KerriganSpawnBanelings FunctionDef/Name/lib_ABFE498B_A46848D1=AP_Triggers_unlockZergMercenaries FunctionDef/Name/lib_ABFE498B_A4C5EC8C=AP_Triggers_Zerg_unlockInfestedLiberator @@ -700,6 +703,7 @@ FunctionDef/Name/lib_ABFE498B_B1C5D1B5=AP_Triggers_Zerg_unlockInfestedMissileTur FunctionDef/Name/lib_ABFE498B_B2F590B0=AP_Triggers_unlockZergMutation1 FunctionDef/Name/lib_ABFE498B_B324F75E=AP_Triggers_Protoss_unlockDarkTemplarGreaterShadowFury FunctionDef/Name/lib_ABFE498B_B33C38A6=AP_Triggers_Terran_unlockVikingWILDMissiles +FunctionDef/Name/lib_ABFE498B_B3521BAE=AP_Triggers_Protoss_unlockArchonSuicide FunctionDef/Name/lib_ABFE498B_B358D099=AP_Triggers_Terran_unlockVehicleArmor FunctionDef/Name/lib_ABFE498B_B38C6B54=AP_Triggers_Terran_unlockWidowMineConcealment FunctionDef/Name/lib_ABFE498B_B3FFF76C=AP_Triggers_Protoss_unlockWarpPrismWarConfiguration @@ -996,6 +1000,7 @@ ParamDef/Name/lib_ABFE498B_08B3D29D=player ParamDef/Name/lib_ABFE498B_08CA6C97=player ParamDef/Name/lib_ABFE498B_08FE0002=player ParamDef/Name/lib_ABFE498B_099D5849=player +ParamDef/Name/lib_ABFE498B_09B0F616=player ParamDef/Name/lib_ABFE498B_09C47095=player ParamDef/Name/lib_ABFE498B_09D076EE=player ParamDef/Name/lib_ABFE498B_0A7AF2A1=player @@ -1082,6 +1087,7 @@ ParamDef/Name/lib_ABFE498B_217397A3=player ParamDef/Name/lib_ABFE498B_222960C2=player ParamDef/Name/lib_ABFE498B_22632E03=player ParamDef/Name/lib_ABFE498B_2286D958=player +ParamDef/Name/lib_ABFE498B_229D166A=player ParamDef/Name/lib_ABFE498B_22A58B94=player ParamDef/Name/lib_ABFE498B_22E05BD4=player ParamDef/Name/lib_ABFE498B_2338F085=player @@ -1167,6 +1173,7 @@ ParamDef/Name/lib_ABFE498B_3717DDB1=build ParamDef/Name/lib_ABFE498B_3747994F=bitArrayValue ParamDef/Name/lib_ABFE498B_37714540=player ParamDef/Name/lib_ABFE498B_3873585F=player +ParamDef/Name/lib_ABFE498B_38A446E1=player ParamDef/Name/lib_ABFE498B_391D15FB=bitArrayValue ParamDef/Name/lib_ABFE498B_3993D6F7=player ParamDef/Name/lib_ABFE498B_39AFBC7F=player @@ -1394,6 +1401,7 @@ ParamDef/Name/lib_ABFE498B_7490E20B=player ParamDef/Name/lib_ABFE498B_74C35162=player ParamDef/Name/lib_ABFE498B_74CBF7AF=player ParamDef/Name/lib_ABFE498B_74D1700B=player +ParamDef/Name/lib_ABFE498B_74E19969=player ParamDef/Name/lib_ABFE498B_750A1E67=protossValue ParamDef/Name/lib_ABFE498B_75A3E02D=player ParamDef/Name/lib_ABFE498B_75A6D1EC=player