Skip to content

fix(inquisition): Restore Necron Tomb progression #1495

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

Merged
EttyKitty merged 1 commit into from
Sep 2, 2026
Merged

fix(inquisition): Restore Necron Tomb progression #1495

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
79 changes: 49 additions & 30 deletions scripts/scr_inquisition_mission/scr_inquisition_mission.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,9 @@ function mission_investigate_planet() {
}

/// @self Asset.GMObject.obj_star
/// @desc Queues the Necron Tomb mission prompt when a Plasma Bomb is present.
/// @param {Real} planet Planet index containing the Necron Tomb.
/// @returns {Undefined}
function setup_necron_tomb_raid(planet) {
LOGGER.info($"player on planet with necron mission {name} planet: {planet}");
var have_bomb;
Expand All @@ -726,7 +729,7 @@ function setup_necron_tomb_raid(planet) {
var tixt;
tixt = $"Your marines on {planet_numeral_name(planet, id)}";
tixt += " are prepared and ready to enter the Necron Tombs. A Plasma Bomb is in tow.";
var _number = instance_exists(obj_turn_end) ? obj_turn_end.current_popup : 0;
var _number = instance_exists(obj_turn_end) ? 1 : 0;

@OH296 OH296 Sep 1, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think this is required to keep up with the popup sequence count when there are multiple stacked popups in a turn end

@The-Real-Nyx The-Real-Nyx Sep 1, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_number doesn't store the popup’s position in the sequence, it's used as a queue continuation flag inside popup_default_close(), which checks if != 0 before scheduling obj_turn_end.alarm[1]. So, before this path would store 0, and then the recreated post combat popup would fail to rearm Alarm 1 when closed stalling the end turn popup queue, and preventing the player from ending their turn. And from testing it did for sure get stuck before sometimes and does for sure not get stuck now but if the change does somehow cause regression with the popup sequencing can you point out where that happens more specifically cause I don't see it.

var _pop_data = {
mission: "necron_tomb_excursion",
loc: name,
Expand All @@ -741,7 +744,7 @@ function setup_necron_tomb_raid(planet) {
},
{
str1: "Not Yet",
choice_func: instance_destroy,
choice_func: popup_default_close,
},
],
};
Expand All @@ -750,17 +753,58 @@ function setup_necron_tomb_raid(planet) {
}

/// @self Asset.GMObject.obj_popup
/// @desc Initializes the popup and choices for a Necron Tomb mission.
/// @returns {Undefined}
function necron_tomb_mission_start() {
mission_star = find_star_by_name(pop_data.loc);
planet = pop_data.planet;

title = $"Necron Tunnels : {pop_data.mission_stage}";
replace_options([{str1: "Continue", choice_func: necron_tomb_mission_sequence}, {str1: "Return to the surface", choice_func: instance_destroy}]);
replace_options([{str1: "Continue", choice_func: necron_tomb_mission_sequence}, {str1: "Return to the surface", choice_func: popup_default_close}]);
image = "necron_tunnels_1";
text = "Your marines enter the massive tunnel complex, following the energy readings. At first the walls are cramped and tiny, closing about them, but the tunnels widen at a rapid pace.";
}

/// @self Asset.GMObject.obj_popup
/// @desc Advances the Necron Tomb mission and renders the resulting popup state.
/// @returns {Bool} Whether the mission reached completion.
function advance_necron_tomb_mission() {
pop_data.mission_stage++;
title = $"Necron Tunnels : {pop_data.mission_stage}";

if (pop_data.mission_stage == 2) {
image = "necron_tunnels_2";
text = "The energy readings are much stronger, now that your marines are deep inside the tunnels. What was once cramped is now luxuriously large, the tunnel ceiling far overhead decorated by stalactites.";
return false;
}
if (pop_data.mission_stage == 3) {
image = "necron_tunnels_3";
text = "After several hours of descent the entrance to the Necron Tomb finally looms ahead- dancing, sickly green light shining free. Your marine confirms that the Plasma Bomb is ready.";
return false;
}
if (pop_data.mission_stage >= 4) {
image = "";
title = "Inquisition Mission Completed";
text = "Your marines finally enter the deepest catacombs of the Necron Tomb. There they place the Plasma Bomb and arm it. All around are signs of increasing Necron activity. With half an hour set, your men escape back to the surface. There is a brief rumble as the charge goes off, your mission a success.";
reset_popup_options();

alter_disposition(eFACTION.INQUISITION, obj_controller.demanding ? choose(0, 0, 1) : 1);

mission_star = find_star_by_name(pop_data.loc);
remove_planet_problem(planet, "necron", mission_star);
seal_tomb_world(mission_star.p_feature[planet]);

scr_event_log("", $"Inquisition Mission Completed: Your Astartes have sealed the Necron Tomb on {mission_star.name} {scr_roman(planet)}.", mission_star.name);
scr_gov_disp(mission_star.name, planet, irandom_range(3, 7));
scr_check_equip("Plasma Bomb", pop_data.loc, pop_data.planet, 1);
return true;
}
return false;
}

/// @self Asset.GMObject.obj_popup
/// @desc Advances the Necron Tomb mission or starts a combat encounter.
/// @returns {Undefined}
function necron_tomb_mission_sequence() {
var battle;
var player_forces = 0;
Expand Down Expand Up @@ -792,33 +836,8 @@ function necron_tomb_mission_sequence() {

// Result
if (roll <= 60) {
pop_data.mission_stage += 1;
title = $"Necron Tunnels : {pop_data.mission_stage}";

if (pop_data.mission_stage == 2) {
image = "necron_tunnels_2";
text = "The energy readings are much stronger, now that your marines are deep inside the tunnels. What was once cramped is now luxuriously large, the tunnel ceiling far overhead decorated by stalactites.";
} else if (pop_data.mission_stage == 3) {
image = "necron_tunnels_3";
text = "After several hours of descent the entrance to the Necron Tomb finally looms ahead- dancing, sickly green light shining free. Your marine confirms that the Plasma Bomb is ready.";
} else if (pop_data.mission_stage >= 4) {
image = "";
title = "Inquisition Mission Completed";
text = "Your marines finally enter the deepest catacombs of the Necron Tomb. There they place the Plasma Bomb and arm it. All around are signs of increasing Necron activity. With half an hour set, your men escape back to the surface. There is a brief rumble as the charge goes off, your mission a success.";
reset_popup_options();

alter_disposition(eFACTION.INQUISITION, obj_controller.demanding ? choose(0, 0, 1) : 1);

mission_star = find_star_by_name(pop_data.loc);
remove_planet_problem(planet, "necron", mission_star);
seal_tomb_world(mission_star.p_feature[planet]);
// mission_star.p_feature[planet][search_planet_features(mission_star.p_feature[planet], eP_FEATURES.NECRON_TOMB)[0]].sealed = 1;

scr_event_log("", $"Inquisition Mission Completed: Your Astartes have sealed the Necron Tomb on {mission_star.name} {scr_roman(planet)}.", mission_star.name);
scr_gov_disp(mission_star.name, planet, irandom_range(3, 7));
var have_bomb = scr_check_equip("Plasma Bomb", pop_data.loc, pop_data.planet, 1);
exit;
}
advance_necron_tomb_mission();
exit;
}
if ((roll > 60) && (roll <= 82)) {
// Necron Wraith attack
Expand Down
10 changes: 8 additions & 2 deletions scripts/scr_post_battle_events/scr_post_battle_events.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
/// @self Asset.GMObject.obj_ncombat
/// @desc Resolves Necron Tomb combat and resumes or completes the mission.
/// @returns {Undefined}
function necron_tomb_raid_post_battle_sequence() {
if (!string_count("wake", battle_special)) {
if (defeat == 1) {
obj_controller.combat = 0;
obj_controller.cooldown = 10;
obj_turn_end.alarm[1] = 4;
} else if (defeat == 0) {
battle_data.mission_stage += 1;
obj_controller.combat = 0;
var pip = instance_create(0, 0, obj_popup);
pip.pop_data = battle_data;

with (pip) {
necron_tomb_mission_start();
necron_tomb_mission_sequence();
var _completed = advance_necron_tomb_mission();
if (_completed) {
keyboard_clear(vk_enter);
} else {
text = "The last of the attackers is cut down. Your marines regroup in the tunnel and ready themselves to press deeper into the complex.\n\n" + text;
}
number = pop_data.number;
}
}
Expand Down
Loading