fix: Make dungeon battles and local battles run on modern roster system (Adeptus-Dominus#459)

Author: OH296

objects/obj_ncombat/Create_0.gml

@@ -2,12 +2,7 @@ if (instance_number(obj_ncombat)>1) then  instance_destroy();
 
 set_zoom_to_default();
 var co,i;co=-1;
-repeat(15){co+=1;i=-1;
-    repeat(401){i+=1;
-        fighting[co][i]=0;
-        if (i<=150){veh_fighting[co][i]=0;}
-    }
-}co=0;i=0;hue=0;
+co=0;i=0;hue=0;
 
 turn_count = 0;
 debugl("Ground Combat Started");

objects/obj_popup/Alarm_0.gml

@@ -24,7 +24,23 @@ if (battle_special=3.1){
     instance_activate_object(obj_controller);
     instance_activate_object(obj_ncombat);
 
-    scr_battle_roster(loc,planet,true);
+    _roster = new Roster();
+    with (_roster){
+        roster_location = obj_ncombat.battle_loc;
+        roster_planet = obj_ncombat.battle_id;
+        determine_full_roster();
+        only_locals();
+        update_roster();
+        if (array_length(selected_units)){  
+            setup_battle_formations();
+            add_to_battle();
+        } else {
+            instance_destroy(obj_ncombat);
+            instance_activate_all();
+            delete _roster
+        }               
+    }
+    delete _roster
 }
 instance_destroy();exit;
 

objects/obj_popup/Destroy_0.gml

@@ -82,10 +82,12 @@ if (instance_exists(obj_controller)){
 
         obj_controller.useful_info+="CHTRP|";
 
-        var v;v=0;
+        var v=0;
         repeat(obj_temp_meeting.dudes){v+=1;
             if (obj_temp_meeting.present[v]=1){
-                obj_ncombat.fighting[obj_temp_meeting.co[v],obj_temp_meeting.ide[v]]=1;
+                var _unit_array = [obj_temp_meeting.co[v],obj_temp_meeting.ide[v]];
+                add_unit_to_battle(_unit_array)
+
             }
         }
 

objects/obj_popup/Step_0.gml

@@ -1280,7 +1280,20 @@ try {
 				instance_activate_object(obj_temp8);
 
 				instance_create(0, 0, obj_ncombat);
-				scr_battle_roster(obj_temp8.loc, obj_temp8.wid, true);
+			    _roster = new Roster();
+			    with (_roster){
+			        roster_location = obj_temp8.loc;
+			        roster_planet = obj_temp8.wid;
+			        determine_full_roster();
+			        only_locals();
+			        update_roster();
+			        if (array_length(selected_units)){  
+			            setup_battle_formations();
+			            add_to_battle();
+			        }               
+			    }
+			    delete _roster				
+
 
 				instance_activate_object(obj_star);
 				with (obj_star) {

objects/obj_turn_end/Mouse_56.gml

@@ -119,7 +119,9 @@ __b__ = action_if_number(obj_popup, 0, 0);
 
 
 
-				    if (tip!=""){                                   // Fight fight fight, ground
+				    if (tip!=""){
+				        var _loc = battle_location[current_battle]
+				        var _planet = battle_world[current_battle]				                                     // Fight fight fight, ground
 				        obj_controller.cooldown=8;
 
 				        // Start battle here
@@ -130,27 +132,40 @@ __b__ = action_if_number(obj_popup, 0, 0);
 				        instance_activate_object(obj_controller);
 				        instance_activate_object(obj_ini);
 				        instance_activate_object(battle_object[current_battle]);
-        
+
+				        var _battle_obj = battle_object[current_battle];
+        				
 				        instance_create(0,0,obj_ncombat);
 				        obj_ncombat.enemy=battle_opponent[current_battle];
-				        obj_ncombat.battle_object=battle_object[current_battle];
-				        obj_ncombat.battle_loc=battle_location[current_battle];
-				        obj_ncombat.battle_id=battle_world[current_battle];
-        
-				        if (tip="offensive") then obj_ncombat.formation_set=1;
-				        if (tip="defensive") then obj_ncombat.formation_set=2;
-        
-        
-				        var yeah;yeah=false;
-				        if (battle_object[current_battle].p_owner[battle_world[current_battle]]=1) then yeah=true;
-				        if (battle_object[current_battle].p_owner[battle_world[current_battle]]=7) then yeah=true;
-				        if (battle_object[current_battle].p_owner[battle_world[current_battle]]=9) then yeah=true;
-				        if (obj_controller.faction_status[battle_object[current_battle].p_owner[battle_world[current_battle]]]!="War") then yeah=true;
-				        if (yeah=true) then obj_ncombat.fortified=battle_object[current_battle].p_fortified[battle_world[current_battle]];
-				        if (obj_ncombat.enemy=13) then obj_ncombat.fortified=0;
+				        obj_ncombat.battle_object=_battle_obj;
+				        obj_ncombat.battle_loc=_loc;
+				        obj_ncombat.battle_id=_planet;
+
+				        var _enemy = obj_ncombat.enemy;
+        				
+        				var _planet_data = new PlanetData(_planet, _battle_obj);
+				        if (tip="offensive"){
+				        	obj_ncombat.formation_set=1;
+				        } else if (tip="defensive"){
+				        	obj_ncombat.formation_set=2;
+				        }
+        
+        
+				        var _allow_fortifications=false;
+				        var _fort_factions = [eFACTION.Player, eFACTION.Tyranids,eFACTION.Ork];
+				        _allow_fortifications =  (array_contains(_fort_factions, _planet_data.current_owner))
+
+				        if (!_allow_fortifications){
+				        	var owner_fac_status
+				        	_allow_fortifications =  (_planet_data.owner_status() != "War");
+				        }
+
+				        if (_allow_fortifications) then obj_ncombat.fortified=_planet_data.fortification_level;
+
+				        if (obj_ncombat.enemy==13) then obj_ncombat.fortified=0;
 
 				        obj_ncombat.battle_special=battle_special[current_battle];
-				        obj_ncombat.battle_climate=battle_object[current_battle].p_type[battle_world[current_battle]];
+				        obj_ncombat.battle_climate=_planet_data.planet_type;
 
 				        // show_message(string(battle_object[current_battle].p_feature[battle_world[current_battle]]));
 				        /*if (scr_planetary_feature.plant_feature_bool(battle_object[current_battle].p_feature[battle_world[current_battle]], P_features.Monastery)==1){
@@ -160,20 +175,29 @@ __b__ = action_if_number(obj_popup, 0, 0);
 				            obj_ncombat.player_silos+=battle_object[current_battle].p_silo[battle_world[current_battle]];
 				        }*/
 
-				        if (obj_ncombat.enemy = eFACTION.Imperium){obj_ncombat.threat=min(1000000,battle_object[current_battle].p_guardsmen[battle_world[current_battle]]);}
-				        if (obj_ncombat.enemy = eFACTION.Eldar) then obj_ncombat.threat=battle_object[current_battle].p_eldar[battle_world[current_battle]];
-				        if (obj_ncombat.enemy = eFACTION.Ork) then obj_ncombat.threat=battle_object[current_battle].p_orks[battle_world[current_battle]];
-				        if (obj_ncombat.enemy = eFACTION.Tau) then obj_ncombat.threat=battle_object[current_battle].p_tau[battle_world[current_battle]];
-				        if (obj_ncombat.enemy = eFACTION.Tyranids) then obj_ncombat.threat=battle_object[current_battle].p_tyranids[battle_world[current_battle]];
-				        if (obj_ncombat.enemy = eFACTION.Chaos) then obj_ncombat.threat=battle_object[current_battle].p_traitors[battle_world[current_battle]];
-				        if (obj_ncombat.enemy = eFACTION.Heretics) then obj_ncombat.threat=battle_object[current_battle].p_chaos[battle_world[current_battle]];
-				        if (obj_ncombat.enemy = eFACTION.Necrons) then obj_ncombat.threat=battle_object[current_battle].p_necrons[battle_world[current_battle]];
-				        if (obj_ncombat.enemy=30) then obj_ncombat.threat=1;
-        
-				        // 
-        
-				        scr_battle_roster(string(battle_location[current_battle]),battle_world[current_battle],true);
-        
+				        if (_enemy == eFACTION.Imperium){
+				        	obj_ncombat.threat=min(1000000,_planet_data.guardsmen);
+				        } else if (obj_ncombat.enemy<14 && _enemy>5){
+							obj_ncombat.threat = _planet_data.planet_forces[_enemy];
+				        }
+				        else if (_enemy=30){
+				        	obj_ncombat.threat=1;
+				        }
+        
+				        //
+        				_roster = new Roster();
+					    with (_roster){
+					        roster_location = _loc;
+					        roster_planet = _planet;
+					        determine_full_roster();
+					        only_locals();
+					        update_roster();
+					        if (array_length(selected_units)){  
+					            setup_battle_formations();
+					            add_to_battle();
+					        }              
+					    }
+					    delete _roster
 				        instance_deactivate_object(battle_object[current_battle]);
 				    }
 				}

scripts/scr_PlanetData/scr_PlanetData.gml

@@ -34,6 +34,9 @@ function PlanetData(planet, system) constructor{
         return _at_war;
     }
 
+    static owner_status = function(){
+    	return obj_controller.faction_status[current_owner];
+    }
     guardsmen = system.p_guardsmen[planet];
     pdf = system.p_pdf[planet];
     fortification_level  = system.p_fortified[planet];

scripts/scr_ancient_ruins/scr_ancient_ruins.gml

@@ -25,15 +25,32 @@ function scr_ruins_suprise_attack_player(){
 		instance_activate_object(obj_ground_mission);
 		var _star = star_by_name(obj_ground_mission.loc);
 		var _planet = obj_ground_mission.num;
+		var _units = obj_ground_mission.display_unit;
 
 		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(obj_ground_mission.loc ,_planet,true);
-		obj_controller.cooldown=10;
+		_roster = new Roster();
+		with (_roster){
+			roster_location = obj_ground_mission.loc;
+			roster_planet = _planet;
+	        selected_units = _units;
+			if (array_length(selected_units)){	
+	            setup_battle_formations();
+	            add_to_battle();
+	        } else {
+	        	instance_destroy(obj_ncombat);
+	        	instance_destroy(obj_pnunit);
+	        	instance_destroy(obj_enunit);
+	        	instance_activate_all();
+	        	scr_ruins_reward(_star,_planet,self);
+	        }				
+		}
+
+
 		obj_ncombat.battle_object=_star;
 		obj_ncombat.battle_loc=_star.name;
 		instance_deactivate_object(obj_star);    
@@ -202,7 +219,7 @@ function scr_check_for_ruins_exploration(select_planet, star){
 	var _ruins_list =  search_planet_features( _planet_features, P_features.Ancient_Ruins)
 	var _explore_ruins=0;
     if (array_length(_ruins_list) > 0){
-		for (var _ruin= 0; _ruin < array_length(_ruins_list); _ruin++){
+		for (var _ruin = 0; _ruin < array_length(_ruins_list); _ruin++){
 			var _specific_ruins = _ruins_list[_ruin];
 			var _cur_ruins = _planet_features[_specific_ruins];
 			if ( _cur_ruins.exploration_complete == false){

scripts/scr_battle_roster/scr_battle_roster.gml

@@ -62,7 +62,6 @@ function scr_battle_roster(required_location, _target_location, _is_planet, over
                 if (_spyrer_mission > 0) {
                     if (okay == 1) and(array_length(new_combat.unit_struct)) then okay = -1;
                 }
-                if (okay <= -1) then new_combat.fighting[company][v] = 0;
 
                 //Normal and other battle cases checks go here
                 else if (okay >= 0) {
@@ -83,9 +82,8 @@ function scr_battle_roster(required_location, _target_location, _is_planet, over
                         }
                     } else if (instance_exists(obj_drop_select)) { // When attacking, normal battle
                         //If not fighting (obj_drop_select pre-check), we skip the unit
-                        if (obj_drop_select.fighting[company][v] == 0) then okay = 0;
 
-                        else if (obj_drop_select.attack == 1) {
+                        if (obj_drop_select.attack == 1) {
                             if (_is_planet) and(obj_ini.loc[company][v] == required_location) and(unit.planet_location == _target_location)   then okay = 1;
                             else if (!_is_planet) and(unit.ship_location == _target_location) then okay = 1;
                         } else if (obj_drop_select.attack != 1) {

scripts/scr_clean/scr_clean.gml

@@ -98,15 +98,26 @@ function scr_clean(target_object, target_is_infantry, hostile_shots, hostile_dam
 
                 // Apply damage for each shot
                 for (var shot = 0; shot < man_hits; shot++) {
-                    if (array_length(valid_marines) == 0) break; // No valid targets left
+                    if (array_length(valid_marines) == 0){
+                        break; // No valid targets left
+                    }
 
                     // Select a random marine from the valid list
                     var random_index = array_random_index(valid_marines);
                     var marine_index = valid_marines[random_index];
                     var marine = unit_struct[marine_index];
 
                     // Apply damage
-                    var minus = hostile_damage - (2 * marine_ac[marine_index]);
+                    var _shot_luck = d100_roll();
+                    if (_shot_luck<1){
+                        var minus = hostile_damage;
+                    } else if (_shot_luck<5){
+                        var minus = hostile_damage - marine_ac[marine_index];
+                    } else {
+                        var minus = hostile_damage - (2 * marine_ac[marine_index]);
+                    }
+                    
+
                     if (minus > 0) {
                         var damage_resistance = (marine.damage_resistance() / 100);
                         if (marine_mshield[marine_index] > 0) damage_resistance += 0.1;

scripts/scr_drop_select_function/scr_drop_select_function.gml

@@ -337,6 +337,7 @@ function drop_select_draw(){
                             combating = 0;
                             instance_activate_all();
                             exit;
+                        
                         }
                         if (obj_controller.known[eFACTION.Chaos] >= 2 && obj_controller.faction_gender[10] = 1){
                             with(obj_drop_select) {