v3.6.0 - Bug fixes and number display mode for stats
- Fixed custom status fields not being sent to prompts or parsed - Fixed date format selection not working beyond default format - Fixed widget text overflow issues with minimal scrollbars - Added ability to display stats as numbers with custom max values instead of percentages - Enabled desktop strip widgets by default - Removed icon from Desktop Collapsed Strip Widgets heading
This commit is contained in:
Spicy_Marinara
@@ -28,6 +28,7 @@ export function buildUserStatsJSONInstruction() {
|
||||
const trackerConfig = extensionSettings.trackerConfig;
|
||||
const userStatsConfig = trackerConfig?.userStats;
|
||||
const enabledStats = userStatsConfig?.customStats?.filter(s => s && s.enabled && s.name) || [];
|
||||
const displayMode = userStatsConfig?.statsDisplayMode || 'percentage';
|
||||
|
||||
let instruction = '{\n';
|
||||
instruction += ' "stats": [\n';
|
||||
@@ -36,7 +37,12 @@ export function buildUserStatsJSONInstruction() {
|
||||
for (let i = 0; i < enabledStats.length; i++) {
|
||||
const stat = enabledStats[i];
|
||||
const comma = i < enabledStats.length - 1 ? ',' : '';
|
||||
instruction += ` {"id": "${stat.id}", "name": "${stat.name}", "value": X}${comma}\n`;
|
||||
if (displayMode === 'number') {
|
||||
const maxValue = stat.maxValue || 100;
|
||||
instruction += ` {"id": "${stat.id}", "name": "${stat.name}", "value": X}${comma} // 0 to ${maxValue}\n`;
|
||||
} else {
|
||||
instruction += ` {"id": "${stat.id}", "name": "${stat.name}", "value": X}${comma} // 0 to 100 (percentage)\n`;
|
||||
}
|
||||
}
|
||||
|
||||
instruction += ' ],\n';
|
||||
@@ -45,9 +51,24 @@ export function buildUserStatsJSONInstruction() {
|
||||
if (userStatsConfig?.statusSection?.enabled) {
|
||||
instruction += ' "status": {\n';
|
||||
if (userStatsConfig.statusSection.showMoodEmoji) {
|
||||
instruction += ' "mood": "Mood Emoji",\n';
|
||||
instruction += ' "mood": "Mood Emoji"';
|
||||
}
|
||||
// Add all custom status fields
|
||||
const customFields = userStatsConfig.statusSection.customFields || [];
|
||||
if (customFields.length > 0) {
|
||||
for (let i = 0; i < customFields.length; i++) {
|
||||
const fieldName = customFields[i].toLowerCase();
|
||||
const fieldKey = toSnakeCase(fieldName);
|
||||
const comma = (i === customFields.length - 1 && !userStatsConfig.statusSection.showMoodEmoji) ? '' : (userStatsConfig.statusSection.showMoodEmoji || i < customFields.length - 1 ? ',\n' : '\n');
|
||||
if (i === 0 && userStatsConfig.statusSection.showMoodEmoji) {
|
||||
instruction += ',\n';
|
||||
}
|
||||
instruction += ` "${fieldKey}": "[${fieldName}1, ${fieldName}2]"${comma}`;
|
||||
}
|
||||
}
|
||||
if (!userStatsConfig.statusSection.showMoodEmoji && customFields.length > 0) {
|
||||
instruction += '\n';
|
||||
}
|
||||
instruction += ' "conditions": "[Condition1, Condition2]"\n';
|
||||
instruction += ' },\n';
|
||||
}
|
||||
|
||||
@@ -105,7 +126,8 @@ export function buildInfoBoxJSONInstruction() {
|
||||
let hasFields = false;
|
||||
|
||||
if (widgets.date?.enabled) {
|
||||
instruction += ' "date": {"value": "Weekday, Month, Year"}';
|
||||
const dateFormat = widgets.date.format || 'Weekday, Month, Year';
|
||||
instruction += ` "date": {"value": "${dateFormat}"}`;
|
||||
hasFields = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -547,9 +547,15 @@ export function parseUserStats(statsText) {
|
||||
extensionSettings.userStats.mood = statsData.status.mood;
|
||||
// console.log('[RPG Parser] ✓ Set mood =', statsData.status.mood);
|
||||
}
|
||||
if (statsData.status.conditions) {
|
||||
extensionSettings.userStats.conditions = statsData.status.conditions;
|
||||
// console.log('[RPG Parser] ✓ Set conditions =', statsData.status.conditions);
|
||||
// Extract all custom status fields
|
||||
const trackerConfig = extensionSettings.trackerConfig;
|
||||
const customFields = trackerConfig?.userStats?.statusSection?.customFields || [];
|
||||
for (const fieldName of customFields) {
|
||||
const fieldKey = fieldName.toLowerCase();
|
||||
if (statsData.status[fieldKey]) {
|
||||
extensionSettings.userStats[fieldKey] = statsData.status[fieldKey];
|
||||
// console.log(`[RPG Parser] ✓ Set ${fieldKey} =`, statsData.status[fieldKey]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -679,6 +685,7 @@ export function parseUserStats(statsText) {
|
||||
const statusConfig = trackerConfig?.userStats?.statusSection;
|
||||
if (statusConfig?.enabled) {
|
||||
let moodMatch = null;
|
||||
const customFields = statusConfig.customFields || [];
|
||||
|
||||
// Try Status: format
|
||||
const statusMatch = statsText.match(/Status:\s*(.+)/i);
|
||||
@@ -691,14 +698,30 @@ export function parseUserStats(statsText) {
|
||||
if (emoji) {
|
||||
extensionSettings.userStats.mood = emoji;
|
||||
// Remaining text contains custom status fields
|
||||
if (text) {
|
||||
extensionSettings.userStats.conditions = text;
|
||||
if (text && customFields.length > 0) {
|
||||
// For first custom field, use the remaining text
|
||||
const firstFieldKey = customFields[0].toLowerCase();
|
||||
extensionSettings.userStats[firstFieldKey] = text;
|
||||
}
|
||||
moodMatch = true;
|
||||
}
|
||||
} else {
|
||||
// No mood emoji, whole status is conditions
|
||||
extensionSettings.userStats.conditions = statusContent;
|
||||
// No mood emoji, whole status goes to first custom field
|
||||
if (customFields.length > 0) {
|
||||
const firstFieldKey = customFields[0].toLowerCase();
|
||||
extensionSettings.userStats[firstFieldKey] = statusContent;
|
||||
}
|
||||
moodMatch = true;
|
||||
}
|
||||
}
|
||||
|
||||
// Try to extract individual custom status fields by name
|
||||
for (const fieldName of customFields) {
|
||||
const fieldKey = fieldName.toLowerCase();
|
||||
const fieldRegex = new RegExp(`${fieldName}:\\s*(.+?)(?:,|$)`, 'i');
|
||||
const fieldMatch = statsText.match(fieldRegex);
|
||||
if (fieldMatch) {
|
||||
extensionSettings.userStats[fieldKey] = fieldMatch[1].trim();
|
||||
moodMatch = true;
|
||||
}
|
||||
}
|
||||
@@ -706,7 +729,10 @@ export function parseUserStats(statsText) {
|
||||
debugLog('[RPG Parser] Status match:', {
|
||||
found: !!moodMatch,
|
||||
mood: extensionSettings.userStats.mood,
|
||||
conditions: extensionSettings.userStats.conditions
|
||||
customFields: customFields.map(f => ({
|
||||
name: f,
|
||||
value: extensionSettings.userStats[f.toLowerCase()]
|
||||
}))
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -485,11 +485,22 @@ function formatTrackerDataForContext(jsonData, trackerType, userName) {
|
||||
|
||||
// Handle common object formats
|
||||
if (field && typeof field === 'object') {
|
||||
// Status object: {mood, conditions}
|
||||
if ('mood' in field && 'conditions' in field) {
|
||||
// Status object: {mood, [customFields...]}
|
||||
if ('mood' in field) {
|
||||
const statusParts = [];
|
||||
const mood = getValue(field.mood);
|
||||
const conditions = getValue(field.conditions);
|
||||
return `${mood} - ${conditions}`;
|
||||
if (mood) statusParts.push(mood);
|
||||
|
||||
// Add all other status fields (custom fields)
|
||||
for (const [key, value] of Object.entries(field)) {
|
||||
if (key !== 'mood') {
|
||||
const fieldValue = getValue(value);
|
||||
if (fieldValue && fieldValue !== 'None') {
|
||||
statusParts.push(fieldValue);
|
||||
}
|
||||
}
|
||||
}
|
||||
return statusParts.join(' - ');
|
||||
}
|
||||
|
||||
// Skill/item/quest objects: {name}, {title}, {name, quantity}
|
||||
@@ -830,9 +841,17 @@ export function formatHistoricalTrackerData(trackerData, trackerConfig, userName
|
||||
// Status section
|
||||
if (shouldInclude(userStatsConfig.statusSection) && userStatsData.status) {
|
||||
const mood = getValue(userStatsData.status.mood || userStatsData.status);
|
||||
const conditions = getValue(userStatsData.status.conditions);
|
||||
if (mood) statsFormatted += `Mood: ${mood}, `;
|
||||
if (conditions && conditions !== 'None') statsFormatted += `Conditions: ${conditions}, `;
|
||||
if (mood && userStatsConfig.statusSection.showMoodEmoji) statsFormatted += `Mood: ${mood}, `;
|
||||
|
||||
// Add all custom status fields
|
||||
const customFields = userStatsConfig.statusSection.customFields || [];
|
||||
for (const fieldName of customFields) {
|
||||
const fieldKey = fieldName.toLowerCase();
|
||||
const fieldValue = getValue(userStatsData.status[fieldKey]);
|
||||
if (fieldValue && fieldValue !== 'None') {
|
||||
statsFormatted += `${fieldName}: ${fieldValue}, `;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Skills section
|
||||
|
||||
@@ -105,7 +105,8 @@ function updateUserStatsData() {
|
||||
|
||||
// Then, add any other numeric stats from extensionSettings that aren't in config
|
||||
// (these could be custom stats the AI added or disabled stats)
|
||||
const excludeFields = new Set(['mood', 'conditions', 'inventory', 'skills', 'level']);
|
||||
const customFields = config.statusSection?.customFields || [];
|
||||
const excludeFields = new Set(['mood', ...customFields.map(f => f.toLowerCase()), 'inventory', 'skills', 'level']);
|
||||
Object.entries(stats).forEach(([key, value]) => {
|
||||
if (!processedIds.has(key) && !excludeFields.has(key) && typeof value === 'number') {
|
||||
statsArray.push({
|
||||
@@ -118,12 +119,17 @@ function updateUserStatsData() {
|
||||
|
||||
jsonData.stats = statsArray;
|
||||
|
||||
// Update status
|
||||
// Update status - include all custom status fields
|
||||
jsonData.status = {
|
||||
mood: stats.mood || '😐',
|
||||
conditions: stats.conditions || 'None'
|
||||
mood: stats.mood || '😐'
|
||||
};
|
||||
|
||||
// Add all custom status fields
|
||||
for (const fieldName of customFields) {
|
||||
const fieldKey = fieldName.toLowerCase();
|
||||
jsonData.status[fieldKey] = stats[fieldKey] || 'None';
|
||||
}
|
||||
|
||||
// Update inventory (convert to v3 format)
|
||||
const convertToV3Items = (itemString) => {
|
||||
if (!itemString) return [];
|
||||
@@ -276,16 +282,33 @@ export function renderUserStats() {
|
||||
}
|
||||
html += '<div class="rpg-stats-grid">';
|
||||
const enabledStats = config.customStats.filter(stat => stat && stat.enabled && stat.name && stat.id);
|
||||
const displayMode = config.statsDisplayMode || 'percentage';
|
||||
|
||||
for (const stat of enabledStats) {
|
||||
const value = stats[stat.id] !== undefined ? stats[stat.id] : 100;
|
||||
const maxValue = stat.maxValue || 100;
|
||||
|
||||
// Calculate percentage for bar fill
|
||||
let percentage;
|
||||
let displayValue;
|
||||
|
||||
if (displayMode === 'number') {
|
||||
// In number mode, value is already the number (0 to maxValue)
|
||||
percentage = maxValue > 0 ? (value / maxValue) * 100 : 100;
|
||||
displayValue = `${value}/${maxValue}`;
|
||||
} else {
|
||||
// In percentage mode, value is 0-100
|
||||
percentage = value;
|
||||
displayValue = `${value}%`;
|
||||
}
|
||||
|
||||
html += `
|
||||
<div class="rpg-stat-row">
|
||||
<span class="rpg-stat-label rpg-editable-stat-name" contenteditable="true" data-field="${stat.id}" title="Click to edit stat name">${stat.name}:</span>
|
||||
<div class="rpg-stat-bar" style="background: ${gradient}">
|
||||
<div class="rpg-stat-fill" style="width: ${100 - value}%"></div>
|
||||
<div class="rpg-stat-fill" style="width: ${100 - percentage}%"></div>
|
||||
</div>
|
||||
<span class="rpg-stat-value rpg-editable-stat" contenteditable="true" data-field="${stat.id}" title="Click to edit">${value}%</span>
|
||||
<span class="rpg-stat-value rpg-editable-stat" contenteditable="true" data-field="${stat.id}" data-max="${maxValue}" data-mode="${displayMode}" title="Click to edit">${displayValue}</span>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
@@ -308,13 +331,15 @@ export function renderUserStats() {
|
||||
|
||||
// Render custom status fields
|
||||
if (config.statusSection.customFields && config.statusSection.customFields.length > 0) {
|
||||
// For now, use first field as "conditions" for backward compatibility
|
||||
let conditionsValue = stats.conditions || 'None';
|
||||
// Strip brackets if present (from JSON array format)
|
||||
if (typeof conditionsValue === 'string') {
|
||||
conditionsValue = conditionsValue.replace(/^\[|\]$/g, '').trim();
|
||||
for (const fieldName of config.statusSection.customFields) {
|
||||
const fieldKey = fieldName.toLowerCase();
|
||||
let fieldValue = stats[fieldKey] || 'None';
|
||||
// Strip brackets if present (from JSON array format)
|
||||
if (typeof fieldValue === 'string') {
|
||||
fieldValue = fieldValue.replace(/^\[|\]$/g, '').trim();
|
||||
}
|
||||
html += `<div class="rpg-mood-conditions rpg-editable" contenteditable="true" data-field="${fieldKey}" title="Click to edit ${fieldName}">${fieldValue}</div>`;
|
||||
}
|
||||
html += `<div class="rpg-mood-conditions rpg-editable" contenteditable="true" data-field="conditions" title="Click to edit conditions">${conditionsValue}</div>`;
|
||||
}
|
||||
|
||||
html += '</div>';
|
||||
@@ -406,14 +431,31 @@ export function renderUserStats() {
|
||||
// Add event listeners for editable stat values
|
||||
$('.rpg-editable-stat').on('blur', function() {
|
||||
const field = $(this).data('field');
|
||||
const textValue = $(this).text().replace('%', '').trim();
|
||||
let value = parseInt(textValue);
|
||||
const mode = $(this).data('mode');
|
||||
const maxValue = parseInt($(this).data('max')) || 100;
|
||||
const textValue = $(this).text().trim();
|
||||
let value;
|
||||
|
||||
// Validate and clamp value between 0 and 100
|
||||
if (isNaN(value)) {
|
||||
value = 0;
|
||||
if (mode === 'number') {
|
||||
// In number mode, parse "X/MAX" or just "X"
|
||||
const parts = textValue.split('/');
|
||||
value = parseInt(parts[0]);
|
||||
|
||||
// Validate and clamp value between 0 and maxValue
|
||||
if (isNaN(value)) {
|
||||
value = 0;
|
||||
}
|
||||
value = Math.max(0, Math.min(maxValue, value));
|
||||
} else {
|
||||
// In percentage mode, parse "X%" or just "X"
|
||||
value = parseInt(textValue.replace('%', ''));
|
||||
|
||||
// Validate and clamp value between 0 and 100
|
||||
if (isNaN(value)) {
|
||||
value = 0;
|
||||
}
|
||||
value = Math.max(0, Math.min(100, value));
|
||||
}
|
||||
value = Math.max(0, Math.min(100, value));
|
||||
|
||||
// Update the setting
|
||||
extensionSettings.userStats[field] = value;
|
||||
@@ -445,7 +487,8 @@ export function renderUserStats() {
|
||||
|
||||
$('.rpg-mood-conditions.rpg-editable').on('blur', function() {
|
||||
const value = $(this).text().trim();
|
||||
extensionSettings.userStats.conditions = value || 'None';
|
||||
const fieldKey = $(this).data('field');
|
||||
extensionSettings.userStats[fieldKey] = value || 'None';
|
||||
|
||||
// Update userStats data (maintains JSON or text format)
|
||||
updateUserStatsData();
|
||||
|
||||
@@ -729,13 +729,27 @@ function renderUserStatsTab() {
|
||||
|
||||
// Custom Stats section
|
||||
html += `<h4><i class="fa-solid fa-heart-pulse"></i> ${i18n.getTranslation('template.trackerEditorModal.userStatsTab.customStatsTitle')}</h4>`;
|
||||
|
||||
// Stats display mode toggle
|
||||
const statsDisplayMode = config.statsDisplayMode || 'percentage';
|
||||
html += '<div class="rpg-editor-toggle-row">';
|
||||
html += '<label>Display Mode:</label>';
|
||||
html += '<div class="rpg-radio-group">';
|
||||
html += `<label><input type="radio" name="stats-display-mode" value="percentage" ${statsDisplayMode === 'percentage' ? 'checked' : ''}> Percentage</label>`;
|
||||
html += `<label><input type="radio" name="stats-display-mode" value="number" ${statsDisplayMode === 'number' ? 'checked' : ''}> Number</label>`;
|
||||
html += '</div>';
|
||||
html += '</div>';
|
||||
|
||||
html += '<div class="rpg-editor-stats-list" id="rpg-editor-stats-list">';
|
||||
|
||||
config.customStats.forEach((stat, index) => {
|
||||
const showMaxValue = statsDisplayMode === 'number';
|
||||
const maxValue = stat.maxValue || 100;
|
||||
html += `
|
||||
<div class="rpg-editor-stat-item" data-index="${index}">
|
||||
<input type="checkbox" ${stat.enabled ? 'checked' : ''} class="rpg-stat-toggle" data-index="${index}">
|
||||
<input type="text" value="${stat.name}" class="rpg-stat-name" data-index="${index}" placeholder="Stat Name">
|
||||
<input type="number" value="${maxValue}" class="rpg-stat-max ${showMaxValue ? '' : 'rpg-hidden'}" data-index="${index}" placeholder="Max" min="1" step="1" title="Maximum value">
|
||||
<button class="rpg-stat-remove" data-index="${index}" title="Remove stat"><i class="fa-solid fa-trash"></i></button>
|
||||
</div>
|
||||
`;
|
||||
@@ -845,7 +859,8 @@ function setupUserStatsListeners() {
|
||||
extensionSettings.trackerConfig.userStats.customStats.push({
|
||||
id: newId,
|
||||
name: 'New Stat',
|
||||
enabled: true
|
||||
enabled: true,
|
||||
maxValue: 100
|
||||
});
|
||||
// Initialize value if doesn't exist
|
||||
if (extensionSettings.userStats[newId] === undefined) {
|
||||
@@ -873,6 +888,19 @@ function setupUserStatsListeners() {
|
||||
extensionSettings.trackerConfig.userStats.customStats[index].name = $(this).val();
|
||||
});
|
||||
|
||||
// Change stat max value
|
||||
$('.rpg-stat-max').off('blur').on('blur', function() {
|
||||
const index = $(this).data('index');
|
||||
const value = parseInt($(this).val()) || 100;
|
||||
extensionSettings.trackerConfig.userStats.customStats[index].maxValue = Math.max(1, value);
|
||||
});
|
||||
|
||||
// Stats display mode toggle
|
||||
$('input[name="stats-display-mode"]').off('change').on('change', function() {
|
||||
extensionSettings.trackerConfig.userStats.statsDisplayMode = $(this).val();
|
||||
renderUserStatsTab(); // Re-render to show/hide max value fields
|
||||
});
|
||||
|
||||
// Add attribute
|
||||
$('#rpg-add-attr').off('click').on('click', function() {
|
||||
// Ensure rpgAttributes array exists with defaults if needed
|
||||
@@ -979,9 +1007,7 @@ function renderInfoBoxTab() {
|
||||
html += `<label for="rpg-widget-date">${i18n.getTranslation('template.trackerEditorModal.infoBoxTab.dateWidget')}</label>`;
|
||||
html += '<select id="rpg-date-format" class="rpg-select-mini">';
|
||||
html += `<option value="Weekday, Month, Year" ${config.widgets.date.format === 'Weekday, Month, Year' ? 'selected' : ''}>Weekday, Month, Year</option>`;
|
||||
html += `<option value="dd/mm/yyyy" ${config.widgets.date.format === 'dd/mm/yyyy' ? 'selected' : ''}>dd/mm/yyyy</option>`;
|
||||
html += `<option value="mm/dd/yyyy" ${config.widgets.date.format === 'mm/dd/yyyy' ? 'selected' : ''}>mm/dd/yyyy</option>`;
|
||||
html += `<option value="yyyy-mm-dd" ${config.widgets.date.format === 'yyyy-mm-dd' ? 'selected' : ''}>yyyy-mm-dd</option>`;
|
||||
html += `<option value="Day (Numerical), Month, Year" ${config.widgets.date.format === 'Day (Numerical), Month, Year' ? 'selected' : ''}>Day (Numerical), Month, Year</option>`;
|
||||
html += '</select>';
|
||||
html += '</div>';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user