From 62d4ed8f3e1e9fd4dac8f6e6e3e985112c93f356 Mon Sep 17 00:00:00 2001
From: somebody <onesome01@protonmail.com>
Date: Mon, 12 Dec 2022 19:18:48 -0600
Subject: [PATCH] Add object_type as a WI parameter

---
 aiserver.py              |  7 +++++--
 koboldai_settings.py     | 26 ++++++++++++++++++++++----
 templates/templates.html |  1 -
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index 2fcf2268..6ece9abb 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -8990,14 +8990,17 @@ def UI_2_edit_world_info(data):
         koboldai_vars.worldinfo_v2.add_item(data['title'], data['key'], 
                                              data['keysecondary'], data['folder'], 
                                              data['constant'], data['manual_text'], 
-                                             data['comment'], wpp=data['wpp'], use_wpp=data['use_wpp'])
+                                             data['comment'], wpp=data['wpp'],
+                                             use_wpp=data['use_wpp'], object_type=data["object_type"])
         emit("delete_new_world_info_entry", {})
     else:
         logger.debug("Editting WI: {}".format(data))
         koboldai_vars.worldinfo_v2.edit_item(data['uid'], data['title'], data['key'], 
                                              data['keysecondary'], data['folder'], 
                                              data['constant'], data['manual_text'], 
-                                             data['comment'], wi_type=data["type"], wpp=data['wpp'], use_wpp=data['use_wpp'])
+                                             data['comment'], wi_type=data["type"],
+                                             wpp=data['wpp'], use_wpp=data['use_wpp'],
+                                             object_type=data["object_type"])
 
 
 #==================================================================#
diff --git a/koboldai_settings.py b/koboldai_settings.py
index 35280aeb..0adf05b7 100644
--- a/koboldai_settings.py
+++ b/koboldai_settings.py
@@ -2139,7 +2139,7 @@ class KoboldWorldInfo(object):
     def add_item(self, title, key, keysecondary, folder, constant, manual_text,
                  comment, wi_type="wi", use_wpp=False,
                  wpp={'name': "", 'type': "", 'format': "W++", 'attributes': {}},
-                 v1_uid=None, recalc=True, sync=True, send_to_ui=True):
+                 v1_uid=None, recalc=True, sync=True, send_to_ui=True, object_type=None):
         if len(self.world_info) == 0:
             uid = 0
         else:
@@ -2189,7 +2189,8 @@ class KoboldWorldInfo(object):
                                     "used_in_game": constant,
                                     'wpp': wpp,
                                     'use_wpp': use_wpp,
-                                    'v1_uid': v1_uid
+                                    'v1_uid': v1_uid,
+                                    "object_type": object_type,
                                     }
         except:
             print("Error:")
@@ -2213,7 +2214,22 @@ class KoboldWorldInfo(object):
             ignore = self.koboldai_vars.calc_ai_text()
         return uid
         
-    def edit_item(self, uid, title, key, keysecondary, folder, constant, manual_text, comment, wi_type, use_wpp=False, before=None, wpp={'name': "", 'type': "", 'format': "W++", 'attributes': {}}):
+    def edit_item(
+            self,
+            uid,
+            title,
+            key,
+            keysecondary,
+            folder,
+            constant,
+            manual_text,
+            comment,
+            wi_type,
+            use_wpp=False,
+            before=None,
+            wpp={'name': "", 'type': "", 'format': "W++", 'attributes': {}},
+            object_type=None,
+        ):
         logger.debug("Editing World Info {}: {}".format(uid, title))
         old_folder = self.world_info[uid]['folder']
         #move the world info entry if the folder changed or if there is a new order requested
@@ -2253,7 +2269,8 @@ class KoboldWorldInfo(object):
                                 "selective": len(keysecondary) > 0,
                                 "used_in_game": constant,
                                 'wpp': wpp,
-                                'use_wpp': use_wpp
+                                'use_wpp': use_wpp,
+                                "object_type": object_type,
                                 }
                                 
         self.story_settings.gamesaved = False
@@ -2369,6 +2386,7 @@ class KoboldWorldInfo(object):
                           wi_type=item["type"],
                           use_wpp=item['use_wpp'] if 'use_wpp' in item else False, 
                           wpp=item['wpp'] if 'wpp' in item else {'name': "", 'type': "", 'format': "W++", 'attributes': {}},
+                          object_type=item.get("object_type"),
                           recalc=False, sync=False)
         if folder is None:
             #self.world_info = {int(x): data['entries'][x] for x in data['entries']}
diff --git a/templates/templates.html b/templates/templates.html
index 08d8c313..4a5de1bb 100644
--- a/templates/templates.html
+++ b/templates/templates.html
@@ -81,7 +81,6 @@
 		</div>
 	</div>
 	<div>
-		Comment:
 		<textarea draggable="true" ondragstartondragstart="event.preventDefault();event.stopPropagation();" rows=1 id="world_info_comment_" 
 				  class="world_info_text world_info_comment fullwidth" oninput="autoResize(this, 60)" onfocus="autoResize(this, 60)" onblur="this.style.height='60px';"
 				  onfocus="this.parentElement.parentElement.setAttribute('draggable', 'false');this.setAttribute('draggable', 'false');;"