Merge pull request #221 from EnvyDragon/hansons-fall

Haven's Fall race-swap
Ziktofel · Jul 29, 2024 · edefef8 · edefef8
2 parents ffebdd6 + 55e4cdb
commit edefef8
Show file tree

Hide file tree

Showing 28 changed files with 1,746 additions and 577 deletions.
diff --git a/...Base.SC2Data/Assets/StoryModeCharacters/Zerg/SMX1_EvolutionMaster/SMX1_EvolutionMaster.m3 b/...Base.SC2Data/Assets/StoryModeCharacters/Zerg/SMX1_EvolutionMaster/SMX1_EvolutionMaster.m3
diff --git a/...Zerg/SMX1_EvolutionMaster_Background_Portrait/SMX1_EvolutionMaster_Background_Portrait.m3 b/...Zerg/SMX1_EvolutionMaster_Background_Portrait/SMX1_EvolutionMaster_Background_Portrait.m3
diff --git a/...ModeCharacters/Zerg/SMX1_EvolutionMaster_FacialAnims/SMX1_EvolutionMaster_FacialAnims.m3a b/...ModeCharacters/Zerg/SMX1_EvolutionMaster_FacialAnims/SMX1_EvolutionMaster_FacialAnims.m3a
diff --git a/...X1_EvolutionMaster_RequiredAnims_Portrait/SMX1_EvolutionMaster_RequiredAnims_Portrait.m3a b/...X1_EvolutionMaster_RequiredAnims_Portrait/SMX1_EvolutionMaster_RequiredAnims_Portrait.m3a
diff --git a/...p_havens_fall.SC2Map/Base.SC2Data/Assets/Textures/smx1_evolutionmasterportrait_static.dds b/...p_havens_fall.SC2Map/Base.SC2Data/Assets/Textures/smx1_evolutionmasterportrait_static.dds
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ActorData.xml b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ActorData.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="us-ascii"?>
+<Catalog>
+    <CActorModel id="AP_EvolutionMasterPortraitAddition" parent="CompositePortraitAddition"/>
+    <CActorPortrait id="AP_EvolutionMasterPortrait" parent="CompositePortrait"/>
+</Catalog>
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/CharacterData.xml b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/CharacterData.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Catalog>
+    <CCharacter id="Abathur">
+        <Variations index="0" Model="AP_EvolutionMasterPortrait" Actor="AP_EvolutionMasterPortrait"/>
+    </CCharacter>
+</Catalog>
diff --git a/.../ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ConversationData.xml b/.../ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ConversationData.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Catalog>
+    <CConversation id="zEvoMission_Mutalisk">
+        <EditorCategories value="ConversationType:Mission"/>
+        <ProductionLevel value="3"/>
+        <DefaultSpeaker1 value="Abathur"/>
+        <DefaultSpeaker2 value="Abathur"/>
+        <Lines>
+            <Id value="Line00020"/>
+            <Text value="Conversation/zEvoMission_Mutalisk/Line00020"/>
+            <Sound value="zEvoMission_Mutalisk_EvolutionMaster_020"/>
+            <OverlapPrevious value="500"/>
+            <AnimProps value="Talk"/>
+            <SpeakerCharacter value="Abathur"/>
+            <Objects index="Camera" value="Medium"/>
+        </Lines>
+        <Lines>
+            <Id value="Line00051"/>
+            <Text value="Conversation/zEvoMission_Mutalisk/Line00051"/>
+            <Sound value="zEvoMission_Mutalisk_EvolutionMaster_051"/>
+            <OverlapPrevious value="500"/>
+            <AnimProps value="Talk"/>
+            <SpeakerCharacter value="Abathur"/>
+            <Objects index="Camera" value="Medium"/>
+        </Lines>
+        <Groups Id="Group00001" Name="Conversation/zCutscene_Zerg02/Group00003">
+            <Children value="Line00020"/>
+            <Children value="Line00051"/>
+        </Groups>
+        <RootItems value="Group00001"/>
+    </CConversation>
+</Catalog>
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/LightData.xml b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/LightData.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="us-ascii"?>
+<Catalog>
+    <CLight id="AP_EvolutionMasterPortrait">
+        <EditorCategories value="LightGroup:PortraitsUnitsZerg"/>
+        <ToDInfoArray index="0" Id="1.000000" AmbientColor="0.686275,0.674510,0.447059" OperatorHDR="4">
+            <Param index="HDRExposure" value="1.480000"/>
+            <Param index="HDRBloomThreshold" value="1.950000"/>
+            <Param index="HDREmisMultiplier" value="3.000000"/>
+            <Param index="HDRGain" value="0.000000"/>
+            <Param index="HDRScale" value="0.000000"/>
+            <Param index="AOOcclusionRadius" value="1.000000"/>
+            <Param index="AONoOcclusion" value="0.900000"/>
+            <Param index="AOOcclusionPower" value="2.000000"/>
+            <Param index="AODetailOcclusionRadius" value="0.010000"/>
+            <Param index="AODetailNoOcclusion" value="0.060000"/>
+            <Param index="AODetailOcclusionPower" value="4.000000"/>
+            <DirectionalLight index="Key">
+                <Color value="0.313726,1.000000,0.619608"/>
+                <ColorMultiplier value="0.966000"/>
+                <SpecularColor value="0.800000,1.000000,0.874510"/>
+                <SpecColorMultiplier value="1.303000"/>
+                <Direction value="0.399796,0.536562,-0.743145"/>
+            </DirectionalLight>
+            <DirectionalLight index="Fill" Color="1.000000,0.592157,0.113725" ColorMultiplier="3.631000" Direction="-0.689159,-0.298225,0.660395"/>
+            <DirectionalLight index="Back" Color="0.501961,1.000000,0.501961" ColorMultiplier="0.335000" Direction="-0.034016,0.351342,0.935629"/>
+        </ToDInfoArray>
+    </CLight>
+</Catalog>
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ModelData.xml b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/ModelData.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="us-ascii"?>
+<Catalog>
+    <CModel id="AP_EvolutionMasterPortrait" parent="FXAPortrait" Race="Zerg">
+        <Model value="Assets\StoryModeCharacters\Zerg\SMX1_EvolutionMaster_Background_Portrait\SMX1_EvolutionMaster_Background_Portrait.m3"/>
+        <Image value="Assets\Textures\SMX1_EvolutionMasterPortrait_Static.dds"/>
+        <FacialController value="LocalizedData\Facial\SMX1_EvolutionMaster.fxa"/>
+        <Flags index="Download" value="1"/>
+    </CModel>
+    <CModel id="AP_EvolutionMasterPortraitAddition" parent="FXAPortrait" Race="Zerg">
+        <Model value="Assets\StoryModeCharacters\Zerg\SMX1_EvolutionMaster\SMX1_EvolutionMaster.m3"/>
+        <RequiredAnims value="Assets\StoryModeCharacters\Zerg\SMX1_EvolutionMaster_RequiredAnims_Portrait\SMX1_EvolutionMaster_RequiredAnims_Portrait.m3a"/>
+        <RequiredAnims value="Assets\StoryModeCharacters\Zerg\SMX1_EvolutionMaster_FacialAnims\SMX1_EvolutionMaster_FacialAnims.m3a"/>
+        <FacialController value="LocalizedData\Facial\SMX1_EvolutionMaster.fxa"/>
+    </CModel>
+    <CModel id="AP_EvolutionMasterPortrait3D" parent="FXAPortrait" Race="Zerg">
+        <Model value="Assets\StoryModeCharacters\Zerg\SMX1_EvolutionMaster_Background_Portrait\SMX1_EvolutionMaster_Background_Portrait.m3"/>
+        <Flags index="ForcePortraitModel" value="1"/>
+        <Lighting value="EvolutionMasterPortrait"/>
+        <Image value="Assets\Textures\SMX1_EvolutionMasterPortrait_Static.dds"/>
+        <FacialController value="LocalizedData\Facial\SMX1_EvolutionMaster.fxa"/>
+    </CModel>
+    <CModel id="AP_EvolutionMasterPortrait3DAddition" parent="FXAPortrait" Race="Zerg">
+        <Model value="Assets\StoryModeCharacters\Zerg\SMX1_EvolutionMaster\SMX1_EvolutionMaster.m3"/>
+        <RequiredAnims value="Assets\StoryModeCharacters\Zerg\SMX1_EvolutionMaster_RequiredAnims_Portrait\SMX1_EvolutionMaster_RequiredAnims_Portrait.m3a"/>
+        <RequiredAnims value="Assets\StoryModeCharacters\Zerg\SMX1_EvolutionMaster_FacialAnims\SMX1_EvolutionMaster_FacialAnims.m3a"/>
+        <Flags index="ForcePortraitModel" value="1"/>
+        <FacialController value="LocalizedData\Facial\SMX1_EvolutionMaster.fxa"/>
+    </CModel>
+</Catalog>
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/SoundData.xml b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Base.SC2Data/GameData/SoundData.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Catalog>
+    <CSound default="1" id="HoS_World" parent="VO">
+        <Mode value="3DWorld"/>
+        <ReverbBalance Room="0"/>
+    </CSound>
+    <CSound default="1" id="HoS_Mission" parent="HoS_World">
+        <Category value="Mission"/>
+        <Mode value="3DHead"/>
+        <PanLevel value="0.750000"/>
+        <ReverbBalance Room="-1000"/>
+        <SustainFade index="1" Time="250"/>
+        <SpeakerMix index="BackLeft" value="0.500000"/>
+        <SpeakerMix index="BackRight" value="0.500000"/>
+        <SpeakerMix index="SideLeft" value="0.500000"/>
+        <SpeakerMix index="SideRight" value="0.500000"/>
+    </CSound>
+    <CSound default="1" id="HoS_Portrait" parent="HoS_Mission">
+        <Mode value="2D"/>
+        <ReverbRolloffBlend value="Linear"/>
+        <ReverbRolloffPoints Direct="1.000000" Room="0.250000"/>
+        <ReverbRolloffPoints Distance="15.000000" Direct="1.000000" Room="0.250000"/>
+        <SpeakerMix index="FrontLeft" value="0.700000"/>
+        <SpeakerMix index="FrontRight" value="0.700000"/>
+        <SpeakerMix index="BackLeft" value="0.000000"/>
+        <SpeakerMix index="BackRight" value="0.000000"/>
+        <SpeakerMix index="SideLeft" value="0.000000"/>
+        <SpeakerMix index="SideRight" value="0.000000"/>
+    </CSound>
+    <CSound default="1" id="HoS_PortraitAbathur" parent="HoS_Portrait">
+        <Volume value="1.000000,1.000000"/>
+    </CSound>
+    <CSound id="zEvoMission_Mutalisk_EvolutionMaster_020" parent="HoS_PortraitAbathur" Portrait="AP_EvolutionMasterPortrait" Subtitle="zEvoMission_Mutalisk" Speaker="Abathur" Actor="AP_EvolutionMasterPortrait" Line="00020">
+        <AssetArray index="0" Speaker="Character/Name/EvolutionMaster" Subtitle="Conversation/zEvoMission_Mutalisk2/Line00020"/>
+    </CSound>
+    <CSound id="zEvoMission_Mutalisk_EvolutionMaster_051" parent="HoS_PortraitAbathur" Portrait="AbathurPortraitEx3" Subtitle="zEvoMission_Mutalisk" Speaker="Abathur" Actor="" Line="00051">
+        <AssetArray index="0" Speaker="Character/Name/EvolutionMaster" Subtitle="Conversation/zEvoMission_Mutalisk2/Line00051"/>
+    </CSound>
+</Catalog>
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/ComponentList.SC2Components
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Components>
-    <Optimized/>
     <DataComponent Type="gada">GameData</DataComponent>
     <DataComponent Type="info">DocumentInfo</DataComponent>
     <DataComponent Type="mapi">MapInfo</DataComponent>

diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/GameData.version b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/GameData.version
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/MapScript.galaxy
@@ -224,6 +224,7 @@ trigger gt_NorthHive;
 trigger gt_EastHive;
 trigger gt_SouthHive;
 trigger gt_ArchInit;
+trigger gt_FactionSwapInit;
 trigger gt_Initialization;
 trigger gt_Init01Technology;
 trigger gt_Init02Players;
@@ -1363,6 +1364,7 @@ bool gt_ArchInit_Func (bool testConds, bool runActions) {
     lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p01_USER, lib5BD4895D_gv_aP_Core_Faction_RAYNORS_RAIDERS);
     lib5BD4895D_gf_AP_Core_MapConfig_setMapInit(gt_Initialization);
     libABFE498B_gf_AP_Triggers_MapConfig_setDifficultySetup(gt_onDifficultyCasual, gt_onDifficultyNormal, gt_onDifficultyHard, gt_onDifficultyBrutal);
+    libABFE498B_gv_aP_Triggers_Option_overridePlayerRace = "Zerg";
     lib5BD4895D_gf_AP_Core_initObjectivePanel();
     return true;
 }
@@ -1373,6 +1375,76 @@ void gt_ArchInit_Init () {
     TriggerAddEventMapInit(gt_ArchInit);
 }
 
+//--------------------------------------------------------------------------------------------------
+// Trigger: Faction Swap Init
+//--------------------------------------------------------------------------------------------------
+bool gt_FactionSwapInit_Func (bool testConds, bool runActions) {
+    // Automatic Variable Declarations
+    unitgroup autoE89A680B_g;
+    int autoE89A680B_u;
+    unit autoE89A680B_var;
+    unitgroup autoF7078C34_g;
+    int autoF7078C34_u;
+    unit autoF7078C34_var;
+
+    // Actions
+    if (!runActions) {
+        return true;
+    }
+
+    if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut")) {
+        lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), "Terr");
+    }
+    else {
+        libABFE498B_gv_aP_Triggers_skipCutscenes = true;
+        lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace);
+        libLbty_gf_OrderWorkerstoGatherNearbyResources(RegionEntireMap(), gv_p01_USER);
+        lib15EF4C78_gf_AP_Player_UtilTownHallAutoRally(gv_p01_USER);
+        if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) {
+            UnitSetPropertyFixed(UnitFromId(237324189), c_unitPropEnergyPercent, 100.0);
+            autoE89A680B_g = UnitGroup("AP_Lair", gv_p01_USER, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
+            autoE89A680B_u = UnitGroupCount(autoE89A680B_g, c_unitCountAll);
+            for (;; autoE89A680B_u -= 1) {
+                autoE89A680B_var = UnitGroupUnitFromEnd(autoE89A680B_g, autoE89A680B_u);
+                if (autoE89A680B_var == null) { break; }
+                libNtve_gf_ReplaceUnit(autoE89A680B_var, "AP_Hive", libNtve_ge_ReplaceUnitOptions_OldUnitsRelative);
+                autoF7078C34_g = UnitGroup("AP_Larva", c_playerAny, RegionCircle(UnitGetPosition(libNtve_gf_LastReplacedUnit()), 5.0), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
+                autoF7078C34_u = UnitGroupCount(autoF7078C34_g, c_unitCountAll);
+                for (;; autoF7078C34_u -= 1) {
+                    autoF7078C34_var = UnitGroupUnitFromEnd(autoF7078C34_g, autoF7078C34_u);
+                    if (autoF7078C34_var == null) { break; }
+                    UnitRemove(autoF7078C34_var);
+                }
+                lib15EF4C78_gf_AP_Player_SpawnLarvaForHatchery(libNtve_gf_LastReplacedUnit(), 3);
+            }
+            PlayerSetRace(gv_p01_USER, "Zerg");
+            lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p01_USER, lib5BD4895D_gv_aP_Core_Faction_KERRIGAN_SWARM);
+        }
+        else {
+            if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
+                PlayerSetRace(gv_p01_USER, "Prot");
+                lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p01_USER, lib5BD4895D_gv_aP_Core_Faction_DAELAAM);
+                if ((libABFE498B_gv_aP_Triggers_Option_SoAPresence == 2)) {
+                    lib15EF4C78_gf_AP_Player_CreateSoAUnit(gv_p01_USER);
+                }
+
+                if ((libABFE498B_gv_aP_Triggers_Option_SoAPresenceAutocasts == 2)) {
+                    lib15EF4C78_gf_AP_Player_CreateSoAAutonomousCasterUnit(gv_p01_USER);
+                }
+
+            }
+
+        }
+    }
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+void gt_FactionSwapInit_Init () {
+    gt_FactionSwapInit = TriggerCreate("gt_FactionSwapInit_Func");
+    TriggerAddEventGeneric(gt_FactionSwapInit, lib5BD4895D_gv_aP_Core_LOAD_FINISHED_EVENT);
+}
+
 //--------------------------------------------------------------------------------------------------
 // Trigger: Initialization
 //--------------------------------------------------------------------------------------------------
@@ -1652,7 +1724,10 @@ bool gt_Init05Environment_Func (bool testConds, bool runActions) {
     libLbty_gf_AutoRevealRegion(RegionFromId(64), RegionFromId(66), gv_p01_USER);
     libLbty_gf_AutoRevealRegion(RegionFromId(63), RegionFromId(8), gv_p01_USER);
     libLbty_gf_AutoRevealRegion(RegionFromId(62), RegionFromId(67), gv_p01_USER);
-    CreepSetSpeed(c_creepSpeedDecay, 200.0);
+    if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace != "Zerg")) {
+        CreepSetSpeed(c_creepSpeedDecay, 200.0);
+    }
+
     libCamp_gf_ChangeAmbience("Ambience_Hanson03bRain");
     return true;
 }
@@ -3314,12 +3389,24 @@ bool gt_TransmissionMissionStartQ_Func (bool testConds, bool runActions) {
     TriggerQueueEnter();
     libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech);
     libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll());
-    // Transmission - SoundLink("THanson03BRaynor00017", -1)
-    libCamp_gf_SendTransmissionCampaign(null, SoundLink("THanson03BRaynor00017", -1), c_transmissionDurationAdd, 0.0, true);
-    // Transmission - SoundLink("THanson03BTychus00030", -1)
-    libCamp_gf_SendTransmissionCampaign(null, SoundLink("THanson03BTychus00030", -1), c_transmissionDurationAdd, 0.0, true);
-    // Transmission - SoundLink("THanson03BRaynor00038", -1)
-    libCamp_gf_SendTransmissionCampaign(null, SoundLink("THanson03BRaynor00038", -1), c_transmissionDurationAdd, 0.0, true);
+    if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) {
+        libCamp_gf_SendTransmissionCampaign(null, SoundLink("zEvoMission_Mutalisk_EvolutionMaster_020", -1), c_transmissionDurationAdd, 0.0, true);
+        libCamp_gf_SendTransmissionCampaign(null, SoundLink("zEvoMission_Mutalisk_EvolutionMaster_051", -1), c_transmissionDurationAdd, 0.0, true);
+    }
+    else {
+        // Transmission - SoundLink("THanson03BRaynor00017", -1)
+        libCamp_gf_SendTransmissionCampaign(null, SoundLink("THanson03BRaynor00017", -1), c_transmissionDurationAdd, 0.0, true);
+        // Transmission - SoundLink("THanson03BTychus00030", -1)
+        libCamp_gf_SendTransmissionCampaign(null, SoundLink("THanson03BTychus00030", -1), c_transmissionDurationAdd, 0.0, true);
+        if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
+            // Transmission - SoundLink("TZeratul01Zeratul00060", -1)
+            libCamp_gf_SendTransmissionCampaign(null, SoundLink("TZeratul01Zeratul00060", -1), c_transmissionDurationAdd, 0.0, true);
+        }
+        else {
+            // Transmission - SoundLink("THanson03BRaynor00038", -1)
+            libCamp_gf_SendTransmissionCampaign(null, SoundLink("THanson03BRaynor00038", -1), c_transmissionDurationAdd, 0.0, true);
+        }
+    }
     libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game);
     TriggerQueueExit();
     return true;
@@ -5336,6 +5423,7 @@ void InitTriggers () {
     gt_EastHive_Init();
     gt_SouthHive_Init();
     gt_ArchInit_Init();
+    gt_FactionSwapInit_Init();
     gt_Initialization_Init();
     gt_Init01Technology_Init();
     gt_Init02Players_Init();

diff --git a/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Minimap.tga b/Maps/ArchipelagoCampaign/WoL/ap_havens_fall.SC2Map/Minimap.tga