Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WttJ swaps #304

Merged
merged 1 commit into from
Oct 21, 2024
Merged

WttJ swaps #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...pelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/BehaviorData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Catalog>
<CBehaviorBuff id="HarvestingTerrazine">
<!-- Override -->
<Modification>
<AbilLinkEnableArray value="AP_DroneHarvest"/>
<AbilLinkEnableArray value="AP_ProbeHarvest"/>
</Modification>
</CBehaviorBuff>
</Catalog>
31 changes: 31 additions & 0 deletions ...goCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/ConversationData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<Catalog>
<CConversation id="TTosh02">
<Lines>
<Id value="Line00068"/>
<Text value="Conversation/TTosh02/Line00068"/>
<Sound value="Drone_Pissed"/>
<SoundIndex value="9"/>
<OverlapPrevious value="500"/>
<AnimProps value="Talk"/>
<AnimBlendIn value="-1"/>
<AnimBlendOut value="-1"/>
<Objects index="Camera" value="Medium"/>
</Lines>
<Lines>
<Id value="Line00069"/>
<Text value="Conversation/TTosh02/Line00069"/>
<Sound value="Probe_Yes"/>
<SoundIndex value="2"/>
<OverlapPrevious value="500"/>
<AnimProps value="Talk"/>
<AnimBlendIn value="-1"/>
<AnimBlendOut value="-1"/>
<Objects index="Camera" value="Medium"/>
</Lines>
<Groups index="18">
<Children value="Line00068"/>
<Children value="Line00069"/>
</Groups>
</CConversation>
</Catalog>
15 changes: 15 additions & 0 deletions ...chipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/SoundData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Catalog>
<CSound id="TTosh02Drone00068" parent="Campaign" Portrait="" Subtitle="TTosh02" Speaker="Drone" Line="00068">
<AssetArray index="0">
<File value="Assets\Sounds\Zerg\Drone\Drone_What2.ogg"/>
<Subtitle value="Conversation/TTosh02/Line00068"/>
</AssetArray>
</CSound>
<CSound id="TTosh02Probe00069" parent="Campaign" Portrait="" Subtitle="TTosh02" Speaker="Probe" Line="00069">
<AssetArray index="0">
<File value="Assets\Sounds\Protoss\Probe\Probe_Yes2.ogg"/>
<Subtitle value="Conversation/TTosh02/Line00069"/>
</AssetArray>
</CSound>
</Catalog>
9 changes: 9 additions & 0 deletions ...rchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/UnitData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Catalog>
<CUnit id="AP_Drone">
<AbilArray Link="CancelTerrazineHarvest"/>
</CUnit>
<CUnit id="AP_Probe">
<AbilArray Link="CancelTerrazineHarvest"/>
</CUnit>
</Catalog>
85 changes: 78 additions & 7 deletions Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/MapScript.galaxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ trigger gt_WestRelic;
trigger gt_NorthEastRelic;
trigger gt_AwardPlayerdependingonSealedNodes;
trigger gt_ArchInit;
trigger gt_FactionSwapInit;
trigger gt_Initialization;
trigger gt_Init01Technology;
trigger gt_Init02Players;
Expand Down Expand Up @@ -1182,6 +1183,52 @@ void gt_ArchInit_Init () {
TriggerAddEventMapInit(gt_ArchInit);
}

//--------------------------------------------------------------------------------------------------
// Trigger: Faction Swap Init
//--------------------------------------------------------------------------------------------------
bool gt_FactionSwapInit_Func (bool testConds, bool runActions) {
// Automatic Variable Declarations
// Actions
if (!runActions) {
return true;
}

if (((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut") || (libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Terr"))) {
lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), "Terr", false);
}
else {
lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace, false);
lib15EF4C78_gf_AP_Player_UtilTownHallAutoRally(gv_p1_USER);
libLbty_gf_OrderWorkerstoGatherNearbyResources(RegionEntireMap(), gv_p1_USER);
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) {
PlayerSetRace(1, "Zerg");
lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p1_USER, lib5BD4895D_gv_aP_Core_Faction_KERRIGAN_SWARM);
}
else {
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
PlayerSetRace(1, "Prot");
lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p1_USER, lib5BD4895D_gv_aP_Core_Faction_DAELAAM);
if ((libABFE498B_gv_aP_Triggers_Option_SoAPresence == 2)) {
lib15EF4C78_gf_AP_Player_CreateSoAUnit(gv_p1_USER);
}

if ((libABFE498B_gv_aP_Triggers_Option_SoAPresenceAutocasts == 2)) {
lib15EF4C78_gf_AP_Player_CreateSoAAutonomousCasterUnit(gv_p1_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
//--------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -2209,7 +2256,7 @@ bool gt_Playerstartsharvestingterrazine_Func (bool testConds, bool runActions) {

// Conditions
if (testConds) {
if (!((UnitGetType(EventUnit()) == "AP_SCV"))) {
if (!(((UnitGetType(EventUnit()) == "AP_SCV") || (UnitGetType(EventUnit()) == "AP_SISCV") || (UnitGetType(EventUnit()) == "AP_Drone") || (UnitGetType(EventUnit()) == "AP_Probe")))) {
return false;
}

Expand Down Expand Up @@ -2334,6 +2381,8 @@ bool gt_Playerstartsharvestingterrazine_Func (bool testConds, bool runActions) {
void gt_Playerstartsharvestingterrazine_Init () {
gt_Playerstartsharvestingterrazine = TriggerCreate("gt_Playerstartsharvestingterrazine_Func");
TriggerAddEventUnitAbility(gt_Playerstartsharvestingterrazine, null, AbilityCommand("AP_SCVHarvest", 0), c_abilHarvestStageHarvest, false);
TriggerAddEventUnitAbility(gt_Playerstartsharvestingterrazine, null, AbilityCommand("AP_ProbeHarvest", 0), c_abilHarvestStageHarvest, false);
TriggerAddEventUnitAbility(gt_Playerstartsharvestingterrazine, null, AbilityCommand("AP_DroneHarvest", 0), c_abilHarvestStageHarvest, false);
}

//--------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -2439,7 +2488,7 @@ bool gt_SCViskilledwhileharvesting_Func (bool testConds, bool runActions) {
return false;
}

if (!((UnitGetType(EventUnit()) == "AP_SCV"))) {
if (!(((UnitGetType(EventUnit()) == "AP_SCV") || (UnitGetType(EventUnit()) == "AP_SISCV") || (UnitGetType(EventUnit()) == "AP_Drone") || (UnitGetType(EventUnit()) == "AP_Probe")))) {
return false;
}
}
Expand Down Expand Up @@ -2529,7 +2578,7 @@ bool gt_SCVharvestingmanuallystopped_Func (bool testConds, bool runActions) {
return false;
}

if (!((UnitGetType(EventUnit()) == "AP_SCV"))) {
if (!(((UnitGetType(EventUnit()) == "AP_SCV") || (UnitGetType(EventUnit()) == "AP_SISCV") || (UnitGetType(EventUnit()) == "AP_Drone") || (UnitGetType(EventUnit()) == "AP_Probe")))) {
return false;
}
}
Expand Down Expand Up @@ -2561,6 +2610,8 @@ bool gt_SCVharvestingmanuallystopped_Func (bool testConds, bool runActions) {
void gt_SCVharvestingmanuallystopped_Init () {
gt_SCVharvestingmanuallystopped = TriggerCreate("gt_SCVharvestingmanuallystopped_Func");
TriggerAddEventUnitAbility(gt_SCVharvestingmanuallystopped, null, AbilityCommand("AP_SCVHarvest", 0), c_unitAbilStageCancel, false);
TriggerAddEventUnitAbility(gt_SCVharvestingmanuallystopped, null, AbilityCommand("AP_ProbeHarvest", 0), c_unitAbilStageCancel, false);
TriggerAddEventUnitAbility(gt_SCVharvestingmanuallystopped, null, AbilityCommand("AP_DroneHarvest", 0), c_unitAbilStageCancel, false);
}

//--------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -2620,7 +2671,7 @@ bool gt_SCVisheadinghomewithterrazine_Func (bool testConds, bool runActions) {
return false;
}

if (!((UnitGetType(EventUnit()) == "AP_SCV"))) {
if (!(((UnitGetType(EventUnit()) == "AP_SCV") || (UnitGetType(EventUnit()) == "AP_SISCV") || (UnitGetType(EventUnit()) == "AP_Drone") || (UnitGetType(EventUnit()) == "AP_Probe")))) {
return false;
}

Expand Down Expand Up @@ -2662,7 +2713,11 @@ bool gt_SCVisheadinghomewithterrazine_Func (bool testConds, bool runActions) {
void gt_SCVisheadinghomewithterrazine_Init () {
gt_SCVisheadinghomewithterrazine = TriggerCreate("gt_SCVisheadinghomewithterrazine_Func");
TriggerAddEventUnitAbility(gt_SCVisheadinghomewithterrazine, null, AbilityCommand("AP_SCVHarvest", 1), c_abilHarvestStageWaitToReturn, false);
TriggerAddEventUnitAbility(gt_SCVisheadinghomewithterrazine, null, AbilityCommand("AP_ProbeHarvest", 1), c_abilHarvestStageWaitToReturn, false);
TriggerAddEventUnitAbility(gt_SCVisheadinghomewithterrazine, null, AbilityCommand("AP_DroneHarvest", 1), c_abilHarvestStageWaitToReturn, false);
TriggerAddEventUnitAbility(gt_SCVisheadinghomewithterrazine, null, AbilityCommand("AP_SCVHarvest", 0), c_unitAbilStageComplete, false);
TriggerAddEventUnitAbility(gt_SCVisheadinghomewithterrazine, null, AbilityCommand("AP_ProbeHarvest", 0), c_unitAbilStageComplete, false);
TriggerAddEventUnitAbility(gt_SCVisheadinghomewithterrazine, null, AbilityCommand("AP_DroneHarvest", 0), c_unitAbilStageComplete, false);
}

//--------------------------------------------------------------------------------------------------
Expand All @@ -2674,6 +2729,8 @@ bool gt_FirstTerrazineReturnQ_Func (bool testConds, bool runActions) {
unit lv_firstSCVGoingHome;

// Automatic Variable Declarations
string autoA6E1847A_val;

// Variable Initialization

// Conditions
Expand Down Expand Up @@ -2704,8 +2761,19 @@ bool gt_FirstTerrazineReturnQ_Func (bool testConds, bool runActions) {
UIAlertUnit("Trigger", gv_p1_USER, StringExternal("Param/Value/6130E297"), null, lv_firstSCVGoingHome);
libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech);
libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll());
// Transmission - SoundLink("TTosh02SCV00006", -1)
libCamp_gf_SendTransmissionCampaign(lv_firstSCVGoingHome, SoundLink("TTosh02SCV00006", -1), c_transmissionDurationAdd, 0.0, true);
autoA6E1847A_val = UnitGetType(lv_firstSCVGoingHome);
if (autoA6E1847A_val == "AP_Drone") {
// Transmission - SoundLink("TTosh02Drone00068", -1)
libCamp_gf_SendTransmissionCampaign(lv_firstSCVGoingHome, SoundLink("TTosh02Drone00068", -1), c_transmissionDurationAdd, 3.0, true);
}
else if (autoA6E1847A_val == "AP_Probe") {
// Transmission - SoundLink("TTosh02Probe00069", -1)
libCamp_gf_SendTransmissionCampaign(lv_firstSCVGoingHome, SoundLink("TTosh02Probe00069", -1), c_transmissionDurationAdd, 3.0, true);
}
else {
// Transmission - SoundLink("TTosh02SCV00006", -1)
libCamp_gf_SendTransmissionCampaign(lv_firstSCVGoingHome, SoundLink("TTosh02SCV00006", -1), c_transmissionDurationAdd, 0.0, true);
}
libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game);
libNtve_gf_KillModel(lv_talkIcon);
TriggerQueueExit();
Expand Down Expand Up @@ -2733,7 +2801,7 @@ bool gt_SCVwithterrazinediesonreturntrip_Func (bool testConds, bool runActions)
return false;
}

if (!((UnitGetType(EventUnit()) == "AP_SCV"))) {
if (!(((UnitGetType(EventUnit()) == "AP_SCV") || (UnitGetType(EventUnit()) == "AP_SISCV") || (UnitGetType(EventUnit()) == "AP_Drone") || (UnitGetType(EventUnit()) == "AP_Probe")))) {
return false;
}
}
Expand Down Expand Up @@ -2874,6 +2942,8 @@ bool gt_Playerhasclaimedterrazine_Func (bool testConds, bool runActions) {
void gt_Playerhasclaimedterrazine_Init () {
gt_Playerhasclaimedterrazine = TriggerCreate("gt_Playerhasclaimedterrazine_Func");
TriggerAddEventUnitAbility(gt_Playerhasclaimedterrazine, null, AbilityCommand("AP_SCVHarvest", 1), c_abilHarvestStageDropOff, false);
TriggerAddEventUnitAbility(gt_Playerhasclaimedterrazine, null, AbilityCommand("AP_ProbeHarvest", 1), c_abilHarvestStageDropOff, false);
TriggerAddEventUnitAbility(gt_Playerhasclaimedterrazine, null, AbilityCommand("AP_DroneHarvest", 1), c_abilHarvestStageDropOff, false);
}

//--------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -4968,6 +5038,7 @@ void InitTriggers () {
gt_NorthEastRelic_Init();
gt_AwardPlayerdependingonSealedNodes_Init();
gt_ArchInit_Init();
gt_FactionSwapInit_Init();
gt_Initialization_Init();
gt_Init01Technology_Init();
gt_Init02Players_Init();
Expand Down
Binary file modified Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Minimap.tga
View file
Open in desktop
Binary file not shown.
Loading