Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow for the word 'ranged' as well as 'range' when searching #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow for the word 'ranged' as well as 'range' when searching #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6552067
Allow for the word 'ranged' as well as 'range' when searching
chrisryan10 Oct 22, 2020
dfe0f40
More bug fixes for ranged attacks
chrisryan10 Dec 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 52 additions & 10 deletions scripts/automatic_range_modifier/ranged_attacks.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,8 @@ function getWeaponRanges5e(rActor, sRanged, sWeaponName)

if sRanged == 'R' then
bRanged = true;
Debug.console('getWeaponRanges5e sWeaponName', sWeaponName);
Debug.console('getWeaponRanges5e actor', rActor.sType);

-- NPC and PC db structures are different so need different handlers for finding ranges between the two
-- NPC handling
Expand All @@ -406,48 +408,68 @@ function getWeaponRanges5e(rActor, sRanged, sWeaponName)
for k, v in pairs(actionNodes) do
local nodeChild = nodeParent .. '.' .. k;
local nodeName = DB.getText(nodeChild .. '.name');
Debug.console('getWeaponRanges5e nodeName', nodeName);

-- There are 2 standard entry types for weapons and one for spells under actions
-- each is dealt with separately below
-- if ( nodeName:lower() == sWeaponName:lower() ) then
if string.match(nodeName, sWeaponName) then
local comparison = stringCompareNoPatternMatch(string.lower(nodeName), string.lower(sWeaponName));
if comparison == true then
local description = DB.getText(nodeChild .. '.desc');
local rangeText = '';
local rangeFound = false;

-- Weapon version 1
-- search for 'range * ft', return range as substring, split substring in two (medium/max range)
-- string input ex. 'Thrown (range 30/120)'' and 'range 30/120 ft.''
rangeText = string.match(description, "range%s%d*/%d*");
rangeText = string.match(description, "range[d]?%s%d*/%d*");
Debug.console('Range text is:', rangeText);
if rangeText ~= nil then
-- find '/' index
-- medRange = start of numbers to before index
-- maxRange = after index to end
local index = string.find(rangeText, '/');
medRange = string.sub(rangeText, 7, index - 1);
local medIndex = string.find(rangeText, ' ');
Debug.console('index is:', index);
Debug.console('medIndex is:', medIndex);

medRange = string.sub(rangeText, medIndex + 1, index - 1);
maxRange = string.sub(rangeText, index + 1, string.len(rangeText));
Debug.console('medRange is:', medRange);
Debug.console('maxRange is:', maxRange);
rangeFound = true;
end

-- Weapon version 2
-- this exception is needed as some modules have a slightly different range entries
-- string input ex. 'Thrown (range 30 ft./120)'' and 'range 30 ft./120 ft.''
rangeText = string.match(description, "range%s%d*%sft./%d*");
rangeText = string.match(description, "range[d]?%s%d*%sft./%d*");
Debug.console('Range text is:', rangeText);
if rangeText ~= nil and rangeFound == false then
local index = string.find(rangeText, '/');
medRange = string.sub(rangeText, 7, index - 4);
local medIndex = string.find(rangeText, ' ');
Debug.console('index is:', index);
Debug.console('medIndex is:', medIndex);
medRange = string.sub(rangeText, medIndex + 1, index - 1);
maxRange = string.sub(rangeText, index + 1, string.len(rangeText));
Debug.console('medRange is:', medRange);
Debug.console('maxRange is:', maxRange);
rangeFound = true;
end

-- Spell action version 1
-- this exception is needed as some modules have a slightly different range entries
-- where spell entries on NPCs are put under actions, and only one range is available
-- string input ex. 'Ranged Spell Attack: +5 to hit, range 150 ft., one target. Hit: 10 (3d6) fire damage. ...'
rangeText = string.match(description, "range%s%d*");
rangeText = string.match(description, "range[d]?%s%d*");
Debug.console('Range text is:', rangeText);
if rangeText ~= nil and rangeFound == false then
medRange = string.sub(rangeText, 7, string.len(rangeText));
local medIndex = string.find(rangeText, ' ');
Debug.console('medIndex is:', medIndex);
medRange = string.sub(rangeText, medIndex + 1, string.len(rangeText));
maxRange = medRange;
Debug.console('medRange is:', medRange);
Debug.console('maxRange is:', maxRange);
end

end
Expand Down Expand Up @@ -494,15 +516,21 @@ function getWeaponRanges5e(rActor, sRanged, sWeaponName)

-- search for 'range * ft', return range as substring, split substring in two (medium/max range)
-- string input ex. 'Thrown (range 30/120)'' and 'range 30/120 ft.''
local rangeText = string.match(description, "range%s%d*/%d*");
local rangeText = string.match(description, "range[d]?%s%d*/%d*");
Debug.console('Range text is:', rangeText);

if rangeText ~= nil then
-- find '/' index
-- medRange = start of numbers to before index
-- maxRange = after index to end
local index = string.find(rangeText, '/');
medRange = string.sub( rangeText, 7, index - 1);
local medIndex = string.find(rangeText, ' ');
Debug.console('index is:', index);
Debug.console('medIndex is:', medIndex);
medRange = string.sub(rangeText, medIndex + 1, index - 1);
maxRange = string.sub(rangeText, index + 1, string.len(rangeText));
Debug.console('medRange is:', medRange);
Debug.console('maxRange is:', maxRange);
end
end
end
Expand Down Expand Up @@ -574,4 +602,18 @@ function checkConditions(rSource, rTarget)
if ctrlImage == nil then return false; end

return true;
end
end

-- string compare, no pattern matching
function stringCompareNoPatternMatch(str1, str2)
if str1 == nil or str2 == nil then return false; end

local len = string.len(str1);
if not (len == string.len(str2)) then return false; end

for i = 1, len, 1
do
if not (string.byte(str1, i) == string.byte(str2, i)) then return false; end
end
return true;
end