Skip to content

Commit

Permalink
Use new formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
@hesto2
hesto2 committed Nov 18, 2024
1 parent 639fdb9 commit 4b62248
Show file tree
Hide file tree
Showing 50 changed files with 10,837 additions and 5,985 deletions.
123 changes: 95 additions & 28 deletions BlastShieldRando.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,89 +43,141 @@ def from_dict(cls, data: AreaMappingDict) -> AreaMapping[BlastShieldMapping]:

class WorldBlastShieldMapping(WorldMapping[BlastShieldMapping]):
@classmethod
def from_option_value(cls, data: Dict[str, Any]) -> 'WorldBlastShieldMapping':
return WorldBlastShieldMapping(super().from_option_value_generic(data, AreaBlastShieldMapping))
def from_option_value(cls, data: Dict[str, Any]) -> "WorldBlastShieldMapping":
return WorldBlastShieldMapping(
super().from_option_value_generic(data, AreaBlastShieldMapping)
)

def to_option_value(self) -> Dict[str, AreaMappingDict]:
""" This needs to convert these to raw dictionaries otherwise the AP server interprets the slot data as a class and fails"""
"""This needs to convert these to raw dictionaries otherwise the AP server interprets the slot data as a class and fails"""
value = super().to_option_value()
for mapping in value.values():
new_type_mapping: Dict[str, Dict[int, str]] = dict()
for key, door_mapping in mapping['type_mapping'].items():
for key, door_mapping in mapping["type_mapping"].items():
new_door_mapping: Dict[int, str] = dict()
for door_id, shield_type in door_mapping.items():
new_door_mapping[door_id] = shield_type.value
new_type_mapping[key] = new_door_mapping
mapping['type_mapping'] = new_type_mapping
mapping["type_mapping"] = new_type_mapping
return value


MAX_BEAM_COMBO_DOORS_PER_AREA = 1
ALL_SHIELDS: List[BlastShieldType] = [shield for shield in BlastShieldType]
BEAM_COMBOS: List[BlastShieldType] = [BlastShieldType.Flamethrower, BlastShieldType.Ice_Spreader, BlastShieldType.Wavebuster]
BEAM_COMBOS: List[BlastShieldType] = [
BlastShieldType.Flamethrower,
BlastShieldType.Ice_Spreader,
BlastShieldType.Wavebuster,
]


def get_world_blast_shield_mapping(world: 'MetroidPrimeWorld') -> WorldBlastShieldMapping:
def get_world_blast_shield_mapping(
world: "MetroidPrimeWorld",
) -> WorldBlastShieldMapping:
mapping: Dict[str, AreaBlastShieldMapping] = {}
areas_with_locks = []
if world.options.locked_door_count > 0:
# No locks for magmoor since it is too linear and a central hub
areas_with_locks = world.random.sample([area for area in list(MetroidPrimeArea) if area != MetroidPrimeArea.Magmoor_Caverns], world.options.locked_door_count.value)

if cast(str, world.options.blast_shield_randomization.value) != BlastShieldRandomization.option_none:
areas_with_locks = world.random.sample(
[
area
for area in list(MetroidPrimeArea)
if area != MetroidPrimeArea.Magmoor_Caverns
],
world.options.locked_door_count.value,
)

if (
cast(str, world.options.blast_shield_randomization.value)
!= BlastShieldRandomization.option_none
):
for area in MetroidPrimeArea:
mapping[area.value] = AreaBlastShieldMapping(area.value, _generate_blast_shield_mapping_for_area(world, area, area in areas_with_locks))
mapping[area.value] = AreaBlastShieldMapping(
area.value,
_generate_blast_shield_mapping_for_area(
world, area, area in areas_with_locks
),
)

# Still generate mapping for areas with locks even if blast shields are disabled
elif areas_with_locks:
for area in areas_with_locks:
mapping[area.value] = AreaBlastShieldMapping(area.value, _generate_blast_shield_mapping_for_area(world, area, True))
mapping[area.value] = AreaBlastShieldMapping(
area.value, _generate_blast_shield_mapping_for_area(world, area, True)
)
return WorldBlastShieldMapping(mapping)


def _generate_blast_shield_mapping_for_area(world: 'MetroidPrimeWorld', area: MetroidPrimeArea, include_locked_door: bool) -> BlastShieldMapping:
def _generate_blast_shield_mapping_for_area(
world: "MetroidPrimeWorld", area: MetroidPrimeArea, include_locked_door: bool
) -> BlastShieldMapping:
area_mapping: BlastShieldMapping = BlastShieldMapping({})
total_beam_combo_doors = 0

if cast(str, world.options.blast_shield_randomization.value) == BlastShieldRandomization.option_mix_it_up:
if (
cast(str, world.options.blast_shield_randomization.value)
== BlastShieldRandomization.option_mix_it_up
):
blast_shield_regions = get_valid_blast_shield_regions_by_area(world, area)
num_shields_to_add = math.ceil(world.options.blast_shield_frequency.value * len(blast_shield_regions) * .1)
num_shields_to_add = math.ceil(
world.options.blast_shield_frequency.value * len(blast_shield_regions) * 0.1
)
world.random.shuffle(blast_shield_regions)
for i in range(num_shields_to_add):
region = blast_shield_regions[i]
source_room = world.random.choice(list(region.doors.keys()))
door_data = get_door_data_by_room_names(source_room, region.doors[source_room], area, world)
door_data = get_door_data_by_room_names(
source_room, region.doors[source_room], area, world
)

assert door_data is not None
_, door_id = door_data

shield_type = world.random.choice(_get_available_blast_shields(world, total_beam_combo_doors >= MAX_BEAM_COMBO_DOORS_PER_AREA))
shield_type = world.random.choice(
_get_available_blast_shields(
world, total_beam_combo_doors >= MAX_BEAM_COMBO_DOORS_PER_AREA
)
)
if source_room.value not in area_mapping:
area_mapping[source_room.value] = {}
area_mapping[source_room.value][door_id] = shield_type

if shield_type in BEAM_COMBOS:
total_beam_combo_doors += 1

elif cast(str, world.options.blast_shield_randomization.value) == BlastShieldRandomization.option_replace_existing:
elif (
cast(str, world.options.blast_shield_randomization.value)
== BlastShieldRandomization.option_replace_existing
):
for room_name, room_data in world.game_region_data[area].rooms.items():
for door_id, door_data in room_data.doors.items():
if door_data.blast_shield:
if room_name.value not in area_mapping:
area_mapping[room_name.value] = {}

shield_type = world.random.choice(_get_available_blast_shields(world, total_beam_combo_doors >= MAX_BEAM_COMBO_DOORS_PER_AREA))
shield_type = world.random.choice(
_get_available_blast_shields(
world,
total_beam_combo_doors >= MAX_BEAM_COMBO_DOORS_PER_AREA,
)
)
area_mapping[room_name.value][door_id] = shield_type

if shield_type in BEAM_COMBOS:
total_beam_combo_doors += 1

if include_locked_door:
lockable_regions = [regions for regions in get_valid_blast_shield_regions_by_area(world, area) if regions.can_be_locked]
lockable_regions = [
regions
for regions in get_valid_blast_shield_regions_by_area(world, area)
if regions.can_be_locked
]
if lockable_regions:
region = lockable_regions[0]
source_room = world.random.choice(list(region.doors.keys()))
door_data = get_door_data_by_room_names(source_room, region.doors[source_room], area, world)
door_data = get_door_data_by_room_names(
source_room, region.doors[source_room], area, world
)
assert door_data is not None
_, door_id = door_data
if source_room.value not in area_mapping:
Expand All @@ -135,28 +187,43 @@ def _generate_blast_shield_mapping_for_area(world: 'MetroidPrimeWorld', area: Me
return area_mapping


def _get_available_blast_shields(world: 'MetroidPrimeWorld', force_exclude_combo_doors: bool = False) -> List[BlastShieldType]:
available_shields = [shield for shield in ALL_SHIELDS.copy() if shield not in [BlastShieldType.Disabled, BlastShieldType.No_Blast_Shield]]
if cast(str, world.options.blast_shield_randomization.value) == BlastShieldRandomization.option_replace_existing:
def _get_available_blast_shields(
world: "MetroidPrimeWorld", force_exclude_combo_doors: bool = False
) -> List[BlastShieldType]:
available_shields = [
shield
for shield in ALL_SHIELDS.copy()
if shield not in [BlastShieldType.Disabled, BlastShieldType.No_Blast_Shield]
]
if (
cast(str, world.options.blast_shield_randomization.value)
== BlastShieldRandomization.option_replace_existing
):
available_shields.remove(BlastShieldType.Missile)

if world.options.blast_shield_available_types.value == BlastShieldAvailableTypes.option_all and not force_exclude_combo_doors:
if (
world.options.blast_shield_available_types.value
== BlastShieldAvailableTypes.option_all
and not force_exclude_combo_doors
):
return available_shields
else:
return [shield for shield in available_shields if shield not in BEAM_COMBOS]


def apply_blast_shield_mapping(world: 'MetroidPrimeWorld'):
def apply_blast_shield_mapping(world: "MetroidPrimeWorld"):
remove_vanilla_blast_shields(world)
mapping = world.blast_shield_mapping
assert mapping is not None
for area, area_mapping in mapping.items():
for room_name, door_mapping in area_mapping.type_mapping.items():
for door_id, shield_type in door_mapping.items():
world.game_region_data[MetroidPrimeArea(area)].rooms[RoomName(room_name)].doors[door_id].blast_shield = shield_type
world.game_region_data[MetroidPrimeArea(area)].rooms[
RoomName(room_name)
].doors[door_id].blast_shield = shield_type


def remove_vanilla_blast_shields(world: 'MetroidPrimeWorld'):
def remove_vanilla_blast_shields(world: "MetroidPrimeWorld"):
for area in MetroidPrimeArea:
for room_data in world.game_region_data[area].rooms.values():
for door_data in room_data.doors.values():
Expand Down
Loading

0 comments on commit 4b62248

Please sign in to comment.