Skip to content

fix: final ruins I pray #91

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 9, 2024
Merged

fix: final ruins I pray #91

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
4 changes: 3 additions & 1 deletion 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 @@ -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);
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions scripts/scr_mission_functions/scr_mission_functions.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down