display linked ammo name in place of counter

FG-Unofficial-Developers-Guild · Apr 21, 2023 · 36e4a6b · 36e4a6b
1 parent 859b387
commit 36e4a6b
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 12 deletions.
diff --git a/campaign/5e_record_char_weapon.xml b/campaign/5e_record_char_weapon.xml
@@ -24,6 +24,16 @@
 			<basicnumber name="maxammo">
 				<script file="common/scripts/number_crosslink_unlink.lua" />
 			</basicnumber>
+			<combobox_ammo name="ammopicker" source="ammunitionmanager.ammopicker">
+				<anchored>
+					<top parent="maxammo" anchor="top" offset="0" />
+					<bottom parent="maxammo" anchor="bottom" offset="2" />
+					<left parent="maxammo" anchor="right" offset="15" />
+					<right parent="attackframe" anchor="right" offset="0" />
+				</anchored>
+				<itemsheetname><string /><field>subtype</field></itemsheetname>
+				<itemsheetname><string /><field>type</field></itemsheetname>
+  			</combobox_ammo>
 		</sheetdata>
 	</windowclass>
 

diff --git a/campaign/pfrpg2_record_char_actions.xml b/campaign/pfrpg2_record_char_actions.xml
@@ -46,6 +46,16 @@
 			<basicnumber name="maxammo">
 				<script file="common/scripts/number_crosslink_unlink.lua" />
 			</basicnumber>
+			<combobox_ammo name="ammopicker" source="ammunitionmanager.ammopicker">
+				<anchored>
+					<top parent="maxammo" anchor="top" offset="0" />
+					<bottom parent="maxammo" anchor="bottom" offset="2" />
+					<left parent="maxammo" anchor="right" offset="15" />
+					<right parent="attackframe" anchor="right" offset="0" />
+				</anchored>
+				<itemsheetname><string /><field>subtype</field></itemsheetname>
+				<itemsheetname><string /><field>type</field></itemsheetname>
+  			</combobox_ammo>
 		</sheetdata>
 	</windowclass>
 

diff --git a/campaign/pfrpg_record_char_actions.xml b/campaign/pfrpg_record_char_actions.xml
@@ -63,6 +63,16 @@
 			<basicnumber name="maxammo">
 				<script file="common/scripts/number_crosslink_unlink.lua" />
 			</basicnumber>
+			<combobox_ammo name="ammopicker" source="ammunitionmanager.ammopicker">
+				<anchored>
+					<top parent="maxammo" anchor="top" offset="0" />
+					<bottom parent="maxammo" anchor="bottom" offset="2" />
+					<left parent="maxammo" anchor="right" offset="15" />
+					<right parent="attackframe" anchor="right" offset="15" />
+				</anchored>
+				<itemsheetname><string /><field>subtype</field></itemsheetname>
+				<itemsheetname><string /><field>type</field></itemsheetname>
+  			</combobox_ammo>
 		</sheetdata>
 	</windowclass>
 

diff --git a/campaign/scripts/5e_char_weapon.lua b/campaign/scripts/5e_char_weapon.lua
@@ -46,7 +46,10 @@ function setAmmoVis(nodeWeapon, ...)
 	isloaded.setVisible(bLoading)
 
 	local nodeAmmoLink = AmmunitionManager.getAmmoNode(nodeWeapon)
-	ammocounter.setVisible(not nodeAmmoLink)
+	local bRanged = AmmunitionManager.isWeaponRanged(nodeWeapon)
+	ammocounter.setVisible(bRanged and not nodeAmmoLink)
+	ammopicker.setComboBoxVisible(bRanged and nodeAmmoLink)
+	ammopicker.setComboBoxReadOnly(true)
 
 	local nodeCount
 	if nodeAmmoLink then nodeCount = DB.getChild(nodeAmmoLink, 'count') end
@@ -90,11 +93,9 @@ end
 function onInit()
 	if super and super.onInit then super.onInit() end
 
-	if super then
-		if super.onAttackAction then
-			onAttackAction_old = super.onAttackAction
-			super.onAttackAction = onAttackAction_new
-		end
+	if super and super.onAttackAction then
+		onAttackAction_old = super.onAttackAction
+		super.onAttackAction = onAttackAction_new
 	end
 
 	local nodeWeapon = getDatabaseNode()
@@ -106,10 +107,8 @@ end
 function onClose()
 	if super and super.onClose then super.onClose() end
 
-	if super then
-		if super.onAttackAction then
-			super.onAttackAction = onAttackAction_old
-		end
+	if super and super.onAttackAction then
+		super.onAttackAction = onAttackAction_old
 	end
 
 	local nodeWeapon = getDatabaseNode()

diff --git a/campaign/scripts/ammo_weapon.lua b/campaign/scripts/ammo_weapon.lua
@@ -38,6 +38,8 @@ function onDataChanged()
 	label_ammo.setVisible(bRanged)
 	maxammo.setVisible(bRanged)
 	ammocounter.setVisible(bRanged and not bInfiniteAmmo and not nodeAmmoLink)
+	ammopicker.setComboBoxVisible(bRanged and not bInfiniteAmmo and nodeAmmoLink)
+	ammopicker.setComboBoxReadOnly(true)
 
 	if not maxammo.setLink then return end
 

diff --git a/extension.xml b/extension.xml
@@ -5,7 +5,7 @@
 <root version='3.3' release='3'>
 	<properties>
 		<name>Feature: Ammunition Manager</name>
-		<version>4.0</version>
+		<version>4.1</version>
 		<author>bmos (Wil Thieme)</author>
 		<description>This extension aids in tracking ammunition and whether ranged weapons are loaded.</description>
 		<ruleset>
@@ -26,7 +26,7 @@
 		<loadorder>34</loadorder>
 	</properties>
 
-	<announcement text="https://github.com/bmos/FG-PFRPG-Ammunition-Manager\nAmmunition Manager v4.0-hotfix.4:\nThis extension aids in tracking ammunition and whether ranged weapons are loaded." font="emotefont" icon="archery_ammomanager" />
+	<announcement text="https://github.com/bmos/FG-PFRPG-Ammunition-Manager\nAmmunition Manager v4.1:\nThis extension aids in tracking ammunition and whether ranged weapons are loaded." font="emotefont" icon="archery_ammomanager" />
 
 	<base>
 		<!-- Campaign Records -->