From 29c39f990a9d675e56309b380e1d4131ae5c064e Mon Sep 17 00:00:00 2001
From: aardlyworthit <ebujame2009@gmail.com>
Date: Fri, 11 Jan 2019 23:13:10 -0500
Subject: [PATCH] Add files via upload

---
 Aard_Costs.xml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/Aard_Costs.xml b/Aard_Costs.xml
index 251feff..0010d15 100644
--- a/Aard_Costs.xml
+++ b/Aard_Costs.xml
@@ -330,8 +330,8 @@ function set_potential(name, line, args)
 end
 
 function afford_instinct(trains, gold)
-	char_base = gmcp("char.worth")
-	if my_trains >= trains and (char_base.gold + char_base.bank) >= gold then
+	char_worth = gmcp("char.worth")
+	if my_trains >= trains and (char_worth.gold + char_worth.bank) >= gold then
 		return "white", "", " [", "lime", "", "OK", "white", "", "]"
 	else
 		return "white", "", " [", "red", "", "NOK", "white", "", "]"
@@ -347,6 +347,10 @@ function calculate_instinct()
 	else
 		to = current + want
 	end
+	if to > #instinct then
+		ColourNote("orange", "", " >> ", "silver", "", "Invalid instinct cost parameters.")
+		return
+	end
 	if to <= current then
 		ColourNote("orange", "", " >> ", "silver", "", "Your ", "yellow", "", which_instinct, "silver", "", " instinct is already ", "yellow", "", current, "silver", "", "!  Please try again.")
 		return
@@ -363,8 +367,8 @@ function calculate_instinct()
 end
 
 function afford_mastery(qp, gold)
-	char_base = gmcp("char.worth")
-	if quest_points >= qp and (char_base.gold + char_base.bank) >= gold then
+	char_worth = gmcp("char.worth")
+	if quest_points >= qp and (char_worth.gold + char_worth.bank) >= gold then
 		return "white", "", " [", "lime", "", "OK", "white", "", "]"
 	else
 		return "white", "", " [", "red", "", "NOK", "white", "", "]"
@@ -384,6 +388,10 @@ function calculate_mastery(name, line, args)
 	else
 		to = current + want
 	end
+	if to > #mastery then
+		ColourNote("orange", "", " >> ", "silver", "", "Invalid mastery cost parameters.")
+		return
+	end
 	if to <= current then
 		ColourNote("orange", "", " >> ", "silver", "", "Your ", "yellow", "", which_mastery, "silver", "", " mastery is already ", "yellow", "", current, "silver", "", "!  Please try again.")
 		return
@@ -400,8 +408,8 @@ function calculate_mastery(name, line, args)
 end
 
 function afford_potential(qp)
-	char_base = gmcp("char.worth")
-	if quest_points >= qp then
+	char_worth = gmcp("char.worth")
+	if tonumber(char_worth.qp) >= tonumber(qp) then
 		return "white", "", " [", "lime", "", "OK", "white", "", "]"
 	else
 		return "white", "", " [", "red", "", "NOK", "white", "", "]"
@@ -418,6 +426,10 @@ function calculate_potential()
 	else
 		to = current + want
 	end
+	if to > #potential then
+		ColourNote("orange", "", " >> ", "silver", "", "Invalid potential cost parameters.")
+		return
+	end
 	if to <= current then
 		ColourNote("orange", "", " >> ", "silver", "", "Your ", "yellow", "", "Potential", "silver", "", " is already ", "yellow", "", current, "silver", "", "!  Please try again.")
 		return