Delete of tooltips, add both option, change sizes

ZarestiaDev · Sep 2, 2022 · 486e710 · 486e710
1 parent a97337e
commit 486e710
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 70 deletions.
diff --git a/campaign/record_power.xml b/campaign/record_power.xml
@@ -8,10 +8,6 @@
 			<invis_string_additional name="updatecomponents" source="components" />
 			<invis_string_additional name="updaterange" source="range" />
 
-			<string_spell name="name">
-				<script file="campaign/scripts/name_tooltip.lua" />
-			</string_spell>
-
 		<!-- Zarestia adding label to display the casting time -->
 			<label name="action_info" insertbefore="group">
 				<script file="campaign/scripts/show_action_info.lua" />
@@ -24,7 +20,7 @@
 		<!-- Zarestia adding label to display the components -->
 			<label name="additional_info" insertbefore="group">
 				<script file="campaign/scripts/show_additional_info.lua" />
-				<anchored width="0">
+				<anchored width="65">
 					<top offset="2" />
 					<left parent="action_info" anchor="right" />
 				</anchored>

diff --git a/campaign/record_spell_entry.xml b/campaign/record_spell_entry.xml
@@ -33,7 +33,6 @@
 					<left parent="hanchor" anchor="right" relation="relative" offset="5" />
 					<right parent="action_info" anchor="left" offset="-10" />
 				</anchored>
-				<script file="campaign/scripts/name_tooltip.lua" />
 			</string_spell>
 
 		<!-- Zarestia adding invsible strings to update changes live -->
@@ -44,7 +43,7 @@
 		<!-- Zarestia adding label to display the casting time -->
 			<label name="action_info" insertbefore="actionsmini">
 				<script file="campaign/scripts/show_action_info.lua" />
-				<anchored width="70">
+				<anchored width="65">
 					<top offset="2" />
 					<left anchor="center" offset="0" />
 				</anchored>
@@ -53,9 +52,9 @@
 		<!-- Zarestia adding label to display the components -->
 			<label name="additional_info" insertbefore="actionsmini">
 				<script file="campaign/scripts/show_additional_info.lua" />
-				<anchored width="0">
+				<anchored width="65">
 					<top offset="2" />
-					<left parent="action_info" anchor="right" offset="10" />
+					<left parent="action_info" anchor="right" offset="5" />
 				</anchored>
 			</label>
 		</sheetdata>

diff --git a/campaign/record_spell_mini.xml b/campaign/record_spell_mini.xml
@@ -30,7 +30,6 @@
 				</anchored>
 				<multilinespacing>20</multilinespacing>
 				<readonly />
-				<script file="campaign/scripts/name_tooltip.lua" />
 			</simplestring>
 
 		<!-- Zarestia adding invsible strings to update changes live -->
@@ -41,7 +40,7 @@
 		<!-- Zarestia adding label to display the casting time -->
 			<label name="action_info" insertbefore="actions">
 				<script file="campaign/scripts/show_action_info.lua" />
-				<anchored width="70">
+				<anchored width="65">
 					<top offset="2" />
 					<left anchor="center" offset="0" />
 				</anchored>
@@ -50,7 +49,7 @@
 		<!-- Zarestia adding label to display the components -->
 			<label name="additional_info" insertbefore="actions">
 				<script file="campaign/scripts/show_additional_info.lua" />
-				<anchored width="0">
+				<anchored width="65">
 					<top offset="2" />
 					<left parent="action_info" anchor="right" relation="relative" offset="10" />
 				</anchored>

diff --git a/campaign/scripts/name_tooltip.lua b/campaign/scripts/name_tooltip.lua
diff --git a/campaign/scripts/show_action_info.lua b/campaign/scripts/show_action_info.lua
@@ -1,15 +1,23 @@
+local RULESET = "";
+
 function onInit()
+	RULESET = User.getRulesetName();
+
+	if RULESET == "SFRPG" then
+		self.setAnchoredWidth(60);
+	end
+
 	setActionInfo();
 end
 
 function setActionInfo()
 	local nodeSpell = window.getDatabaseNode();
 	local sAction = DB.getValue(nodeSpell, "castingtime", ""):lower();
 
-	if User.getRulesetName() == "5E" then
+	if RULESET == "5E" then
 		sAction = setActionInfo5E(nodeSpell, sAction);
 	else
-		sAction = sAction:gsub("%s?action", "");
+		sAction = setActionInfo35E(sAction);
 	end
 
 	if not (sAction:match("minute") or sAction:match("hour")) then
@@ -39,3 +47,9 @@ function setActionInfo5E(nodeSpell, sAction)
 
 	return sAction;
 end
+
+function setActionInfo35E(sAction)
+	sAction = sAction:gsub("%s?action", "");
+
+	return sAction;
+end
diff --git a/campaign/scripts/show_additional_info.lua b/campaign/scripts/show_additional_info.lua
@@ -1,4 +1,4 @@
-RULESET = "";
+local RULESET = "";
 
 function onInit()
 	OptionsManager.registerCallback("SAIO", StateChanged);
@@ -21,19 +21,25 @@ function StateChanged()
 	if OptionsManager.isOption("SAIO", "off") then
 		self.setVisible(false);
 	else
-		if RULESET == "5E" then
-			setAnchoredWidth(50);
+		if RULESET == "5E" or RULESET == "SFRPG" then
+			self.setAnchoredWidth(50);
 		else
-			setAnchoredWidth(75);
+			self.setAnchoredWidth(65);
 		end
 		self.setVisible(true);
 	end
 
+	local sAdditionalInfo = "";
+
 	if OptionsManager.isOption("SAIO", "components") then
-		setComponentsInfo();
+		sAdditionalInfo = setComponentsInfo();
 	elseif OptionsManager.isOption("SAIO", "range") then
-		setRangeInfo();
+		sAdditionalInfo = setRangeInfo();
+	elseif OptionsManager.isOption("SAIO", "both") then
+		sAdditionalInfo = setBothInfo();
 	end
+
+	self.setValue(sAdditionalInfo);
 end
 
 function setComponentsInfo()
@@ -55,25 +61,30 @@ function setComponentsInfo()
 	-- Getting rid of paranthesis and text inbewteen for 5e
 	sComponents = sComponents:gsub("%s?%b()", "");
 
-	self.setValue(sComponents);
+	return sComponents;
 end
 
 function setRangeInfo()
 	local nodeSpell = window.getDatabaseNode();
 	local sRange = DB.getValue(nodeSpell, "range", ""):lower();
 
 	if RULESET == "5E" then
-		sRange = sRange:gsub("%s?%b()", "");
+		sRange = setRangeInfo5E(sRange);
 	else
 		sRange = setRangeInfo35E(nodeSpell, sRange);
 	end
 
 	sRange = sRange:gsub("feet", "ft");
 	sRange = sRange:gsub("%.", "");
-
 	sRange = StringManager.capitalize(sRange);
 
-	self.setValue(sRange);
+	return sRange;
+end
+
+function setRangeInfo5E(sRange)
+	sRange = sRange:gsub("%s?%b()", "");
+
+	return sRange;
 end
 
 function setRangeInfo35E(nodeSpell, sRange)
@@ -99,3 +110,23 @@ function setRangeInfo35E(nodeSpell, sRange)
 
 	return sRange;
 end
+
+function setBothInfo()
+	if RULESET == "5E" then
+		self.setAnchoredWidth(100);
+	else
+		self.setAnchoredWidth(125);
+	end
+
+	local sRange = setRangeInfo();
+	local sComponents = setComponentsInfo();
+	local sSpacer = " | ";
+
+	if (sRange == "" or sComponents == "") then
+		sSpacer = "";
+	end
+
+	local sBoth = sComponents .. sSpacer .. sRange;
+
+	return sBoth;
+end
diff --git a/extension.xml b/extension.xml
@@ -3,7 +3,7 @@
 <root version="3.3" >
 	<properties>
 		<name>Feature: Spell Action Info</name>
-		<version>4.0</version>
+		<version>4.1</version>
 		<loadorder>142</loadorder>
 		<description>
 			<text>Spell Action Info</text>
@@ -23,7 +23,7 @@
 		</ruleset>
 	</properties>
 
-	<announcement text="https://forge.fantasygrounds.com/shop/items/242/view \n3.5E/PFRPG/5E Spell Action Info - v4.0 \rby Zarestia, compatibility contributions by MeAndUnique, 2022" font="emotefont" icon="sai_icon" />
+	<announcement text="https://forge.fantasygrounds.com/shop/items/242/view \n3.5E/PFRPG/5E Spell Action Info - v4.1 \rby Zarestia, contributions by MeAndUnique, Rhagelstrom" font="emotefont" icon="sai_icon" />
 
 	<base>
 		<!-- Campaign -->

diff --git a/scripts/sai_data_options_init.lua b/scripts/sai_data_options_init.lua
@@ -8,7 +8,7 @@ end
 
 function registerOptionsDND()
 	OptionsManager.registerOption2("SAIO",true, "option_header_client", "option_label_SAIO", "option_entry_cycler", 
-		{ labels = "option_val_components|option_val_range", values = "components|range", baselabel = "option_val_off", baseval = "off", default = "off" });
+		{ labels = "option_val_components|option_val_range|option_val_both", values = "components|range|both", baselabel = "option_val_off", baseval = "off", default = "off" });
 end
 
 function registerOptionsSFRPG()

diff --git a/strings/sai_strings.xml b/strings/sai_strings.xml
@@ -9,4 +9,5 @@
 	<string name="option_label_SAIO">Show additional Spell Info</string>
   <string name="option_val_components">Components</string>
   <string name="option_val_range">Range</string>
+  <string name="option_val_both">Both</string>
 </root>