Skip to content

fix: try-catch for ruins surprise #121

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
merged 1 commit into from
Nov 15, 2024
Merged

fix: try-catch for ruins surprise #121

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
57 changes: 29 additions & 28 deletions scripts/scr_ancient_ruins/scr_ancient_ruins.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,38 +16,39 @@ function scr_ancient_ruins_setup(){
}

function scr_ruins_suprise_attack_player(){
try_and_report_loop("Ruins Ambush", function(){
instance_deactivate_all(true);
instance_activate_object(obj_controller);
instance_activate_object(obj_ini);
instance_activate_object(obj_star);
try {
instance_deactivate_all(true);
instance_activate_object(obj_controller);
instance_activate_object(obj_ini);
instance_activate_object(obj_star);
var _star = star_by_name(obj_ground_mission.loc);
var _planet = planet;
instance_create(0,0,obj_ncombat);
instance_create(0,0,obj_ncombat);
obj_ncombat.man_size_limit = man_size_limit;

//that_one=instance_nearest(0,0,obj_star);
// instance_activate_object(obj_star);
scr_battle_roster(_star.name ,_planet,true);
obj_controller.cooldown=10;
obj_ncombat.battle_object=_star;
obj_ncombat.battle_loc=_star.name;
instance_deactivate_object(obj_star);
obj_ncombat.battle_id =_planet;
obj_ncombat.battle_special="ruins";
if (obj_ground_mission.ruins_race=6) then obj_ncombat.battle_special="ruins_eldar";
obj_ncombat.dropping=0;
obj_ncombat.attacking=0;
obj_ncombat.enemy=obj_ground_mission.ruins_battle;
obj_ncombat.threat=obj_ground_mission.battle_threat;
obj_ncombat.formation_set=1;
instance_destroy(obj_popup);
instance_destroy(obj_star_select);
}, [], function(){

//that_one=instance_nearest(0,0,obj_star);
// instance_activate_object(obj_star);
scr_battle_roster(_star.name ,_planet,true);
obj_controller.cooldown=10;
obj_ncombat.battle_object=_star;
obj_ncombat.battle_loc=_star.name;
instance_deactivate_object(obj_star);
obj_ncombat.battle_id =_planet;
obj_ncombat.battle_special="ruins";
if (obj_ground_mission.ruins_race=6) then obj_ncombat.battle_special="ruins_eldar";
obj_ncombat.dropping=0;
obj_ncombat.attacking=0;
obj_ncombat.enemy=obj_ground_mission.ruins_battle;
obj_ncombat.threat=obj_ground_mission.battle_threat;
obj_ncombat.formation_set=1;
instance_destroy(obj_popup);
instance_destroy(obj_star_select);
} catch (_exception) {
handle_exception(_exception);
instance_activate_all();
});
}
}
//spawn point for starship
function scr_ruins_find_starship (){
Expand Down