feat: Rework The Loyalty System

objects/obj_controller/Alarm_5.gml

@@ -1270,4 +1270,6 @@ with (obj_p_fleet){
     }
 }
 
+loyaty_countdowns();
+
 });

objects/obj_p_fleet/Alarm_1.gml

@@ -24,7 +24,6 @@ try_and_report_loop("player alarm 1",function(){
 
 
     else if (action="move") or (action="crusade1") or (action="crusade2") or (action="crusade3"){
-
         var i;
         set_fleet_location("Warp");
 
@@ -64,8 +63,10 @@ try_and_report_loop("player alarm 1",function(){
             var ret=instance_nearest(x,y,obj_star);
             action_x=ret.x;
             action_y=ret.y;
-            action="crusade3";action_eta=floor(point_distance(x,y,ret.x,ret.y)/128)+1;
-            alarm[4]=1;instance_activate_object(obj_star);
+            action="crusade3";
+            action_eta=floor(point_distance(x,y,ret.x,ret.y)/128)+1;
+            alarm[4]=1;
+            instance_activate_object(obj_star);
         }
         if (action_eta=0) and (action="crusade3"){
             // Popup here

scripts/scr_enemy_ai_d/scr_enemy_ai_d.gml

@@ -99,6 +99,7 @@ function scr_enemy_ai_d() {
             if (result="imperial") then scr_event_log("",alert_text);
             remove_planet_problem(i, "succession");
 	    }
+
 	   if (has_problem_planet_and_time(i, "recon", 0)>-1){
             var alert_text="Inquisition Mission Failed: Investigate ";
             alert_text+=string(name)+" "+scr_roman(i)+".";
@@ -108,34 +109,10 @@ function scr_enemy_ai_d() {
             remove_planet_problem(i, "recon");
         }
 
-        if (has_problem_planet_and_time(i, "great_crusade", 0)>-1){
-            var flet,cont,dir;cont=0;
-            flet=instance_nearest(x,y,obj_p_fleet);
-
-            if (flet.action="") then cont=1;
-            if (cont=1) and (point_distance(x,y,flet.x,flet.y)<40) then cont=2;
-
-            if (cont=2){
-                flet.action="crusade1";
-                dir=point_direction(room_width/2,room_height/2,x,y);
-                flet.action_x=x+lengthdir_x(2000,dir);
-                flet.action_y=y+lengthdir_y(2000,dir);
-                // flet.action_eta=floor(random(8))+12;
-                flet.action_eta=floor(random(8))+2;
-                flet.alarm[4]=1;
-                scr_alert("green","crusade","Fleet embarks upon Crusade.",x,y);
-                scr_event_log("","Fleet embarks upon Crusade.");
-            }
-            if (cont=1) or (cont=0){
-                // hit loyalty here
-                obj_controller.disposition[2]-=5;
-                obj_controller.disposition[4]-=10;
-                scr_alert("red","crusade","No ships designated for Crusade.",x,y);
-                scr_loyalty("Refusing to Crusade","+");
-                scr_event_log("red","No ships designated for Crusade.");
-                if (obj_controller.penitent=1) then obj_controller.penitent_current=0;
-            }
-        	remove_planet_problem(i, "great_crusade");
+        var _great_crusade = has_problem_planet_and_time(i, "great_crusade", 0);
+
+        if (_great_crusade>-1){
+            init_crusade_mission(i, _great_crusade);
         }
 
         var raider_planet_slot = has_problem_planet_with_time(i,"mech_raider");

scripts/scr_event_log/scr_event_log.gml

@@ -1,7 +1,7 @@
 function scr_event_log(event_colour, event_text, target = "none") {
 
 	if (instance_exists(obj_event_log)){
-	    var yf;yf="";
+	    var yf="";
 	    if (obj_controller.year_fraction<10) then yf="00"+string(obj_controller.year_fraction);
 	    if (obj_controller.year_fraction>=10) and (obj_controller.year_fraction<100) then yf="0"+string(obj_controller.year_fraction);
 	    if (obj_controller.year_fraction>=100) then yf=string(obj_controller.year_fraction);
@@ -17,3 +17,13 @@ function scr_event_log(event_colour, event_text, target = "none") {
 
 	}
 }
+
+function alert_and_event(event_colour, event_text, target=-1){
+	if (instance_exists(target)){
+		scr_event_log(event_colour, event_text, target.name);
+		scr_alert(event_colour, event_text, target.x, target.y);
+	} else {
+		scr_event_log(event_colour, event_text);
+		scr_alert(event_colour, event_text);
+	} 	
+}

scripts/scr_fleet_functions/scr_fleet_functions.gml

@@ -143,6 +143,7 @@ function set_fleet_movement(fastest_route = true){
 
 	action = "";
 
+	static minimum_eta = 1;
 	if (action==""){
 		turns_static = 0;
 	    var sys, mine, fleet;
@@ -170,23 +171,24 @@ function set_fleet_movement(fastest_route = true){
 		    sys=instance_nearest(action_x,action_y,obj_star);
 
 		    mine=instance_nearest(x,y,obj_star);
-
-	        var eta = calculate_fleet_eta(x,y,action_x,action_y,action_spd,instance_exists(sys),is_orbiting(),warp_able);
+	        var _travel_to_star = point_distance(sys.x, sys.y, action_x,action_y < 20);
+	        var eta = calculate_fleet_eta(x,y,action_x,action_y,action_spd,is_orbiting(),_travel_to_star,warp_able);
 	        action_eta = eta;
 	        if (action_eta<=0) or (owner  != eFACTION.Inquisition){
 	            action_eta=eta;
 	            if (owner  = eFACTION.Inquisition) and (action_eta<2) and (string_count("_her",trade_goods)=0) then action_eta=2;
 	        }
 
-	        if (owner != eFACTION.Eldar && mine.storm) then action_eta+=10000;
+	        if (owner != eFACTION.Eldar && mine.storm){
+	        	action_eta+=10000;
+	        }
 
 	        // action_x=sys.x;
 	        // action_y=sys.y;
 	        orbiting = false;
 	        action="move";
 
 	        if (minimum_eta>action_eta) and (minimum_eta>0) then action_eta=minimum_eta;
-	        minimum_eta=0;
 		}
 	}
 }