Added crosshair options to options menu

Author: Derpduck

CHANGELOG.md

@@ -22,6 +22,9 @@
 - Added option to adjust volume of flames / afterburn and sentry hitsounds (default: 50%)
 - Fixed hitsound repeat delay being framerate dependent
 
+### Menus
+- Added option to change crosshair to the options menu
+
 ### Quality of Life
 - Made master volume and damage indicator volume settings more intuitive to set
 > **NOTE:** Make sure to adjust your volume setting accordingly, the settings are closer to being linear now so it should be easier to make fine adjustments

Source/gg2/Objects/Menus/Options Menus/OptionsController.events/Create.xml

@@ -68,6 +68,29 @@
         gg2_write_ini("Settings", "Queued Jumping", argument0);
     ');
 
+    menu_addedit_script("Custom Crosshair:", menu_format_crosshair_filepath(global.CrosshairFilename), '
+        var absPath;
+    
+        absPath = get_open_filename("Crosshair Sprite|*.png", working_directory + "\*");
+    
+        if (absPath == "") {
+            global.CrosshairFilename = absPath;
+        } else {
+            global.CrosshairFilename = getRelativePathIfDescendand(working_directory + "\", absPath);
+        }
+        
+        gg2_write_ini("Settings", "CrosshairFilename", global.CrosshairFilename);
+        
+        replace_crosshair();
+        
+        return menu_format_crosshair_filepath(global.CrosshairFilename);
+    ');
+    
+    menu_addedit_boolean("Remove Crosshair Background:", "global.CrosshairRemoveBG", '
+        gg2_write_ini("Settings", "CrosshairRemoveBG", argument0);
+        replace_crosshair();
+    ');
+    
     vanilla_menu_tabs();
 }
 </argument>

Source/gg2/Scripts/Game/game_init.gml

@@ -96,9 +96,8 @@
     global.attemptPortForward = ini_read_real("Server", "Attempt UPnP Forwarding", 0); 
     global.serverPluginList = ini_read_string("Server", "ServerPluginList", "");
     global.serverPluginsRequired = ini_read_real("Server", "ServerPluginsRequired", 0);
-    var CrosshairFilename, CrosshairRemoveBG;
-    CrosshairFilename = ini_read_string("Settings", "CrosshairFilename", "");
-    CrosshairRemoveBG = ini_read_real("Settings", "CrosshairRemoveBG", 1);
+    global.CrosshairFilename = ini_read_string("Settings", "CrosshairFilename", "");
+    global.CrosshairRemoveBG = ini_read_real("Settings", "CrosshairRemoveBG", 1);
     global.queueJumping = ini_read_real("Settings", "Queued Jumping", 0);
     global.hideSpyGhosts = ini_read_real("Settings", "Hide Spy Ghosts", 0);
     //Hidden setting
@@ -175,8 +174,8 @@
     ini_write_real("Server", "Attempt UPnP Forwarding", global.attemptPortForward); 
     ini_write_string("Server", "ServerPluginList", global.serverPluginList); 
     ini_write_real("Server", "ServerPluginsRequired", global.serverPluginsRequired); 
-    ini_write_string("Settings", "CrosshairFilename", CrosshairFilename);
-    ini_write_real("Settings", "CrosshairRemoveBG", CrosshairRemoveBG);
+    ini_write_string("Settings", "CrosshairFilename", global.CrosshairFilename);
+    ini_write_real("Settings", "CrosshairRemoveBG", global.CrosshairRemoveBG);
     ini_write_real("Settings", "Queued Jumping", global.queueJumping);
     ini_write_real("Settings", "Hide Spy Ghosts", global.hideSpyGhosts);
 
@@ -395,11 +394,7 @@ global.launchMap = "";
     previous_window_y = window_get_y();
     previous_window_w = window_get_width();
     
-    if (file_exists(CrosshairFilename))
-    {
-        sprite_replace(CrosshairS,CrosshairFilename,1,CrosshairRemoveBG,false,0,0);
-        sprite_set_offset(CrosshairS,sprite_get_width(CrosshairS)/2,sprite_get_height(CrosshairS)/2);
-    }
+    replace_crosshair();
     
     global.isHost = false;
     

Source/gg2/Scripts/Re-DSM/Functions/_resources.list.xml

@@ -23,4 +23,5 @@
   <resource name="clear_send_buffer" type="RESOURCE"/>
   <resource name="get_superburst_string" type="RESOURCE"/>
   <resource name="calc_linear_volume" type="RESOURCE"/>
+  <resource name="replace_crosshair" type="RESOURCE"/>
 </resources>

Source/gg2/Scripts/Re-DSM/Functions/replace_crosshair.gml

@@ -0,0 +1,11 @@
+if (file_exists(global.CrosshairFilename) and global.CrosshairFilename != "")
+{
+    sprite_replace(CrosshairS,global.CrosshairFilename,1,global.CrosshairRemoveBG,false,0,0);
+    sprite_set_offset(CrosshairS,sprite_get_width(CrosshairS)/2,sprite_get_height(CrosshairS)/2);
+}
+else
+{
+    //sprite_replace(CrosshairS,global.CrosshairFilename,1,global.CrosshairRemoveBG,false,0,0);
+    //sprite_set_offset(CrosshairS,sprite_get_width(CrosshairS)/2,sprite_get_height(CrosshairS)/2);
+    sprite_assign(CrosshairS, DefaultCrosshairS);
+}

Source/gg2/Scripts/Re-DSM/Menus/_resources.list.xml

@@ -7,6 +7,7 @@
   <resource name="DSM_menu_color_options" type="RESOURCE"/>
   <resource name="menu_get_tabcount" type="RESOURCE"/>
   <resource name="menu_format_hitsound_filepath" type="RESOURCE"/>
+  <resource name="menu_format_crosshair_filepath" type="RESOURCE"/>
   <resource name="menu_divider" type="RESOURCE"/>
   <resource name="menu_addedit_float" type="RESOURCE"/>
   <resource name="menu_addedit_num_percent" type="RESOURCE"/>

Source/gg2/Scripts/Re-DSM/Menus/menu_format_crosshair_filepath.gml

@@ -0,0 +1,9 @@
+var LIMIT;
+LIMIT = 30;
+
+if (argument0 == "")
+    return "None (default crosshair)";
+else if (string_length(argument0) <= LIMIT)
+    return argument0;
+else
+    return "..." + string_copy(argument0, string_length(argument0)-(LIMIT-3-1), LIMIT-3);

Source/gg2/Sprites/Re-DSM/DefaultCrosshairS.images/image 0.png

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<sprite>
+  <origin x="10" y="10"/>
+  <mask>
+    <separate>false</separate>
+    <shape>RECTANGLE</shape>
+    <bounds alphaTolerance="0" mode="AUTO"/>
+  </mask>
+  <preload>true</preload>
+  <smoothEdges>false</smoothEdges>
+  <transparent>false</transparent>
+</sprite>

Source/gg2/Sprites/Re-DSM/DefaultCrosshairS.xml

@@ -4,4 +4,5 @@
   <resource name="Menus" type="GROUP"/>
   <resource name="Projectiles" type="GROUP"/>
   <resource name="HUD" type="GROUP"/>
+  <resource name="DefaultCrosshairS" type="RESOURCE"/>
 </resources>