Improved sameRound behavior

join-combat.js

@@ -0,0 +1,29 @@
+import { createToken } from './scripts/createToken.js';
+import { renderSceneControls } from './scripts/renderSceneControls.js';
+
+Hooks.once('init', () => {
+    game.settings.register('join-combat', 'active', {
+        name: 'Join Combat Active',
+        hint: 'Roll Initiative for new tokens or not',
+        scope: 'world',
+        default: false,
+        config: false,
+        type: Boolean,
+    });
+    game.settings.register('join-combat', 'join-same-round', {
+        name: 'Same Round',
+        hint: '',
+        scope: 'world',
+        default: false,
+        config: false,
+        type: Boolean,
+    });
+});
+
+Hooks.on('renderSceneControls', async (controls, html) => {
+   await renderSceneControls(html);
+});
+
+Hooks.on('createToken', async (document, _, userId) => {
+    await createToken(document, userId);
+});

module.json

@@ -4,7 +4,7 @@
     "description": "If the toggle is checked, tokens placed by the DM will automatically be added to combat and roll initiative.",
     "author": "HarryBoy",
     "esmodules": [
-        "scripts/join-combat.js"
+        "join-combat.js"
     ],
     "styles": ["styles/join-combat.css"],
     "languages": [

scripts/createToken.js

@@ -0,0 +1,11 @@
+import { getInitiativeOptions } from './helpers.js';
+
+export const createToken = async (document, userId) => {
+    const dmCreated = game.user.isGM && game.user.id === userId;
+    const activeCombat = Boolean(game.combat);
+    if(activeCombat && dmCreated && game.settings.get('join-combat', 'active')){
+        const token = await document.object.toggleCombat(); 
+        const newCombatant = game.combat.combatants.find(x => x.token.id === token.id);
+        await game.combat.rollInitiative([newCombatant.id], getInitiativeOptions());
+    }
+};

scripts/helpers.js

@@ -11,19 +11,17 @@ export const getInitiativeOptions = () => {
         return {};
     }
 
-    const lowestInitiative = game.combat.data.combatants.reduce((acc, c) => {
-        if(acc === null){
-            return c.data.initiative ? c : null;
-        }
+    const currentCombatantId = game.combat.current.combatantId;
+    if(!currentCombatantId){
+        return {};
+    }
 
-        return acc.data.initiative > c.data.initiative ? c : acc;
-    }, null)?.data?.initiative;
-
-    if(!lowestInitiative){
+    const currentInitiative = game.combat.data.combatants.find(x => x.id === currentCombatantId)?.data?.initiative;
+    if(currentInitiative === undefined){
         return {};
     }
 
-    const dice = Math.max(lowestInitiative-1, 0);
+    const dice = Math.max(currentInitiative-1, 0);
 
     return { formula: dice ? `1d${dice}` : '0' };
 }

scripts/join-combat.js → scripts/renderSceneControls.js

@@ -1,25 +1,6 @@
-import { getInitiativeOptions, isSystemSameRoundCompatible } from './helpers.js';
+import { isSystemSameRoundCompatible } from './helpers.js';
 
-Hooks.once('init', () => {
-    game.settings.register('join-combat', 'active', {
-        name: 'Join Combat Active',
-        hint: 'Roll Initiative for new tokens or not',
-        scope: 'world',
-        default: false,
-        config: false,
-        type: Boolean,
-    });
-    game.settings.register('join-combat', 'join-same-round', {
-        name: 'Same Round',
-        hint: '',
-        scope: 'world',
-        default: false,
-        config: false,
-        type: Boolean,
-    });
-});
-
-Hooks.on('renderSceneControls', async (controls, html) => {
+export const renderSceneControls = async (html) => {
     if(game.user.isGM){
         const tokenSublist = $(html).find('ol.sub-controls').first();
         tokenSublist.append(await renderTemplate('modules/join-combat/templates/TokenButtons.hbs', {
@@ -57,12 +38,4 @@ Hooks.on('renderSceneControls', async (controls, html) => {
             }
         });
     }
-});
-
-Hooks.on('createToken', (document, _, userId) => {
-    const dmCreated = game.user.isGM && game.user.id === userId;
-    const activeCombat = Boolean(game.combat);
-    if(activeCombat && dmCreated && game.settings.get('join-combat', 'active')){
-        document.actor.rollInitiative({createCombatants: true, initiativeOptions: getInitiativeOptions()});
-    }
-});
+};