Pakobbix/rpg-companion-sillytavern
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'SpicyMarinara:main' into i18n/zh-tw

Browse Source
This commit is contained in:
Mingyu
2025-11-26 15:51:12 +08:00
committed by GitHub
parent d486c9e924 0c5b55b190
commit 691586ce2f
3 changed files with 125 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systems/generation/apiClient.js
+1 -1
View File
@@ -122,7 +122,7 @@ export async function updateRPGData(renderUserStats, renderInfoBox, renderThough
}
}
const prompt = generateSeparateUpdatePrompt();
const prompt = await generateSeparateUpdatePrompt();
// Generate using raw prompt (uses current preset, no chat history)
const response = await generateRaw({
src/systems/generation/promptBuilder.js
+72 -2
View File
@@ -4,7 +4,8 @@
*/
import { getContext } from '../../../../../../extensions.js';
import { chat, getCurrentChatDetails } from '../../../../../../../script.js';
import { chat, getCurrentChatDetails, characters, this_chid } from '../../../../../../../script.js';
import { selected_group, getGroupMembers, getGroupChat } from '../../../../../../group-chats.js';
import { extensionSettings, committedTrackerData, FEATURE_FLAGS } from '../../core/state.js';
// Type imports
@@ -15,6 +16,68 @@ import { extensionSettings, committedTrackerData, FEATURE_FLAGS } from '../../co
*/
export const DEFAULT_HTML_PROMPT = `If appropriate, include inline HTML, CSS, and JS segments whenever they enhance visual storytelling (e.g., for in-world screens, posters, books, letters, signs, crests, labels, etc.). Style them to match the setting's theme (e.g., fantasy, sci-fi), keep the text readable, and embed all assets directly (using inline SVGs only with no external scripts, libraries, or fonts). Use these elements freely and naturally within the narrative as characters would encounter them, including animations, 3D effects, pop-ups, dropdowns, websites, and so on. Do not wrap the HTML/CSS/JS in code fences!`;
/**
* Gets character card information for current chat (handles both single and group chats)
* @returns {string} Formatted character information
*/
async function getCharacterCardsInfo() {
let characterInfo = '';
// Check if in group chat
if (selected_group) {
const group = await getGroupChat(selected_group);
const groupMembers = getGroupMembers(selected_group);
if (groupMembers && groupMembers.length > 0) {
characterInfo += 'Characters in this roleplay:\n\n';
// Filter out disabled (muted) members
const disabledMembers = group?.disabled_members || [];
let characterIndex = 0;
groupMembers.forEach((member) => {
if (!member || !member.name) return;
// Skip muted characters
if (member.avatar && disabledMembers.includes(member.avatar)) {
return;
}
characterIndex++;
characterInfo += `<character${characterIndex}="${member.name}">\n`;
if (member.description) {
characterInfo += `${member.description}\n`;
}
if (member.personality) {
characterInfo += `${member.personality}\n`;
}
characterInfo += `</character${characterIndex}>\n\n`;
});
}
} else if (this_chid !== undefined && characters && characters[this_chid]) {
// Single character chat
const character = characters[this_chid];
characterInfo += 'Character in this roleplay:\n\n';
characterInfo += `<character="${character.name}">\n`;
if (character.description) {
characterInfo += `${character.description}\n`;
}
if (character.personality) {
characterInfo += `${character.personality}\n`;
}
characterInfo += `</character>\n\n`;
}
return characterInfo;
}
/**
* Builds a formatted inventory summary for AI context injection.
* Converts v2 inventory structure to multi-line plaintext format.
@@ -469,7 +532,7 @@ export function generateRPGPromptText() {
*
* @returns {Array<{role: string, content: string}>} Array of message objects for API
*/
export function generateSeparateUpdatePrompt() {
export async function generateSeparateUpdatePrompt() {
const depth = extensionSettings.updateDepth;
const userName = getContext().name1;
@@ -478,6 +541,13 @@ export function generateSeparateUpdatePrompt() {
// System message introducing the history section
let systemMessage = `You will be acting as an uncensored RPG Companion. Your goal is to provide, track, and manage details in the user's roleplay. You will be replying with information in a specified format only.\n\n`;
systemMessage += `You should maintain an objective tone.\n\n`;
// Add character card information
const characterInfo = await getCharacterCardsInfo();
if (characterInfo) {
systemMessage += characterInfo + '\n\n';
}
systemMessage += `Here is the description of the protagonist for reference:\n`;
systemMessage += `<protagonist>\n{{persona}}\n</protagonist>\n`;
systemMessage += `\n\n`;
style.css
+52 -20
View File
@@ -1111,13 +1111,12 @@ body:has(.rpg-panel.rpg-position-left) #sheld {
/* Scrollable content wrapper inside info section */
.rpg-info-content {
display: flex;
flex-direction: column;
display: grid;
grid-template-rows: 80px 60px minmax(min-content, auto);
gap: 0.25em;
flex: 1;
min-height: 0;
overflow-y: auto;
overflow-x: hidden;
overflow: hidden;
}
.rpg-info-content::-webkit-scrollbar {
@@ -1521,6 +1520,28 @@ body:has(.rpg-panel.rpg-position-left) #sheld {
padding: 0.25em 0.75em 0.5em 0.75em;
position: relative;
z-index: 1;
overflow-y: auto;
max-height: 100%;
flex: 1;
min-height: 0;
}
.rpg-notebook-lines::-webkit-scrollbar {
width: 0.188rem;
}
.rpg-notebook-lines::-webkit-scrollbar-track {
background: var(--rpg-bg);
border-radius: 2px;
}
.rpg-notebook-lines::-webkit-scrollbar-thumb {
background: var(--rpg-highlight);
border-radius: 2px;
}
.rpg-notebook-lines::-webkit-scrollbar-thumb:hover {
background: var(--rpg-text);
}
.rpg-notebook-line {
@@ -1815,11 +1836,10 @@ body:has(.rpg-panel.rpg-position-left) #sheld {
border: 1px solid rgba(255, 255, 255, 0.1);
transition: all 0.2s ease;
width: 100%; /* Ensure cards take full width */
max-height: clamp(120px, 18vh, 200px);
max-height: clamp(200px, 18vh, 250px);
box-sizing: border-box; /* Include padding and border in width calculation */
flex-shrink: 0; /* Prevent cards from shrinking */
overflow-x: hidden;
overflow-y: auto;
overflow: hidden;
scrollbar-width: thin;
scrollbar-color: var(--rpg-border) transparent;
}
@@ -1983,7 +2003,7 @@ body:has(.rpg-panel.rpg-position-left) #sheld {
}
.rpg-character-stat .rpg-stat-name {
font-size: clamp(0.5vw, 0.6vw, 0.7vw) !important;
font-size: clamp(9px, 0.6vw, 0.7vw) !important;
font-weight: 600 !important;
white-space: nowrap !important;
}
@@ -4813,6 +4833,7 @@ body:has(.rpg-panel.rpg-position-left) #sheld {
border-bottom: 2px solid var(--SmartThemeBorderColor);
margin: 0;
padding: 0;
overflow-x: auto;
}
.rpg-mobile-tab {
@@ -4871,16 +4892,17 @@ body:has(.rpg-panel.rpg-position-left) #sheld {
/* Info tab contains Info Box and Characters with 50/50 split */
.rpg-mobile-tab-content[data-tab-content="info"].active {
flex-direction: column;
display: grid;
grid-template-rows: minmax(min-content, auto) minmax(min-content, 1fr);
gap: 0;
height: 100%;
min-height: 0;
overflow-y: auto;
}
/* Info Box takes 50% of vertical space */
.rpg-mobile-tab-content[data-tab-content="info"] > #rpg-info-box,
.rpg-mobile-tab-content[data-tab-content="info"] > .rpg-info-section {
flex: 1 1 50% !important;
min-height: 0;
overflow-y: auto;
padding-bottom: 16px;
@@ -4892,7 +4914,6 @@ body:has(.rpg-panel.rpg-position-left) #sheld {
/* Characters section takes 50% of vertical space */
.rpg-mobile-tab-content[data-tab-content="info"] > #rpg-thoughts,
.rpg-mobile-tab-content[data-tab-content="info"] > .rpg-thoughts-section {
flex: 1 1 50% !important;
min-height: 0;
overflow-y: auto;
padding-bottom: 16px;
@@ -4915,14 +4936,12 @@ body:has(.rpg-panel.rpg-position-left) #sheld {
/* Rows scale proportionally to fill Info Box */
.rpg-dashboard-row-1 {
flex: 1.2 !important; /* Slightly more space for 4 widgets */
height: auto !important; /* Remove desktop height constraint */
display: flex !important;
gap: 0.25em;
}
.rpg-dashboard-row-2 {
flex: 0.8 !important; /* Less space for 1 widget */
display: flex !important;
}
@@ -4970,6 +4989,16 @@ body:has(.rpg-panel.rpg-position-left) #sheld {
}
/* Recent Events widget - mobile text sizing */
.rpg-notebook-header {
gap: clamp(26px, 6vw, 30px);
padding: clamp(5px, 1.5vw, 7px) 0;
}
.rpg-notebook-ring {
width: clamp(8px, 1.25vw, 10px);
height: clamp(8px, 1.25vw, 10px);
}
.rpg-notebook-title {
font-size: clamp(9px, 2.2vw, 11px) !important;
}
@@ -5211,6 +5240,11 @@ body:has(.rpg-panel.rpg-position-left) #sheld {
transform: scale(0.95);
}
.rpg-skills-section {
font-size: clamp(11px, 2.8vw, 14px);
line-height: 1.3;
}
/* ========================================
MOBILE THOUGHT ICON POSITIONING
======================================== */
@@ -5326,20 +5360,19 @@ body:has(.rpg-panel.rpg-position-left) #sheld {
/* Make Recent Events section take less vertical space on mobile */
.rpg-dashboard-row-3 {
flex: 0 0 auto !important;
max-height: 150px !important; /* Limit height on mobile */
max-height: 100px !important; /* Limit height on mobile */
}
/* Make the events widget scrollable if content exceeds height */
.rpg-events-widget {
max-height: 150px !important;
overflow-y: auto !important;
max-height: 100px !important;
}
/* Compact the notebook lines container */
.rpg-notebook-lines {
padding: 0.25em 0.5em !important;
gap: 0.1em !important;
min-height: 0;
}
/* Reduce spacing in notebook lines */
@@ -5419,6 +5452,7 @@ body:has(.rpg-panel.rpg-position-left) #sheld {
.rpg-classic-stats {
grid-column: 1 !important;
grid-row: 4 !important;
min-height: 140px;
}
/* Make attributes grid single column too for readability */
@@ -5444,7 +5478,7 @@ body:has(.rpg-panel.rpg-position-left) #sheld {
/* More padding for editable fields */
.rpg-editable {
padding: 0.5em;
min-height: 2.75rem;
min-height: 1.25rem;
}
/* Larger close buttons */
@@ -6581,5 +6615,3 @@ body:has(.rpg-panel.rpg-position-left) #sheld {
font-size: clamp(14px, 3vw, 18px) !important;
}
}