Merge pull request #534 from wyrmisis/fix/v12-initiative-woes

feat(combat): replace the combat tab with one made for v12
vttred · Sep 13, 2024 · 4efb6a0 · 4efb6a0
2 parents d4dd64d + 04e5aa9
commit 4efb6a0
Show file tree

Hide file tree

Showing 20 changed files with 1,041 additions and 400 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -98,4 +98,4 @@
 		"fromUuidSync": "readonly",
 		"PoolTerm": "readonly"
 	}
-}
+}
diff --git a/src/lang/en.json b/src/lang/en.json
@@ -8,6 +8,7 @@
   "OSE.Reset": "Reset",
   "OSE.Cancel": "Cancel",
   "OSE.Roll": "Roll",
+  "OSE.Reroll": "Reroll",
   "OSE.Success": "Success",
   "OSE.Failure": "Failure",
 
@@ -304,13 +305,16 @@
   "OSE.colors.orange": "Orange",
   "OSE.colors.white": "White",
 
+  "OSE.colors.black": "Black",
   "OSE.reaction.check": "Reaction Check",
   "OSE.reaction.Hostile": "{name} is Hostile",
   "OSE.reaction.Unfriendly": "{name} is Unfriendly",
   "OSE.reaction.Neutral": "{name} is Neutral",
   "OSE.reaction.Indifferent": "{name} is Indifferent",
   "OSE.reaction.Friendly": "{name} is Friendly",
 
+  "OSE.combat.SetCombatantAsActive": "Set Active",
+  "OSE.combat.SetCombatantGroups": "Set Combatant Groups",
   "OSE.CombatFlag.SpellDeclared": "Spell Declared",
   "OSE.CombatFlag.RetreatFromMeleeDeclared": "Retreat From Melee Declared",
 

diff --git a/src/module/combat.js b/src/module/combat.js