break any deobf, fix some parts of common.py to make more useable, ad…

…d more obf to cesar_cypher and scrambler.

src/main.py

@@ -21,7 +21,7 @@
 from argparse import ArgumentParser
 
 
-__version__ = "2.7.1"
+__version__ = "2.7.2"
 
 
 class Main:

src/util/methods/encryption_methods/cesar_cypher.py

@@ -54,8 +54,8 @@ def upper(rotation_value: int) -> str:
         """
         alphabet = list(string.ascii_uppercase)
         rotated_alphabet = alphabet[rotation_value:] + alphabet[:rotation_value]
-        # cipher_pairs = [f"""{CaesarCipher.get_random_scramble()}{CaesarCipherHelper.add_on(f'{random_semi_and_comma()}{random_single_carrot('set')}{random_space_ammount()}"{rotated_alphabet[i]}1={c}"')}\n""" for i, c in enumerate(alphabet)]
-        cipher_pairs = [f"""{CaesarCipher.get_random_scramble()}{CaesarCipherHelper.add_on(f'set "{rotated_alphabet[i]}1={c}"')}\n""" for i, c in enumerate(alphabet)]
+        cipher_pairs = [f"""{CaesarCipher.get_random_scramble()}{CaesarCipherHelper.add_on(f'{random_semi_and_comma()}{random_single_carrot("set")}{random_space_ammount()}"{rotated_alphabet[i]}1={c}"')}\n""" for i, c in enumerate(alphabet)]
+        # cipher_pairs = [f"""{CaesarCipher.get_random_scramble()}{CaesarCipherHelper.add_on(f'set "{rotated_alphabet[i]}1={c}"')}\n""" for i, c in enumerate(alphabet)]
 
         return "".join(cipher_pairs)
 

src/util/obfuscation/scrambler.py

@@ -5,6 +5,8 @@
 from util.obfuscation.obf_oneline import Obfuscate_Single
 from util.methods.anti_methods.anti_changes import AntiChanges
 
+from util.methods.common.common import random_semi_and_comma, random_single_carrot, random_capitalization, random_spaces
+
 from util.supporting.settings import log
 
 
@@ -69,7 +71,7 @@ def full_scramble(self, line: str) -> str:
         math_problem = set_command_values[0]
 
         # first value we add in before code this goes to the code and allows it to go back to the normal part of the script
-        set_command = Obfuscate_Single(f"set /a ans={math_problem}\ngoto %ans%\n:{self.escape_label}\n", simple=False).out()
+        set_command = Obfuscate_Single(f"{random_semi_and_comma()}{random_single_carrot('set')}{Scrambler.random_single_space()}{random_single_carrot('/a')} {random_single_carrot(random_capitalization('ans') + '=')}{math_problem}\n{random_semi_and_comma()}{random_single_carrot(random_capitalization('goto'))} {random_semi_and_comma()} {random_single_carrot(True)}%{random_capitalization('ans')}%\n:{self.escape_label}\n", simple=False).out()
 
         # first value we add in after code
         out_command_values = self.bit_math.generate_math_problem(self.escape_label)
@@ -124,3 +126,10 @@ def random_anti_method() -> str:
             log.debug(f"Using {use[1]} as anti method")
             return f"{use[0]}\n"
         return ""
+
+    @staticmethod
+    def random_single_space() -> str:
+        random_chance = random.randint(1, 5)
+        if not random_chance == 1:
+            return " "
+        return ""