From 82a705538f9506eaf78139abe491a43d19c606bc Mon Sep 17 00:00:00 2001 From: GateGuy <57763469+GateGuy@users.noreply.github.com> Date: Wed, 23 Jun 2021 18:39:28 -0400 Subject: [PATCH] Some polish I actually remembered the version number this time --- .gitignore | 1 + classes.py | 2 +- srm.py | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2631172..a2f85e1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ __pycache__ build dist *.bat +randomizer not imported.py diff --git a/classes.py b/classes.py index 827c493..8ec1da0 100644 --- a/classes.py +++ b/classes.py @@ -286,7 +286,7 @@ def simplifyRule(self, rulesArray): for j in range(i+1, len(self.left_side)): newRule = Rule(description=newDescription, left_side=self.left_side[i], rule_type="!=", right_side=self.left_side[j], oldRuleNum=self.ruleNum) rulesArray.append(newRule) - elif self.rule_type in ["ne","gt","ge","lt","le"]: + elif self.rule_type in ["eq","ne","gt","ge","lt","le"]: for lVal in self.asList(self.left_side): for rVal in self.asList(self.right_side): newRule = Rule(description=newDescription, left_side=lVal, rule_type=self.rule_type, right_side=rVal, oldRuleNum=self.ruleNum) diff --git a/srm.py b/srm.py index ccb969b..7c0f3f2 100644 --- a/srm.py +++ b/srm.py @@ -137,6 +137,8 @@ def randomize(): defaultValue += ord(tempFile.read(1)) * (256**i) # little endian by default if not att.is_little_endian: defaultValue = swapEndianness(defaultValue, att.number_of_bytes) + if not (defaultValue in att.possible_values): + att.possible_values.append(defaultValue) myRules.append(Rule( description="Lock: "+att.name, left_side=value(att.name), @@ -819,7 +821,7 @@ def showAboutPopup(self): showinfo("About", About_Page_Text) def showSRMPopup(self): - showinfo("Simple Randomizer Maker v1.24", "This was made using\nGateGuy's Simple Randomizer Maker.\n\nhttps://github.com/GateGuy/SimpleRandomizerMaker") + showinfo("Simple Randomizer Maker v1.25", "This was made using\nGateGuy's Simple Randomizer Maker.\n\nhttps://github.com/GateGuy/SimpleRandomizerMaker") # ====================================================== # Support code for Balloon Help (also called tooltips).