morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added more enemy shuffle options to be consistent with what's on the website

Browse Source
This commit is contained in:
Bonta-kun
2019-12-16 01:35:10 +01:00
parent feb8bfeced
commit fcde1e9cdc
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
EntranceRandomizer.py
View File

@@ -249,7 +249,7 @@ def parse_arguments(argv, no_defaults=False):
parser.add_argument('--skip_playthrough', action='store_true', default=defval(False)) parser.add_argument('--skip_playthrough', action='store_true', default=defval(False))
parser.add_argument('--enemizercli', default=defval('')) parser.add_argument('--enemizercli', default=defval(''))
parser.add_argument('--shufflebosses', default=defval('none'), choices=['none', 'basic', 'normal', 'chaos']) parser.add_argument('--shufflebosses', default=defval('none'), choices=['none', 'basic', 'normal', 'chaos'])
parser.add_argument('--shuffleenemies', default=defval(False), action='store_true') parser.add_argument('--shuffleenemies', default=defval('none'), choices=['none', 'shuffled', 'chaos'])
parser.add_argument('--enemy_health', default=defval('default'), choices=['default', 'easy', 'normal', 'hard', 'expert']) parser.add_argument('--enemy_health', default=defval('default'), choices=['default', 'easy', 'normal', 'hard', 'expert'])
parser.add_argument('--enemy_damage', default=defval('default'), choices=['default', 'shuffled', 'chaos']) parser.add_argument('--enemy_damage', default=defval('default'), choices=['default', 'shuffled', 'chaos'])
parser.add_argument('--shufflepalette', default=defval(False), action='store_true') parser.add_argument('--shufflepalette', default=defval(False), action='store_true')

2
Gui.py
View File

@@ -407,7 +407,7 @@ def guiMain(args=None):
guiargs.hints = bool(hintsVar.get()) guiargs.hints = bool(hintsVar.get())
guiargs.enemizercli = enemizerCLIpathVar.get() guiargs.enemizercli = enemizerCLIpathVar.get()
guiargs.shufflebosses = enemizerBossVar.get() guiargs.shufflebosses = enemizerBossVar.get()
guiargs.shuffleenemies = bool(enemyShuffleVar.get()) guiargs.shuffleenemies = 'chaos' if bool(enemyShuffleVar.get()) else 'none'
guiargs.enemy_health = enemizerHealthVar.get() guiargs.enemy_health = enemizerHealthVar.get()
guiargs.enemy_damage = enemizerDamageVar.get() guiargs.enemy_damage = enemizerDamageVar.get()
guiargs.shufflepalette = bool(paletteShuffleVar.get()) guiargs.shufflepalette = bool(paletteShuffleVar.get())

2
Main.py
View File

@@ -146,7 +146,7 @@ def main(args, seed=None):
"-nohints" if not world.hints else "")) if not args.outputname else '' "-nohints" if not world.hints else "")) if not args.outputname else ''
outfilebase = outfileprefix + outfilesuffix outfilebase = outfileprefix + outfilesuffix
use_enemizer = args.enemizercli and (args.shufflebosses != 'none' or args.shuffleenemies or args.enemy_health != 'default' or args.enemy_health != 'default' or args.enemy_damage or args.shufflepalette or args.shufflepots) use_enemizer = args.enemizercli and (args.shufflebosses != 'none' or args.shuffleenemies != 'none' or args.enemy_health != 'default' or args.enemy_health != 'default' or args.enemy_damage or args.shufflepalette or args.shufflepots)
jsonout = {} jsonout = {}
if not args.suppress_rom: if not args.suppress_rom:

8
Rom.py
View File

@@ -170,9 +170,9 @@ def get_enemizer_patch(world, player, rom, baserom_path, enemizercli, shuffleene
# write options file for enemizer # write options file for enemizer
options = { options = {
'RandomizeEnemies': shuffleenemies, 'RandomizeEnemies': shuffleenemies != 'none',
'RandomizeEnemiesType': 3, 'RandomizeEnemiesType': 3,
'RandomizeBushEnemyChance': True, 'RandomizeBushEnemyChance': shuffleenemies == 'chaos',
'RandomizeEnemyHealthRange': enemy_health != 'default', 'RandomizeEnemyHealthRange': enemy_health != 'default',
'RandomizeEnemyHealthType': {'default': 0, 'easy': 0, 'normal': 1, 'hard': 2, 'expert': 3}[enemy_health], 'RandomizeEnemyHealthType': {'default': 0, 'easy': 0, 'normal': 1, 'hard': 2, 'expert': 3}[enemy_health],
'OHKO': False, 'OHKO': False,
@@ -218,9 +218,9 @@ def get_enemizer_patch(world, player, rom, baserom_path, enemizercli, shuffleene
'SwordGraphics': "sword_gfx/normal.gfx", 'SwordGraphics': "sword_gfx/normal.gfx",
'BeeMizer': False, 'BeeMizer': False,
'BeesLevel': 0, 'BeesLevel': 0,
'RandomizeTileTrapPattern': True, 'RandomizeTileTrapPattern': shuffleenemies == 'chaos',
'RandomizeTileTrapFloorTile': False, 'RandomizeTileTrapFloorTile': False,
'AllowKillableThief': shuffleenemies, 'AllowKillableThief': bool(random.randint(0,1)) if shuffleenemies == 'chaos' else shuffleenemies != 'none',
'RandomizeSpriteOnHit': False, 'RandomizeSpriteOnHit': False,
'DebugMode': False, 'DebugMode': False,
'DebugForceEnemy': False, 'DebugForceEnemy': False,