merge: resolve conflicts with upstream/main
Merged upstream/main into feat/v2-widget-dashboard-system branch. Key conflict resolutions: - index.js: Added renderQuests() to Dashboard v2 fallback rendering - state.js: Combined memoryMessagesToProcess with Dashboard v2 config - apiClient.js: Combined refreshDashboard() and renderQuests() calls - style.css: Kept Dashboard v2 mobile refresh button styles New features from upstream: - Quest tracking system (renderQuests, quests.js) - Memory recollection system - Lorebook limiter feature - Various parser and prompt builder improvements
This commit is contained in:
@@ -143,6 +143,7 @@ export function saveChatData() {
|
||||
chat_metadata.rpg_companion = {
|
||||
userStats: extensionSettings.userStats,
|
||||
classicStats: extensionSettings.classicStats,
|
||||
quests: extensionSettings.quests,
|
||||
lastGeneratedData: lastGeneratedData,
|
||||
committedTrackerData: committedTrackerData,
|
||||
timestamp: Date.now()
|
||||
@@ -237,6 +238,17 @@ export function loadChatData() {
|
||||
extensionSettings.classicStats = { ...savedData.classicStats };
|
||||
}
|
||||
|
||||
// Restore quests
|
||||
if (savedData.quests) {
|
||||
extensionSettings.quests = { ...savedData.quests };
|
||||
} else {
|
||||
// Initialize with defaults if not present
|
||||
extensionSettings.quests = {
|
||||
main: "None",
|
||||
optional: []
|
||||
};
|
||||
}
|
||||
|
||||
// Restore last generated data
|
||||
if (savedData.lastGeneratedData) {
|
||||
setLastGeneratedData({ ...savedData.lastGeneratedData });
|
||||
|
||||
Reference in New Issue
Block a user