Skip to content

Commit ddfbb1b

Browse files
committed
Drop python 3.8 to use removeprefix and restore default in multiselect
1 parent a9f418a commit ddfbb1b

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
python-version: ["3.8"]
15+
python-version: ["3.9"]
1616

1717
steps:
1818
- uses: actions/checkout@v4

Gui.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python3
22
import sys
3-
if sys.version_info < (3, 8):
4-
print("OoT Randomizer requires Python version 3.8 or newer and you are using %s" % '.'.join([str(i) for i in sys.version_info[0:3]]))
3+
if sys.version_info < (3, 9):
4+
print("OoT Randomizer requires Python version 3.9 or newer and you are using %s" % '.'.join([str(i) for i in sys.version_info[0:3]]))
55
# raw_input was renamed to input in 3.0, handle both 2.x and 3.x by trying the rename for 2.x
66
try:
77
input = raw_input

Messages.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,8 +1504,7 @@ def update_map_compass_messages(messages: list[Message], world: World):
15041504
update_message_by_id(messages, compass_id, compass_message, allow_duplicates=True)
15051505
if 'map_dungeon_location' in world.settings.enhance_map_compass and world.settings.shuffle_dungeon_entrances != 'off':
15061506
dungeon_index = [i for i, c in enumerate(dungeon_entrances) if dungeon.name in c]
1507-
if dungeon.name not in ('Dodongos Cavern', 'Jabu Jabus Belly'):
1508-
dungeon_name = dungeon_name.split(' ', 1)[1] # Remove the "the" to make room.
1507+
dungeon_name = dungeon_name.removeprefix('the ') # to make room
15091508
if 'map_mq' in world.settings.enhance_map_compass and (world.settings.mq_dungeons_mode == 'random' or world.settings.mq_dungeons_count != 0 and world.settings.mq_dungeons_count != 12):
15101509
map_message = f"\x13\x76\x08You found the \x05\x41Map\x05\x40 for \x05{COLOR_MAP['Red'] + 'masterful' if world.dungeon_mq[dungeon.name] else COLOR_MAP['Green'] + 'ordinary'}\x05\x40\x01{dungeon_name}\x05\x40! This dungeon\x01is at {dungeon_textbox_list[dungeon_index[0]]}\x05\x40!\x09"
15111510
else:

OoTRandomizer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python3
22
import sys
3-
if sys.version_info < (3, 8):
4-
print("OoT Randomizer requires Python version 3.8 or newer and you are using %s" % '.'.join([str(i) for i in sys.version_info[0:3]]))
3+
if sys.version_info < (3, 9):
4+
print("OoT Randomizer requires Python version 3.9 or newer and you are using %s" % '.'.join([str(i) for i in sys.version_info[0:3]]))
55
sys.exit(1)
66

77
import datetime

SettingsList.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3117,6 +3117,7 @@ class SettingInfos:
31173117
'compass_boss_location': 'Compass gives boss location',
31183118
'compass_reward': 'Compass gives reward info',
31193119
},
3120+
default = [],
31203121
gui_tooltip = '''\
31213122
Gives the Map and Compass extra functionality.
31223123

0 commit comments

Comments
 (0)