SFRPG: Fixes and improvements for grenade handling

campaign/scripts/sfrpg_ammolist.lua

@@ -0,0 +1,25 @@
+--
+-- Please see the LICENSE.md file included with this distribution for
+-- attribution and copyright information.
+--
+-- luacheck: globals getAmmoType onFilter onInit
+
+function getAmmoType(itemNode)
+	local _, ammoType = AmmunitionManager.parseWeaponCapacity(DB.getValue(itemNode, "capacity", ""))
+	if ammoType:find('grenade') then
+		return 'Grenade'
+	end
+	return 'Ammunition'
+end
+
+local attackNode, itemNode, ammoSubtype
+
+function onInit()
+	attackNode = window.parentcontrol.window.getDatabaseNode()
+	itemNode = AmmunitionManager.getShortcutNode(attackNode)
+	ammoSubtype = getAmmoType(itemNode)
+end
+
+function onFilter(w)
+	return w.subtype.getValue() == ammoSubtype and w.location.getValue() == ''
+end

campaign/scripts/sfrpg_char_reload.lua

@@ -2,13 +2,6 @@
 -- Please see the LICENSE.md file included with this distribution for attribution and copyright information.
 --
 
-local function parseWeaponCapacity(capacity)
-	capacity = capacity:lower()
-	if capacity == 'drawn' then return 0, capacity end
-	local splitCapacity = StringManager.splitWords(capacity)
-	return tonumber(splitCapacity[1]), splitCapacity[2]
-end
-
 local function getContainedItems(nodeContainer)
 	local containerName = ItemManager.getSortName(nodeContainer)
 	local containedItems = {}
@@ -25,7 +18,7 @@ end
 
 local function loadCartridges(weaponActionNode, newAmmoNode, loadedAmmoNode)
 	local weaponInventoryNode = AmmunitionManager.getShortcutNode(weaponActionNode, 'shortcut')
-	local maxAmmo, _ = parseWeaponCapacity(DB.getValue(weaponInventoryNode, 'capacity', ''))
+	local maxAmmo, _ = AmmunitionManager.parseWeaponCapacity(DB.getValue(weaponInventoryNode, 'capacity', ''))
 	local currentAmmoCount = 0
 	if loadedAmmoNode then
 		currentAmmoCount = DB.getValue(loadedAmmoNode, 'count', 0)
@@ -56,7 +49,7 @@ local function moveInventoryAmmunition(weaponActionNode, newAmmoNode)
 		return newAmmoNode
 	end
 
-	local _, ammoType = parseWeaponCapacity(DB.getValue(weaponInventoryNode, 'capacity', ''))
+	local _, ammoType = AmmunitionManager.parseWeaponCapacity(DB.getValue(weaponInventoryNode, 'capacity', ''))
 	if ammoType == 'drawn' then return newAmmoNode end
 
 	if ammoType == 'charges' then

campaign/scripts/sfrpg_char_weapon.lua

@@ -171,13 +171,19 @@ function isThrownAttack()
 	return (string.find(sSpecial, 'thrown') and bRanged)
 end
 
+--	luacheck: globals isAmmoAutolinkable
+function isAmmoAutolinkable()
+	return isThrownAttack() or DB.getValue(getDatabaseNode(), 'subtype', ''):lower():find('grenade')
+end
+
+
 --	luacheck: globals onInit
 function onInit()
-	if not isThrownAttack() and not DB.getValue(getDatabaseNode(), 'subtype', ''):lower():find('grenade') then return end
+	if not isAmmoAutolinkable() then return end
 
 	local shortcutNode = getDatabaseNode().getChild('shortcut')
 	if not shortcutNode then return end
 
-	local ammoShortcuttNode = getDatabaseNode().getChild('ammoshortcut', shortcutNode.getType())
-	DB.copyNode(shortcutNode, ammoShortcuttNode)
+	local ammoShortcutNode = getDatabaseNode().createChild('ammoshortcut', shortcutNode.getType())
+	DB.copyNode(shortcutNode, ammoShortcutNode)
 end

campaign/scripts/sfrpg_crosslink_ammocounter.lua

@@ -22,7 +22,10 @@ function onValueChanged()
 
 	bLocked = true
 
-	DB.setValue(sLink, 'number', (getMaxValue() - getCurrentValue()) * AmmunitionManager.getWeaponUsage(window.getDatabaseNode()))
+	local currentAmmo = DB.getValue(sLink, 'number', 0)
+	local usage = AmmunitionManager.getWeaponUsage(window.getDatabaseNode())
+	local excess = math.fmod(currentAmmo, usage)
+	DB.setValue(sLink, 'number', math.min(excess + (getMaxValue() - getCurrentValue()) * usage, getMaxValue() * usage))
 
 	bLocked = false
 end

campaign/sfrpg_record_char_actions.xml

@@ -25,7 +25,7 @@
 				<script file="common/scripts/number_crosslink_unlink.lua" />
 				<script>
 					function onDoubleClick()
-						if not window.isThrownAttack() then
+						if not window.isAmmoAutolinkable() then
 							Interface.openWindow('char_weapon_reload', window.getDatabaseNode())
 							return true
 						end
@@ -91,11 +91,7 @@
 				<child><backcolor>1A40301E</backcolor></child>
 				<datasource>...inventorylist</datasource>
 				<class>inv_ammoitem</class>
-				<script>
-					function onFilter(w)
-						return w.subtype.getValue() == 'Ammunition' and w.location.getValue() == ''
-					end
-				</script>
+				<script file="campaign/scripts/sfrpg_ammolist.lua" />
 			</windowlist>
 			<scrollbar>
 				<anchored to="ammunitionlist" />

scripts/manager_ammunition.lua

@@ -19,6 +19,14 @@ function getShortcutNode(node, shortcutName)
 	if sRecord and sRecord ~= '' then return DB.findNode(sRecord) end
 end
 
+-- luacheck: globals parseWeaponCapacity
+function parseWeaponCapacity(capacity)
+	capacity = capacity:lower()
+	if capacity == 'drawn' then return 0, capacity end
+	local splitCapacity = StringManager.splitWords(capacity)
+	return tonumber(splitCapacity[1]), splitCapacity[2]
+end
+
 ---	This function finds the correct node for a weapon's ammunition.
 --	It first checks for a path saved in ammoshortcut. If found, databasenode record is returned.
 --	If no path is found, it checks to see if the ammo name is known.