Build ready

johnwdubois · Apr 7, 2023 · 9b16a37 · 9b16a37
1 parent f7ac7ef
commit 9b16a37
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 13,967 deletions.
diff --git a/Rezonator/Rezonator.yyp b/Rezonator/Rezonator.yyp
diff --git a/Rezonator/datafiles/Firebase Web Setup - Release.zip b/Rezonator/datafiles/Firebase Web Setup - Release.zip
diff --git a/Rezonator/datafiles/Firebase_Firestore_Documentation.pdf b/Rezonator/datafiles/Firebase_Firestore_Documentation.pdf
diff --git a/Rezonator/datafiles/Steamworks_Extension_Documentation.html b/Rezonator/datafiles/Steamworks_Extension_Documentation.html
diff --git a/Rezonator/datafiles/Steamworks_Extension_Documentation.pdf b/Rezonator/datafiles/Steamworks_Extension_Documentation.pdf
diff --git a/Rezonator/objects/obj_aiControl/Draw_0.gml b/Rezonator/objects/obj_aiControl/Draw_0.gml
@@ -29,21 +29,32 @@ var promptSendY1 = instInputBox_Prompt.textBoxY;
 var promptSendX1 = promptSendX2 - promptSendWidth;
 var promptSendY2 = promptSendY1 + promptSendWidth;
 var promptSendPadding = 3;
+var promptSendHolding = false;
 var mouseoverPromptSend = point_in_rectangle(mouse_x, mouse_y, promptSendX1, promptSendY1, promptSendX2, promptSendY2) && !mouseoverCancel;
-draw_set_alpha(mouseoverPromptSend ? 1 : 0.5);
-draw_set_color(global.colorThemeBG);
-draw_roundrect(promptSendX1 + (promptSendPadding * 2), promptSendY1 + promptSendPadding, promptSendX2, promptSendY2 - promptSendPadding, false);
-draw_set_alpha(1);
-draw_sprite_ext(spr_send, 0, floor(mean(promptSendX1, promptSendX2)), floor(mean(promptSendY1, promptSendY2)), 1, 1, 0, global.colorThemeSelected2, 1);
 if (mouseoverPromptSend) {
 	scr_createTooltip(floor(mean(promptSendX1, promptSendX2)), promptSendY2, scr_get_translation("option_submit-prompt"), TOOLTIP_DIR_UP);
 	if (mouse_check_button_pressed(mb_left)) {
 		mousePressedButton = "send";
 	}
+	if (mouse_check_button(mb_left) && mousePressedButton == "send") promptSendHolding = true;
 	if (mouse_check_button_released(mb_left) && mousePressedButton == "send") {
-		sendPrompt = true;
+		if (is_string(instInputBox_Prompt.str) && instInputBox_Prompt.str != "") {
+			sendPrompt = true;
+		}
 	}
 }
+if (keyboard_check(vk_enter) && is_string(instInputBox_Prompt.str) && instInputBox_Prompt.str != "") promptSendHolding = true;
+draw_set_alpha(mouseoverPromptSend || promptSendHolding ? 1 : 0.5);
+draw_set_color(global.colorThemeBG);
+draw_roundrect(promptSendX1 + (promptSendPadding * 2), promptSendY1 + promptSendPadding, promptSendX2, promptSendY2 - promptSendPadding, false);
+draw_set_alpha(1);
+if (promptSendHolding) {
+	draw_set_color(global.colorThemeText);
+	draw_roundrect(promptSendX1 + (promptSendPadding * 2), promptSendY1 + promptSendPadding, promptSendX2, promptSendY2 - promptSendPadding, true);
+}
+draw_sprite_ext(spr_send, 0, floor(mean(promptSendX1, promptSendX2)), floor(mean(promptSendY1, promptSendY2)), 1, 1, 0, global.colorThemeSelected2, 1);
+
+
 
 // position AI prompt input box
 var _instInputBox_ApiKey = instInputBox_ApiKey;

diff --git a/Rezonator/objects/obj_aiControl/Step_0.gml b/Rezonator/objects/obj_aiControl/Step_0.gml
@@ -1,5 +1,5 @@
 // use enter key to submit prompt
-if (keyboard_check_released(vk_enter)) sendPrompt = true;
+if (keyboard_check_released(vk_enter) && is_string(instInputBox_Prompt.str) && instInputBox_Prompt.str != "") sendPrompt = true;
 
 // when sending prompt, check that prompt and api key are both valid strings and then send request
 if (sendPrompt) {

diff --git a/Rezonator/options/windows/options_windows.yy b/Rezonator/options/windows/options_windows.yy
diff --git a/Rezonator/post_build_step.bat b/Rezonator/post_build_step.bat
diff --git a/Rezonator/post_build_step.sh b/Rezonator/post_build_step.sh
diff --git a/Rezonator/post_package_step.bat b/Rezonator/post_package_step.bat
diff --git a/Rezonator/post_package_step.sh b/Rezonator/post_package_step.sh
diff --git a/Rezonator/scripts/scr_macros/scr_macros.gml b/Rezonator/scripts/scr_macros/scr_macros.gml
@@ -4,12 +4,12 @@ function scr_macros(){
 
 	#region BUILD SETTINGS
 		// set BUILD to true when you want to load CJK fonts, set false if not
-		#macro BUILD false
+		#macro BUILD true
 
 		// BUILDTYPE should be set to one of the following values:
 		// "Windows_GitHub_Master", "Mac_GitHub_Master", "Windows_GitHub_Release"
 		// "Mac_GitHub_Release", "Steam", "Windows_Website", "Mac_Website", "Web"
-		#macro BUILDTYPE "Windows_Website"  
+		#macro BUILDTYPE "Windows_Website"
 
 		// to set whether Steam is enabled, open the Steamworks extension in the Asset Browser
 		// and set the platforms and App ID