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

Ruleset addNPC update #1

Merged
merged 2 commits into from
Aug 9, 2022
Merged

Ruleset addNPC update #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bed564
update to new addNPC function
bmos Aug 9, 2022
c8b5bbf
add 2e variant
bmos Aug 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 17 additions & 9 deletions scripts/manager_combat_override.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ function onInit()
--Debug.console("Ruleset", rulesetName)
if ( rulesetName == "2E" ) then
originalAddNPC = CombatManagerADND.addCTANPC;
CombatManagerADND.addCTANPC = NPCFlavorAddNPC;
CombatManagerADND.addCTANPC = NPCFlavorAddNPC2E;
else
originalAddNPC = CombatManager.addNPC;
CombatManager.addNPC = NPCFlavorAddNPC;
originalAddNPC = CombatRecordManager.addNPC;
CombatRecordManager.addNPC = NPCFlavorAddNPC;
end

originalAddBattle = CombatManager.addBattle;
Expand All @@ -23,7 +23,7 @@ end


function getCombatantNodes()
return DB.getChildren("combattracker.list")
return DB.getChildren(CombatManager.CT_LIST)
end

function addFlavors( caller )
Expand Down Expand Up @@ -58,15 +58,23 @@ function NPCFlavorAddBattle( nodeBattle )
addingFromBattle = false
end

function NPCFlavorAddNPC( sClass, nodeNPC, sName )
--Debug.console("NPCFlavorAddNPC",addingFromBattle)
local result = originalAddNPC( sClass, nodeNPC, sName )
function NPCFlavorAddNPC( tCustom )
originalAddNPC( tCustom )

if (not addingFromBattle) then
addFlavors('addNPC')
else
--Debug.console("addNPC - skipping, adding from battle")
end
end

function NPCFlavorAddNPC2E( sClass, nodeNPC, sName )
local nodeEntry = originalAddNPC( sClass, nodeNPC, sName )

return result
end
if (not addingFromBattle) then
addFlavors('addNPC')
else
--Debug.console("addNPC - skipping, adding from battle")
end
return nodeEntry
end