morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The Witness - 0.3.3 features and fixes (#617)

Browse Source 
New option: "Early Secret Area" (Opens a door to the Challenge Area from the start of the game)
New option: Victory Conditions "Mountaintop Box Short" and "Mountaintop Box Long"
New options: Number of Lasers of Mountain, Number of Lasers for Challenge
New option & item: Add some number of "Puzzle Skips", which let you skip one puzzle in the game

Many logic fixes
This commit is contained in:
NewSoupVi
2022-06-16 03:04:45 +02:00
committed by GitHub
parent 0a63bd0fc6
commit 7d79cff66f
13 changed files with 410 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
worlds/witness/__init__.py
View File

@@ -11,7 +11,7 @@ from .locations import WitnessPlayerLocations, StaticWitnessLocations
from .items import WitnessItem, StaticWitnessItems, WitnessPlayerItems
from .rules import set_rules
from .regions import WitnessRegions
from .Options import is_option_enabled, the_witness_options
from .Options import is_option_enabled, the_witness_options, get_option_value
from .utils import best_junk_to_add_based_on_weights
@@ -50,7 +50,9 @@ class WitnessWorld(World):
return {
'seed': self.world.random.randint(0, 1000000),
'victory_location': int(self.player_logic.VICTORY_LOCATION, 16),
'panelhex_to_id': self.locat.CHECK_PANELHEX_TO_ID
'panelhex_to_id': self.locat.CHECK_PANELHEX_TO_ID,
'doorhex_to_id': self.player_logic.DOOR_DICT_FOR_CLIENT,
'door_connections_to_sever': self.player_logic.DOOR_CONNECTIONS_TO_SEVER
}
def generate_early(self):
@@ -67,20 +69,36 @@ class WitnessWorld(World):
items_by_name = dict()
for item in self.items.ITEM_TABLE:
witness_item = self.create_item(item)
if item not in self.items.EVENT_ITEM_TABLE:
if item in self.items.PROGRESSION_TABLE:
pool.append(witness_item)
items_by_name[item] = witness_item
# Put good item on first check
random_good_item = self.world.random.choice(self.items.GOOD_ITEMS)
first_check = self.world.get_location(
"Tutorial Gate Open", self.player
)
first_check.place_locked_item(items_by_name[random_good_item])
pool.remove(items_by_name[random_good_item])
less_junk = 0
# Put good item on first check if symbol shuffle is on
# symbols = is_option_enabled(self.world, self.player, "shuffle_symbols")
symbols = True
if symbols:
random_good_item = self.world.random.choice(self.items.GOOD_ITEMS)
first_check = self.world.get_location(
"Tutorial Gate Open", self.player
)
first_check.place_locked_item(items_by_name[random_good_item])
pool.remove(items_by_name[random_good_item])
less_junk = 1
for item in self.items.EXTRA_AMOUNTS:
witness_item = self.create_item(item)
for i in range(0, self.items.EXTRA_AMOUNTS[item]):
if len(pool) < len(self.locat.CHECK_LOCATION_TABLE) - len(self.locat.EVENT_LOCATION_TABLE) - less_junk:
pool.append(witness_item)
# Put in junk items to fill the rest
junk_size = len(self.locat.CHECK_LOCATION_TABLE) - len(pool) - len(self.locat.EVENT_LOCATION_TABLE) - 1
junk_size = len(self.locat.CHECK_LOCATION_TABLE) - len(pool) - len(self.locat.EVENT_LOCATION_TABLE) - less_junk
print(junk_size)
for i in range(0, junk_size):
pool.append(self.create_item(self.get_filler_item_name()))
@@ -107,7 +125,7 @@ class WitnessWorld(World):
slot_data["hard_mode"] = False
for option_name in the_witness_options:
slot_data[option_name] = is_option_enabled(
slot_data[option_name] = get_option_value(
self.world, self.player, option_name
)
@@ -124,6 +142,8 @@ class WitnessWorld(World):
name, item.progression, item.code, player=self.player
)
new_item.trap = item.trap
if item.never_exclude:
new_item.never_exclude = True
return new_item
def get_filler_item_name(self) -> str: # Used by itemlinks