Skip to content

Commit

Permalink
chore: Added Waverider and Xingqiu skin Bamboo Rain (Jorixon#168)
Browse files Browse the repository at this point in the history
Also changed Preset info text and added drag cursor to preset and icon to read only option
  • Loading branch information
Jorixon authored Mar 31, 2024
1 parent 2176bfb commit c978d06
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 7 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -1366,7 +1366,14 @@
"Liyue"
],
"ModFilesName": "Xingqiu",
"InGameSkins": [],
"InGameSkins": [
{
"ModFilesName": "XingqiuBamboo",
"Image": "Character_Skin_XingqiuBambooRain_Thumb.png",
"InternalName": "Xingqiu Bamboo Rain",
"DisplayName": "Bamboo Rain"
}
],
"InternalName": "Xingqiu",
"DisplayName": "Xingqiu"
},
Expand Down
6 changes: 6 additions & 0 deletions src/GIMI-ModManager.WinUI/Assets/Games/Genshin/objects.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,11 @@
"DisplayName": "Other Objects",
"IsMultiMod": true,
"Image": "Object_Others.png"
},
{
"InternalName": "waverider",
"DisplayName": "Waverider",
"IsMultiMod": false,
"Image": "Waverider.png"
}
]
2 changes: 2 additions & 0 deletions src/GIMI-ModManager.WinUI/GIMI-ModManager.WinUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_RosariaCN_Thumb.png" />
<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_RosariaCN_Thumb.webp" />
<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_ShenheFrostflower_Thumb.png" />
<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\Character_Skin_XingqiuBambooRain_Thumb.png" />
<Content Remove="Assets\Games\Genshin\Images\AltCharacterSkins\convert.py" />
<Content Remove="Assets\Games\Genshin\Images\Characters\Character_Albedo_Thumb.png" />
<Content Remove="Assets\Games\Genshin\Images\Characters\Character_Alhaitham_Thumb.png" />
Expand Down Expand Up @@ -195,6 +196,7 @@
<Content Remove="Assets\Games\Genshin\Images\Npcs\Npc_Skirk.webp" />
<Content Remove="Assets\Games\Genshin\Images\Npcs\Npc_Slimes.webp" />
<Content Remove="Assets\Games\Genshin\Images\Npcs\Npc_Sorush.webp" />
<Content Remove="Assets\Games\Genshin\Images\Objects\Waverider.png" />
<Content Remove="Assets\Games\Genshin\Images\Start_Game.png" />
<Content Remove="Assets\Games\Genshin\Images\Weapons\Weapon_Akuoumaru.png" />
<Content Remove="Assets\Games\Genshin\Images\Weapons\Weapon_Alley_Hunter.png" />
Expand Down
11 changes: 9 additions & 2 deletions src/GIMI-ModManager.WinUI/Views/PresetPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,10 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid>
<Grid
x:Name="DragHandleIcon"
PointerEntered="DragHandleIcon_OnPointerEntered"
PointerExited="DragHandleIcon_OnPointerExited">
<FontIcon Glyph="&#xE76F;" />
</Grid>
<Grid Grid.Column="1">
Expand Down Expand Up @@ -237,7 +240,11 @@
Command="{x:Bind ToggleReadOnlyCommand}"
CommandParameter="{Binding Mode=OneWay}"
IsChecked="{x:Bind IsReadOnly, Mode=OneWay}"
Text="Read Only" />
Text="Read Only">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE736;" />
</MenuFlyoutItem.Icon>
</ToggleMenuFlyoutItem>
<MenuFlyoutItem
Command="{x:Bind StartEditingNameCommand}"
CommandParameter="{Binding Mode=OneWay}"
Expand Down
11 changes: 7 additions & 4 deletions src/GIMI-ModManager.WinUI/Views/PresetPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using GIMI_ModManager.WinUI.Services.AppManagement;
using GIMI_ModManager.WinUI.ViewModels;
using GIMI_ModManager.WinUI.Views.Controls;
using Microsoft.UI.Input;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Input;
Expand Down Expand Up @@ -67,10 +68,6 @@ private async void ButtonBase_OnClick(object sender, RoutedEventArgs e)
CreateTextBlock(
"You can allow JASM to handle 3Dmigoto reloading by starting the Elevator and checking the Auto Sync checkbox. But you can also do it yourself by checking the Show Manual Controls checkbox and saving/loading preferences manually and refreshing 3Dmigoto with the F10 key."),

CreateTextBlock(
"In this JASM version there is no way to see what mods are in a preset... But if you reallly want to, you can find the preset configuration files in this path: %appdata%\\..\\local\\JASM\\ApplicationData_Genshin \n" +
"I suggest not changing anything as these files are not meant to be edited manually."),

CreateTextBlock(
"It is possible to simply ignore the preset part of this page and only use the manual controls to persist mod preferences."
)
Expand All @@ -80,4 +77,10 @@ private async void ButtonBase_OnClick(object sender, RoutedEventArgs e)

await App.GetService<IWindowManagerService>().ShowDialogAsync(dialog).ConfigureAwait(false);
}

private void DragHandleIcon_OnPointerEntered(object sender, PointerRoutedEventArgs e) =>
ProtectedCursor = InputSystemCursor.Create(InputSystemCursorShape.SizeAll);

private void DragHandleIcon_OnPointerExited(object sender, PointerRoutedEventArgs e) =>
ProtectedCursor = InputSystemCursor.Create(InputSystemCursorShape.Arrow);
}

0 comments on commit c978d06

Please sign in to comment.