Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 gui/desktop/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,7 @@ void MainWindow::apply_config_settings()
APPLY_COMBOBOX_SETTING(config, ui, dungeon_small_keys);
APPLY_COMBOBOX_SETTING(config, ui, dungeon_big_keys);
APPLY_COMBOBOX_SETTING(config, ui, dungeon_maps_compasses);
APPLY_CHECKBOX_SETTING(config, ui, required_boss_items);

APPLY_SPINBOX_SETTING(config, ui, damage_multiplier, float(2.0f), float(MAXIMUM_DAMAGE_MULTIPLIER));

Expand Down Expand Up @@ -861,6 +862,7 @@ void MainWindow::on_remove_swords_stateChanged(int arg1)

DEFINE_STATE_CHANGE_FUNCTION(randomize_charts)
DEFINE_STATE_CHANGE_FUNCTION(chest_type_matches_contents)
DEFINE_STATE_CHANGE_FUNCTION(required_boss_items)

void MainWindow::on_damage_multiplier_valueChanged(int multiplier)
{
Expand Down Expand Up @@ -1378,4 +1380,3 @@ void MainWindow::on_paste_permalink_clicked()
auto permalink = QGuiApplication::clipboard()->text();
on_permalink_textEdited(permalink);
}

1 change: 1 addition & 0 deletions gui/desktop/mainwindow.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ private slots:
void on_chest_type_matches_contents_stateChanged(int arg1);
void on_damage_multiplier_valueChanged(int multiplier);
void on_num_required_dungeons_currentIndexChanged(int index);
void on_required_boss_items_stateChanged(int arg1);

// Convenience Tweaks
void on_invert_sea_compass_x_axis_stateChanged(int arg1);
Expand Down
178 changes: 94 additions & 84 deletions gui/desktop/mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -1746,46 +1746,86 @@
</property>
<layout class="QGridLayout" name="gridLayout_7">
<item row="1" column="0">
<widget class="QCheckBox" name="performance">
<property name="text">
<string>Performance</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="do_not_generate_spoiler_log">
<property name="text">
<string>Do Not Generate Spoiler Log</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="random_item_slide_item">
<property name="text">
<string>Start With Random Item Sliding Item</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="classic_mode">
<property name="text">
<string>Classic Mode</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="fix_rng">
<property name="text">
<string>Fix RNG</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="random_item_slide_item">
<item row="3" column="0">
<widget class="QCheckBox" name="required_boss_items">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Start With Random Item Sliding Item</string>
<string>Require Boss Items</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="start_with_random_item">
<property name="text">
<string>Start With Random Item</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="2">
<layout class="QGridLayout" name="plandomizer_file_layout">
<item row="4" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_33">
<property name="sizeConstraint">
<enum>QLayout::SizeConstraint::SetNoConstraint</enum>
</property>
<item row="0" column="1">
<widget class="QLabel" name="plandomizer_label">
<item>
<widget class="QCheckBox" name="plandomizer">
<property name="minimumSize">
<size>
<width>0</width>
<height>24</height>
</size>
</property>
<property name="text">
<string>Plandomizer File</string>
<string>Plandomizer</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="plandomizer_path_browse_button">
<item>
<widget class="QLabel" name="plandomizer_label">
<property name="text">
<string>Browse</string>
<string>Plandomizer File</string>
</property>
</widget>
</item>
<item row="0" column="2">
<item>
<widget class="QLineEdit" name="plandomizer_path">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
Expand All @@ -1795,42 +1835,15 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="plandomizer">
<property name="minimumSize">
<size>
<width>0</width>
<height>24</height>
</size>
</property>
<item>
<widget class="QPushButton" name="plandomizer_path_browse_button">
<property name="text">
<string>Plandomizer</string>
<string>Browse</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="performance">
<property name="text">
<string>Performance</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="classic_mode">
<property name="text">
<string>Classic Mode</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="start_with_random_item">
<property name="text">
<string>Start With Random Item</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -2108,13 +2121,6 @@
<string>Logic Tweaks</string>
</property>
<layout class="QGridLayout" name="gridLayout_9">
<item row="0" column="0">
<widget class="QCheckBox" name="open_drc">
<property name="text">
<string>Open DRC</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="progressive_magic_always_double">
<property name="text">
Expand All @@ -2129,6 +2135,13 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="open_drc">
<property name="text">
<string>Open DRC</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand All @@ -2137,36 +2150,33 @@
<property name="title">
<string>In-Game Preferences</string>
</property>
<layout class="QGridLayout" name="gridLayout_11">
<item row="0" column="3">
<layout class="QHBoxLayout" name="horizontalLayout_27">
<layout class="QHBoxLayout" name="horizontalLayout_34">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_28">
<item>
<widget class="QLabel" name="label_for_gyroscope">
<widget class="QLabel" name="label_for_ui_display">
<property name="text">
<string>Gyroscope</string>
<string>UI Display</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="gyroscope">
<property name="currentText">
<string>Off</string>
</property>
<widget class="QComboBox" name="ui_display">
<item>
<property name="text">
<string>Off</string>
<string>On</string>
</property>
</item>
<item>
<property name="text">
<string>On</string>
<string>Off</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item row="0" column="0">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_24">
<item>
<widget class="QLabel" name="label_for_target_type">
Expand All @@ -2191,75 +2201,78 @@
</item>
</layout>
</item>
<item row="0" column="2">
<layout class="QHBoxLayout" name="horizontalLayout_26">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_25">
<item>
<widget class="QLabel" name="label_for_first_person_camera">
<widget class="QLabel" name="label_for_camera">
<property name="text">
<string>First-Person Camera</string>
<string>Camera</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="first_person_camera">
<widget class="QComboBox" name="camera">
<item>
<property name="text">
<string>Standard</string>
</property>
</item>
<item>
<property name="text">
<string>Reverse Up/Down</string>
<string>Reverse Left/Right</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_25">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_26">
<item>
<widget class="QLabel" name="label_for_camera">
<widget class="QLabel" name="label_for_first_person_camera">
<property name="text">
<string>Camera</string>
<string>First-Person Camera</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="camera">
<widget class="QComboBox" name="first_person_camera">
<item>
<property name="text">
<string>Standard</string>
</property>
</item>
<item>
<property name="text">
<string>Reverse Left/Right</string>
<string>Reverse Up/Down</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_28">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_27">
<item>
<widget class="QLabel" name="label_for_ui_display">
<widget class="QLabel" name="label_for_gyroscope">
<property name="text">
<string>UI Display</string>
<string>Gyroscope</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="ui_display">
<widget class="QComboBox" name="gyroscope">
<property name="currentText">
<string>Off</string>
</property>
<item>
<property name="text">
<string>On</string>
<string>Off</string>
</property>
</item>
<item>
<property name="text">
<string>Off</string>
<string>On</string>
</property>
</item>
</widget>
Expand All @@ -2269,9 +2282,6 @@
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="widget_2" native="true"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="tracker_tab">
Expand Down Expand Up @@ -2470,7 +2480,7 @@ color: lightgray</string>
<cursorShape>ArrowCursor</cursorShape>
</property>
<property name="autoFillBackground">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="styleSheet">
<string notr="true"/>
Expand Down
4 changes: 4 additions & 0 deletions gui/desktop/option_descriptions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@ static std::unordered_map<std::string, std::string> optionDescriptions = {
"num_required_dungeons",
"Select the number of randomly-chosen bosses that are required. The door to Puppet Ganon will not unlock until you've defeated all of these bosses. Sectors with required bosses will be marked on the map.",
},
{
"required_boss_items",
"Required dungeon bosses will drop required items (e.g. Triforce Shards). Applies to \"Standard\" and \"Race Mode\" dungeons.",
},
{
"randomize_charts",
"Randomizes which sector is drawn on each Triforce/Treasure Chart."
Expand Down
Loading