Core: Fix Generate's slot parsing to default unknown slot names to file name (#3795)
* make Generate handle slots without names defined better * set name dict before loop so we don't have to check for its existence later * move setter so it's more obvious why
This commit is contained in:
		
							parent
							
								
									6d6d35d598
								
							
						
					
					
						commit
						cf375cbcc4
					
				| 
						 | 
				
			
			@ -155,6 +155,7 @@ def main(args=None) -> Tuple[argparse.Namespace, int]:
 | 
			
		|||
    erargs.outputpath = args.outputpath
 | 
			
		||||
    erargs.skip_prog_balancing = args.skip_prog_balancing
 | 
			
		||||
    erargs.skip_output = args.skip_output
 | 
			
		||||
    erargs.name = {}
 | 
			
		||||
 | 
			
		||||
    settings_cache: Dict[str, Tuple[argparse.Namespace, ...]] = \
 | 
			
		||||
        {fname: (tuple(roll_settings(yaml, args.plando) for yaml in yamls) if args.sameoptions else None)
 | 
			
		||||
| 
						 | 
				
			
			@ -202,7 +203,7 @@ def main(args=None) -> Tuple[argparse.Namespace, int]:
 | 
			
		|||
 | 
			
		||||
                    if path == args.weights_file_path:  # if name came from the weights file, just use base player name
 | 
			
		||||
                        erargs.name[player] = f"Player{player}"
 | 
			
		||||
                    elif not erargs.name[player]:  # if name was not specified, generate it from filename
 | 
			
		||||
                    elif player not in erargs.name:  # if name was not specified, generate it from filename
 | 
			
		||||
                        erargs.name[player] = os.path.splitext(os.path.split(path)[-1])[0]
 | 
			
		||||
                    erargs.name[player] = handle_name(erargs.name[player], player, name_counter)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue