Core: Add some more world convenience methods (#3021)
* Add some more convenience methods * Typing stuff * Rename the method * beauxq's suggestions * Back to Push Precollected
This commit is contained in:
parent
d1823a21ea
commit
728d249202
|
@ -7,7 +7,7 @@ import sys
|
||||||
import time
|
import time
|
||||||
from random import Random
|
from random import Random
|
||||||
from dataclasses import make_dataclass
|
from dataclasses import make_dataclass
|
||||||
from typing import (Any, Callable, ClassVar, Dict, FrozenSet, List, Mapping, Optional, Set, TextIO, Tuple,
|
from typing import (Any, Callable, ClassVar, Dict, FrozenSet, Iterable, List, Mapping, Optional, Set, TextIO, Tuple,
|
||||||
TYPE_CHECKING, Type, Union)
|
TYPE_CHECKING, Type, Union)
|
||||||
|
|
||||||
from Options import item_and_loc_options, ItemsAccessibility, OptionGroup, PerGameCommonOptions
|
from Options import item_and_loc_options, ItemsAccessibility, OptionGroup, PerGameCommonOptions
|
||||||
|
@ -534,12 +534,24 @@ class World(metaclass=AutoWorldRegister):
|
||||||
def get_location(self, location_name: str) -> "Location":
|
def get_location(self, location_name: str) -> "Location":
|
||||||
return self.multiworld.get_location(location_name, self.player)
|
return self.multiworld.get_location(location_name, self.player)
|
||||||
|
|
||||||
|
def get_locations(self) -> "Iterable[Location]":
|
||||||
|
return self.multiworld.get_locations(self.player)
|
||||||
|
|
||||||
def get_entrance(self, entrance_name: str) -> "Entrance":
|
def get_entrance(self, entrance_name: str) -> "Entrance":
|
||||||
return self.multiworld.get_entrance(entrance_name, self.player)
|
return self.multiworld.get_entrance(entrance_name, self.player)
|
||||||
|
|
||||||
|
def get_entrances(self) -> "Iterable[Entrance]":
|
||||||
|
return self.multiworld.get_entrances(self.player)
|
||||||
|
|
||||||
def get_region(self, region_name: str) -> "Region":
|
def get_region(self, region_name: str) -> "Region":
|
||||||
return self.multiworld.get_region(region_name, self.player)
|
return self.multiworld.get_region(region_name, self.player)
|
||||||
|
|
||||||
|
def get_regions(self) -> "Iterable[Region]":
|
||||||
|
return self.multiworld.get_regions(self.player)
|
||||||
|
|
||||||
|
def push_precollected(self, item: Item) -> None:
|
||||||
|
self.multiworld.push_precollected(item)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def player_name(self) -> str:
|
def player_name(self) -> str:
|
||||||
return self.multiworld.get_player_name(self.player)
|
return self.multiworld.get_player_name(self.player)
|
||||||
|
|
Loading…
Reference in New Issue