monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LttP, beemizer: support fine-tuned trap replacements (#113) 

* update beemizer logic to separate replacement chance and single vs trap chance

* convert beemizer options to new style
This commit is contained in:
Adam Ziegler 2021-11-03 05:34:11 +00:00 committed by GitHub
parent cb8da2e757
commit 583819c4ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 172 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BaseClasses.py
View File

@ -103,7 +103,8 @@ class MultiWorld():
set_player_attr('boss_shuffle', 'none')
set_player_attr('enemy_health', 'default')
set_player_attr('enemy_damage', 'default')
set_player_attr('beemizer', 0)
set_player_attr('beemizer_total_chance', 0)
set_player_attr('beemizer_trap_chance', 0)
set_player_attr('escape_assist', [])
set_player_attr('open_pyramid', False)
set_player_attr('treasure_hunt_icon', 'Triforce Piece')
@ -1248,7 +1249,6 @@ class Spoiler():
outfile.write('Boss shuffle: %s\n' % self.world.boss_shuffle[player])
outfile.write('Enemy health: %s\n' % self.world.enemy_health[player])
outfile.write('Enemy damage: %s\n' % self.world.enemy_damage[player])
outfile.write('Beemizer: %s\n' % self.world.beemizer[player])
outfile.write('Prize shuffle %s\n' %
self.world.shuffle_prizes[player])
if self.entrances:

2
Generate.py
View File

@ -634,8 +634,6 @@ def roll_alttp_settings(ret: argparse.Namespace, weights, plando_options):
ret.enemy_health = get_choice_legacy('enemy_health', weights)
ret.beemizer = int(get_choice_legacy('beemizer', weights, 0))
ret.timer = {'none': False,
None: False,
False: False,

3
Main.py
View File

@ -59,7 +59,8 @@ def main(args, seed=None, baked_server_options: Optional[Dict[str, object]] = No
world.boss_shuffle = args.shufflebosses.copy()
world.enemy_health = args.enemy_health.copy()
world.enemy_damage = args.enemy_damage.copy()
world.beemizer = args.beemizer.copy()
world.beemizer_total_chance = args.beemizer_total_chance.copy()
world.beemizer_trap_chance = args.beemizer_trap_chance.copy()
world.timer = args.timer.copy()
world.countdown_start_time = args.countdown_start_time.copy()
world.red_clock_time = args.red_clock_time.copy()

172
WebHostLib/static/static/weightedSettings.json
View File

@ -1,12 +1,12 @@
{
"gameOptions": {
"description": {
"keyString": "description",
"friendlyName": "Description",
"inputType": "text",
"description": "A short description of this preset. Useful if you have multiple files",
"defaultValue": "Preset Name"
},
"keyString": "description",
"friendlyName": "Description",
"inputType": "text",
"description": "A short description of this preset. Useful if you have multiple files",
"defaultValue": "Preset Name"
},
"name": {
"keyString": "name",
"friendlyName": "Player Name",
@ -476,8 +476,8 @@
}
}
},
"triforce_pieces_mode": {
"keyString": "triforce_pieces_mode",
"triforce_pieces_mode": {
"keyString": "triforce_pieces_mode",
"friendlyName": "Triforce Piece Availability Mode",
"description": "Determines which of the following three options will be used to determine the total available triforce pieces.",
"inputType": "range",
@ -501,7 +501,7 @@
"defaultValue": 0
}
}
},
},
"triforce_pieces_available": {
"keyString": "triforce_pieces_available",
"friendlyName": "Exact Number (Triforce Hunt)",
@ -534,7 +534,7 @@
}
}
},
"triforce_pieces_extra": {
"triforce_pieces_extra": {
"keyString": "triforce_pieces_extra",
"friendlyName": "Required Plus (Triforce Hunt)",
"description": "Only used if enabled in Triforce Piece Availability Mode.",
@ -564,7 +564,7 @@
"description": "15 extra Triforce pieces will be hidden throughout Hyrule",
"defaultValue": 0
},
"20": {
"20": {
"keyString": "triforce_pieces_extra.20",
"friendlyName": 20,
"description": "20 extra Triforce pieces will be hidden throughout Hyrule",
@ -572,7 +572,7 @@
}
}
},
"triforce_pieces_percentage": {
"triforce_pieces_percentage": {
"keyString": "triforce_pieces_percentage",
"friendlyName": "Percentage (Triforce Hunt)",
"description": "Only used if enabled in Triforce Piece Availability Mode.",
@ -1164,41 +1164,79 @@
}
}
},
"beemizer": {
"keyString": "beemizer",
"friendlyName": "Beemizer",
"description": "Remove non-health items from the global item pool and replace them with single bees and bee traps.",
"beemizer_total_chance": {
"keyString": "beemizer_total_chance",
"friendlyName": "Beemizer - Total Chance",
"description": "Chance to replace junk-fill items in the global item pool with single bees and bee traps.",
"inputType": "range",
"subOptions": {
"0": {
"keyString": "beemizer.0",
"keyString": "beemizer_total_chance.0",
"friendlyName": "Level 0",
"description": "No bee traps are placed.",
"defaultValue": 50
},
"1": {
"keyString": "beemizer.1",
"25": {
"keyString": "beemizer_total_chance.25",
"friendlyName": "Level 1",
"description": "25% of rupees, bombs and arrows are replaced with bees, of which 60% are traps and 40% single bees",
"defaultValue": 1
"description": "25% chance for each junk-fill item (rupees, bombs and arrows) to be replaced with bees.",
"defaultValue": 0
},
"2": {
"keyString": "beemizer.2",
"50": {
"keyString": "beemizer_total_chance.50",
"friendlyName": "Level 2",
"description": "50% of rupees, bombs and arrows are replaced with bees, of which 70% are traps and 30% single bees",
"defaultValue": 2
"description": "50% chance for each junk-fill item (rupees, bombs and arrows) to be replaced with bees.",
"defaultValue": 0
},
"3": {
"keyString": "beemizer.3",
"75": {
"keyString": "beemizer_total_chance.75",
"friendlyName": "Level 3",
"description": "75% of rupees, bombs and arrows are replaced with bees, of which 80% are traps and 20% single bees",
"defaultValue": 3
"description": "75% chance for each junk-fill item (rupees, bombs and arrows) to be replaced with bees.",
"defaultValue": 0
},
"4": {
"keyString": "beemizer.4",
"100": {
"keyString": "beemizer_total_chance.100",
"friendlyName": "Level 4",
"description": "100% of rupees, bombs and arrows are replaced with bees, of which 90% are traps and 10% single bees",
"defaultValue": 4
"description": "All junk-fill items (rupees, bombs and arrows) are replaced with bees.",
"defaultValue": 0
}
}
},
"beemizer_trap_chance": {
"keyString": "beemizer_trap_chance",
"friendlyName": "Beemizer - Trap Chance",
"description": "Chance that replaced junk-fill items are bee traps.",
"inputType": "range",
"subOptions": {
"60": {
"keyString": "beemizer_trap_chance.60",
"friendlyName": "Level 0",
"description": "60% chance for each beemizer replacement to be a trap (40% chance of a single bee).",
"defaultValue": 50
},
"70": {
"keyString": "beemizer_trap_chance.70",
"friendlyName": "Level 1",
"description": "70% chance for each beemizer replacement to be a trap (30% chance of a single bee).",
"defaultValue": 0
},
"80": {
"keyString": "beemizer_trap_chance.80",
"friendlyName": "Level 2",
"description": "80% chance for each beemizer replacement to be a trap (20% chance of a single bee).",
"defaultValue": 0
},
"90": {
"keyString": "beemizer_trap_chance.90",
"friendlyName": "Level 3",
"description": "90% chance for each beemizer replacement to be a trap (10% chance of a single bee).",
"defaultValue": 0
},
"100": {
"keyString": "beemizer_trap_chance.100",
"friendlyName": "Level 4",
"description": "All beemizer replacements are traps (no single bees).",
"defaultValue": 0
}
}
},
@ -1818,37 +1856,37 @@
"description": "Never use this. Makes all overworld palette colors black.",
"defaultValue": 0
},
"grayscale": {
"grayscale": {
"keyString": "rom.ow_palettes.grayscale",
"friendlyName": "Grayscale",
"description": "Removes all saturation of colors.",
"defaultValue": 0
},
"negative": {
"negative": {
"keyString": "rom.ow_palettes.negative",
"friendlyName": "Negative",
"description": "Invert all colors",
"defaultValue": 0
},
"classic": {
"classic": {
"keyString": "rom.ow_palettes.classic",
"friendlyName": "Classic",
"description": "Produces results similar to the website.",
"defaultValue": 0
},
"dizzy": {
"dizzy": {
"keyString": "rom.ow_palettes.dizzy",
"friendlyName": "Dizzy",
"description": "No logic in colors but saturation and lightness are conserved.",
"defaultValue": 0
},
"sick": {
"sick": {
"keyString": "rom.ow_palettes.sick",
"friendlyName": "Sick",
"description": "No logic in colors but lightness is conserved.",
"defaultValue": 0
},
"puke": {
"puke": {
"keyString": "rom.ow_palettes.puke",
"friendlyName": "Puke",
"description": "No logic at all.",
@ -1880,37 +1918,37 @@
"description": "Never use this. Makes all underworld palette colors black.",
"defaultValue": 0
},
"grayscale": {
"grayscale": {
"keyString": "rom.uw_palettes.grayscale",
"friendlyName": "Grayscale",
"description": "Removes all saturation of colors.",
"defaultValue": 0
},
"negative": {
"negative": {
"keyString": "rom.uw_palettes.negative",
"friendlyName": "Negative",
"description": "Invert all colors",
"defaultValue": 0
},
"classic": {
"classic": {
"keyString": "rom.uw_palettes.classic",
"friendlyName": "Classic",
"description": "Produces results similar to the website.",
"defaultValue": 0
},
"dizzy": {
"dizzy": {
"keyString": "rom.uw_palettes.dizzy",
"friendlyName": "Dizzy",
"description": "No logic in colors but saturation and lightness are conserved.",
"defaultValue": 0
},
"sick": {
"sick": {
"keyString": "rom.uw_palettes.sick",
"friendlyName": "Sick",
"description": "No logic in colors but lightness is conserved.",
"defaultValue": 0
},
"puke": {
"puke": {
"keyString": "rom.uw_palettes.puke",
"friendlyName": "Puke",
"description": "No logic at all.",
@ -1918,7 +1956,7 @@
}
}
},
"hud_palettes": {
"hud_palettes": {
"keyString": "rom.hud_palettes",
"friendlyName": "HUD Palettes",
"description": "Randomize the colors of the HUD (user interface), within reason.",
@ -1942,37 +1980,37 @@
"description": "Never use this. Makes all HUD palette colors black.",
"defaultValue": 0
},
"grayscale": {
"grayscale": {
"keyString": "rom.hud_palettes.grayscale",
"friendlyName": "Grayscale",
"description": "Removes all saturation of colors.",
"defaultValue": 0
},
"negative": {
"negative": {
"keyString": "rom.hud_palettes.negative",
"friendlyName": "Negative",
"description": "Invert all colors",
"defaultValue": 0
},
"classic": {
"classic": {
"keyString": "rom.hud_palettes.classic",
"friendlyName": "Classic",
"description": "Produces results similar to the website.",
"defaultValue": 0
},
"dizzy": {
"dizzy": {
"keyString": "rom.hud_palettes.dizzy",
"friendlyName": "Dizzy",
"description": "No logic in colors but saturation and lightness are conserved.",
"defaultValue": 0
},
"sick": {
"sick": {
"keyString": "rom.hud_palettes.sick",
"friendlyName": "Sick",
"description": "No logic in colors but lightness is conserved.",
"defaultValue": 0
},
"puke": {
"puke": {
"keyString": "rom.hud_palettes.puke",
"friendlyName": "Puke",
"description": "No logic at all.",
@ -1980,7 +2018,7 @@
}
}
},
"shield_palettes": {
"shield_palettes": {
"keyString": "rom.shield_palettes",
"friendlyName": "Shield Palettes",
"description": "Randomize the colors of the shield, within reason.",
@ -2004,37 +2042,37 @@
"description": "Never use this. Makes all shield palette colors black.",
"defaultValue": 0
},
"grayscale": {
"grayscale": {
"keyString": "rom.shield_palettes.grayscale",
"friendlyName": "Grayscale",
"description": "Removes all saturation of colors.",
"defaultValue": 0
},
"negative": {
"negative": {
"keyString": "rom.shield_palettes.negative",
"friendlyName": "Negative",
"description": "Invert all colors",
"defaultValue": 0
},
"classic": {
"classic": {
"keyString": "rom.shield_palettes.classic",
"friendlyName": "Classic",
"description": "Produces results similar to the website.",
"defaultValue": 0
},
"dizzy": {
"dizzy": {
"keyString": "rom.shield_palettes.dizzy",
"friendlyName": "Dizzy",
"description": "No logic in colors but saturation and lightness are conserved.",
"defaultValue": 0
},
"sick": {
"sick": {
"keyString": "rom.shield_palettes.sick",
"friendlyName": "Sick",
"description": "No logic in colors but lightness is conserved.",
"defaultValue": 0
},
"puke": {
"puke": {
"keyString": "rom.shield_palettes.puke",
"friendlyName": "Puke",
"description": "No logic at all.",
@ -2042,7 +2080,7 @@
}
}
},
"sword_palettes": {
"sword_palettes": {
"keyString": "rom.sword_palettes",
"friendlyName": "Sword Palettes",
"description": "Randomize the colors of the sword, within reason.",
@ -2066,37 +2104,37 @@
"description": "Never use this. Makes all sword palette colors black.",
"defaultValue": 0
},
"grayscale": {
"grayscale": {
"keyString": "rom.sword_palettes.grayscale",
"friendlyName": "Grayscale",
"description": "Removes all saturation of colors.",
"defaultValue": 0
},
"negative": {
"negative": {
"keyString": "rom.sword_palettes.negative",
"friendlyName": "Negative",
"description": "Invert all colors",
"defaultValue": 0
},
"classic": {
"classic": {
"keyString": "rom.sword_palettes.classic",
"friendlyName": "Classic",
"description": "Produces results similar to the website.",
"defaultValue": 0
},
"dizzy": {
"dizzy": {
"keyString": "rom.sword_palettes.dizzy",
"friendlyName": "Dizzy",
"description": "No logic in colors but saturation and lightness are conserved.",
"defaultValue": 0
},
"sick": {
"sick": {
"keyString": "rom.sword_palettes.sick",
"friendlyName": "Sick",
"description": "No logic in colors but lightness is conserved.",
"defaultValue": 0
},
"puke": {
"puke": {
"keyString": "rom.sword_palettes.puke",
"friendlyName": "Puke",
"description": "No logic at all.",
@ -2105,4 +2143,4 @@
}
}
}
}
}

19
WebHostLib/static/static/weightedSettings.yaml
View File

@ -226,12 +226,19 @@ pot_shuffle:
'on': 0 # Keys, items, and buttons hidden under pots in dungeons are shuffled with other pots in their supertile
'off': 50 # Default pot item locations
### End of Enemizer Section ###
beemizer: # Remove items from the global item pool and replace them with single bees and bee traps
0: 50 # No bee traps are placed
1: 0 # 25% of rupees, bombs and arrows are replaced with bees, of which 60% are traps and 40% single bees
2: 0 # 50% of rupees, bombs and arrows are replaced with bees, of which 70% are traps and 30% single bees
3: 0 # 75% of rupees, bombs and arrows are replaced with bees, of which 80% are traps and 20% single bees
4: 0 # 100% of rupees, bombs and arrows are replaced with bees, of which 90% are traps and 10% single bees
# can add weights for any whole number between 0 and 100
beemizer_total_chance: # Remove items from the global item pool and replace them with single bees (fill bottles) and bee traps
0: 50 # No junk fill items are replaced (Beemizer is off)
25: 0 # 25% chance for each junk fill item (rupees, bombs and arrows) to be replaced with bees
50: 0 # 50% chance for each junk fill item (rupees, bombs and arrows) to be replaced with bees
75: 0 # 75% chance for each junk fill item (rupees, bombs and arrows) to be replaced with bees
100: 0 # All junk fill items (rupees, bombs and arrows) are replaced with bees
beemizer_trap_chance:
60: 50 # 60% chance for each beemizer replacement to be a trap, 40% chance to be a single bee
70: 0 # 70% chance for each beemizer replacement to be a trap, 30% chance to be a single bee
80: 0 # 80% chance for each beemizer replacement to be a trap, 20% chance to be a single bee
90: 0 # 90% chance for each beemizer replacement to be a trap, 10% chance to be a single bee
100: 0 # All beemizer replacements are traps
### Shop Settings ###
shop_shuffle_slots: # Maximum amount of shop slots to be filled with regular item pool items (such as Moon Pearl)
0: 50

21
playerSettings.yaml
View File

@ -481,13 +481,20 @@ A Link to the Past:
'on': 0 # Keys, items, and buttons hidden under pots in dungeons are shuffled with other pots in their supertile
'off': 50 # Default pot item locations
### End of Enemizer Section ###
beemizer: # Remove items from the global item pool and replace them with single bees (fill bottles) and bee traps
0: 50 # No bee traps are placed
1: 0 # 25% of rupees, bombs and arrows are replaced with bees, of which 60% are traps and 40% single bees
2: 0 # 50% of rupees, bombs and arrows are replaced with bees, of which 70% are traps and 30% single bees
3: 0 # 75% of rupees, bombs and arrows are replaced with bees, of which 80% are traps and 20% single bees
4: 0 # 100% of rupees, bombs and arrows are replaced with bees, of which 90% are traps and 10% single bees
5: 0 # 100% of rupees, bombs and arrows are replaced with bees, of which 100% are traps and 0% single bees
### Beemizer ###
# can add weights for any whole number between 0 and 100
beemizer_total_chance: # Remove items from the global item pool and replace them with single bees (fill bottles) and bee traps
0: 50 # No junk fill items are replaced (Beemizer is off)
25: 0 # 25% chance for each junk fill item (rupees, bombs and arrows) to be replaced with bees
50: 0 # 50% chance for each junk fill item (rupees, bombs and arrows) to be replaced with bees
75: 0 # 75% chance for each junk fill item (rupees, bombs and arrows) to be replaced with bees
100: 0 # All junk fill items (rupees, bombs and arrows) are replaced with bees
beemizer_trap_chance:
60: 50 # 60% chance for each beemizer replacement to be a trap, 40% chance to be a single bee
70: 0 # 70% chance for each beemizer replacement to be a trap, 30% chance to be a single bee
80: 0 # 80% chance for each beemizer replacement to be a trap, 20% chance to be a single bee
90: 0 # 90% chance for each beemizer replacement to be a trap, 10% chance to be a single bee
100: 0 # All beemizer replacements are traps
### Shop Settings ###
shop_item_slots: # Maximum amount of shop slots to be filled with regular item pool items (such as Moon Pearl)
0: 50

5
worlds/alttp/EntranceRandomizer.py
View File

@ -221,7 +221,8 @@ def parse_arguments(argv, no_defaults=False):
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('--beemizer', default=defval(0), type=lambda value: min(max(int(value), 0), 4))
parser.add_argument('--beemizer_total_chance', default=defval(0), type=lambda value: min(max(int(value), 0), 100))
parser.add_argument('--beemizer_trap_chance', default=defval(0), type=lambda value: min(max(int(value), 0), 100))
parser.add_argument('--shop_shuffle', default='', help='''\
combine letters for options:
g: generate default inventories for light and dark world shops, and unique shops
@ -273,7 +274,7 @@ def parse_arguments(argv, no_defaults=False):
for name in ['logic', 'mode', 'goal', 'difficulty', 'item_functionality',
'shuffle', 'open_pyramid', 'timer',
'countdown_start_time', 'red_clock_time', 'blue_clock_time', 'green_clock_time',
'beemizer',
'beemizer_total_chance', 'beemizer_trap_chance',
'shufflebosses', 'enemy_health', 'enemy_damage',
'sprite',
"triforce_pieces_available",

21
worlds/alttp/Items.py
View File

@ -1,19 +1,20 @@
import typing
def GetBeemizerItem(world, player, item):
item_name = item if isinstance(item, str) else item.name
if world.beemizer[player] and item_name in trap_replaceable:
if world.random.random() < world.beemizer[player] * 0.25:
if world.random.random() < (0.5 + world.beemizer[player] * 0.1):
return "Bee Trap" if isinstance(item, str) else world.create_item("Bee Trap", player)
else:
return "Bee" if isinstance(item, str) else world.create_item("Bee", player)
else:
return item
else:
if item_name not in trap_replaceable:
return item
# first roll - replaceable item should be replaced, within beemizer_total_chance
if not world.beemizer_total_chance[player] or world.random.random() > (world.beemizer_total_chance[player] / 100):
return item
# second roll - bee replacement should be trap, within beemizer_trap_chance
if not world.beemizer_trap_chance[player] or world.random.random() > (world.beemizer_trap_chance[player] / 100):
return "Bee" if isinstance(item, str) else world.create_item("Bee", player)
else:
return "Bee Trap" if isinstance(item, str) else world.create_item("Bee Trap", player)
# should be replaced with direct world.create_item(item) call in the future
def ItemFactory(items, player: int):

22
worlds/alttp/Options.py
View File

@ -261,6 +261,26 @@ class TriforceHud(Choice):
option_hide_both = 3
class BeemizerRange(Range):
value: int
range_start = 0
range_end = 100
class BeemizerTotalChance(BeemizerRange):
"""Percentage chance for each junk-fill item (rupees, bombs, arrows) to be
replaced with either a bee swarm trap or a single bottle-filling bee."""
default = 0
displayname = "Beemizer Total Chance"
class BeemizerTrapChance(BeemizerRange):
"""Percentage chance for each replaced junk-fill item to be a bee swarm
trap; all other replaced items are single bottle-filling bees."""
default = 60
displayname = "Beemizer Trap Chance"
alttp_options: typing.Dict[str, type(Option)] = {
"crystals_needed_for_gt": CrystalsTower,
"crystals_needed_for_ganon": CrystalsGanon,
@ -293,6 +313,8 @@ alttp_options: typing.Dict[str, type(Option)] = {
"reduceflashing": ReduceFlashing,
"triforcehud": TriforceHud,
"glitch_boots": DefaultOnToggle,
"beemizer_total_chance": BeemizerTotalChance,
"beemizer_trap_chance": BeemizerTrapChance,
"death_link": DeathLink
}