diff --git a/aiserver.py b/aiserver.py
index 4488b706..bc035fc0 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -1606,6 +1606,12 @@ def get_message(msg):
if(msg['cmd'] == 'submit'):
if(vars.mode == "play"):
vars.lua_koboldbridge.feedback = None
+ if(vars.chatmode):
+ if(type(msg['chatname']) is not str):
+ raise ValueError("Chatname must be a string")
+ vars.chatname = msg['chatname']
+ settingschanged()
+ emit('from_server', {'cmd': 'setchatname', 'data': vars.chatname}, broadcast=True)
actionsubmit(msg['data'], actionmode=msg['actionmode'])
elif(vars.mode == "edit"):
editsubmit(msg['data'])
@@ -1613,6 +1619,12 @@ def get_message(msg):
memsubmit(msg['data'])
# Retry Action
elif(msg['cmd'] == 'retry'):
+ if(vars.chatmode):
+ if(type(msg['chatname']) is not str):
+ raise ValueError("Chatname must be a string")
+ vars.chatname = msg['chatname']
+ settingschanged()
+ emit('from_server', {'cmd': 'setchatname', 'data': vars.chatname}, broadcast=True)
actionretry(msg['data'])
# Back/Undo Action
elif(msg['cmd'] == 'back'):
diff --git a/static/application.js b/static/application.js
index 620c2d02..560568e9 100644
--- a/static/application.js
+++ b/static/application.js
@@ -30,6 +30,7 @@ var button_actwi;
var game_text;
var input_text;
var message_text;
+var chat_name;
var settings_menu;
var format_menu;
var wi_menu;
@@ -722,6 +723,7 @@ function exitEditMode() {
function enterMemoryMode() {
memorymode = true;
setmodevisibility(false);
+ setchatnamevisibility(false);
showMessage("Edit the memory to be sent with each request to the AI.");
button_actmem.html("Cancel");
hide([button_actback, button_actretry, button_actwi]);
@@ -732,6 +734,7 @@ function enterMemoryMode() {
function exitMemoryMode() {
memorymode = false;
setmodevisibility(adventure);
+ setchatnamevisibility(chatmode);
hideMessage();
button_actmem.html("Memory");
show([button_actback, button_actretry, button_actwi]);
@@ -744,6 +747,7 @@ function enterWiMode() {
showMessage("World Info will be added to memory only when the key appears in submitted text or the last action.");
button_actwi.html("Accept");
hide([button_actback, button_actmem, button_actretry, game_text]);
+ setchatnamevisibility(false);
show([wi_menu]);
disableSendBtn();
$("#gamescreen").addClass("wigamescreen");
@@ -753,6 +757,7 @@ function exitWiMode() {
hideMessage();
button_actwi.html("W Info");
hide([wi_menu]);
+ setchatnamevisibility(chatmode);
show([button_actback, button_actmem, button_actretry, game_text]);
enableSendBtn();
$("#gamescreen").removeClass("wigamescreen");
@@ -797,7 +802,7 @@ function dosubmit() {
input_text.val("");
hideMessage();
hidegenseqs();
- socket.send({'cmd': 'submit', 'actionmode': adventure ? action_mode : 0, 'data': txt});
+ socket.send({'cmd': 'submit', 'actionmode': adventure ? action_mode : 0, 'chatname': chatmode ? chat_name.val() : undefined, 'data': txt});
if(memorymode) {
memorytext = input_text.val();
}
@@ -1155,6 +1160,14 @@ function setmodevisibility(state) {
}
}
+function setchatnamevisibility(state) {
+ if(state){ // Enabling
+ show([chat_name]);
+ } else{ // Disabling
+ hide([chat_name]);
+ }
+}
+
function setadventure(state) {
adventure = state;
if(state) {
@@ -1169,6 +1182,7 @@ function setadventure(state) {
function setchatmode(state) {
chatmode = state;
+ setchatnamevisibility(state);
}
function autofocus(event) {
@@ -1706,6 +1720,7 @@ $(document).ready(function(){
game_text = $('#gametext');
input_text = $('#input_text');
message_text = $('#messagefield');
+ chat_name = $('#chatname');
settings_menu = $("#settingsmenu");
format_menu = $('#formatmenu');
anote_menu = $('#anoterowcontainer');
@@ -2130,6 +2145,8 @@ $(document).ready(function(){
} else if(msg.cmd == "hidegenseqs") {
// Collapse genseqs menu
hidegenseqs();
+ } else if(msg.cmd == "setchatname") {
+ chat_name.val(msg.data);
} else if(msg.cmd == "setlabelnumseq") {
// Update setting label with value from server
$("#setnumseqcur").html(msg.data);
@@ -2234,7 +2251,7 @@ $(document).ready(function(){
button_actretry.on("click", function(ev) {
hideMessage();
- socket.send({'cmd': 'retry', 'data': ''});
+ socket.send({'cmd': 'retry', 'chatname': chatmode ? chat_name.val() : undefined, 'data': ''});
hidegenseqs();
});
diff --git a/static/custom.css b/static/custom.css
index d17c0c1c..ee573bac 100644
--- a/static/custom.css
+++ b/static/custom.css
@@ -32,6 +32,13 @@ chunk.editing, chunk.editing * {
display: flex;
}
+#chatname {
+ background-color: #404040;
+ color: #ffffff;
+ width: 200px;
+ margin-left: 10px;
+}
+
#menuitems {
display: flex;
width: 100%;
diff --git a/templates/index.html b/templates/index.html
index fda8fd34..df53315d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,12 +10,12 @@
-
+
-
+
@@ -124,6 +124,7 @@
+