Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove logic from no logic Raindo #961

Merged
merged 1 commit into from
Dec 24, 2021
Merged

Remove logic from no logic Raindo #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/Randomizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,8 @@ public function prepareWorld(World $world): void
}
if ($world->config('region.wildKeys', false)) {
foreach ($dungeon_items as $key => $item) {
if ($item instanceof Item\Key && ($world->config('mode.state') != 'standard' || $item != Item::get('KeyH2', $world))) {
if ($item instanceof Item\Key && ($world->config('mode.state') !== 'standard' || $item != Item::get('KeyH2', $world)
|| $world->config('logic') === 'NoLogic')) {
unset($dungeon_items[$key]);
$advancement_items[] = $item;
}
Expand Down
2 changes: 1 addition & 1 deletion app/Region.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ public function canFill(Item $item): bool
$from_world = $item->getWorld();
if (((!$from_world->config('region.wildKeys', false) && $item instanceof Item\Key)
|| (!$from_world->config('region.wildBigKeys', false) && $item instanceof Item\BigKey)
|| ($item == Item::get('KeyH2', $from_world) && $from_world->config('mode.state') == 'standard') // Sewers Key cannot leave
|| ($item == Item::get('KeyH2', $from_world) && $from_world->config('mode.state') == 'standard' && $from_world->config('logic') !== 'NoLogic') // Sewers Key cannot leave
|| (!$from_world->config('region.wildMaps', false) && $item instanceof Item\Map)
|| (!$from_world->config('region.wildCompasses', false) && $item instanceof Item\Compass))
&& !in_array($item, $this->region_items)
Expand Down
2 changes: 1 addition & 1 deletion app/World.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,7 @@ public function setEscapeFills(Rom $rom) {
if ($this->config('rom.EscapeAssist', false)) {
$rom->setEscapeAssist(0b00000001);
}
} elseif ($uncle_items->has('TenBombs') || $this->config('logic') !== 'None') {
} elseif ($uncle_items->has('TenBombs') || $this->config('logic') !== 'NoLogic') {
// TenBombs, or give player bombs if uncle was plando'd to not have a weapon.
$rom->setEscapeFills(0b00000010);
$rom->setUncleSpawnRefills(
Expand Down