diff --git a/public/img/DefaultExpressions/admiration.png b/public/img/default-expressions/admiration.png similarity index 100% rename from public/img/DefaultExpressions/admiration.png rename to public/img/default-expressions/admiration.png diff --git a/public/img/DefaultExpressions/amusement.png b/public/img/default-expressions/amusement.png similarity index 100% rename from public/img/DefaultExpressions/amusement.png rename to public/img/default-expressions/amusement.png diff --git a/public/img/DefaultExpressions/anger.png b/public/img/default-expressions/anger.png similarity index 100% rename from public/img/DefaultExpressions/anger.png rename to public/img/default-expressions/anger.png diff --git a/public/img/DefaultExpressions/annoyance.png b/public/img/default-expressions/annoyance.png similarity index 100% rename from public/img/DefaultExpressions/annoyance.png rename to public/img/default-expressions/annoyance.png diff --git a/public/img/DefaultExpressions/approval.png b/public/img/default-expressions/approval.png similarity index 100% rename from public/img/DefaultExpressions/approval.png rename to public/img/default-expressions/approval.png diff --git a/public/img/DefaultExpressions/caring.png b/public/img/default-expressions/caring.png similarity index 100% rename from public/img/DefaultExpressions/caring.png rename to public/img/default-expressions/caring.png diff --git a/public/img/DefaultExpressions/confusion.png b/public/img/default-expressions/confusion.png similarity index 100% rename from public/img/DefaultExpressions/confusion.png rename to public/img/default-expressions/confusion.png diff --git a/public/img/DefaultExpressions/curiosity.png b/public/img/default-expressions/curiosity.png similarity index 100% rename from public/img/DefaultExpressions/curiosity.png rename to public/img/default-expressions/curiosity.png diff --git a/public/img/DefaultExpressions/desire.png b/public/img/default-expressions/desire.png similarity index 100% rename from public/img/DefaultExpressions/desire.png rename to public/img/default-expressions/desire.png diff --git a/public/img/DefaultExpressions/desire1.png b/public/img/default-expressions/desire1.png similarity index 100% rename from public/img/DefaultExpressions/desire1.png rename to public/img/default-expressions/desire1.png diff --git a/public/img/DefaultExpressions/desire2.png b/public/img/default-expressions/desire2.png similarity index 100% rename from public/img/DefaultExpressions/desire2.png rename to public/img/default-expressions/desire2.png diff --git a/public/img/DefaultExpressions/disappointment.png b/public/img/default-expressions/disappointment.png similarity index 100% rename from public/img/DefaultExpressions/disappointment.png rename to public/img/default-expressions/disappointment.png diff --git a/public/img/DefaultExpressions/disapproval.png b/public/img/default-expressions/disapproval.png similarity index 100% rename from public/img/DefaultExpressions/disapproval.png rename to public/img/default-expressions/disapproval.png diff --git a/public/img/DefaultExpressions/disgust.png b/public/img/default-expressions/disgust.png similarity index 100% rename from public/img/DefaultExpressions/disgust.png rename to public/img/default-expressions/disgust.png diff --git a/public/img/DefaultExpressions/embarrassment.png b/public/img/default-expressions/embarrassment.png similarity index 100% rename from public/img/DefaultExpressions/embarrassment.png rename to public/img/default-expressions/embarrassment.png diff --git a/public/img/DefaultExpressions/excitement.png b/public/img/default-expressions/excitement.png similarity index 100% rename from public/img/DefaultExpressions/excitement.png rename to public/img/default-expressions/excitement.png diff --git a/public/img/DefaultExpressions/fear.png b/public/img/default-expressions/fear.png similarity index 100% rename from public/img/DefaultExpressions/fear.png rename to public/img/default-expressions/fear.png diff --git a/public/img/DefaultExpressions/gratitude.png b/public/img/default-expressions/gratitude.png similarity index 100% rename from public/img/DefaultExpressions/gratitude.png rename to public/img/default-expressions/gratitude.png diff --git a/public/img/DefaultExpressions/grief.png b/public/img/default-expressions/grief.png similarity index 100% rename from public/img/DefaultExpressions/grief.png rename to public/img/default-expressions/grief.png diff --git a/public/img/DefaultExpressions/joy.png b/public/img/default-expressions/joy.png similarity index 100% rename from public/img/DefaultExpressions/joy.png rename to public/img/default-expressions/joy.png diff --git a/public/img/DefaultExpressions/love.png b/public/img/default-expressions/love.png similarity index 100% rename from public/img/DefaultExpressions/love.png rename to public/img/default-expressions/love.png diff --git a/public/img/DefaultExpressions/nervousness.png b/public/img/default-expressions/nervousness.png similarity index 100% rename from public/img/DefaultExpressions/nervousness.png rename to public/img/default-expressions/nervousness.png diff --git a/public/img/DefaultExpressions/neutral.png b/public/img/default-expressions/neutral.png similarity index 100% rename from public/img/DefaultExpressions/neutral.png rename to public/img/default-expressions/neutral.png diff --git a/public/img/DefaultExpressions/optimism.png b/public/img/default-expressions/optimism.png similarity index 100% rename from public/img/DefaultExpressions/optimism.png rename to public/img/default-expressions/optimism.png diff --git a/public/img/DefaultExpressions/pride.png b/public/img/default-expressions/pride.png similarity index 100% rename from public/img/DefaultExpressions/pride.png rename to public/img/default-expressions/pride.png diff --git a/public/img/DefaultExpressions/realization.png b/public/img/default-expressions/realization.png similarity index 100% rename from public/img/DefaultExpressions/realization.png rename to public/img/default-expressions/realization.png diff --git a/public/img/DefaultExpressions/relief.png b/public/img/default-expressions/relief.png similarity index 100% rename from public/img/DefaultExpressions/relief.png rename to public/img/default-expressions/relief.png diff --git a/public/img/DefaultExpressions/remorse.png b/public/img/default-expressions/remorse.png similarity index 100% rename from public/img/DefaultExpressions/remorse.png rename to public/img/default-expressions/remorse.png diff --git a/public/img/DefaultExpressions/sadness.png b/public/img/default-expressions/sadness.png similarity index 100% rename from public/img/DefaultExpressions/sadness.png rename to public/img/default-expressions/sadness.png diff --git a/public/img/DefaultExpressions/surprise.png b/public/img/default-expressions/surprise.png similarity index 100% rename from public/img/DefaultExpressions/surprise.png rename to public/img/default-expressions/surprise.png diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js index 141d87a8a..6ea43bc06 100644 --- a/public/scripts/RossAscends-mods.js +++ b/public/scripts/RossAscends-mods.js @@ -2,23 +2,25 @@ import { encode } from "../scripts/gpt-2-3-tokenizer/mod.js"; import { Generate, - getSettings, +/* getSettings, saveSettings, printMessages, clearChat, getChat, - this_chid, - settings, + chat + settings, */ + this_chid, characters, online_status, main_api, api_server, api_key_novel, - getCharacters, is_send_press, - chat + } from "../script.js"; +import { LoadLocal, SaveLocal, ClearLocal, CheckLocal, LoadLocalBool } from "./f-localStorage.js"; + var NavToggle = document.getElementById("nav-toggle"); var PanelPin = document.getElementById("rm_button_panel_pin"); var SelectedCharacterTab = document.getElementById("rm_button_selected_ch"); @@ -39,30 +41,6 @@ var count_tokens; var perm_tokens; var ALC_Done; -////////////////// LOCAL STORAGE HANDLING ///////////////////// - -function SaveLocal(target, val) { - localStorage.setItem(target, val); - console.log('SaveLocal -- '+target+' : '+val); - } - function LoadLocal(target) { - return localStorage.getItem(target); - } - function LoadLocalBool(target){ - let result = localStorage.getItem(target) === 'true'; - return result; - } - function CheckLocal() { - console.log("----------local storage---------"); - var i; - for (i = 0; i < localStorage.length; i++) { - console.log(localStorage.key(i) +" : " +localStorage.getItem(localStorage.key(i))); - } - console.log("------------------------------"); - } - function ClearLocal() {localStorage.clear();console.log('Removed All Local Storage');} - -///////////////////////////////////////////////////////////////////////// //RossAscends: Added function to format dates used in files and chat timestamps to a humanized format. //Mostly I wanted this to be for file names, but couldn't figure out exactly where the filename save code was as everything seemed to be connected. //Does not break old characters/chats, as the code just uses whatever timestamp exists in the chat. diff --git a/public/scripts/f-localStorage.js b/public/scripts/f-localStorage.js new file mode 100644 index 000000000..52bc6a7bb --- /dev/null +++ b/public/scripts/f-localStorage.js @@ -0,0 +1,25 @@ +////////////////// LOCAL STORAGE HANDLING ///////////////////// + +export function SaveLocal(target, val) { + localStorage.setItem(target, val); + console.log('SaveLocal -- '+target+' : '+val); + } +export function LoadLocal(target) { + return localStorage.getItem(target); + } +export function LoadLocalBool(target){ + let result = localStorage.getItem(target) === 'true'; + return result; + } +export function CheckLocal() { + console.log("----------local storage---------"); + var i; + for (i = 0; i < localStorage.length; i++) { + console.log(localStorage.key(i) +" : " +localStorage.getItem(localStorage.key(i))); + } + console.log("------------------------------"); + } + +export function ClearLocal() {localStorage.clear();console.log('Removed All Local Storage');} + +///////////////////////////////////////////////////////////////////////// \ No newline at end of file