fix: Mission issues with selection and loading (Adeptus-Dominus#617)

Author: OH296

objects/obj_controller/Alarm_5.gml

@@ -817,6 +817,7 @@ if (fest_scheduled>0) and (fest_repeats>0){
 
 research_end();
 merge_ork_fleets();
+location_viewer.update_mission_log();
 //complex route plotting for player fleets
 return_lost_ships_chance();
 with (obj_p_fleet){

scripts/is_specialist/is_specialist.gml

@@ -347,22 +347,10 @@ function group_selection(group, selection_data){
 		obj_controller.selection_data = selection_data;
 		set_zoom_to_default();
 		with (obj_controller){
-				menu=1;
-				onceh=1;
-				cooldown=8000;
-				click=1;
-				popup=0;
-				selected=0;
-				hide_banner=1;
+				basic_manage_settings();
 				with(obj_fleet_select){instance_destroy();}
 				with(obj_star_select){instance_destroy();}
-				view_squad=false;
-				managing=0;		
-				zoomed=0;
-				menu=1;
-				managing=0;
-				diplomacy=0;
-				cooldown=8000;
+
 				exit_button = new ShutterButton();
 				proceed_button = new ShutterButton();
 				selection_data.start_count=0;
@@ -417,7 +405,7 @@ function group_selection(group, selection_data){
 			man_see=38-4;
 		}
 	} catch(_exception) {
-	handle_exception(_exception);
-	scr_toggle_manage();//handle and send player back to map
+		handle_exception(_exception);
+		scr_toggle_manage();//handle and send player back to map
 	}
 }

scripts/scr_cheatcode/scr_cheatcode.gml

@@ -116,13 +116,19 @@ function scr_cheatcode(argument0) {
 					var last_artifact = scr_add_artifact("good", "inquisition", 0, obj_ini.ship[0], 501);
 					break;
 				case "govmission":
+					var problem = "";
+					if (array_length(cheat_arguments)){
+						if (cheat_arguments[0] != "1"){
+							problem = cheat_arguments[0]
+						}
+					} 
 					with (obj_star) {
 						for (var i = 1; i <= planets; i++) {
 							var existing_problem = false; //has_any_problem_planet(i);
 							if (!existing_problem) {
 								if (p_owner[i] == eFACTION.Imperium) {
 									show_debug_message("mission");
-									scr_new_governor_mission(i);
+									scr_new_governor_mission(i, problem);
 								}
 							}
 						}

scripts/scr_controller_helpers/scr_controller_helpers.gml

@@ -110,35 +110,40 @@ function scr_in_game_menu(){
 		}
 	});
 }
+
+function basic_manage_settings(){
+    menu=1;
+    popup=0;
+    selected=0;
+    hide_banner=1;
+	diplomacy=0; 
+	zoomed=0;  
+	view_squad=false; 	
+    management_buttons = {
+    	squad_toggle : new UnitButtonObject({
+    		style : "pixel",
+    		label : "Squad View",
+    		tooltip : "Click here or press S to toggle Squad View."
+    	}),
+
+    	profile_toggle : new UnitButtonObject({
+    		style : "pixel",
+    		label : "Show Profile",
+    		tooltip : "Click here or press P to show unit profile."
+    	}),
+
+    	bio_toggle : new UnitButtonObject({
+    		style : "pixel",
+    		label : "Show Bio",
+    		tooltip : "Click here or press B to Toggle Unit Biography."
+    	}),
+    }
+}
 function scr_toggle_manage(){
     scr_change_menu(function(){
     	with (obj_controller){
 		    if (menu!=1){
-		    	view_squad=false;
-		        scr_management(1);
-		        menu=1;
-		        popup=0;
-		        selected=0;
-		        hide_banner=1;
-		        management_buttons = {
-		        	squad_toggle : new UnitButtonObject({
-		        		style : "pixel",
-		        		label : "Squad View",
-		        		tooltip : "Click here or press S to toggle Squad View."
-		        	}),
-
-		        	profile_toggle : new UnitButtonObject({
-		        		style : "pixel",
-		        		label : "Show Profile",
-		        		tooltip : "Click here or press P to show unit profile."
-		        	}),
-
-		        	bio_toggle : new UnitButtonObject({
-		        		style : "pixel",
-		        		label : "Show Bio",
-		        		tooltip : "Click here or press B to Toggle Unit Biography."
-		        	}),
-		        }
+				basic_manage_settings();
 		    }
 		    else if (menu==1){
 		        menu=0;

scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml

@@ -53,15 +53,17 @@ function scr_enemy_ai_d() {
 	    }
     }
     for (var i=1;i<=planets;i++){
-        if (planet_problemless(i)) then continue;
         problem_count_down(i);
+        if (planet_problemless(i)) then continue;
         numeral_name = planet_numeral_name(i);
+
 	    if (has_problem_planet_and_time(i, "succession", 0)){
             var result,alert_text;
             var dice1=roll_dice(1, 100);
             var dice2=roll_dice(1, 100);
 
-            result="";alert_text="";
+            result="";
+            alert_text="";
             if (dice1<=(p_heresy[i]*2)) then result="chaos";
             if (dice2<=(p_influence[i][eFACTION.Tau]*2)) and (result="") then result="tau";
             if (result="") then result="imperial";
@@ -387,9 +389,13 @@ function scr_enemy_ai_d() {
         if (garrison_mission>-1){
             try_and_report_loop("complete garrison mission", complete_garrison_mission,true, [i,garrison_mission]);
         }
-        var beast_hunt = has_problem_planet_and_time(i,"hunt_beast", 0);
-        if (beast_hunt>-1){
-             try_and_report_loop("complete beast hunt mission", complete_beast_hunt_mission,true, [i,beast_hunt]);
+        var _beast_hunt = has_problem_planet_and_time(i,"hunt_beast", 0);
+        if (_beast_hunt>-1){
+            try{
+                complete_beast_hunt_mission(i,_beast_hunt);
+            } catch (_exception){
+                handle_exception(exception);
+            }
         }        
 
 	    if ((p_tyranids[i]=3) or (p_tyranids[i]=4)) and (p_population[i]>0){

scripts/scr_mission_functions/scr_mission_functions.gml

@@ -1,6 +1,10 @@
 // Script assets have changed for v2.3.0 see
 // https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information
 
+
+function MissionHandler(planet, system) : PlanetData(planet, system) constructor{
+
+}
 function mission_name_key(mission){
 	var mission_key = {
 		"meeting_trap" : "Chaos Lord Meeting",
@@ -34,29 +38,31 @@ function mission_name_key(mission){
 		return "none"
 	}  
 }
-function scr_new_governor_mission(planet){
-	problem = "";
-	if p_owner[planet]!=eFACTION.Imperium then exit;
+function scr_new_governor_mission(planet, problem = ""){
+
+	if p_owner[planet] != eFACTION.Imperium then exit;
 	var planet_type= p_type[planet];
-	if (planet_type=="Death"){
-		problem = choose("hunt_beast", "provide_garrison");
-		accept_time = 6+irandom(30);
-	} else if (planet_type == "Hive"){
-		problem = choose("Show_of_power", "provide_garrison", "purge_enemies", "raid_black_market");
-	} else if (planet_type == "Temperate"){
-		problem = choose("provide_garrison", "train_forces", "join_parade");
-	}else if (planet_type == "Shrine"){
-		problem = choose("provide_garrison", "join_communion");
-	}else if (planet_type == "Ice"){
-		problem = choose("provide_garrison", "hunt_beast");
-	}else if (planet_type == "Lava"){
-		problem = choose("provide_garrison", "protect_raiders");
-	}else if (planet_type == "Agri"){
-		problem = choose("provide_garrison", "protect_raiders", "recover_artifacts");
-	}else if (planet_type == "Desert"){
-		problem = choose("provide_garrison", "protect_raiders", "recover_artifacts");
-	}else if (planet_type == "Feudal"){
-		problem = choose("hunt_beast", "protect_raiders");
+	if (problem == ""){
+		if (planet_type=="Death"){
+			problem = choose("hunt_beast", "provide_garrison");
+			accept_time = 6+irandom(30);
+		} else if (planet_type == "Hive"){
+			problem = choose("Show_of_power", "provide_garrison", "purge_enemies", "raid_black_market");
+		} else if (planet_type == "Temperate"){
+			problem = choose("provide_garrison", "train_forces", "join_parade");
+		}else if (planet_type == "Shrine"){
+			problem = choose("provide_garrison", "join_communion");
+		}else if (planet_type == "Ice"){
+			problem = choose("provide_garrison", "hunt_beast");
+		}else if (planet_type == "Lava"){
+			problem = choose("provide_garrison", "protect_raiders");
+		}else if (planet_type == "Agri"){
+			problem = choose("provide_garrison", "protect_raiders", "recover_artifacts");
+		}else if (planet_type == "Desert"){
+			problem = choose("provide_garrison", "protect_raiders", "recover_artifacts");
+		}else if (planet_type == "Feudal"){
+			problem = choose("hunt_beast", "protect_raiders");
+		}
 	}
 	var mission_data = {
 		stage : "preliminary",
@@ -84,31 +90,6 @@ function scr_new_governor_mission(planet){
 	}
 }
 
-
-function init_garrison_mission(planet, star, mission_slot){
-	var problems_data = star.p_problem_other_data[planet]
-	var mission_data = problems_data[mission_slot];
-	if (mission_data.stage == "preliminary"){
-		var numeral_name = planet_numeral_name(planet, star);
-		mission_data.stage = "active";
-		var garrison_length=(10+irandom(6));
-		star.p_timer[planet][mission_slot] = garrison_length;
-	    //pop.image="ancient_ruins";
-	    var gar_pop=instance_create(0,0,obj_popup);
-	    //TODO some new universal methods for popups
-	    gar_pop.title=$"Requested Garrison Provided to {numeral_name}";
-	    gar_pop.text=$"The govornor of {numeral_name} Thanks you for considering his request for a garrison, you agree that the garrison will remain for at least {garrison_length} months.";
-	    //pip.image="event_march"
-	    gar_pop.option1="Commence Garrison";
-        gar_pop.image="";
-        gar_pop.cooldown=8;
-        obj_controller.cooldown=8;	    
-	    scr_event_log("",$"Garrison commited to {numeral_name} for {garrison_length} months.", target.name);
-	}	
-}
-
-
-
 function init_beast_hunt_mission(planet, star, mission_slot){
 	var problems_data = star.p_problem_other_data[planet]
 	var mission_data = problems_data[mission_slot];
@@ -221,10 +202,10 @@ function complete_beast_hunt_mission(targ_planet, problem_index){
 					} else if (_tough_check[1]>=-10){
 						if (irandom(100)<_unit.luck){
 							_unit.add_or_sub_health(-100);
-							$"{_unit.name_role()} Was injured (health - 100)\n";
+							_unit_report_string += $"{_unit.name_role()} Was injured (health - 100)\n";
 						} else {
 							_unit.add_or_sub_health(-250);
-							$"{_unit.name_role()} Was Badly injured, it is unknown if he will recover (health - 250)\n";
+							_unit_report_string += $"{_unit.name_role()} Was Badly injured, it is unknown if he will recover (health - 250)\n";
 						}
 					}
 				}
@@ -238,7 +219,8 @@ function complete_beast_hunt_mission(targ_planet, problem_index){
         	}
         	_mission_string += $"\n{_unit_report_string}";
         } else {
-
+        	_mission_string = $"The mission was a failiure. The governor is disapointed and the legend of your chapter has undoubtedly been diminished";
+        	_mission_string += $"\n{_unit_report_string}";
         }
         scr_popup($"Beast Hunt on {planet_numeral_name(i)}",_mission_string,"","");
         remove_planet_problem(targ_planet, "hunt_beast");
@@ -265,20 +247,20 @@ function has_any_problem_planet(planet, star="none"){
 }
 
 function planet_problemless(planet, star="none"){
-	var has_problem = false;
+	var _problemless = true;
 	if (star=="none"){
 		for (var i=0;i<array_length(p_problem[planet]);i++){
 			if (p_problem[planet][i] != ""){
-				has_problem=true;
+				_problemless=false;
 				break;
 			}
 		}
 	} else {
 		with (star){
-			has_problem =  planet_problemless(planet);
+			_problemless =  planet_problemless(planet);
 		}
 	}
-	return !has_problem;
+	return _problemless;
 }
 
 /*