Skip to content

Various features related to reward choice, some other fixes #263

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

Merged
dimon222 merged 16 commits into from
Feb 23, 2023
Merged

Various features related to reward choice, some other fixes #263

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b2668eb
Remove traces of SlowSecondProcess
D1firehail Feb 18, 2023
66974b7
UI and settings for theme selection
D1firehail Feb 18, 2023
68e83ee
Custom Theme logic, fix settings UI
D1firehail Feb 18, 2023
2bbacb8
Filter customization UI
D1firehail Feb 19, 2023
8e1e6b5
ThemeAdjuster borders
D1firehail Feb 19, 2023
8f1bb15
Reward Overlay Location for 1/2 rewards. Better logging of auto-list …
D1firehail Feb 19, 2023
adf05a0
if AFK checker or VerifyWarframe notices game closed, check for restart
D1firehail Feb 19, 2023
2b7836d
Reward Choice to CSV
D1firehail Feb 19, 2023
9f20267
Add Auto Count
D1firehail Feb 20, 2023
73872c9
capitalization
D1firehail Feb 20, 2023
c69554c
remove test fill code from AutoCount
D1firehail Feb 20, 2023
2797b9e
auto-add title
D1firehail Feb 20, 2023
ee21f50
other auto-add title
D1firehail Feb 20, 2023
bbf234c
Fix the old typo
dimon222 Feb 20, 2023
b559c4b
Merge
D1firehail Feb 21, 2023
19e1f2f
reset reward choice without auto-list, treat unknown theme as custom
D1firehail Feb 21, 2023
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
138 changes: 138 additions & 0 deletions WFInfo/AutoAddViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;

namespace WFInfo
{
public class AutoAddViewModel : INPC
{
private ObservableCollection<AutoAddSingleItem> _itemList;

public ObservableCollection<AutoAddSingleItem> ItemList
{
get => _itemList;
private set
{
_itemList = value;
RaisePropertyChanged();
}
}
public AutoAddViewModel()
{
_itemList = new ObservableCollection<AutoAddSingleItem>();
}

public void addItem(AutoAddSingleItem item)
{
_itemList.Add(item);
RaisePropertyChanged();
}

public void removeItem(AutoAddSingleItem item)
{
_itemList.Remove(item);
RaisePropertyChanged();
}
}

public class AutoAddSingleItem : INPC
{
public AutoAddViewModel _parent;

private ObservableCollection<string> _rewardOptions;

public ObservableCollection<string> RewardOptions
{
get => _rewardOptions;
private set
{
_rewardOptions = value;
RaisePropertyChanged();
}
}

private string _activeOption;
public string ActiveOption
{
get => _activeOption;
set
{
_activeOption = value;
RaisePropertyChanged();
}
}

public SimpleCommand Increment { get; }

public SimpleCommand Remove { get; }

public AutoAddSingleItem(List<string> options, int activeIndex, AutoAddViewModel parent)
{

RewardOptions = new ObservableCollection<string>(options);
activeIndex = Math.Min(RewardOptions.Count - 1, activeIndex);
if (activeIndex >= 0 && options != null)
{
ActiveOption = options[activeIndex];
} else
{
ActiveOption = "";
}
_parent = parent;
Remove = new SimpleCommand(() => RemoveFromParent());
Increment = new SimpleCommand(() => AddCount(true));
}

public void AddCount(bool save)
{
//get item count, increment, save
bool saveFailed = false;
string item = ActiveOption;
if (item.Contains("Prime"))
{
string[] nameParts = item.Split(new string[] { "Prime" }, 2, StringSplitOptions.None);
string primeName = nameParts[0] + "Prime";
string partName = primeName + ((nameParts[1].Length > 10 && !nameParts[1].Contains("Kubrow")) ? nameParts[1].Replace(" Blueprint", "") : nameParts[1]);


Main.AddLog("Incrementing owned amount for part \"" + partName + "\"");
try
{

int count = Main.dataBase.equipmentData[primeName]["parts"][partName]["owned"].ToObject<int>();

Main.dataBase.equipmentData[primeName]["parts"][partName]["owned"] = count + 1;
}
catch (Exception ex)
{
Main.AddLog("FAILED to increment owned amount, Name: " + item + ", primeName: " + primeName + ", partName: " + partName + Environment.NewLine + ex.Message);
saveFailed = true;
}
}
if (saveFailed)
{
//shouldn't need Main.RunOnUIThread since this is already on the UI Thread
//adjust for time diff between snap-it finishing and save being pressed, in case of long delay
Main.SpawnErrorPopup(DateTime.UtcNow);
Main.StatusUpdate("Failed to save one or more item, report to dev", 2);
}

RemoveFromParent();
if (save)
{
Main.dataBase.SaveAllJSONs();
EquipmentWindow.INSTANCE.reloadItems();
}
}

private void RemoveFromParent()
{
if (_parent != null)
{
_parent.removeItem(this);
}
RaisePropertyChanged();
}
}
}
214 changes: 214 additions & 0 deletions WFInfo/AutoCount.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
<Window x:Class="WFInfo.AutoCount"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:wfInfo="clr-namespace:WFInfo"
xmlns:components="clr-namespace:WFInfo.Components"
mc:Ignorable="d"
Title="Auto Add"
MaxWidth="400"
MinWidth="400"
Width="400"
Height="634"
BorderBrush="#FF707070"
WindowStyle="None"
FontSize="16"
AllowsTransparency="True"
DataContext="{Binding RelativeSource={RelativeSource Self}}"
ResizeMode="CanResizeWithGrip">
<Window.Resources>
</Window.Resources>
<Grid MouseDown="MouseDown"
Background="#FF1B1B1B"
MinWidth="334">
<Grid.Resources>

<Style x:Key="NestedBorder"
TargetType="Border">
<Setter Property="BorderBrush"
Value="#FF646464" />
<Setter Property="Padding"
Value="5, 2" />
<Setter Property="BorderThickness"
Value="1" />
</Style>
<Style TargetType="Border">
<Setter Property="BorderBrush"
Value="#FF646464" />
<Setter Property="Padding"
Value="25, 5" />
<Setter Property="BorderThickness"
Value="1" />
</Style>
<Style x:Key="AllTextBoxes"
BasedOn="{StaticResource baseStyle}"
TargetType="TextBox">
<Setter Property="Background"
Value="#FF0F0F0F" />
<Setter Property="BorderBrush"
Value="#FFB1D0D9" />
<Setter Property="VerticalContentAlignment"
Value="Center" />
<Setter Property="HorizontalContentAlignment"
Value="Center" />
<Setter Property="Margin"
Value="0, 5" />
<Setter Property="Padding"
Value="0,1,0,2.5" />
<Setter Property="Cursor"
Value="Arrow" />
<Setter Property="TextWrapping"
Value="Wrap" />
<Setter Property="FontFamily"
Value="{StaticResource Roboto}" />
<Setter Property="components:SelectTextOnFocus.Active"
Value="True" />
<Setter Property="wfInfo:FocusAdvancement.AdvancesByEnterKey"
Value="True" />
</Style>

<Style TargetType="CheckBox"
BasedOn="{StaticResource baseStyle}">
<Setter Property="Background"
Value="#FFB1D0D9" />
<Setter Property="BorderBrush"
Value="#FF0F0F0F" />
<Setter Property="VerticalContentAlignment"
Value="Center" />
</Style>
<Style BasedOn="{StaticResource AllTextBoxes}"
TargetType="TextBox" />
<Style x:Key="KeyBindTextboxStyle"
BasedOn="{StaticResource AllTextBoxes}"
TargetType="TextBox">
<Setter Property="components:SelectTextOnFocus.Active"
Value="False" />
<Style.Triggers>
<Trigger Property="IsFocused"
Value="True">
<Setter Property="Foreground"
Value="Transparent">
</Setter>
</Trigger>
</Style.Triggers>
</Style>
<components:NegateIntConverter x:Key="NegateIntConverter" />
<components:KeyStringConverter x:Key="KeyStringConverter" />
</Grid.Resources>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="30"> </RowDefinition>
</Grid.RowDefinitions>
<Grid VerticalAlignment="Top"
Grid.Row="0"
Grid.ColumnSpan="2"
Grid.Column="0">
<Rectangle Fill="#FF0F0F0F"
Stroke="#FF646464" />
<DockPanel>
<Image HorizontalAlignment="Left"
VerticalAlignment="Center"
Width="26"
DockPanel.Dock="Left"
Margin="2,0,5,1"
Source="Resources/WFLogo.png" />
<Label MouseLeftButtonDown="Hide"
Content="x"
Width="30"
Style="{StaticResource Label_Button}"
VerticalContentAlignment="Stretch"
DockPanel.Dock="Right" />
<TextBlock Text="Auto Add"
VerticalAlignment="Center"
FontSize="16"
FontFamily="{StaticResource Roboto_Black}"
FontWeight="Bold" />
</DockPanel>
</Grid>
<ScrollViewer Grid.Row="1">

<DataGrid ItemsSource="{Binding viewModel.ItemList}" AutoGenerateColumns="False" Margin="0" VerticalAlignment="Top" HorizontalAlignment="Stretch" HeadersVisibility="Column" PreviewMouseWheel="RedirectScrollToParent">
<DataGrid.Resources>
<ResourceDictionary>
<Style BasedOn="{StaticResource baseStyle}" TargetType="{x:Type DataGridColumnHeader}">
<Setter Property="Background" Value="#FF1B1B1B" />
</Style>
<Style TargetType="{x:Type DataGridCell}">
<Style.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource Self}, Path=Foreground}"/>
<Setter Property="Background" Value="{Binding RelativeSource={RelativeSource Self}, Path=Background}"/>
<Setter Property="BorderBrush" Value="{Binding RelativeSource={RelativeSource Self}, Path=BorderBrush}"/>
</Trigger>
</Style.Triggers>
</Style>
</ResourceDictionary>
</DataGrid.Resources>
<DataGrid.Columns>
<DataGridTemplateColumn Header=" Items" Width="*">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<ComboBox
x:Name="themeSelectionComboBox"
FontSize="14"
FontFamily="{DynamicResource Roboto}"
Background="#FF1B1B1B"
BorderBrush="#FF0F0F0F"
HorizontalAlignment="Stretch"
ItemsSource="{Binding RewardOptions}"
SelectedItem="{Binding ActiveOption, Mode=TwoWay}"
Margin="5,3" Template="{DynamicResource ComboBoxTemplate}" Style="{DynamicResource ComboBoxStyle1}">
</ComboBox>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="Save" Width="70">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Label Grid.Column="1" Content="✓" Foreground="#506464" FontSize="14" Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center" Style="{StaticResource Label_Button}">
<Label.InputBindings>
<MouseBinding MouseAction="LeftClick" Command="{Binding Increment}" />
</Label.InputBindings>
</Label>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="Dismiss" Width="70">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<Label Grid.Column="2" Content="X" Foreground="#506464" FontSize="14" Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center" Style="{StaticResource Label_Button}">
<Label.InputBindings>
<MouseBinding MouseAction="LeftClick" Command="{Binding Remove}" />
</Label.InputBindings>
</Label>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
</DataGrid.Columns>
</DataGrid>
</ScrollViewer>
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Content="Save all" Foreground="#506464" FontSize="14" Style="{StaticResource Label_Button}">
<Label.InputBindings>
<MouseBinding MouseAction="LeftClick" Command="{Binding IncrementAll}" />
</Label.InputBindings>
</Label>

<Label Grid.Column="1" Content="Dismiss all" Foreground="#506464" FontSize="14" Style="{StaticResource Label_Button}">
<Label.InputBindings>
<MouseBinding MouseAction="LeftClick" Command="{Binding RemoveAll}" />
</Label.InputBindings>
</Label>
</Grid>
</Grid>
</Window>
Loading