From 597308964a499fa65e5c148a7cf4523efe6d8021 Mon Sep 17 00:00:00 2001
From: Wil Thieme <wil.thieme@protonmail.com>
Date: Thu, 15 Sep 2022 20:32:17 -0400
Subject: [PATCH 1/8] override StringManager.contains to match items better

---
 README.md                   |  2 +-
 extension.xml               |  7 +++--
 scripts/manager_item_EI.lua | 60 +++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 scripts/manager_item_EI.lua

diff --git a/README.md b/README.md
index 4c6ef7f..a1262e0 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ This extension modifies the item sheet to add some additional features:
 * Wand / staff charges field
 * Slot field for wondrous items
 * Source field for tracking which book the information is from
-* Type field visibility fixed
+* Weapon/Shield/Armor detection functions are now 'fuzzy' so "Armor" / "Armors" / "Armor and Defense" / etc will all detect as armor.
 
 All of the type specific fields only display with the appropriate item type, the same as would originally happen with "Weapon" or "Armor" in the Type field. Additionally, I have fixed the problem where "Weapon" would show the additional fields, but "Magic Weapon" would not. Visibility of the type-specific fields depends on "Weapon", "Armor", "Wand", "Staff", or "Wondrous Item" exactly, with capitalization. Otherwise text before or after doesn't matter.
 
diff --git a/extension.xml b/extension.xml
index 8711d08..3a9b75f 100644
--- a/extension.xml
+++ b/extension.xml
@@ -8,7 +8,7 @@
 <root version="3.1">
 	<properties>
 		<name>Feature: Enhanced Items</name>
-		<version>4.7</version>
+		<version>4.8</version>
 		<author>llisandur</author>
 		<description>Adds useful fields to various types of items</description>
 		<ruleset>
@@ -20,12 +20,15 @@
 		<loadorder>50</loadorder>
 	</properties>
 
-	<announcement text="https://www.fantasygrounds.com/forums/showthread.php?40602-Extension-Enhanced-Items-v4\rEnhanced Items v4.7\rOriginal extension by sciencephile with updates by jwguy, llisandur, rmilmine, zarestia, and bmos\rAdds useful fields to various types of items." font="emotefont" />
+	<announcement text="https://www.fantasygrounds.com/forums/showthread.php?40602-Extension-Enhanced-Items-v4\rEnhanced Items v4.8\rOriginal extension by sciencephile with updates by jwguy, llisandur, rmilmine, zarestia, and bmos\rAdds useful fields to various types of items." font="emotefont" />
 
 	<base>
 		<!-- Strings -->
 		<includefile source="strings/strings.xml" />
 
+		<!-- Scripts -->
+		<script name="ItemManagerEI" file="scripts/manager_item_EI.lua" />
+
 		<!-- Campaign Records -->
 		<includefile source="campaign/record_item.xml" />
 	</base>
diff --git a/scripts/manager_item_EI.lua b/scripts/manager_item_EI.lua
new file mode 100644
index 0000000..1582396
--- /dev/null
+++ b/scripts/manager_item_EI.lua
@@ -0,0 +1,60 @@
+--
+-- Please see the LICENSE.md file included with this distribution for attribution and copyright information.
+--
+
+--
+-- Please see the LICENSE.md file included with this distribution for attribution and copyright information.
+--
+
+-- luacheck: globals ItemManager.isArmor ItemManager.isShield ItemManager.isWeapon
+
+local contains_old;
+local function contains(tList, sItem)
+	if not tList or not sItem then
+		return false;
+	end
+	for i = 1, #tList do
+		if sItem:match(tList[i]) then
+			return true;
+		end
+	end
+	return false;
+end
+
+local isArmor_old;
+local function isArmor(nodeItem, ...)
+	StringManager.contains = contains;
+	local bReturn = isArmor_old(nodeItem, ...);
+	StringManager.contains = contains_old;
+
+	return bReturn;
+end
+
+local isShield_old;
+local function isShield(nodeItem, ...)
+	StringManager.contains = contains;
+	local bReturn = isShield_old(nodeItem, ...);
+	StringManager.contains = contains_old;
+
+	return bReturn;
+end
+
+local isWeapon_old;
+local function isWeapon(nodeItem, ...)
+	StringManager.contains = contains;
+	local bReturn = isWeapon_old(nodeItem, ...);
+	StringManager.contains = contains_old;
+
+	return bReturn;
+end
+
+function onInit()
+	contains_old = StringManager.contains
+
+	isArmor_old = ItemManager.isArmor
+	ItemManager.isArmor = isArmor;
+	isShield_old = ItemManager.isShield
+	ItemManager.isShield = isShield;
+	isWeapon_old = ItemManager.isWeapon
+	ItemManager.isWeapon = isWeapon;
+end
\ No newline at end of file

From d21f49f77cff576965fc436998e8a8f058c24a08 Mon Sep 17 00:00:00 2001
From: Wil Thieme <wil.thieme@protonmail.com>
Date: Thu, 15 Sep 2022 20:45:16 -0400
Subject: [PATCH 2/8] move item_main

---
 campaign/record_item.xml                             | 2 +-
 campaign/scripts/{item_main.lua => item_main_EI.lua} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename campaign/scripts/{item_main.lua => item_main_EI.lua} (100%)

diff --git a/campaign/record_item.xml b/campaign/record_item.xml
index 31a5d2b..cd47a68 100644
--- a/campaign/record_item.xml
+++ b/campaign/record_item.xml
@@ -7,7 +7,7 @@
 
 <root>
 	<windowclass name="item_main" merge="join">
-		<script file="campaign/scripts/item_main.lua" />
+		<script file="campaign/scripts/item_main_EI.lua" />
 		<sheetdata>
 			<label_column name="equipslot_label" insertbefore="divider2">
 				<static textres="item_label_equipslot" />
diff --git a/campaign/scripts/item_main.lua b/campaign/scripts/item_main_EI.lua
similarity index 100%
rename from campaign/scripts/item_main.lua
rename to campaign/scripts/item_main_EI.lua

From 092df10731aaf7df261b0b0164db255877fcf6e9 Mon Sep 17 00:00:00 2001
From: Wil Thieme <wil.thieme@protonmail.com>
Date: Thu, 15 Sep 2022 20:46:33 -0400
Subject: [PATCH 3/8] document change

---
 scripts/manager_item_EI.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/manager_item_EI.lua b/scripts/manager_item_EI.lua
index 1582396..4f3d68f 100644
--- a/scripts/manager_item_EI.lua
+++ b/scripts/manager_item_EI.lua
@@ -14,7 +14,7 @@ local function contains(tList, sItem)
 		return false;
 	end
 	for i = 1, #tList do
-		if sItem:match(tList[i]) then
+		if sItem:match(tList[i]) then -- replace exact string match with string.match
 			return true;
 		end
 	end

From c77bf3706354e30b38f61729d5dffa58c332f36b Mon Sep 17 00:00:00 2001
From: Wil Thieme <wil.thieme@protonmail.com>
Date: Fri, 16 Sep 2022 07:28:17 -0400
Subject: [PATCH 4/8] save prior function immediately before replacing

---
 scripts/manager_item_EI.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/manager_item_EI.lua b/scripts/manager_item_EI.lua
index 4f3d68f..768bc7a 100644
--- a/scripts/manager_item_EI.lua
+++ b/scripts/manager_item_EI.lua
@@ -23,6 +23,7 @@ end
 
 local isArmor_old;
 local function isArmor(nodeItem, ...)
+	contains_old = StringManager.contains;
 	StringManager.contains = contains;
 	local bReturn = isArmor_old(nodeItem, ...);
 	StringManager.contains = contains_old;
@@ -32,6 +33,7 @@ end
 
 local isShield_old;
 local function isShield(nodeItem, ...)
+	contains_old = StringManager.contains;
 	StringManager.contains = contains;
 	local bReturn = isShield_old(nodeItem, ...);
 	StringManager.contains = contains_old;
@@ -41,6 +43,7 @@ end
 
 local isWeapon_old;
 local function isWeapon(nodeItem, ...)
+	contains_old = StringManager.contains;
 	StringManager.contains = contains;
 	local bReturn = isWeapon_old(nodeItem, ...);
 	StringManager.contains = contains_old;
@@ -49,8 +52,6 @@ local function isWeapon(nodeItem, ...)
 end
 
 function onInit()
-	contains_old = StringManager.contains
-
 	isArmor_old = ItemManager.isArmor
 	ItemManager.isArmor = isArmor;
 	isShield_old = ItemManager.isShield

From 0e7a9909cf5868e087b2585b39f5b0f19e5ad998 Mon Sep 17 00:00:00 2001
From: Wil Thieme <wil.thieme@protonmail.com>
Date: Fri, 16 Sep 2022 07:30:02 -0400
Subject: [PATCH 5/8] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a1262e0..1b55ca9 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ This extension modifies the item sheet to add some additional features:
 * Source field for tracking which book the information is from
 * Weapon/Shield/Armor detection functions are now 'fuzzy' so "Armor" / "Armors" / "Armor and Defense" / etc will all detect as armor.
 
-All of the type specific fields only display with the appropriate item type, the same as would originally happen with "Weapon" or "Armor" in the Type field. Additionally, I have fixed the problem where "Weapon" would show the additional fields, but "Magic Weapon" would not. Visibility of the type-specific fields depends on "Weapon", "Armor", "Wand", "Staff", or "Wondrous Item" exactly, with capitalization. Otherwise text before or after doesn't matter.
+All of the type specific fields only display with the appropriate item type, the same as would originally happen with "Weapon" or "Armor" in the Type field.
 
 # Example Images
 ![example item sheets](https://user-images.githubusercontent.com/1916835/123555247-872b8b00-d752-11eb-95f0-db22c24091c2.jpg)

From 5bdd9bb29fd77c13009b9fa2c647b506fb1ea6b6 Mon Sep 17 00:00:00 2001
From: Wil Thieme <wil.thieme@protonmail.com>
Date: Fri, 16 Sep 2022 07:32:46 -0400
Subject: [PATCH 6/8] Update README.md

---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1b55ca9..399b1e5 100644
--- a/README.md
+++ b/README.md
@@ -10,10 +10,11 @@ This extension has been tested with [FantasyGrounds Unity](https://www.fantasygr
 # Features
 This extension modifies the item sheet to add some additional features:
 
-* Add GM-only field for tracking notes not visible to players.
-* Wand / staff charges field
-* Slot field for wondrous items
-* Source field for tracking which book the information is from
+* Add GM-only field added to all items for tracking notes not visible to players.
+* Charges fields added for Wands and Staffs.
+* Slot field added for Wondrous Items.
+* Source field added to all items for tracking an item's sourcebook.
+* Activation field for tracking what action is needed for use. Visible for Weapons, Armor, Shields, Staffs, and Wondrous Items.
 * Weapon/Shield/Armor detection functions are now 'fuzzy' so "Armor" / "Armors" / "Armor and Defense" / etc will all detect as armor.
 
 All of the type specific fields only display with the appropriate item type, the same as would originally happen with "Weapon" or "Armor" in the Type field.

From d879cfb0e9d9744d156ca755f25162fcbe04abaa Mon Sep 17 00:00:00 2001
From: Wil Thieme <wil.thieme@protonmail.com>
Date: Sun, 18 Sep 2022 11:10:18 -0400
Subject: [PATCH 7/8] fix wondrous item detection

---
 campaign/scripts/item_main_EI.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/campaign/scripts/item_main_EI.lua b/campaign/scripts/item_main_EI.lua
index 8d5fda9..fd78804 100644
--- a/campaign/scripts/item_main_EI.lua
+++ b/campaign/scripts/item_main_EI.lua
@@ -103,13 +103,13 @@ function update(...)
 		maxcharges_label.setVisible(false);
 	end
 
-	if self.updateControl('equipslot', bReadOnly, bID and tTypes['wondrous']) then tSections[4] = true; end
+	if self.updateControl('equipslot', bReadOnly, bID and tTypes['wondrous%sitem']) then tSections[4] = true; end
 
 	if self.updateControl("aura", bReadOnly, bID) then tSections[5] = true; end
 	if self.updateControl("cl", bReadOnly, bID) then tSections[5] = true; end
 	if self.updateControl("prerequisites", bReadOnly, bID) then tSections[5] = true; end
 	if self.updateControl("activation", bReadOnly, bID and (
-							tTypes['shield'] or tTypes['armor'] or tTypes['staff'] or tTypes['wondrous']
+							tTypes['shield'] or tTypes['armor'] or tTypes['staff'] or tTypes['wondrous%sitem']
 						)) then tSections[5] = true; end
 
 	tSections[6] = bID;

From a4891486d3cc33d1ce1b5d09ab23fbf006309e6c Mon Sep 17 00:00:00 2001
From: Wil Thieme <wil.thieme@protonmail.com>
Date: Sun, 18 Sep 2022 11:13:56 -0400
Subject: [PATCH 8/8] wider charge fields

---
 campaign/record_item.xml    | 4 ++--
 scripts/manager_item_EI.lua | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/campaign/record_item.xml b/campaign/record_item.xml
index cd47a68..362b614 100644
--- a/campaign/record_item.xml
+++ b/campaign/record_item.xml
@@ -41,7 +41,7 @@
 			</label_column>
 
 			<number_columnh name="charge" insertbefore="divider4">
-				<anchored>
+				<anchored width="45">
 					<top offset="16" />
 				</anchored>
 				<stateframe>
@@ -62,7 +62,7 @@
 			</label_fieldtop>
 
 			<number_column name="maxcharges">
-				<anchored>
+				<anchored width="45">
 					<top parent="charge" anchor="top" offset="0" />
 					<left parent="charge" anchor="right" offset="10" />
 				</anchored>
diff --git a/scripts/manager_item_EI.lua b/scripts/manager_item_EI.lua
index 768bc7a..95e352c 100644
--- a/scripts/manager_item_EI.lua
+++ b/scripts/manager_item_EI.lua
@@ -54,8 +54,10 @@ end
 function onInit()
 	isArmor_old = ItemManager.isArmor
 	ItemManager.isArmor = isArmor;
+
 	isShield_old = ItemManager.isShield
 	ItemManager.isShield = isShield;
+
 	isWeapon_old = ItemManager.isWeapon
 	ItemManager.isWeapon = isWeapon;
 end
\ No newline at end of file