Merge branch 'feat-Crusade-Rename' of https://github.com/Blogaugis/Space-Brigade-Master into feat-Crusade-Rename

Author: Blogaugis

objects/obj_controller/Alarm_0.gml

@@ -1,6 +1,6 @@
 
 instance_activate_object(obj_star);
-if (instance_exists(obj_ini)) and (global.load==0){
+if (instance_exists(obj_ini)) and (global.load==-1){
 	alarm[1]=2;
     instance_activate_object(obj_star);
     instance_activate_all();

objects/obj_controller/Alarm_1.gml

@@ -495,7 +495,7 @@ for(var i=0; i<100; i++){
 }
 // End craftworld
 
-if (!instance_exists(obj_saveload)) and (instance_exists(obj_creation)) and (global.load=0){
+if (!instance_exists(obj_saveload)) and (instance_exists(obj_creation)) and (global.load==-1){
     for(var i=1; i<=10; i++){
         if (obj_creation.world[i]!=""){
             var _wanted_worlds = [];

objects/obj_controller/Create_0.gml

@@ -335,6 +335,7 @@ music_volume=ini_read_real("Settings","music_volume",1);
 large_text=ini_read_real("Settings","large_text",0);
 settings_heresy=ini_read_real("Settings","settings_heresy",0);
 settings_fullscreen=ini_read_real("Settings","fullscreen",1);
+settings_autosave=ini_read_real("Settings","settings_autosave",1);
 settings_window_data=ini_read_string("Settings","window_data","fullscreen");
 if (is_test_map) then global.cheat_debug=true;
 ini_close();
@@ -463,6 +464,7 @@ gene_sold=0;
 gene_xeno=0;
 gene_tithe=24;
 gene_iou=0;
+draw_helms = true;
 
 // ** Sets default views and in game values on creation **
 managing=0;
@@ -1288,7 +1290,7 @@ other1="";
 // ** Sets up bonuses once chapter is created **
 if (instance_exists(obj_ini)){
     // General setup
-    if (global.load==0){
+    if (global.load==-1){
         // Tolerant trait
         if (scr_has_disadv("Tolerant")) {
             obj_controller.disposition[6]+=5;
@@ -1389,7 +1391,7 @@ serialize = function(){
 
 
 // ** Loads the game **
-if (global.load>0){
+if (global.load>=0){
     load_game=global.load;
     successor_chapters=0;
     instance_create(0,0,obj_saveload);
@@ -1548,7 +1550,7 @@ marines+=obj_ini.sixths+obj_ini.sevenths+obj_ini.eighths+obj_ini.ninths+obj_ini.
 command=0;
 command=obj_ini.commands;
 // Removes the command marines from marine count
-if (global.load==0) then marines-=command;
+if (global.load==-1) then marines-=command;
 // **** INTRO SCREEN ****
 temp[30]=string(check_number)+" "+string(year_fraction)+" "+string(year)+".M"+string(millenium);// Date
 temp[31]=string_upper(adept_name);// Adept name

objects/obj_controller/Draw_64.gml

@@ -1,14 +1,13 @@
 /// @description Insert description here
 // You can write your code in this editor
-
 // Draws the main UI menu. The function is used to highlight if you selected something in the menu
 if instance_exists
 var l_hei=37,l_why=0;
 
 if (instance_exists(obj_saveload)) then exit;
 if (instance_exists(obj_ncombat)) then exit;
 if (instance_exists(obj_fleet)) then exit;
-if (global.load>0) then exit;
+if (global.load>=0) then exit;
 if (invis==true) then exit;
 
 if (is_test_map==true){
@@ -21,7 +20,6 @@ if (is_test_map==true){
 
 var xx = 0;
 var yy = 0;
-
 // Main UI
 if (!zoomed && !zui){
     draw_sprite(spr_new_ui,menu==0,0,0);

objects/obj_controller/Step_0.gml

@@ -696,7 +696,7 @@ try {
         }
     }
 
-    if (global.load > 0) {
+    if (global.load >= 0) {
         exit;
     }
     if (menu == 0) {

objects/obj_creation/Create_0.gml

@@ -102,7 +102,7 @@ if (nope!=1){
 	audio_sound_gain(snd_diboz,0.25*master_volume*music_volume,2000);
 }
 
-global.load=0;
+global.load=-1;
 planet_types = ARR_planet_types;
 skip=false;
 premades=true;
@@ -151,6 +151,8 @@ heheh=0;
 icons_top=1;
 icons_max=0;
 turn_selection_change=false;
+draw_helms = true;
+
 buttons = {
     home_world_recruit_share : new ToggleButton(),
     complex_homeworld : new ToggleButton({

objects/obj_en_fleet/Step_0.gml

@@ -1,5 +1,5 @@
 
-if (global.load>0) or (instance_exists(obj_saveload)) then exit;
+if (global.load>=0) or (instance_exists(obj_saveload)) then exit;
 
 if (action!="") and (orbiting!=0){
     if (instance_exists(orbiting)){
@@ -115,7 +115,7 @@ if (owner = eFACTION.Tyranids) and (trade_goods=""){
     trade_goods+="|";
 }
 
-if (global.load>0){
+if (global.load>=0){
     if (owner = eFACTION.Imperium) then sprite_index=spr_fleet_imperial;
     if (owner = eFACTION.Mechanicus) then sprite_index=spr_fleet_mechanicus;
     if (owner  = eFACTION.Inquisition) then sprite_index=spr_fleet_inquisition;

objects/obj_garbage_collector/Step_0.gml

@@ -2,7 +2,7 @@ if (gc_timer > 0) {
     gc_timer -= 1;
     // show_debug_message($"obj_garbage_collector: gc_timer = {gc_timer}");
 } else {
-    gc_timer = 25; // 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(){

objects/obj_ingame_menu/Create_0.gml

@@ -13,6 +13,7 @@ effect_volume=ini_read_real("Settings","effect_volume",1);
 music_volume=ini_read_real("Settings","music_volume",1);
 large_text=ini_read_real("Settings","large_text",0);
 settings_heresy=ini_read_real("Settings","settings_heresy",0);
+settings_autosave=ini_read_real("Settings", "settings_autosave", 1);
 settings_fullscreen=ini_read_real("Settings","fullscreen",1);
 settings_window_data=ini_read_string("Settings","window_data","fullscreen");
 ini_close();

objects/obj_ingame_menu/Draw_0.gml

@@ -25,8 +25,8 @@ if (settings=1){
     draw_text(xx+493,yy+281,string_hash_to_newline("Effects Volume"));
     draw_text(xx+493,yy+339,string_hash_to_newline("Music Volume"));
     draw_text(xx+493,yy+423,string_hash_to_newline("Full Screen?:"));
+    draw_text(xx+493,yy+483,string_hash_to_newline("Enable Autosaves?:"));
     // draw_text(xx+493,yy+423+59,string_hash_to_newline("Large Text?:"));
-    // draw_text(xx+493,yy+483+59,string_hash_to_newline("Heresy?:"));
 
     draw_set_color(0);// 264 long
     draw_rectangle(xx+710,yy+224,xx+974,yy+254,0);
@@ -58,7 +58,7 @@ if (settings=1){
 
     bar=settings_fullscreen;draw_sprite(spr_creation_check,bar,xx+626,yy+426);
     // bar=large_text;draw_sprite(spr_creation_check,bar,xx+622,yy+426+59);
-    // bar=settings_heresy;draw_sprite(spr_creation_check,bar,xx+590,yy+485+59);
+    bar=settings_autosave;draw_sprite(spr_creation_check,bar,xx+680,yy+485);
 
 
     if (cooldown<=0) and (mouse_left=1){var onceh;onceh=0;
@@ -72,6 +72,16 @@ if (settings=1){
         if (scr_hit(xx+626,yy+426,xx+626+32,yy+426+32)=true){
             if (settings_fullscreen=1) and (onceh=0){onceh=1;cooldown=8000;settings_fullscreen=0;window_set_fullscreen(false);change_volume=2;}
             if (settings_fullscreen=0) and (onceh=0){onceh=1;cooldown=8000;settings_fullscreen=1;window_set_fullscreen(true);change_volume=2;}
+            ini_open("saves.ini");
+            ini_write_real("Settings", "fullscreen", settings_fullscreen);
+            ini_close();
+        }
+        if (scr_hit(xx+680,yy+485,xx+680+32,yy+485+32)=true){
+            if (settings_autosave=1) and (onceh=0){onceh=1;cooldown=8000;settings_autosave=0;}
+            if (settings_autosave=0) and (onceh=0){onceh=1;cooldown=8000;settings_autosave=1;}
+            ini_open("saves.ini");
+            ini_write_real("Settings", "settings_autosave", settings_autosave);
+            ini_close();
         }
         // if (scr_hit(xx+622,yy+426+59,xx+622+32,yy+426+32+59)=true){
         //     if (large_text=1) and (onceh=0){onceh=1;cooldown=8000;large_text=0;change_volume=2;}