From 64bb58616bff10b7f0208c285a17e47a270e80b0 Mon Sep 17 00:00:00 2001 From: Unleashed Date: Thu, 8 Jul 2021 21:29:34 +0300 Subject: [PATCH 1/5] added new charge type --- yabcm/panels/entry.py | 1 + 1 file changed, 1 insertion(+) diff --git a/yabcm/panels/entry.py b/yabcm/panels/entry.py index 4b16110..7f97efc 100644 --- a/yabcm/panels/entry.py +++ b/yabcm/panels/entry.py @@ -77,6 +77,7 @@ def __init__(self, parent): ('Charge Type', { 'Automatic': 0x0, 'Manual': 0x1, + 'Unknown (0x2)': 0x2, }, False), (None, None, False), (None, None, False), From caacff09cfaec8122945a0d52eba87aefea6315b Mon Sep 17 00:00:00 2001 From: Unleashed Date: Thu, 8 Jul 2021 21:31:06 +0300 Subject: [PATCH 2/5] Update YaBCM Organizer.py --- YaBCM Organizer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YaBCM Organizer.py b/YaBCM Organizer.py index 5a60aea..546f78b 100644 --- a/YaBCM Organizer.py +++ b/YaBCM Organizer.py @@ -16,7 +16,7 @@ from yabcm.dlg.replace import ReplaceDialog from pyxenoverse.gui.file_drop_target import FileDropTarget -VERSION = '0.2.5' +VERSION = '0.2.5 - Unleashed v1.0' class MainWindow(wx.Frame): From e4ace6fbf5b9944a955e7291fa6140070e97343f Mon Sep 17 00:00:00 2001 From: Unleashed Date: Thu, 8 Jul 2021 21:35:35 +0300 Subject: [PATCH 3/5] fixed replace --- yabcm/dlg/find.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/yabcm/dlg/find.py b/yabcm/dlg/find.py index 4086d28..2d55625 100644 --- a/yabcm/dlg/find.py +++ b/yabcm/dlg/find.py @@ -128,7 +128,12 @@ def on_find(self, _): @staticmethod def get_value(ctrl): + #old logic caused EVERY value that was not hexadecimal to be converted to float type + #that causes struct.pack exception when writing and corrupts the file value = ctrl.GetValue() if value.startswith('0x'): return int(value, 16) - return float(value) + try: + return int(value,10) + except ValueError: + return float(value) From 3cbbdddc924eb8ad839ceebd9db7b89dbdbb860f Mon Sep 17 00:00:00 2001 From: Unleashed Date: Tue, 9 Nov 2021 20:32:25 +0300 Subject: [PATCH 4/5] 1.1 edits --- YaBCM Organizer.py | 2 +- yabcm/panels/entry.py | 40 ++++++++++++++++++++++++++++++---------- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/YaBCM Organizer.py b/YaBCM Organizer.py index 546f78b..056a61f 100644 --- a/YaBCM Organizer.py +++ b/YaBCM Organizer.py @@ -16,7 +16,7 @@ from yabcm.dlg.replace import ReplaceDialog from pyxenoverse.gui.file_drop_target import FileDropTarget -VERSION = '0.2.5 - Unleashed v1.0' +VERSION = '0.2.5 - Unleashed Edits v1.1' class MainWindow(wx.Frame): diff --git a/yabcm/panels/entry.py b/yabcm/panels/entry.py index 7f97efc..e681d63 100644 --- a/yabcm/panels/entry.py +++ b/yabcm/panels/entry.py @@ -14,7 +14,7 @@ class Page(ScrolledPanel): - def __init__(self, parent, rows): + def __init__(self, parent, rows=32): ScrolledPanel.__init__(self, parent) self.sizer = wx.FlexGridSizer(rows=rows, cols=2, hgap=5, vgap=5) self.SetSizer(self.sizer) @@ -28,11 +28,11 @@ def __init__(self, parent): self.entry = None self.notebook = wx.Notebook(self) self.edit_thread = None - button_input_panel = Page(self.notebook, 3) - activator_panel = Page(self.notebook, 5) - bac_panel = Page(self.notebook, 7) - misc_panel = Page(self.notebook, 9) - unknown_panel = Page(self.notebook, 8) + button_input_panel = Page(self.notebook) + activator_panel = Page(self.notebook) + bac_panel = Page(self.notebook) + misc_panel = Page(self.notebook) + unknown_panel = Page(self.notebook) self.notebook.AddPage(button_input_panel, 'Inputs') self.notebook.AddPage(activator_panel, 'Activator') @@ -106,7 +106,7 @@ def __init__(self, parent): self.primary_activator_conditions = self.add_multiple_selection_entry( activator_panel, 'Primary Activator\nConditions', cols=3, orient=wx.VERTICAL, choices=[ ('Health', ["User's Health (One Use)", "Target's health < 25%", - "User's Health(?)", "User's Health"], True), + "When own attack hits", "User's Health"], True), ('Collision/stamina', ["Active Projectile", 'Stamina > 0%', 'Not near map ceiling', 'Not near certain objects'], True), ('Targeting', ["Opponent Knockback", None, 'Targeting Opponent'], True), ('Touching', [None, None, 'Ground', 'Opponent'], True), @@ -130,8 +130,17 @@ def __init__(self, parent): self.bac_entry_user_connect = self.add_num_entry(bac_panel, 'BAC Entry\nUser Connect', True) self.bac_entry_victim_connect = self.add_num_entry(bac_panel, 'BAC Entry\nVictim Connect', True) self.bac_entry_airborne = self.add_num_entry(bac_panel, 'BAC Entry Airborne', True) - self.bac_entry_unknown = self.add_num_entry(bac_panel, 'BAC Entry Unknown', True) - self.random_flag = self.add_hex_entry(bac_panel, 'Random Flag', max=MAX_UINT16) + self.bac_entry_unknown = self.add_num_entry(bac_panel, 'BAC Entry Targetting Override', True) + self.random_flag = self.add_multiple_selection_entry(bac_panel, 'Unknown BAC Flags', majorDimension=2, choices=[ + ('', { + 'None': 0x0, + 'Random BAC Entry': 0x1, + 'Unknown (0x2)': 0x2, + '3 Instance Setup': 0x3, + 'Unknown (0x4)': 0x4, + 'Unknown (0x5)': 0x6, + }, False) + ]) self.ki_cost = self.add_num_entry(misc_panel, 'Ki Cost', True) self.u_44 = self.add_hex_entry(unknown_panel, 'U_44', max=MAX_UINT32) @@ -144,7 +153,18 @@ def __init__(self, parent): self.health_required = self.add_float_entry(misc_panel, 'Health Required') self.trans_stage = self.add_num_entry(misc_panel, 'Transformation\nStage') self.cus_aura = self.add_num_entry(misc_panel, 'CUS_AURA') - self.u_68 = self.add_hex_entry(unknown_panel, 'U_68', max=MAX_UINT32) + self.u_68 = self.add_multiple_selection_entry(unknown_panel, 'Unknown Flags', majorDimension=2, choices=[ + ('', { + 'None': 0x0, + 'Use Skill Upgrades': 0x1, + 'Unknown (0x2)': 0x2, + 'Unknown (0x4)': 0x4, + 'Opponent Reached Ground?': 0x6, + 'Unknown (0x8)': 0x8, + }, False) + ]) + + self.u_6a = self.add_hex_entry(unknown_panel, 'U_6A', max=MAX_UINT16) self.u_6c = self.add_hex_entry(unknown_panel, 'U_6C', max=MAX_UINT32) # Binds From e18ba36a61e0ecda2e64dd3070151d53da2e0013 Mon Sep 17 00:00:00 2001 From: Unleashed Date: Tue, 16 Nov 2021 18:05:45 +0300 Subject: [PATCH 5/5] Update YaBCM Organizer.py --- YaBCM Organizer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YaBCM Organizer.py b/YaBCM Organizer.py index 056a61f..77fc6cf 100644 --- a/YaBCM Organizer.py +++ b/YaBCM Organizer.py @@ -16,7 +16,7 @@ from yabcm.dlg.replace import ReplaceDialog from pyxenoverse.gui.file_drop_target import FileDropTarget -VERSION = '0.2.5 - Unleashed Edits v1.1' +VERSION = '0.2.6' class MainWindow(wx.Frame):