Exposed randi_range to global funcs + renamed rand_range to randf_range

3 files changed, 38 insertions, 10 deletions

diff --git a/modules/gdscript/doc_classes/@GDScript.xml b/modules/gdscript/doc_classes/@GDScript.xml
index e170667a30..95818e5fcf 100644
--- a/modules/gdscript/doc_classes/@GDScript.xml
+++ b/modules/gdscript/doc_classes/@GDScript.xml
@@ -921,7 +921,7 @@
 				[/codeblock]
 			</description>
 		</method>
-		<method name="rand_range">
+		<method name="randf_range">
 			<return type="float">
 			</return>
 			<argument index="0" name="from" type="float">
@@ -931,7 +931,22 @@
 			<description>
 				Random range, any floating point value between [code]from[/code] and [code]to[/code].
 				[codeblock]
-				prints(rand_range(0, 1), rand_range(0, 1)) # Prints e.g. 0.135591 0.405263
+				prints(randf_range(-10, 10), randf_range(-10, 10)) # Prints e.g. -3.844535 7.45315
+				[/codeblock]
+			</description>
+		</method>
+		<method name="randi_range">
+			<return type="int">
+			</return>
+			<argument index="0" name="from" type="int">
+			</argument>
+			<argument index="1" name="to" type="int">
+			</argument>
+			<description>
+				Random range, any 32-bit integer value between [code]from[/code] and [code]to[/code] (inclusive). If [code]to[/code] is lesser than [code]from[/code] they are swapped.
+				[codeblock]
+				print(randi_range(0, 1)) # Prints 0 or 1
+				print(randi_range(-10, 1000)) # Prints any number from -10 to 1000
 				[/codeblock]
 			</description>
 		</method>
diff --git a/modules/gdscript/gdscript_functions.cpp b/modules/gdscript/gdscript_functions.cpp
index 31ce63bc6e..ce4b3ca90c 100644
--- a/modules/gdscript/gdscript_functions.cpp
+++ b/modules/gdscript/gdscript_functions.cpp
@@ -83,7 +83,8 @@ const char *GDScriptFunctions::get_func_name(Function p_func) {
 		"randomize",
 		"randi",
 		"randf",
-		"rand_range",
+		"randf_range",
+		"randi_range",
 		"seed",
 		"rand_seed",
 		"deg2rad",
@@ -419,7 +420,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			Math::randomize();
 			r_ret = Variant();
 		} break;
-		case MATH_RAND: {
+		case MATH_RANDI: {
 			VALIDATE_ARG_COUNT(0);
 			r_ret = Math::rand();
 		} break;
@@ -427,12 +428,18 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_
 			VALIDATE_ARG_COUNT(0);
 			r_ret = Math::randf();
 		} break;
-		case MATH_RANDOM: {
+		case MATH_RANDF_RANGE: {
 			VALIDATE_ARG_COUNT(2);
 			VALIDATE_ARG_NUM(0);
 			VALIDATE_ARG_NUM(1);
 			r_ret = Math::random((double)*p_args[0], (double)*p_args[1]);
 		} break;
+		case MATH_RANDI_RANGE: {
+			VALIDATE_ARG_COUNT(2);
+			VALIDATE_ARG_NUM(0);
+			VALIDATE_ARG_NUM(1);
+			r_ret = Math::random((int)*p_args[0], (int)*p_args[1]);
+		} break;
 		case MATH_SEED: {
 			VALIDATE_ARG_COUNT(1);
 			VALIDATE_ARG_NUM(0);
@@ -1655,7 +1662,7 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 			mi.return_val.type = Variant::NIL;
 			return mi;
 		} break;
-		case MATH_RAND: {
+		case MATH_RANDI: {
 			MethodInfo mi("randi");
 			mi.return_val.type = Variant::INT;
 			return mi;
@@ -1665,11 +1672,16 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) {
 			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
-		case MATH_RANDOM: {
-			MethodInfo mi("rand_range", PropertyInfo(Variant::FLOAT, "from"), PropertyInfo(Variant::FLOAT, "to"));
+		case MATH_RANDF_RANGE: {
+			MethodInfo mi("randf_range", PropertyInfo(Variant::FLOAT, "from"), PropertyInfo(Variant::FLOAT, "to"));
 			mi.return_val.type = Variant::FLOAT;
 			return mi;
 		} break;
+		case MATH_RANDI_RANGE: {
+			MethodInfo mi("randi_range", PropertyInfo(Variant::INT, "from"), PropertyInfo(Variant::INT, "to"));
+			mi.return_val.type = Variant::INT;
+			return mi;
+		} break;
 		case MATH_SEED: {
 			MethodInfo mi("seed", PropertyInfo(Variant::INT, "seed"));
 			mi.return_val.type = Variant::NIL;
diff --git a/modules/gdscript/gdscript_functions.h b/modules/gdscript/gdscript_functions.h
index 2c6dc02913..ea92808f42 100644
--- a/modules/gdscript/gdscript_functions.h
+++ b/modules/gdscript/gdscript_functions.h
@@ -73,9 +73,10 @@ public:
 		MATH_MOVE_TOWARD,
 		MATH_DECTIME,
 		MATH_RANDOMIZE,
-		MATH_RAND,
+		MATH_RANDI,
 		MATH_RANDF,
-		MATH_RANDOM,
+		MATH_RANDF_RANGE,
+		MATH_RANDI_RANGE,
 		MATH_SEED,
 		MATH_RANDSEED,
 		MATH_DEG2RAD,