mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-17 14:06:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Alternate RMLUI Menu Sounds (#686)

Browse Source 
* Alternate RMLUI Menu Sounds

Those fit more the game I feel like.

* swapped tab sounds

* pressing A on tab button plays the OK sound

* Fix tab sound + Added menu sounds to prelaunch menu

* Centralize UI sound definitions

* Improvements

* Add "Play" button sound

* Use kSoundItemFocus in prelaunch

* Oops

* Update play/enable/disable sounds

---------

Co-authored-by: MelonSpeedruns <melonspeedruns@stratobox.net>
Co-authored-by: Luke Street <luke@street.dev>
This commit is contained in:
MelonSpeedruns
2026-05-05 18:44:11 -04:00
committed by GitHub
parent 782a8573e9
commit 945ce3e4bc
18 changed files with 142 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dusk/ui/editor.cpp
+76 -17
View File
@@ -185,7 +185,10 @@ void populate_stage_picker(Pane& pane, std::function<Rml::String()> getStageFile
return getStageFile() == stageFile;
},
})
.on_pressed([setStageFile, stageFile = map.mapFile] { setStageFile(stageFile); });
.on_pressed([setStageFile, stageFile = map.mapFile] {
mDoAud_seStartMenu(kSoundItemChange);
setStageFile(stageFile);
});
}
}
}
@@ -741,11 +744,13 @@ void populate_toggle_group(Pane& pane, const std::vector<ToggleEntry>& entries)
pane.clear();
pane.add_section("Actions");
pane.add_button("Select All").on_pressed([entries] {
mDoAud_seStartMenu(kSoundItemChange);
for (const auto& entry : entries) {
entry.setSelected(true);
}
});
pane.add_button("Select None").on_pressed([entries] {
mDoAud_seStartMenu(kSoundItemChange);
for (const auto& entry : entries) {
entry.setSelected(false);
}
@@ -758,6 +763,7 @@ void populate_toggle_group(Pane& pane, const std::vector<ToggleEntry>& entries)
.isSelected = entry.isSelected,
})
.on_pressed([isSelected = entry.isSelected, setSelected = entry.setSelected] {
mDoAud_seStartMenu(kSoundItemChange);
setSelected(!isSelected());
});
}
@@ -878,7 +884,10 @@ void populate_item_slot_picker(Pane& pane, int slot) {
pane.clear();
pane.add_section("Actions");
pane.add_button(fmt::format("Default ({})", get_item_name(get_slot_default(slot))))
.on_pressed([slot] { dComIfGs_setItem(slot, get_slot_default(slot)); });
.on_pressed([slot] {
mDoAud_seStartMenu(kSoundItemChange);
dComIfGs_setItem(slot, get_slot_default(slot));
});
pane.add_section("Items");
pane.add_button(
@@ -886,7 +895,10 @@ void populate_item_slot_picker(Pane& pane, int slot) {
.text = "None",
.isSelected = [slot] { return get_player_item()->mItems[slot] == dItemNo_NONE_e; },
})
.on_pressed([slot] { dComIfGs_setItem(slot, dItemNo_NONE_e); });
.on_pressed([slot] {
mDoAud_seStartMenu(kSoundItemChange);
dComIfGs_setItem(slot, dItemNo_NONE_e);
});
for (const auto& [itemId, item] : itemMap) {
if (item.m_type != ITEMTYPE_EQUIP_e) {
continue;
@@ -896,15 +908,24 @@ void populate_item_slot_picker(Pane& pane, int slot) {
.text = item.m_name,
.isSelected = [slot, itemId] { return get_player_item()->mItems[slot] == itemId; },
})
.on_pressed([slot, itemId] { dComIfGs_setItem(slot, static_cast<u8>(itemId)); });
.on_pressed([slot, itemId] {
mDoAud_seStartMenu(kSoundItemChange);
dComIfGs_setItem(slot, static_cast<u8>(itemId));
});
}
}
void populate_item_flag_picker(Pane& pane) {
pane.clear();
pane.add_section("Actions");
pane.add_button("Select All").on_pressed([] { set_all_item_first_bits(true); });
pane.add_button("Clear None").on_pressed([] { set_all_item_first_bits(false); });
pane.add_button("Select All").on_pressed([] {
mDoAud_seStartMenu(kSoundItemChange);
set_all_item_first_bits(true);
});
pane.add_button("Clear None").on_pressed([] {
mDoAud_seStartMenu(kSoundItemChange);
set_all_item_first_bits(false);
});
pane.add_section("Items");
for (const auto& [itemId, item] : itemMap) {
@@ -916,7 +937,10 @@ void populate_item_flag_picker(Pane& pane) {
.text = item.m_name,
.isSelected = [itemId] { return dComIfGs_isItemFirstBit(static_cast<u8>(itemId)); },
})
.on_pressed([itemId] { toggle_item_first_bit(static_cast<u8>(itemId)); });
.on_pressed([itemId] {
mDoAud_seStartMenu(kSoundItemChange);
toggle_item_first_bit(static_cast<u8>(itemId));
});
}
}
@@ -927,13 +951,19 @@ void populate_select_item_picker(Pane& pane, u8& selectItemData) {
.text = "None",
.isSelected = [&selectItemData] { return selectItemData == dItemNo_NONE_e; },
})
.on_pressed([&selectItemData] { selectItemData = dItemNo_NONE_e; });
.on_pressed([&selectItemData] {
mDoAud_seStartMenu(kSoundItemChange);
selectItemData = dItemNo_NONE_e;
});
for (int i = 0; i < 24; i++) {
pane.add_button({
.text = item_label_for_slot(i),
.isSelected = [i, &selectItemData] { return selectItemData == i; },
})
.on_pressed([i, &selectItemData] { selectItemData = i; });
.on_pressed([i, &selectItemData] {
mDoAud_seStartMenu(kSoundItemChange);
selectItemData = i;
});
}
}
@@ -946,6 +976,7 @@ void populate_select_clothes_picker(Pane& pane) {
.isSelected = [id] { return get_player_status()->mSelectEquip[0] == id; },
})
.on_pressed([id] {
mDoAud_seStartMenu(kSoundItemChange);
dMeter2Info_setCloth(id, false);
daPy_getPlayerActorClass()->setClothesChange(0);
});
@@ -964,7 +995,10 @@ void populate_select_equip_picker(Pane& pane, u8& equip, const std::array<u8, Si
.text = get_item_name(id),
.isSelected = [id, &equip] { return equip == id; },
})
.on_pressed([id, &equip] { equip = id; });
.on_pressed([id, &equip] {
mDoAud_seStartMenu(kSoundItemChange);
equip = id;
});
};
addOption(dItemNo_NONE_e);
for (const auto item : entries) {
@@ -985,7 +1019,10 @@ void populate_wallet_picker(Pane& pane) {
.text = walletSizeNames[i],
.isSelected = [i] { return get_player_status()->getWalletSize() == i; },
})
.on_pressed([i] { get_player_status()->setWalletSize(i); });
.on_pressed([i] {
mDoAud_seStartMenu(kSoundItemChange);
get_player_status()->setWalletSize(i);
});
}
}
@@ -1002,7 +1039,10 @@ void populate_form_picker(Pane& pane) {
.text = formNames[i],
.isSelected = [i] { return get_player_status()->getTransformStatus() == i; },
})
.on_pressed([i] { get_player_status()->setTransformStatus(i); });
.on_pressed([i] {
mDoAud_seStartMenu(kSoundItemChange);
get_player_status()->setTransformStatus(i);
});
}
}
@@ -1013,7 +1053,10 @@ void add_toggle_button(Pane& pane, ToggleEntry entry) {
.text = entry.text,
.isSelected = isSelected,
})
.on_pressed([isSelected, setSelected] { setSelected(!isSelected()); });
.on_pressed([isSelected, setSelected] {
mDoAud_seStartMenu(kSoundItemChange);
setSelected(!isSelected());
});
}
template <size_t Size>
@@ -1126,8 +1169,14 @@ void populate_collect_clothes_picker(Pane& pane) {
void populate_poe_souls_picker(Pane& pane) {
pane.clear();
pane.add_section("Actions");
pane.add_button("All 60").on_pressed([] { dComIfGs_setPohSpiritNum(60); });
pane.add_button("Clear").on_pressed([] { dComIfGs_setPohSpiritNum(0); });
pane.add_button("All 60").on_pressed([] {
mDoAud_seStartMenu(kSoundItemChange);
dComIfGs_setPohSpiritNum(60);
});
pane.add_button("Clear").on_pressed([] {
mDoAud_seStartMenu(kSoundItemChange);
dComIfGs_setPohSpiritNum(0);
});
pane.add_section("Value");
pane.add_child<NumberButton>(NumberButton::Props{
@@ -1143,10 +1192,12 @@ void populate_max_life_picker(Pane& pane) {
pane.clear();
pane.add_section("Actions");
pane.add_button("3 Hearts").on_pressed([] {
mDoAud_seStartMenu(kSoundItemChange);
dComIfGs_setMaxLife(15);
dComIfGs_setLife(12);
});
pane.add_button("20 Hearts").on_pressed([] {
mDoAud_seStartMenu(kSoundItemChange);
dComIfGs_setMaxLife(100);
dComIfGs_setLife(80);
});
@@ -1257,7 +1308,10 @@ void populate_target_type_picker(Pane& pane) {
.text = targetTypeNames[type],
.isSelected = [type] { return get_player_config()->getAttentionType() == type; },
})
.on_pressed([type] { get_player_config()->setAttentionType(type); });
.on_pressed([type] {
mDoAud_seStartMenu(kSoundItemChange);
get_player_config()->setAttentionType(type);
});
}
}
@@ -1269,7 +1323,10 @@ void populate_sound_mode_picker(Pane& pane) {
.text = soundModeNames[mode],
.isSelected = [mode] { return get_player_config()->getSound() == mode; },
})
.on_pressed([mode] { get_player_config()->setSound(mode); });
.on_pressed([mode] {
mDoAud_seStartMenu(kSoundItemChange);
get_player_config()->setSound(mode);
});
}
}
@@ -1594,6 +1651,7 @@ EditorWindow::EditorWindow() {
leftPane.add_section("Item Wheel");
leftPane.register_control(leftPane.add_button("Default All").on_pressed([&rightPane] {
mDoAud_seStartMenu(kSoundItemChange);
for (int slot = 0; slot < 24; ++slot) {
dComIfGs_setItem(slot, get_slot_default(slot));
}
@@ -1601,6 +1659,7 @@ EditorWindow::EditorWindow() {
}),
rightPane, {});
leftPane.register_control(leftPane.add_button("Clear All").on_pressed([&rightPane] {
mDoAud_seStartMenu(kSoundItemChange);
for (int slot = 0; slot < 24; ++slot) {
dComIfGs_setItem(slot, dItemNo_NONE_e);
}