Merge remote-tracking branch 'origin/HH' into HH

Author: Werwolf-12

.gitignore

@@ -12,3 +12,5 @@ ChapterMaster.resource_order
 
 tmp/
 stitch.config.json
+
+objects/obj_garbage_collector/

ChapterMaster.yyp

@@ -1688,6 +1688,7 @@
     {"id":{"name":"spr_weapon_flamer","path":"sprites/spr_weapon_flamer/spr_weapon_flamer.yy",},},
     {"id":{"name":"spr_weapon_frcaxe","path":"sprites/spr_weapon_frcaxe/spr_weapon_frcaxe.yy",},},
     {"id":{"name":"spr_weapon_frcstaff","path":"sprites/spr_weapon_frcstaff/spr_weapon_frcstaff.yy",},},
+    {"id":{"name":"spr_weapon_frcsword","path":"sprites/spr_weapon_frcsword/spr_weapon_frcsword.yy",},},
     {"id":{"name":"spr_weapon_grav_cannon","path":"sprites/spr_weapon_grav_cannon/spr_weapon_grav_cannon.yy",},},
     {"id":{"name":"spr_weapon_grav_gun","path":"sprites/spr_weapon_grav_gun/spr_weapon_grav_gun.yy",},},
     {"id":{"name":"spr_weapon_grav_pistol","path":"sprites/spr_weapon_grav_pistol/spr_weapon_grav_pistol.yy",},},

objects/obj_garbage_collector/Step_0.gml

@@ -4,7 +4,7 @@ if (gc_timer > 0) {
 } else {
 
 
-    gc_timer = 50000; // Default is every frame, so de-facto 1;
+    gc_timer = 50; // Default is every frame, so de-facto 1;
     gc_collect();
 
     wait_and_execute(0, function(){
@@ -22,4 +22,4 @@ if (gc_timer > 0) {
         }
         log_message(_gc_message);
     });
-}
+}

scripts/scr_culture_visuals/scr_culture_visuals.gml

@@ -2486,7 +2486,7 @@ base: {
   },
   variants: [
     {
-      sprite: spr_weapon_powswo
+      sprite: spr_weapon_frcsword
     }
   ]
 },

scripts/scr_demand/scr_demand.gml

@@ -1,3 +1,53 @@
+function threat_plausibility(){
+    var _threat = 20;
+    var _good_imperium_position = diplomacy[eFACTION.Imperium] > 50 ? 1 : -1;
+    var _relative_strength = floor(obj_controller/20);
+    var _nature = "";
+}
+
+function clear_inspections(){
+	with(obj_en_fleet){
+	    if (owner  = eFACTION.Inquisition) and (string_count("Inqis",trade_goods)>0){
+	        trade_goods="cancel_inspection";
+	        target=0;
+	    }
+	}
+}
+
+function inquis_use_inspection_pass(){
+   	if (inspection_passes>0){
+        inspection_passes-=1;
+        last_world_inspection=turn+25;
+        last_fleet_inspection=turn+25;
+        //obj_controller.liscensing=5;
+        clear_inspections();
+        diplo_text = "Very well i shall honour our previous agreements. (24 months leave of inspections)";
+    }
+}
+
+function inquis_demand_inspection_pass(){
+    var resistance=10;
+    var _worked = false;
+    clear_diplo_choices();
+    if (inspection_passes==0){
+        rull=floor(random(10))+1;
+        if (rull>resistance){
+            _worked=true;
+            last_world_inspection=turn+24;
+            last_fleet_inspection=turn+24;
+            //obj_controller.liscensing=5;
+            clear_inspections();
+            diplo_text = "Very well Chapter Master I Your service to the imperium is well known i have no doubt that you would not ask such of me without good reasoon. I shall forgoe my normal duties just this onece. \n do not becomne complacent Chapter Master i may not always be so generous";
+        } else {
+        	var _diff = resistance - rull;
+        	diplomacy[eFACTION.Inquisition] -= 1;
+        	diplo_text = "Consider your request denied. If there is heresy or any wrong doing i shal see that is rooted out and made plain for all to see";;
+
+        }
+    }
+
+}
+
 function scr_demand(demand_type) {
 
 	// demand_type: button
@@ -73,28 +123,14 @@ function scr_demand(demand_type) {
 	    resistance=10;
 
 	    if (demand_type=1){// Requisition
-	        rull=floor(random(10))+1;
-	        if (rull>resistance){requisition+=300;worked=true;}
-	        if (rull<=resistance){worked=false;}
-	    }
-	    if (demand_type=2) and (inspection_passes=0){
 	        rull=floor(random(10))+1;
 	        if (rull>resistance){
-	            worked=true;
-	            last_world_inspection=turn+12;
-	            last_fleet_inspection=turn+12;
-	            obj_controller.liscensing=5;
-	            with(obj_en_fleet){if (owner  = eFACTION.Inquisition) and (string_count("Inqis",trade_goods)>0){trade_goods="cancel_inspection";target=0;}}
+	        	requisition+=300;
+	        	worked=true;
+	        }
+	        if (rull<=resistance){
+	        	worked=false;
 	        }
-	        if (rull<=resistance){worked=false;}
-	    }
-	    if (demand_type=2) and (inspection_passes>0){
-	        inspection_passes-=1;
-	        worked=true;no_penalty=true;
-	        last_world_inspection=turn+12;
-	        last_fleet_inspection=turn+12;
-	        obj_controller.liscensing=5;
-	        with(obj_en_fleet){if (owner  = eFACTION.Inquisition) and (string_count("Inqis",trade_goods)>0){trade_goods="cancel_inspection";target=0;}}
 	    }
 	}
 

scripts/scr_dialogue/scr_dialogue.gml

@@ -478,6 +478,11 @@ function scr_dialogue(diplo_keyphrase) {
 
 		};
 	}
+	if (diplo_keyphrase=="Demand Method"){
+		add_diplomacy_option({option_text:"Threaten", tooltip : "The plausibility will of your threat"});
+		add_diplomacy_option({option_text:"Bribe"});
+		add_diplomacy_option({option_text:"Plausible Excuse"});
+	}
 	// ** Chaos **
 	if (diplomacy=10){
 	    if (diplo_keyphrase=="civilwar_begin"){
@@ -746,7 +751,10 @@ function scr_dialogue(diplo_keyphrase) {
 	        }
 	        add_diplomacy_option({option_text:"Demand Requisition"});
 			add_diplomacy_option({option_text:"Demand Military Assistance"});
-			add_diplomacy_option({option_text:"Cancel"});
+			add_diplomacy_option({
+				option_text:"Cancel",
+				goto:"disagree"
+			});
 	    }
 	    if (diplo_keyphrase=="propose_alliance") and (obj_controller.faction_gender[10]==1){
 	    	var _found = false;
@@ -985,7 +993,10 @@ function scr_dialogue(diplo_keyphrase) {
 	        if (rela=="hostile") then diplo_text="Consider your next words carefully.";
 	        add_diplomacy_option({option_text:"Demand Requisition"});
 			add_diplomacy_option({option_text:"Demand Military Assistance"});
-			add_diplomacy_option({option_text:"Cancel"});
+			add_diplomacy_option({
+				option_text:"Cancel",
+				goto:"disagree"
+			});
 	    }
 	    if (string_count("assassination_angryish",diplo_keyphrase)>0){
 	        var ta="",tb="",tc="";
@@ -1188,7 +1199,10 @@ function scr_dialogue(diplo_keyphrase) {
 	            if (randoo!=1) then diplo_text="Certain queries may have to be answered by action.";
 	        }
 	        add_diplomacy_option({option_text:"Demand Requisition"});
-			add_diplomacy_option({option_text:"Cancel"});
+			add_diplomacy_option({
+				option_text:"Cancel",
+				goto:"disagree"
+			});
 	    }
 	}
 	// ** Inquisition **
@@ -1435,12 +1449,26 @@ function scr_dialogue(diplo_keyphrase) {
 	        if (rela=="friendly") then diplo_text="Remember whom you speak to, Chapter Master.";
 	        if (rela=="neutral") then diplo_text=$"I, Inquisitor Lord {faction_leader[eFACTION.Inquisition]}, on behalf of the Inquisition, am awaiting your words.";
 	        if (rela=="hostile") then diplo_text="Speak your next words very carefully, Astartes, for they may be your last.";
-	        add_diplomacy_option({option_text:"Demand Requisition"});
-			add_diplomacy_option({option_text:"Skip Inspection"});
-			add_diplomacy_option({option_text:"Cancel"});
+	        add_diplomacy_option({
+	        	option_text:"Demand Requisition"
+	        });
+
+
+			add_diplomacy_option({
+				option_text:"Skip Inspection",
+				method : inquis_demand_inspection_pass,
+			});
+
 	        if (inspection_passes>0){
-				add_diplomacy_option({option_text:"Skip Inspection ({inspection_passes} pass)"});
+				add_diplomacy_option({
+					option_text:"Skip Inspection (Use pass)",
+					method : inquis_use_inspection_pass
+				});
 			}
+			add_diplomacy_option({
+				option_text:"Cancel",
+				goto:"disagree"
+			});
 	    }
 	    if (diplo_keyphrase=="penitent_end"){
 	        rando=choose(1,2);
@@ -1761,7 +1789,10 @@ function scr_dialogue(diplo_keyphrase) {
 	        if (rela=="neutral") then diplo_text="What is the meaning of this?";
 	        if (rela=="hostile") then diplo_text="“The Heretic and Blasphemer can offer no excuse for their crimes. Those who are pardoned merely live to further shroud Humanity from the Light of the Emperor with the Darkness of their souls.”";
 	        add_diplomacy_option({option_text:"Demand Requisition"});
-			add_diplomacy_option({option_text:"Cancel"});
+			add_diplomacy_option({
+				option_text:"Cancel",
+				goto:"disagree"
+			});
 	    }
 	    if (diplo_keyphrase=="penitent_end"){
 	        rando=choose(1,2);
@@ -2014,7 +2045,10 @@ function scr_dialogue(diplo_keyphrase) {
 	        }
 	        add_diplomacy_option({option_text:"Demand Requisition"});
 			add_diplomacy_option({option_text:"Demand Useful Information"});
-			add_diplomacy_option({option_text:"Cancel"});
+			add_diplomacy_option({
+				option_text:"Cancel",
+				goto:"disagree"
+			});
 	    }
 	    if (diplo_keyphrase=="mission1"){
 	        diplo_text="The good that might come from simple acts of benevolence are oft underestimated.  A token goodwill gesture can go far, ";
@@ -2497,7 +2531,10 @@ function scr_dialogue(diplo_keyphrase) {
 	        diplo_text="Yeah?  Wut?";
 	        add_diplomacy_option({option_text:"Demand Requisition"});
 			add_diplomacy_option({option_text:"Demand Military Assistance"});
-			add_diplomacy_option({option_text:"Cancel"});
+			add_diplomacy_option({
+				option_text:"Cancel",
+				goto:"disagree"
+			});
 	    }
 	}
 	// ** Tau **

scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.gml

@@ -83,15 +83,15 @@ function basic_diplomacy_screen(){
 
                 var sw=1;
                 for (var i=1;i<5;i++){
-                	if (string_width(string_hash_to_newline(_opt))*sw>530) then sw-=0.05;
+                	if (string_width(string_hash_to_newline(_opt.option_text))*sw>530) then sw-=0.05;
                 }
-                if (string_width(string_hash_to_newline(_opt))*sw<=530) and (sw=1){
-                    draw_text_transformed(xx+620,yy+696,string_hash_to_newline(_opt),sw,sw,0);
-					draw_text_transformed(xx+620,yy+696+2,string_hash_to_newline(_opt),sw,sw,0);
+                if (string_width(string_hash_to_newline(_opt.option_text))*sw<=530) and (sw=1){
+                    draw_text_transformed(xx+620,yy+696,string_hash_to_newline(_opt.option_text),sw,sw,0);
+					draw_text_transformed(xx+620,yy+696+2,string_hash_to_newline(_opt.option_text),sw,sw,0);
                 }
 
-                if (string_width(string_hash_to_newline(_opt))*sw>530){
-                    draw_text_ext_transformed(xx+620,yy+696-4,string_hash_to_newline(_opt),16,530/sw,sw,sw,0);
+                if (string_width(string_hash_to_newline(_opt.option_text))*sw>530){
+                    draw_text_ext_transformed(xx+620,yy+696-4,string_hash_to_newline(_opt.option_text),16,530/sw,sw,sw,0);
                 }
 				if scr_hit(left,top,right,base){
                     draw_set_alpha(0.2);
@@ -223,17 +223,16 @@ function draw_character_diplomacy(){
 
 function evaluate_chosen_diplomacy_option(diplo_pressed){
     var _opt = diplo_option[diplo_pressed];
-    if (_opt.goto != ""){
-        scr_dialogue(_opt.goto);
-        exit;
-    }
 
     var _pressed_option = _opt.key;
     if (struct_exists(_opt, "method")){
         if (is_callable(_opt.method)){
             script_execute(_opt.method);
         }
     }
+    if (_opt.goto != ""){
+        scr_dialogue(_opt.goto);
+    }
 }
 
 function scr_diplomacy_hit(selection, new_path, complex_path="none"){

scripts/scr_garrison/scr_garrison.gml

@@ -1,7 +1,9 @@
 function disposition_description_chart(dispo) {
     if (global.cheat_debug) {
         return $"{dispo}"
-    } else if (dispo < -100) {
+    } else if (dispo < -4000) {
+    	return "Ruled";
+    }else if (dispo < -100) {
         return "DEBUG: Numbers lower than -100 detected, this shouldn't happen!";
     } else if (dispo <= 0) {
         return "Extremely Hostile";
@@ -154,11 +156,15 @@ function GarrisonForce(planet_operatives, turn_end=false, type="garrison") const
 		} else {report_string+="The garrison is comprised of a single _squad,"}
 
 		report_string+= $" with a total man count of {total_garrison}.#"
-        if (system.p_owner[planet] != eFACTION.Player) {
+        if (system.p_owner[planet] != eFACTION.Player && system.dispo[planet] >=-100) {
             var disposition = disposition_description_chart(system.dispo[planet]);
             report_string += $"Our Relationship with the Rulers of the planet is {disposition}#";
-        } else if (system.dispo[planet] < -1000 && system.p_owner[planet] == eFACTION.Player) {
-            report_string += $"Rule of the planet is going well";
+        } else if (system.dispo[planet] < -1000) {
+        	if (system.p_owner[planet] == eFACTION.Player){
+            	report_string += $"Rule of the planet is going well";
+        	} else {
+        		report_string += $"Your rule of the the planet is being undermined by hostile forces";
+        	}
         } else {
             report_string += $"DEBUG: planet owner check failed";
             //report_string+=$"There is no clear chain of command on the planet we suspect the existence of Xenos or Heretic Forces"; // TODO LOW GARRISON_XENO // Readd when this actually gets implented

scripts/scr_inquisition_fleet_functions/scr_inquisition_fleet_functions.gml

@@ -13,6 +13,7 @@ function base_inquis_fleet (){
     }
 }
 
+
 function hunt_player_serfs(){
     explode_script(obj_controller.temp[1008],"|");
     var tb=string(explode[0]);

scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml

@@ -203,36 +203,44 @@ function init_ork_waagh(overide = false){
             }
         }
 
+        var _waaagh_star_found = false;
         if (array_length(ork_waagh_activity)){
 
             var _waaagh_star = array_random_element(ork_waagh_activity);
+            _waaagh_star_found = true;
 
         } else if (array_length(_any_ork_star) > 0) {
             var _waaagh_star = array_random_element(_any_ork_star);
-        }
-        var _pdata = new PlanetData(_waaagh_star[1], _waaagh_star[0]);
-        var _boss = _pdata.add_feature(P_features.OrkWarboss);
-        if (overide){
-            _boss.player_hidden = false;
-            scr_event_log("red","boss on {_pdata.name()}", _pdata.system.name);
+            _waaagh_star_found = true;
         }
 
-        if (_pdata.planet_forces[eFACTION.Ork] < 4) {
-            _pdata.add_forces(eFACTION.Ork, 2);
-        }
+        if (_waaagh_star_found){
+            var _pdata = new PlanetData(_waaagh_star[1], _waaagh_star[0]);
+
+            var _boss = _pdata.add_feature(P_features.OrkWarboss);
+            if (overide){
+                _boss.player_hidden = false;
+                scr_event_log("red",$"boss on {_pdata.name()}", _pdata.system.name);
+            }
 
+            if (_pdata.planet_forces[eFACTION.Ork] < 4) {
+                _pdata.add_forces(eFACTION.Ork, 2);
+            }
+        } else {
+            out_of_system_warboss(true);
+        }
     }
 }
 
-function out_of_system_warboss(){
+function out_of_system_warboss(overide = false){
 
     with (obj_controller){
     // More Testing
     // peace_check=2;
 
     var did_so=false;
 
-    if (did_so=false)&& (faction_defeated[7]=1 || known[eFACTION.Ork]== 0 ) {
+    if (did_so=false) && (faction_defeated[7]=1 || known[eFACTION.Ork] == 0 || overide) {
         known[eFACTION.Ork] = 0;
         var _warboss = new NewPlanetFeature(P_features.OrkWarboss);
         if (faction_defeated[7]=1){
@@ -318,10 +326,10 @@ function out_of_system_warboss(){
         instance_activate_object(obj_en_fleet);
 
         var _ork_leader = obj_controller.faction_leader[eFACTION.Ork];
-        var tix=$"Warboss {_ork_leader} leads a WAAAGH! into Sector "+string(obj_ini.sector_name)+".";
+        var tix=$"Warboss {_ork_leader} leads a WAAAGH! into Sector {obj_ini.sector_name}.";
         scr_alert("red","lol",string(tix),starf.x,starf.y);
         scr_event_log("red",tix);
-        scr_popup("WAAAAGH!",$"A WAAAGH! led by the Warboss {_ork_leader} has arrived in "+string(obj_ini.sector_name)+".  With him is a massive Ork fleet.  Numbering in the dozens of battleships, they carry with them countless greenskins.  The forefront of the WAAAGH! is destined for the "+string(starf.name)+" system.","waaagh","");
+        scr_popup("WAAAAGH!",$"A WAAAGH! led by the Warboss {_ork_leader} has arrived in {obj_ini.sector_name}.  With him is a massive Ork fleet.  Numbering in the dozens of battleships, they carry with them countless greenskins.  The forefront of the WAAAGH! is destined for the {starf.name} system.","waaagh","");
     }
     }
 }