Individual settings: hints
This commit is contained in:
		
							parent
							
								
									d9281adc07
								
							
						
					
					
						commit
						8a5eef11ce
					
				| 
						 | 
				
			
			@ -75,7 +75,7 @@ class World(object):
 | 
			
		|||
        self.fix_fake_world = True
 | 
			
		||||
        self.boss_shuffle = boss_shuffle
 | 
			
		||||
        self.escape_assist = {player: [] for player in range(1, players + 1)}
 | 
			
		||||
        self.hints = hints
 | 
			
		||||
        self.hints = hints.copy()
 | 
			
		||||
        self.crystals_needed_for_ganon = {}
 | 
			
		||||
        self.crystals_needed_for_gt = {}
 | 
			
		||||
        self.open_pyramid = {player: False for player in range(1, players + 1)}
 | 
			
		||||
| 
						 | 
				
			
			@ -1101,6 +1101,7 @@ class Spoiler(object):
 | 
			
		|||
            outfile.write('Compass shuffle:                 %s\n' % {k: 'Yes' if v else 'No' for k, v in self.metadata['compassshuffle'].items()})
 | 
			
		||||
            outfile.write('Small Key shuffle:               %s\n' % {k: 'Yes' if v else 'No' for k, v in self.metadata['keyshuffle'].items()})
 | 
			
		||||
            outfile.write('Big Key shuffle:                 %s\n' % {k: 'Yes' if v else 'No' for k, v in self.metadata['bigkeyshuffle'].items()})
 | 
			
		||||
            outfile.write('Hints:                           %s\n' % {k: 'Yes' if v else 'No' for k, v in self.metadata['hints'].items()})
 | 
			
		||||
            outfile.write('Players:                         %d' % self.world.players)
 | 
			
		||||
            if self.entrances:
 | 
			
		||||
                outfile.write('\n\nEntrances:\n\n')
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -281,7 +281,7 @@ def parse_arguments(argv, no_defaults=False):
 | 
			
		|||
            for name in ['logic', 'mode', 'swords', 'goal', 'difficulty', 'item_functionality',
 | 
			
		||||
                         'shuffle', 'crystals_ganon', 'crystals_gt', 'openpyramid',
 | 
			
		||||
                         'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle',
 | 
			
		||||
                         'retro', 'accessibility']:
 | 
			
		||||
                         'retro', 'accessibility', 'hints']:
 | 
			
		||||
                value = getattr(defaults, name) if getattr(playerargs, name) is None else getattr(playerargs, name)
 | 
			
		||||
                if player == 1:
 | 
			
		||||
                    setattr(ret, name, {1: value})
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								Main.py
								
								
								
								
							
							
						
						
									
										2
									
								
								Main.py
								
								
								
								
							| 
						 | 
				
			
			@ -193,7 +193,7 @@ def main(args, seed=None):
 | 
			
		|||
                                                                          world.shuffle[player], world.algorithm, mcsb_name,
 | 
			
		||||
                                                                          "-retro" if world.retro[player] else "",
 | 
			
		||||
                                                                          "-prog_" + world.progressive if world.progressive in ['off', 'random'] else "",
 | 
			
		||||
                                                                          "-nohints" if not world.hints else "")) if not args.outputname else ''
 | 
			
		||||
                                                                          "-nohints" if not world.hints[player] else "")) if not args.outputname else ''
 | 
			
		||||
                rom.write_to_file(output_path(f'{outfilebase}{outfilesuffix}.sfc'))
 | 
			
		||||
 | 
			
		||||
        with open(output_path('%s_multidata' % outfilebase), 'wb') as f:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								Rom.py
								
								
								
								
							
							
						
						
									
										2
									
								
								Rom.py
								
								
								
								
							| 
						 | 
				
			
			@ -1364,7 +1364,7 @@ def write_strings(rom, world, player):
 | 
			
		|||
        return hint
 | 
			
		||||
 | 
			
		||||
    # For hints, first we write hints about entrances, some from the inconvenient list others from all reasonable entrances.
 | 
			
		||||
    if world.hints:
 | 
			
		||||
    if world.hints[player]:
 | 
			
		||||
        tt['sign_north_of_links_house'] = '> Randomizer The telepathic tiles can have hints!'
 | 
			
		||||
        hint_locations = HintLocations.copy()
 | 
			
		||||
        random.shuffle(hint_locations)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue