From 2c79da17e4357e63b92580cdff136abde2663896 Mon Sep 17 00:00:00 2001
From: balloonpopper <5151242+balloonpopper@users.noreply.github.com>
Date: Tue, 29 Mar 2022 16:20:12 +1100
Subject: [PATCH] fix: rand_global fixes (#555)

Co-authored-by: Balloonpopper <balloonpopper@git.com>
---
 .../core-scripts/esc/commands/rand_global.gd  | 29 ++++---------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/addons/escoria-core/game/core-scripts/esc/commands/rand_global.gd b/addons/escoria-core/game/core-scripts/esc/commands/rand_global.gd
index 2b81dfa7..1f93c798 100644
--- a/addons/escoria-core/game/core-scripts/esc/commands/rand_global.gd
+++ b/addons/escoria-core/game/core-scripts/esc/commands/rand_global.gd
@@ -1,11 +1,13 @@
 # `rand_global name max_value`
 #
-# Sets the given global to a random integer between 0 and `max_value` (inclusive).
+# Sets the given global to a random integer between 0 and `max_value`
+# (inclusive). e.g. Setting `max_value` to 2 could result in '0', '1' or '2'
+# being returned.
 #
 # **Parameters**
 #
 # - *name*: Name of the global to set
-# - *max_value*: Maximum possible integer value (exclusive)
+# - *max_value*: Maximum possible integer value (inclusive)
 #
 # @ESC
 extends ESCBaseCommand
@@ -21,31 +23,10 @@ func configure() -> ESCCommandArgumentDescriptor:
 	)
 
 
-# Validate whether the given arguments match the command descriptor
-func validate(arguments: Array):
-	if not escoria.globals_manager.has(arguments[0]):
-		escoria.logger.report_errors(
-			"rand_global: invalid global",
-			[
-				"Global %s does not exist." % arguments[0]
-			]
-		)
-		return false
-	if not escoria.globals_manager.get_global(arguments[0]) is int:
-		escoria.logger.report_errors(
-			"rand_global: invalid global",
-			[
-				"Global %s didn't have an integer value." % arguments[0]
-			]
-		)
-		return false
-	return .validate(arguments)
-
-
 # Run the command
 func run(command_params: Array) -> int:
 	randomize()
-	var rnd = randi() % command_params[1]
+	var rnd = randi() % (command_params[1] + 1)
 	escoria.globals_manager.set_global(
 		command_params[0],
 		rnd