Questions about updates

.gitignore

@@ -0,0 +1,3 @@
+*.pyc
+*.lnk
+* - Copy.*

D3Edit.py

@@ -1,143 +1,26 @@
 #!/usr/bin/env python3
 
-from json import load
-from sys import getsizeof
-from os.path import isfile, join
-from argparse import ArgumentParser
-from binascii import hexlify as _hexlify
+import platform
+from os import getcwd
 
-# pip3 install protobuf
-import Account_pb2
 
-BYTE_MAX_VALUE = 255
-XOR_KEY = 0x305F92D82EC9A01B
+def main():
+    import gui
+    # Initialize GUI
+    instanced_gui = gui.D3Edit()
+    instanced_gui.start()
 
-GBIDS_FILE = "gbids.json"
-SLOTS_FILE = "slots.json"
-AFFIXES_FILE = "affixes.json"
-CURRENCY_FILE = "currencies.json"
-
-HERO_DIR = "heroes"
-ASSET_DIR = "assets"
-
-def hexlify(b: (bytes, bytearray)) -> (bytes, bytearray):
-    """
-    bytes -> hex
-    :param b: the bytes you want to convert to hex
-    :return: the hex string representation of the specified bytes
-    """
-    return _hexlify(b).decode("utf8")
-
-def truncate(num: int, boundary: int, signed: bool, endian: str = "little") -> int:
-    """
-    Truncate an int to a given byte boundary
-    :param num: the number to truncate
-    :param margin: the byte boundary
-    :param signed: whether or not the int is signed
-    :param endian: the integer's endianness
-    :return: the truncated integer
-    """
-    return int.from_bytes(num.to_bytes(getsizeof(num), endian, signed=signed)[:boundary], endian, signed=signed)
-
-def decrypt_save(data: (bytes, bytearray)) -> (bytes, bytearray):
-    """
-    Decrypt a save file
-    :param data: the save data to decrypt
-    :return: the decrypted save data
-    """
-    global XOR_KEY
-
-    if isinstance(data, bytes):
-        data = bytearray(data)
-
-    num = XOR_KEY
-    for i in range(len(data)):
-        data[i] ^= (num & BYTE_MAX_VALUE)
-        num = truncate((((num ^ data[i]) << 56) | num >> 8), 8, False)
-
-    return bytes(data)
-
-def encrypt_save(data: (bytes, bytearray)) -> (bytes, bytearray):
-    """
-    Encrypt a save file
-    :param data: the save data to encrypt
-    :return: the encrypted save data
-    """
-    global XOR_KEY
-
-    if isinstance(data, bytes):
-        data = bytearray(data)
-
-    num1 = XOR_KEY
-    for i in range(len(data)):
-        num2 = data[i]
-        data[i] ^= (num1 & BYTE_MAX_VALUE)
-        num1 = truncate(((num1 ^ num2) << 56) | num1 >> 8, 8, False)
-
-    return bytes(data)
 
 if __name__ == "__main__":
-    # make sure assets exist
-    assert isfile(join(ASSET_DIR, GBIDS_FILE)), "%s doesn't exist" % (GBIDS_FILE)
-    assert isfile(join(ASSET_DIR, AFFIXES_FILE)), "%s doesn't exist" % (AFFIXES_FILE)
-    assert isfile(join(ASSET_DIR, CURRENCY_FILE)), "%s doesn't exist" % (CURRENCY_FILE)
-
-    # load assets
-    with open(join(ASSET_DIR, GBIDS_FILE), "r") as f:
-        gbid_list = load(f)
-    with open(join(ASSET_DIR, AFFIXES_FILE), "r") as f:
-        affix_list = load(f)
-    with open(join(ASSET_DIR, CURRENCY_FILE), "r") as f:
-        currency_list = load(f)
-    with open(join(ASSET_DIR, SLOTS_FILE), "r") as f:
-        slot_list = load(f)
-
-    # parse arguments
-    parser = ArgumentParser(description="A script to encrypt/decrypt and modify Diablo III saves")
-    parser.add_argument("-i", "--in-file", type=str, required=True, help="The account file you want to work with")
-    parser.add_argument("-o", "--out-file", type=str, default="account_modified.dat", help="The account file you want to output to")
-    select_group = parser.add_argument_group("selection")
-    select_group.add_argument("-s", "--slot", type=int, default=0, help="The slot ID you want to work with")
-    mod_group = parser.add_argument_group("modifications")
-    for single in currency_list:
-        mod_group.add_argument("--" + single.lower().replace("'", "").replace(" ", "-"), type=int, help="Set the amount of %s" % (single.lower()))
-    mod_group.add_argument("--all-currencies", type=int, help="Set all currencies to the given value")
-    args = parser.parse_args()
-
-    # make sure the input file exists
-    assert isfile(args.in_file), "input file doesn't exist"
-
-    # account
-    # decrypt
-    with open(args.in_file, "rb") as f:
-        account_enc = f.read()
-    account_dec = decrypt_save(account_enc)
-
-    # parse
-    asd = Account_pb2.SavedDefinition()
-    asd.ParseFromString(account_dec)
-
-    # modify account here
-    if len(asd.partitions[args.slot].currency_data.currency) > 0:
-        for currency_id in range(len(currency_list)):
-            currency_name = currency_list[currency_id]
-            if len(asd.partitions[args.slot].currency_data.currency) >= (currency_id + 1):
-                amt = None
-                try:
-                    amt = getattr(args, currency_name.lower().replace("'", "").replace(" ", "_"))
-                    if not amt and args.all_currencies:
-                        amt = args.all_currencies
-                except AttributeError:
-                    pass
-                if amt:
-                    print("Set slot %s %s to %s" % (args.slot, currency_name.lower(), amt))
-                    asd.partitions[args.slot].currency_data.currency[currency_id].count = amt
-
-    # end account modifications
-    account_mod_dec = asd.SerializeToString()
-    account_mod_enc = encrypt_save(account_mod_dec)
-    # output the modified account
-    if args.out_file:
-        with open(args.out_file, "wb") as f:
-            f.write(account_mod_enc)
-    # end account output
+    venv_platforms = ['Linux', 'Darwin']
+    running_os = platform.system()
+    # activate Linux/Darwin venvs:
+    if any(p in running_os for p in venv_platforms):
+        print("activated linux venv")
+        activate_this_file = "{}/venv/bin/activate_this.py".format(getcwd())
+        exec(open(activate_this_file).read(), dict(__file__=activate_this_file))
+    elif running_os == 'Windows':
+        print("Activating Windows venv")
+        activate_this_file = "{}\\winvenv\\Scripts\\activate_this.py".format(getcwd())
+        exec(open(activate_this_file).read(), dict(__file__=activate_this_file))
+    main()

README.md

@@ -1,90 +1,31 @@
-### A script to encrypt/decrypt and modify Diablo III saves
+### A program to encrypt/decrypt and modify Diablo III saves
+Instructions:
+- Make sure Python3 is installed.
+- Run D3Edit.py with python3.
 
-This script is a WIP for modifying Xbox One, PS4, and Switch saves for Diablo III
+Currently supported:
 
+- Currency edition.
+- Hero and account edition: Hero level, Paragon level, Highest GR completed...
+- Stash and Hero inventory viewing.
+- Item edition.
+- Item generation (By ID).
 
-An example of how to mod gold would work like this (this is the only thing implemented ATM):
 
-`python D3Edit.py -i account.dat -o account_mod.dat -s 0 --gold 999999999`
+In development:
+----
+- Item Edition safe mode (easier to make legal items).
 
-```
-usage: D3Edit.py [-h] -i IN_FILE [-o OUT_FILE] [-s SLOT]
-                 [--gold GOLD]
-                 [--blood-shards BLOOD_SHARDS]
-                 [--reusable-parts REUSABLE_PARTS] [--arcane-dust ARCANE_DUST]
-                 [--veiled-crystals VEILED_CRYSTALS]
-                 [--deaths-breath DEATHS_BREATH]
-                 [--forgotten-souls FORGOTTEN_SOULS]
-                 [--khanduran-runes KHANDURAN_RUNES]
-                 [--caldeum-nightshade CALDEUM_NIGHTSHADE]
-                 [--arreat-war-tapestries ARREAT_WAR_TAPESTRIES]
-                 [--corrupted-angel-flesh CORRUPTED_ANGEL_FLESH]
-                 [--westmarch-holy-water WESTMARCH_HOLY_WATER]
-                 [--hearts-of-fright HEARTS_OF_FRIGHT]
-                 [--vials-of-putridness VIALS_OF_PUTRIDNESS]
-                 [--idols-of-terror IDOLS_OF_TERROR]
-                 [--leorics-regrets LEORICS_REGRETS]
-                 [--vengeful-eyes VENGEFUL_EYES]
-                 [--writhing-spines WRITHING_SPINES]
-                 [--devils-fangs DEVILS_FANGS]
-                 [--all-currencies ALL_CURRENCIES]
+Help needed:
+----
+Help needed identifying the missing items and affixes.
+If you find a missing item please report back.
 
-A script to encrypt/decrypt and modify Diablo III saves
-
-optional arguments:
-  -h, --help
-                        show this help message and exit
-  -i IN_FILE, --in-file IN_FILE
-                        The account file you want to work with
-  -o OUT_FILE, --out-file OUT_FILE
-                        The account file you want to output to
+Credits:
+> https://github.com/fry -> Diablo III Protobin Decompiler
 
-selection:
-  -s SLOT, --slot SLOT
-                        The slot ID you want to work with
+> https://github.com/VisualStudio-zz -> Original creator of the python CLI tool.
 
-modifications:
-  --gold GOLD
-                        Set the amount of gold
-  --blood-shards BLOOD_SHARDS
-                        Set the amount of blood shards
-  --reusable-parts REUSABLE_PARTS
-                        Set the amount of reusable parts
-  --arcane-dust ARCANE_DUST
-                        Set the amount of arcane dust
-  --veiled-crystals VEILED_CRYSTALS
-                        Set the amount of veiled crystals
-  --deaths-breath DEATHS_BREATH
-                        Set the amount of death's breath
-  --forgotten-souls FORGOTTEN_SOULS
-                        Set the amount of forgotten souls
-  --khanduran-runes KHANDURAN_RUNES
-                        Set the amount of khanduran runes
-  --caldeum-nightshade CALDEUM_NIGHTSHADE
-                        Set the amount of caldeum nightshade
-  --arreat-war-tapestries ARREAT_WAR_TAPESTRIES
-                        Set the amount of arreat war tapestries
-  --corrupted-angel-flesh CORRUPTED_ANGEL_FLESH
-                        Set the amount of corrupted angel flesh
-  --westmarch-holy-water WESTMARCH_HOLY_WATER
-                        Set the amount of westmarch holy water
-  --hearts-of-fright HEARTS_OF_FRIGHT
-                        Set the amount of hearts of fright
-  --vials-of-putridness VIALS_OF_PUTRIDNESS
-                        Set the amount of vials of putridness
-  --idols-of-terror IDOLS_OF_TERROR
-                        Set the amount of idols of terror
-  --leorics-regrets LEORICS_REGRETS
-                        Set the amount of leoric's regrets
-  --vengeful-eyes VENGEFUL_EYES
-                        Set the amount of vengeful eyes
-  --writhing-spines WRITHING_SPINES
-                        Set the amount of writhing spines
-  --devils-fangs DEVILS_FANGS
-                        Set the amount of devil's fangs
-  --all-currencies ALL_CURRENCIES
-                        Set all currencies to the given value
-```
+> https://github.com/sixwings -> Primal item affix, various database items and gui improvements.
 
-Credits:
-> https://github.com/fry -> Diablo III Protobin Decompiler
+> GBATemp user - RobertIII -> Identifying the item flag for Primal items.