Skip to content

Mod Presets: Revamp death sound options #5616

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

Open
exurd wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Mod Presets: Revamp death sound options #5616

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 Bloxstrap/Bloxstrap.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
<EmbeddedResource Include="Resources\Mods\Cursor\From2006\ArrowFarCursor.png" />
<EmbeddedResource Include="Resources\Mods\Cursor\From2013\ArrowCursor.png" />
<EmbeddedResource Include="Resources\Mods\Cursor\From2013\ArrowFarCursor.png" />
<EmbeddedResource Include="Resources\Mods\Sounds\OldDeath.ogg" />
<EmbeddedResource Include="Resources\Mods\Sounds\Death\From2022.ogg" />
<EmbeddedResource Include="Resources\Mods\Sounds\Death\Unused.ogg" />
<EmbeddedResource Include="Resources\Mods\Sounds\OldGetUp.mp3" />
<EmbeddedResource Include="Resources\Mods\Sounds\OldJump.mp3" />
<EmbeddedResource Include="Resources\Mods\Sounds\OldWalk.mp3" />
Expand Down
9 changes: 9 additions & 0 deletions Bloxstrap/Enums/DeathSound.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
namespace Bloxstrap.Enums
{
public enum DeathSound
{
Default,
From2022,
Unused
}
}
Binary file added Bloxstrap/Resources/Mods/Sounds/Death/From2022.ogg
View file
Open in desktop
Binary file not shown.
Binary file added Bloxstrap/Resources/Mods/Sounds/Death/Unused.ogg
View file
Open in desktop
Binary file not shown.
Binary file removed Bloxstrap/Resources/Mods/Sounds/OldDeath.ogg
View file
Open in desktop
Binary file not shown.
12 changes: 6 additions & 6 deletions Bloxstrap/Resources/Strings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 13 additions & 4 deletions Bloxstrap/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,15 @@ If not, then please report this exception through a [GitHub issue]({1}) along wi
<data name="Enums.CursorType.From2013" xml:space="preserve">
<value>2013 (Angular)</value>
</data>
<data name="Enums.DeathSound.Default" xml:space="preserve">
<value>Default (uuhhh.wav)</value>
</data>
<data name="Enums.DeathSound.From2022" xml:space="preserve">
<value>2022 - 2025 (ouch.ogg)</value>
</data>
<data name="Enums.DeathSound.Unused" xml:space="preserve">
<value>Unused (Kid saying Ouch.wav)</value>
</data>
<data name="Enums.EmojiType.Catmoji" xml:space="preserve">
<value>Catmoji</value>
</data>
Expand Down Expand Up @@ -795,11 +804,11 @@ Selecting 'No' will ignore this warning and continue installation.</value>
<data name="Menu.Mods.Presets.OldCharacterSounds.Title" xml:space="preserve">
<value>Emulate old character sounds</value>
</data>
<data name="Menu.Mods.Presets.OldDeathSound.Description" xml:space="preserve">
<value>Bring back the classic 'oof' death sound.</value>
<data name="Menu.Mods.Presets.CustomDeathSound.Description" xml:space="preserve">
<value>Choose between using three death sounds.</value>
</data>
<data name="Menu.Mods.Presets.OldDeathSound.Title" xml:space="preserve">
<value>Use old death sound</value>
<data name="Menu.Mods.Presets.CustomDeathSound.Title" xml:space="preserve">
<value>Death Sound</value>
</data>
<data name="Menu.Mods.Title" xml:space="preserve">
<value>Mods</value>
Expand Down
12 changes: 9 additions & 3 deletions Bloxstrap/UI/Elements/Settings/Pages/ModsPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,15 @@
<TextBlock Text="{x:Static resources:Strings.Common_Presets}" FontSize="20" FontWeight="Medium" Margin="0,16,0,0" />

<controls:OptionControl
Header="{x:Static resources:Strings.Menu_Mods_Presets_OldDeathSound_Title}"
Description="{x:Static resources:Strings.Menu_Mods_Presets_OldDeathSound_Description}">
<ui:ToggleSwitch IsChecked="{Binding OldDeathSoundTask.NewState, Mode=TwoWay}" />
Header="{x:Static resources:Strings.Menu_Mods_Presets_CustomDeathSound_Title}"
Description="{x:Static resources:Strings.Menu_Mods_Presets_CustomDeathSound_Description}">
<ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="240" ItemsSource="{Binding CustomDeathSoundTask.Selections, Mode=OneTime}" Text="{Binding CustomDeathSoundTask.NewState, Mode=TwoWay}">
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=., Converter={StaticResource EnumNameConverter}}" />
</DataTemplate>
</ComboBox.ItemTemplate>
</ComboBox>
</controls:OptionControl>

<controls:OptionControl
Expand Down
16 changes: 15 additions & 1 deletion Bloxstrap/UI/ViewModels/Settings/ModsViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,21 @@ private void ManageCustomFont()

public ICommand OpenCompatSettingsCommand => new RelayCommand(OpenCompatSettings);

public ModPresetTask OldDeathSoundTask { get; } = new("OldDeathSound", @"content\sounds\ouch.ogg", "Sounds.OldDeath.ogg");
public EnumModPresetTask<DeathSound> CustomDeathSoundTask { get; } = new("DeathSound", new()
{
{
DeathSound.From2022, new()
{
{ @"content\sounds\oof.ogg", "Sounds.Death.From2022.ogg" },
}
},
{
DeathSound.Unused, new()
{
{ @"content\sounds\oof.ogg", "Sounds.Death.Unused.ogg" },
}
}
});

public ModPresetTask OldAvatarBackgroundTask { get; } = new("OldAvatarBackground", @"ExtraContent\places\Mobile.rbxl", "OldAvatarBackground.rbxl");

Expand Down