Merged in DR v1.4.1.10
This commit is contained in:
7
Main.py
7
Main.py
@@ -7,6 +7,7 @@ import RaceRandom as random
|
||||
import string
|
||||
import time
|
||||
import zlib
|
||||
import base64
|
||||
|
||||
from BaseClasses import World, CollectionState, Item, Region, Location, Shop, Entrance, Settings
|
||||
from Bosses import place_bosses
|
||||
@@ -40,7 +41,7 @@ from source.enemizer.DamageTables import DamageTable
|
||||
from source.enemizer.Enemizer import randomize_enemies
|
||||
from source.rom.DataTables import init_data_tables
|
||||
|
||||
version_number = '1.4.1.8'
|
||||
version_number = '1.4.1.10'
|
||||
version_branch = '-u'
|
||||
__version__ = f'{version_number}{version_branch}'
|
||||
|
||||
@@ -328,6 +329,10 @@ def main(args, seed=None, fish=None):
|
||||
|
||||
if args.jsonout:
|
||||
jsonout[f'patch_t{team}_p{player}'] = rom.patches
|
||||
if args.bps:
|
||||
localRom = LocalRom.fromJsonRom(rom, args.rom)
|
||||
patch = create_bps_from_data(LocalRom(args.rom, patch=False).buffer, localRom.buffer)
|
||||
jsonout[f'bps_t{team}_p{player}'] = base64.b64encode(patch.binary_ba).decode()
|
||||
else:
|
||||
outfilepname = f'_T{team+1}' if world.teams > 1 else ''
|
||||
if world.players > 1:
|
||||
|
||||
Reference in New Issue
Block a user