Skip to content

Added body count to initiative panel title. #5986

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

Open
bubblobill wants to merge 10 commits into
base: develop
Choose a base branch
from
+184 −47
Open

Added body count to initiative panel title. #5986

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6cdd5c2
Added status message for initiative panel summary.
bubblobill Jun 23, 2026
a93bb91
Merge branch 'RPTools:develop' into InitStatus
bubblobill Jul 1, 2026
9ada467
Merge branch 'develop' into InitStatus
bubblobill Jul 7, 2026
3df556d
Changed from status bar message to title bar component text.
bubblobill Jul 8, 2026
4a9be57
Added preference for display of info in title bar.
bubblobill Jul 9, 2026
6b6820d
Merge branch 'develop' into InitStatus
bubblobill Jul 9, 2026
ab78e13
Merge branch 'develop' into InitStatus
bubblobill Jul 14, 2026
2fe21be
Merge branch 'RPTools:develop' into InitStatus
bubblobill Jul 14, 2026
f666c5d
Merge branch 'RPTools:develop' into InitStatus
bubblobill Jul 17, 2026
902a9a0
Merge branch 'develop' into InitStatus
bubblobill Aug 3, 2026
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
164 changes: 118 additions & 46 deletions src/main/java/net/rptools/maptool/client/ui/tokenpanel/InitiativePanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,18 @@
*/
package net.rptools.maptool.client.ui.tokenpanel;

import static net.rptools.maptool.client.ui.MapToolFrame.MTFrame.INITIATIVE;

import com.google.common.eventbus.Subscribe;
import com.jidesoft.docking.DockableFrame;
import com.jidesoft.docking.event.DockableFrameAdapter;
import com.jidesoft.docking.event.DockableFrameEvent;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.*;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Collections;
import java.util.*;
import java.util.List;
import java.util.Set;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
Expand Down Expand Up @@ -62,7 +63,7 @@ public class InitiativePanel extends JPanel
* Instance Variables
*-------------------------------------------------------------------------------------------*/

/** Model containing all of the tokens in this initiative. */
/** Model containing all the tokens in this initiative. */
private InitiativeList list;

/** The model used to display a list in the panel; */
Expand Down Expand Up @@ -98,7 +99,7 @@ public class InitiativePanel extends JPanel
/** The component that contains the initiative menu. */
private final JPopupMenu popupMenu;

/** The menu item that tells the GM if NPC's are visible. */
/** The menu item that tells the GM if NPCs are visible. */
private JCheckBoxMenuItem hideNPCMenuItem;

/**
Expand Down Expand Up @@ -135,10 +136,13 @@ public class InitiativePanel extends JPanel
*/
private boolean initPanelButtonsDisabled;

/** Frame used in docking manager */
private DockableFrame dockableFrame;

/*---------------------------------------------------------------------------------------------
* Constructor
*-------------------------------------------------------------------------------------------*/
/** Setup the menu */
/** Set up the menu */
public InitiativePanel() {

// Build the form and add it's component
Expand Down Expand Up @@ -178,7 +182,7 @@ public InitiativePanel() {

// Set up the list with an empty model
displayList =
new JList<TokenInitiative>() {
new JList<>() {
@Override
public boolean getScrollableTracksViewportWidth() {
// Make sure the width of the list always tracks with the width of the panel. Without
Expand Down Expand Up @@ -243,9 +247,12 @@ public boolean getScrollableTracksViewportWidth() {
"initPanel.warnWhenResettingRoundCounter", TOGGLE_WARN_WHEN_RESETTING_COUNTER_ACTION);
I18N.setAction("initPanel.next", NEXT_ACTION);
I18N.setAction("initPanel.prev", PREV_ACTION);

updateView();

new MapToolEventBus().getMainEventBus().register(this);

SwingUtilities.invokeLater(() -> dockableFrame = getDockableFrame());
}

private static class TextlessButton extends JButton {
Expand Down Expand Up @@ -332,7 +339,7 @@ public void updateView() {
valueChanged(null);
}

/** Remove all of the tokens from the model and clear round and current */
/** Remove all the tokens from the model and clear round and current */
public void clearTokens() {
list.clearModel();
}
Expand Down Expand Up @@ -410,7 +417,7 @@ public InitiativeListModel getModel() {
}

/**
* Set the zone that we are currently working on.
* Set the zone we are working on.
*
* @param aZone The new zone
*/
Expand Down Expand Up @@ -442,15 +449,14 @@ public void setZone(Zone aZone) {
public boolean hasOwnerPermission(Token token) {
if (token == null) return false;
if (hasGMPermission()) return true;
if (ownerPermissions
return ownerPermissions
&& (!MapTool.getServerPolicy().useStrictTokenManagement()
|| token.isOwner(MapTool.getPlayer().getName()))) return true;
return false;
|| token.isOwner(MapTool.getPlayer().getName()));
}

/**
* See if the current player has permission to execute GM restricted actions. This is <b>not</b>
* related to so-called <i>trusted macros</i> in MTscript.
* related to so-called <i>trusted macros</i> in MT Script.
*
* @return The value <code>true</code> if this player has permission for all actions.
*/
Expand Down Expand Up @@ -503,7 +509,7 @@ public boolean isInitPanelButtonsDisabled() {
* Updates the "Disable Panel Buttons" setting, and tweaks the Next/Previous button tooltips
* appropriately. Updates the view.
*
* @param initPanelButtonsDisabled
* @param initPanelButtonsDisabled disable panel buttons
*/
public void setInitPanelButtonsDisabled(boolean initPanelButtonsDisabled) {
this.initPanelButtonsDisabled = initPanelButtonsDisabled;
Expand All @@ -526,8 +532,7 @@ public void setInitPanelButtonsDisabled(boolean initPanelButtonsDisabled) {
public boolean isMovementLocked(Token token) {
if (!movementLock || list == null || list.getSize() == 0) return false;
if (model.getCurrentTokenInitiative() == null) return true;
if (model.getCurrentTokenInitiative().getToken() == token) return false;
return true;
return model.getCurrentTokenInitiative().getToken() != token;
}

/**
Expand All @@ -553,7 +558,73 @@ private void onInitiativeListChanged(InitiativeListChanged event) {

int oldSize = model.getSize();
setList(list);
if (oldSize != model.getSize()) displayList.getSelectionModel().clearSelection();
if (oldSize != model.getSize()) {
displayList.getSelectionModel().clearSelection();
}
}

public DockableFrame getDockableFrame() {
if (dockableFrame == null) {
dockableFrame = MapTool.getFrame().getFrame(INITIATIVE);
dockableFrame.addDockableFrameListener(
new DockableFrameAdapter() {
private String oldStatusMessage;

@Override
public void dockableFrameActivated(DockableFrameEvent dockableFrameEvent) {
oldStatusMessage = MapTool.getFrame().getStatusMessage();
updateStatusBar();
}

@Override
public void dockableFrameDeactivated(DockableFrameEvent dockableFrameEvent) {
MapTool.getFrame().setStatusMessage(oldStatusMessage);
oldStatusMessage = null;
}
});
}
return dockableFrame;
}

private void updateStatusBar() {
if (!getDockableFrame().isActive()) {
return;
}
SwingUtilities.invokeLater(
() -> {
if (list != null && list.getSize() > 0 && MapTool.getPlayer().isGM()) {
// PCs/NPCs: {0}/{1}, Current: {2}, Round/Phase {3}/{4}
int pc = 0, npc = 0;
TokenInitiative last = null;
boolean sorted = true;
Comparator<TokenInitiative> comparator = list.getComparator();
for (TokenInitiative ti : list.getTokens()) {
if (last != null && sorted && !ti.isHolding()) {
int comp = comparator.compare(ti, last);
if ((initUseReverseSort && comp > 0) || (!initUseReverseSort && comp < 0)) {
sorted = false;
}
}
last = ti;
if (ti.getToken().getType().equals(Type.PC)) {
pc++;
} else {
npc++;
}
}
TokenInitiative current = list.getCurrentTokenInitiative();
MapTool.getFrame()
.setStatusMessage(
I18N.getText(
"initiative.status.summary",
pc,
npc,
current == null ? "*" : current.getToken().getName(),
list.getRound(),
current == null ? -1 : current.getState(),
sorted));
}
});
}

@Subscribe
Expand Down Expand Up @@ -612,28 +683,29 @@ public void valueChanged(ListSelectionEvent e) {
*/
@Override
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getPropertyName().equals(InitiativeList.ROUND_PROP)) {
updateRound();
} else if (evt.getPropertyName().equals(InitiativeList.CURRENT_PROP)) {
Token t = list.getCurrentToken();
if (t == null) return;
String s = I18N.getText("initPanel.displayMessage", t.getName());
if (InitiativeListModel.isTokenVisible(t, list.isHideNPC())
&& t.getType() != Type.NPC
&& AppPreferences.showInitiativeGainedMessage.get())
MapTool.addMessage(TextMessage.say(null, s));
displayList.ensureIndexIsVisible(model.getDisplayIndex(list.getCurrent()));
NEXT_ACTION.setEnabled(
!isInitPanelButtonsDisabled() && hasOwnerPermission(list.getCurrentToken()));
} else if (evt.getPropertyName().equals(InitiativeList.TOKENS_PROP)) {
if ((evt.getOldValue() == null && evt.getNewValue() instanceof TokenInitiative)
|| (evt.getNewValue() == null & evt.getOldValue() instanceof TokenInitiative))
displayList.getSelectionModel().clearSelection();
} else if (evt.getPropertyName().equals(InitiativeList.HIDE_NPCS_PROP)) {
displayList.getSelectionModel().clearSelection();
} else if (evt.getPropertyName().equals(InitiativeList.OWNER_PERMISSIONS_PROP)) {
updateView();
} // endif
updateStatusBar();
switch (evt.getPropertyName()) {
case InitiativeList.ROUND_PROP -> updateRound();
case InitiativeList.CURRENT_PROP -> {
Token t = list.getCurrentToken();
if (t == null) return;
String s = I18N.getText("initPanel.displayMessage", t.getName());
if (InitiativeListModel.isTokenVisible(t, list.isHideNPC())
&& t.getType() != Type.NPC
&& AppPreferences.showInitiativeGainedMessage.get())
MapTool.addMessage(TextMessage.say(null, s));
displayList.ensureIndexIsVisible(model.getDisplayIndex(list.getCurrent()));
NEXT_ACTION.setEnabled(
!isInitPanelButtonsDisabled() && hasOwnerPermission(list.getCurrentToken()));
}
case InitiativeList.TOKENS_PROP -> {
if ((evt.getOldValue() == null && evt.getNewValue() instanceof TokenInitiative)
|| (evt.getNewValue() == null & evt.getOldValue() instanceof TokenInitiative))
displayList.getSelectionModel().clearSelection();
}
case InitiativeList.HIDE_NPCS_PROP -> displayList.getSelectionModel().clearSelection();
case InitiativeList.OWNER_PERMISSIONS_PROP -> updateView();
}
}

/*---------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -776,7 +848,7 @@ public void actionPerformed(ActionEvent e) {
}
};

/** This action will set the initiative state of the currently selected token. */
/** This action will set the initiative state of the current selected token. */
public final Action SET_INIT_STATE_VALUE =
new AbstractAction() {
@Override
Expand All @@ -788,7 +860,7 @@ public void actionPerformed(ActionEvent e) {
if (hasGMPermission()
&& token != null
&& token.getGMName() != null
&& token.getGMName().trim().length() != 0)
&& !token.getGMName().trim().isEmpty())
sName += " (" + token.getGMName().trim() + ")";
String s = I18N.getText("initPanel.enterState", sName);
String input = JOptionPane.showInputDialog(s, ti.getState());
Expand All @@ -797,7 +869,7 @@ public void actionPerformed(ActionEvent e) {
}
};

/** This action will clear the initiative state of the currently selected token. */
/** This action will clear the initiative state of the current selected token. */
public final Action CLEAR_INIT_STATE_VALUE =
new AbstractAction() {
@Override
Expand Down Expand Up @@ -831,7 +903,7 @@ public void actionPerformed(ActionEvent e) {
new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
List<Token> tokens = new ArrayList<Token>();
List<Token> tokens = new ArrayList<>();
for (Token token : list.getZone().getTokensForLayers(Zone.Layer::isTokenLayer)) {
if (token.getType() == Type.PC) tokens.add(token);
} // endfor
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/net/rptools/maptool/model/InitiativeList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,4 +1023,8 @@ public int compare(TokenInitiative o1, TokenInitiative o2) {
return comparison;
}
}

public TokenInitiativeDescComparator getComparator() {
return new TokenInitiativeDescComparator();
}
}
4 changes: 2 additions & 2 deletions src/main/resources/net/rptools/maptool/language/i18n.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1945,8 +1945,8 @@ initiative.menu.hold = Hold
initiative.menu.remove = Remove
initiative.menu.resume = Resume
initiative.menu.setState = Set Initiative...


# Initiative summary message for display in GM status bar
initiative.status.summary = PC: {0}, NPC: {1}, Current: {2} ({4}), Round: {3}, Sorted: {5}

@kwvanderlinde kwvanderlinde Jul 6, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the goal is to know whether all the PCs or NPCs have rolled initiative, I think we should also include the total number of them that are on the map. E.g.,

PC: 1/4, NPC: 2/5, ...

@kwvanderlinde kwvanderlinde Jul 8, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should have said totals in the initiative, not on the map.

layer.token = Token
layer.gm = Hidden
layer.object = Object
Expand Down
Loading