add 2e variant

Tideturner · Aug 9, 2022 · c8b5bbf · c8b5bbf
1 parent 4bed564
commit c8b5bbf
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/scripts/manager_combat_override.lua b/scripts/manager_combat_override.lua
@@ -10,7 +10,7 @@ function onInit()
         --Debug.console("Ruleset", rulesetName)
         if ( rulesetName == "2E" ) then
             originalAddNPC = CombatManagerADND.addCTANPC;
-            CombatManagerADND.addCTANPC = NPCFlavorAddNPC;
+            CombatManagerADND.addCTANPC = NPCFlavorAddNPC2E;
         else
             originalAddNPC = CombatRecordManager.addNPC;
             CombatRecordManager.addNPC = NPCFlavorAddNPC;
@@ -23,7 +23,7 @@ end
 
 
 function getCombatantNodes()
-    return DB.getChildren("combattracker.list")
+    return DB.getChildren(CombatManager.CT_LIST)
 end
 
 function addFlavors( caller )
@@ -67,3 +67,14 @@ function NPCFlavorAddNPC( tCustom )
         --Debug.console("addNPC - skipping, adding from battle")
     end
 end
+
+function NPCFlavorAddNPC2E( sClass, nodeNPC, sName )
+    local nodeEntry = originalAddNPC( sClass, nodeNPC, sName )
+
+    if (not addingFromBattle) then
+        addFlavors('addNPC')
+    else
+        --Debug.console("addNPC - skipping, adding from battle")
+    end
+	return nodeEntry
+end