Merge pull request #112 from Berserker66/local_keys
Add local_keys option to go in line with the *_shuffle options, and …
This commit is contained in:
		
						commit
						8d47bc5425
					
				| 
						 | 
					@ -370,7 +370,7 @@ def roll_settings(weights):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ret.remote_items = get_choice('remote_items', weights, False)
 | 
					    ret.remote_items = get_choice('remote_items', weights, False)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if "l" in dungeon_items:
 | 
					    if get_choice("local_keys", weights, "l" in dungeon_items):
 | 
				
			||||||
        ret.local_items = {"Small Keys", "Big Keys"}
 | 
					        ret.local_items = {"Small Keys", "Big Keys"}
 | 
				
			||||||
    else:
 | 
					    else:
 | 
				
			||||||
        ret.local_items = set()
 | 
					        ret.local_items = set()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -43,10 +43,14 @@ smallkey_shuffle: # Shuffle small keys into the world and other dungeons, includ
 | 
				
			||||||
bigkey_shuffle: # Shuffle big keys into the world and other dungeons, including other players' worlds
 | 
					bigkey_shuffle: # Shuffle big keys into the world and other dungeons, including other players' worlds
 | 
				
			||||||
  on: 0
 | 
					  on: 0
 | 
				
			||||||
  off: 1
 | 
					  off: 1
 | 
				
			||||||
dungeon_items: # alternative to the 4 shuffles above this, does nothing until the respective 4 shuffles are deleted
 | 
					local_keys: # Keep small keys and big keys local to your world.
 | 
				
			||||||
 | 
					  on: 0
 | 
				
			||||||
 | 
					  off: 1
 | 
				
			||||||
 | 
					dungeon_items: # alternative to the 4 shuffles and local_keys above this, does nothing until the respective 4 shuffles and local_keys above are deleted
 | 
				
			||||||
  mc: 0 # shuffle Maps and Compass
 | 
					  mc: 0 # shuffle Maps and Compass
 | 
				
			||||||
  none: 1 # shuffle none of the 4
 | 
					  none: 1 # shuffle none of the 4
 | 
				
			||||||
  mcsb: 0 # shuffle all of the 4, any combination of m, c, s and b will shuffle the respective item, or not if it's missing, so you can add more options here
 | 
					  mcsb: 0 # shuffle all of the 4, any combination of m, c, s and b will shuffle the respective item, or not if it's missing, so you can add more options here
 | 
				
			||||||
 | 
					  lmcsb: 0 # like mcsb above, but with keys kept local to your world. l is what makes your keys local,  or not if it's missing.
 | 
				
			||||||
dungeon_counters:
 | 
					dungeon_counters:
 | 
				
			||||||
  on: 0 # always display amount of items checked in a dungeon
 | 
					  on: 0 # always display amount of items checked in a dungeon
 | 
				
			||||||
  pickup: 1 # show when compass is picked up
 | 
					  pickup: 1 # show when compass is picked up
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue