diff --git a/scripts/scr_ancient_ruins/scr_ancient_ruins.gml b/scripts/scr_ancient_ruins/scr_ancient_ruins.gml index b273ef886c..2478fc4cca 100644 --- a/scripts/scr_ancient_ruins/scr_ancient_ruins.gml +++ b/scripts/scr_ancient_ruins/scr_ancient_ruins.gml @@ -20,12 +20,12 @@ function scr_ruins_suprise_attack_player(){ 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_activate_object(_star); obj_ncombat.man_size_limit = man_size_limit; //that_one=instance_nearest(0,0,obj_star); @@ -45,6 +45,8 @@ function scr_ruins_suprise_attack_player(){ obj_ncombat.formation_set=1; instance_destroy(obj_popup); instance_destroy(obj_star_select); + }, [], function(){ + instance_activate_all(); }); } //spawn point for starship diff --git a/scripts/scr_mission_functions/scr_mission_functions.gml b/scripts/scr_mission_functions/scr_mission_functions.gml index dc5e97c8dd..3b4469030b 100644 --- a/scripts/scr_mission_functions/scr_mission_functions.gml +++ b/scripts/scr_mission_functions/scr_mission_functions.gml @@ -226,6 +226,7 @@ function complete_beast_hunt_mission(targ_planet, problem_index){ } } } + _unit.job="none" } if (_success){ _mission_string = $"The mission was a success and a great number of beasts rounded up and slain, your marines were able to gain great skills and the prestige of your chapter has increased greatly across the planets populace."