Skip to content

Commit

Permalink
Feature:
Browse files Browse the repository at this point in the history 
- Startup Inteactive Mode in GUI

Fix:

- Edit GUI for ArrayProperty can not multiple edit now
- CopyPlayer error
  • Loading branch information
@magicbear
magicbear committed Feb 21, 2024
1 parent 10075e9 commit eff7a68
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 56 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ Feature:

- Startup Inteactive Mode in GUI

Fix:

- Edit GUI for ArrayProperty can not multiple edit now
- CopyPlayer error

0.8.0
-------

Expand Down
140 changes: 85 additions & 55 deletions palworld_server_toolkit/editor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -546,13 +546,17 @@ def select_all(self, *ignore):
class ParamEditor(tk.Toplevel):
def __init__(self):
super().__init__(master=gui.gui)
# w, h, x, y = (self.winfo_screenwidth() * 0.01, self.winfo_screenheight() * 0.01,
# self.winfo_screenwidth()//2, self.winfo_screenheight() // 2)
# self.geometry("%dx%d+%d+%d" % (int(w), int(h), x, y))
self.wm_minsize(600,300)
self.var_options = None
self.gui = self
self.parent = self
#
# tk.font.Font(family=
self.__font = ("Courier New", 12)
self.geometry("950x800")
# self.geometry("950x800")

def delete_select_attribute(self, master, cmbx, attrib):
if cmbx.current() == -1:
Expand Down Expand Up @@ -664,24 +668,40 @@ def make_attrib_var(master, attrib):
return tk.StringVar(master)
elif attrib['type'] == "StructProperty" and attrib['struct_type'] in ["DateTime", "Guid", "PalContainerId"]:
return tk.StringVar(master)
elif attrib['type'] == "StructProperty" and attrib['struct_type'] == "Vector":
return [tk.StringVar(master), tk.StringVar(master), tk.StringVar(master)]
elif attrib['type'] == "StructProperty" and attrib['struct_type'] in ["Vector", "Quat"]:
return [tk.StringVar(master), tk.StringVar(master), tk.StringVar(master)] + \
([attrib['struct_type']] if attrib['struct_type']=="Quat" else [])
elif attrib['type'] == "StructProperty" and attrib['struct_type'] == "LinearColor":
return [tk.StringVar(master), tk.StringVar(master), tk.StringVar(master), tk.StringVar(master)]
elif attrib['type'] == "BoolProperty":
return tk.BooleanVar(master=master)
elif attrib['type'] == "ArrayProperty" and attrib['array_type'] in ["StructProperty"]:
attrib_var = []
for x in range(len(attrib['value']['values'])):
attrib_var.append({})
return attrib_var
elif attrib['type'] == "ArrayProperty" and attrib['array_type'] in ["NameProperty", "EnumProperty"]:
attrib_var = []
for x in range(len(attrib['value']['values'])):
attrib_var.append({
attrib['array_type'][:-8]: tk.StringVar(master)
})
return attrib_var
elif attrib['type'] == "ArrayProperty" and attrib['array_type'] in ["StructProperty"]:
attrib_var = []
for x in range(len(attrib['value']['values'])):
attrib_var.append(ParamEditor.make_attrib_var(master, attrib={
"type": attrib['value']['prop_type'],
"struct_type": attrib['value']['type_name'],
"value": attrib['value']['values'][x]
}))
return attrib_var
elif attrib['type'] == "StructProperty":
attrib_var = {}
for key in attrib['value']:
attrib_var[key] = ParamEditor.make_attrib_var(master=master, attrib=attrib['value'][key])
return attrib_var
# elif attrib['type'] == "MapProperty" and attrib['key_type'] == "NameProperty" and \
# attrib['value_type'] == "BoolProperty":
# attrib_var = {}
# for attr in attrib['value']:
# attrib_var[attr['key']] = tk.BooleanVar(master=master)
# return attrib_var

def assign_attrib_var(self, var, attrib):
if attrib['type'] in ["IntProperty", "StrProperty", "NameProperty", "FloatProperty"]:
Expand Down Expand Up @@ -716,6 +736,25 @@ def assign_attrib_var(self, var, attrib):
elif attrib['type'] == "ArrayProperty" and attrib['array_type'] in ["NameProperty", "EnumProperty"]:
for x in range(len(attrib['value']['values'])):
var[x][attrib['array_type'][:-8]].set(attrib['value']['values'][x])
elif attrib['type'] == "ArrayProperty" and attrib['array_type'] in ["StructProperty"]:
for x in range(len(attrib['value']['values'])):
self.assign_attrib_var(var[x], {
"type": attrib['value']['prop_type'],
"struct_type": attrib['value']['type_name'],
"value": attrib['value']['values'][x]
})
elif attrib['type'] == "StructProperty":
for key in attrib['value']:
try:
if var[key] is not None:
self.assign_attrib_var(var[key], attrib['value'][key])
except TypeError as e:
log.error("Error attribute [%s] " % (key), exc_info=True)
print("Error attribute [%s] " % (key), attrib)
# elif attrib['type'] == "MapProperty" and attrib['key_type'] == "NameProperty" and \
# attrib['value_type'] == "BoolProperty":
# for attr in attrib['value']:
# var[attr['key']].set(attr['value'])

def save(self, attribs, attrib_var, path=""):
for attribute_key in attribs:
Expand Down Expand Up @@ -853,14 +892,7 @@ def save(self, attribs, attrib_var, path=""):
}}, attrib_var[attribute_key][idx], "%s[%d]." % (attribute_key, idx))
elif attrib['type'] == "ArrayProperty" and attrib['array_type'] in ["StructProperty"]:
for idx, item in enumerate(attrib['value']['values']):
log.debug("%s%s[%d] [%s] = " % (path, attribute_key, idx, attrib['type']))
self.save({
attrib['value']['prop_name']: {
'type': attrib['value']['prop_type'],
'struct_type': attrib['value']['type_name'],
'values': attrib['value']['values'],
'value_idx': idx
}}, attrib_var[attribute_key][idx], "%s[%d]." % (attribute_key, idx))
self.save(attrib['value']['values'][idx], attrib_var[attribute_key][idx], "%s[%d]." % (attribute_key, idx))
elif attrib['type'] == "StructProperty":
if attrib_var[attribute_key] is None:
continue
Expand All @@ -885,29 +917,27 @@ def build_variable_gui(self, parent, attrib_var, attribs, with_labelframe=True):

if attribute_key not in attrib_var:
attrib_var[attribute_key] = self.make_attrib_var(master=parent, attrib=attrib)
self.assign_attrib_var(attrib_var[attribute_key], attrib)

if attrib['type'] == "BoolProperty":
tk.Checkbutton(master=g_frame, text="Enabled", variable=attrib_var[attribute_key],
width=40).pack(
side=tk.RIGHT)
self.assign_attrib_var(attrib_var[attribute_key], attrib)
elif attrib['type'] == "EnumProperty" and attrib['value']['type'] in MappingCache.EnumOptions:
if attrib['value']['value'] not in MappingCache.EnumOptions[attrib['value']['type']]:
MappingCache.EnumOptions[attrib['value']['type']].append(attrib['value']['value'])
AutocompleteCombobox(master=g_frame, font=self.__font, width=40,
textvariable=attrib_var[attribute_key],
values=MappingCache.EnumOptions[attrib['value']['type']]).pack(
side="right")
self.assign_attrib_var(attrib_var[attribute_key], attrib)
elif attrib['type'] == "ArrayProperty" and attrib['array_type'] in ["StructProperty",
"EnumProperty",
"NameProperty"]:
self.assign_attrib_var(attrib_var[attribute_key], attrib)
self.build_subgui(g_frame, attribute_key, attrib_var[attribute_key], attrib)
elif attrib['type'] == "StructProperty" and attrib['struct_type'] in ["Guid", "PalContainerId"]:
tk.Entry(font=self.__font, master=g_frame, width=50,
textvariable=attrib_var[attribute_key]).pack(
side="right", fill=tk.constants.X)
self.assign_attrib_var(attrib_var[attribute_key], attrib)
elif attrib['type'] == "StructProperty" and attrib['struct_type'] == "Vector":
valid_cmd = (self.register(self.valid_float), '%P')
tk.Entry(font=self.__font, master=g_frame, width=16,
Expand All @@ -919,7 +949,6 @@ def build_variable_gui(self, parent, attrib_var, attribs, with_labelframe=True):
tk.Entry(font=self.__font, master=g_frame, width=16,
validate='all', validatecommand=valid_cmd,
textvariable=attrib_var[attribute_key][0]).pack(side="right", fill=tk.constants.X)
self.assign_attrib_var(attrib_var[attribute_key], attrib)
elif attrib['type'] == "StructProperty" and attrib['struct_type'] in ["Quat", "LinearColor"]:
valid_cmd = (self.register(self.valid_float), '%P')
tk.Entry(font=self.__font, master=g_frame, width=12,
Expand All @@ -934,7 +963,30 @@ def build_variable_gui(self, parent, attrib_var, attribs, with_labelframe=True):
tk.Entry(font=self.__font, master=g_frame, width=12,
validate='all', validatecommand=valid_cmd,
textvariable=attrib_var[attribute_key][0]).pack(side="right", fill=tk.constants.X)
self.assign_attrib_var(attrib_var[attribute_key], attrib)
elif attrib['type'] == "StructProperty" and attrib['struct_type'] != "FixedPoint64":
sub_f = tk.Frame(master=g_frame)
sub_f.pack(side="right", fill=tk.constants.X)
try:
for key in attrib['value']:
if attrib_var[attribute_key][key] is not None:
self.build_variable_gui(sub_f, attrib_var[attribute_key],
{key: attrib['value'][key]})
else:
log.error("cannot create Struct %s" % key)
gp(attrib['value'][key])
print("----------------------------")
except Exception as e:
log.error("Error attribute [%s]->%s " % (key, attribute_key), exc_info=True)
traceback.print_exception(e)
gp(attrib)
print("----------------------------")
# elif attrib['type'] == "MapProperty" and attrib['key_type'] == "NameProperty" and \
# attrib['value_type'] == "BoolProperty":
# sub_f = tk.Frame(master=g_frame)
# sub_f.pack(side="right", fill=tk.constants.X)
# gp(attrib['value'])
# for key in attrib['value']:
# tk.Checkbutton(master=sub_f, text=key['key'], variable=attrib_var[key['key']]).pack(side=tk.RIGHT)
elif attrib_var[attribute_key] is not None:
valid_cmd = None
if attrib['type'] in ["IntProperty"] or \
Expand All @@ -949,29 +1001,6 @@ def build_variable_gui(self, parent, attrib_var, attribs, with_labelframe=True):
textvariable=attrib_var[attribute_key],
width=50).pack(
side="right", fill=tk.constants.X)
self.assign_attrib_var(attrib_var[attribute_key], attrib)
elif attrib['type'] == "StructProperty":
attrib_var[attribute_key] = {}
sub_f = tk.Frame(master=g_frame)
sub_f.pack(side="right", fill=tk.constants.X)
try:
for key in attrib['value']:
try:
attrib_var[attribute_key][key] = self.make_attrib_var(master=sub_f,
attrib=attrib['value'][key])
if attrib_var[attribute_key][key] is not None:
self.build_variable_gui(sub_f, attrib_var[attribute_key],
{key: attrib['value'][key]})
else:
log.error("cannot create Struct %s" % key)
except TypeError as e:
log.error("Error attribute [%s]->%s " % (key, attribute_key), exc_info=True)
print("Error attribute [%s]->%s " % (key, attribute_key), attrib)
except Exception as e:
log.error("Error attribute [%s]->%s " % (key, attribute_key), exc_info=True)
traceback.print_exception(e)
gp(attrib)
print("----------------------------")
else:
log.debug(" %s%s%s%s" % (attribute_key, attrib['type'],
".%s" % attrib['struct_type'] if attrib[
Expand All @@ -998,12 +1027,9 @@ def cmb_array_selected(self, evt, g_frame, attribute_key, attrib_var, attrib):
'value': attrib['value']['values'][evt.widget.current()]
}}, with_labelframe=False)
else:
self.build_variable_gui(g_frame, attrib_var[evt.widget.current()], {
attrib['value']['prop_name']: {
'type': attrib['value']['prop_type'],
'struct_type': attrib['value']['type_name'],
'value': attrib['value']['values'][evt.widget.current()]
}}, with_labelframe=False)
struct_value = attrib['value']['values'][evt.widget.current()]
self.build_variable_gui(g_frame, attrib_var[evt.widget.current()], struct_value,
with_labelframe=True)

@staticmethod
def on_table_gui_dblclk(event, popup_set, columns, attrib_var, var_options):
Expand Down Expand Up @@ -1072,6 +1098,8 @@ def build_array_gui(self, master, columns, attrib_var, var_options=None):
lambda event: self.on_table_gui_dblclk(event, popup_set, columns, attrib_var, var_options))
return tables

def autosize(self):
self.geometry("")

class PlayerItemEdit(ParamEditor):
def __init__(self, player_uid, i18n='en-US'):
Expand Down Expand Up @@ -1145,7 +1173,6 @@ def savedata(self):

class PlayerSaveEdit(ParamEditor):
def __init__(self, player_uid):

err, player_gvas, self.player_sav_file, self.player_gvas_file = GetPlayerGvas(player_uid)
if err:
messagebox.showerror("Player Itme Editor", "Player Sav file Not exists: %s" % player_gvas)
Expand All @@ -1161,6 +1188,7 @@ def __init__(self, player_uid):

ttk.Button(master=self.gui, style="custom.TButton", text="Save", command=self.savedata).pack(
fill=tk.constants.X)
self.autosize()

def savedata(self):
self.save(self.player, self.gui_attribute)
Expand Down Expand Up @@ -1191,6 +1219,7 @@ def __init__(self, player_uid=None, instanceId=None):
self.build_variable_gui(base_frame, self.gui_attribute, self.player)
ttk.Button(master=self.gui, style="custom.TButton", text="Save", command=self.savedata).pack(
fill=tk.constants.X)
self.autosize()

def savedata(self):
self.save(self.player, self.gui_attribute)
Expand Down Expand Up @@ -1239,7 +1268,7 @@ def __init__(self, group_id):
self.build_variable_gui(self.create_base_frame(), self.gui_attribute, self.group_data)
ttk.Button(master=self.gui, style="custom.TButton", text="Save", command=self.savedata).pack(
fill=tk.constants.X)
self.geometry("950x350")
self.autosize()

def savedata(self):
self.save(self.group_data, self.gui_attribute)
Expand Down Expand Up @@ -3520,8 +3549,8 @@ def CopyCharacter(characterId, src_wsd, target_container=None, dry_run=False):
"CharacterContainerSaveData")
isFound = None
for _slotIndex, slotItem in enumerate(characterContainer['value']['Slots']['value']['values']):
if slotItem['RawData']['value']['instance_id'] in character['key']['InstanceId']['value']:
slotItem['RawData']['value']['instance_id'] = character['key']['InstanceId']['value']
if slotItem['RawData']['value']['instance_id'] == character['key']['InstanceId']['value']:
# slotItem['RawData']['value']['instance_id'] = character['key']['InstanceId']['value']
isFound = _slotIndex
break
if isFound is None:
Expand Down Expand Up @@ -4627,6 +4656,7 @@ def CopyCharacterContainer(containerId, src_wsd, dry_run=False, new_container_id
copyItemList.add(slotItem['RawData']['value']['instance_id'])
if slotItem['RawData']['value']['instance_id'] != PalObject.EmptyUUID:
copyItemList.add(slotItem['RawData']['value']['instance_id'])
slotItem['RawData']['value']['instance_id'] = PalObject.EmptyUUID
for characterId in copyItemList:
new_uuid = CopyCharacter(characterId, src_wsd, target_container=containerId, dry_run=dry_run)

Expand Down
2 changes: 1 addition & 1 deletion palworld_server_toolkit/resources/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.0
0.8.1

0 comments on commit eff7a68

Please sign in to comment.