Implement combo slot locking mechanism with greyed out preview

This commit is contained in:
alexandriaa
2026-04-06 00:38:42 -04:00
parent d4cd65d81d
commit 92e193d40f
30 changed files with 195 additions and 82 deletions
@@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("MagicalDeckbuilder.Shared")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+03b053f38427a2ac6509ab854d7fd20df24fc705")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d4cd65d81df4739d6b8ba5ba12668d395b04af9d")]
[assembly: System.Reflection.AssemblyProductAttribute("MagicalDeckbuilder.Shared")]
[assembly: System.Reflection.AssemblyTitleAttribute("MagicalDeckbuilder.Shared")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
@@ -1 +1 @@
6a9851f80de456581a63d7f436a9dfc420087bf026edbf7158c495c27567aeb4
5f493f976f5d5d3e4e13cdc97cce2ff4cc83ab3a5372f00d543b9bcf1d881a3b
@@ -1 +1 @@
{"documents":{"C:\\Users\\atw61\\OneDrive\\Desktop\\new\\*":"https://raw.githubusercontent.com/alexandria121/new/03b053f38427a2ac6509ab854d7fd20df24fc705/*"}}
{"documents":{"C:\\Users\\atw61\\OneDrive\\Desktop\\new\\*":"https://raw.githubusercontent.com/alexandria121/new/d4cd65d81df4739d6b8ba5ba12668d395b04af9d/*"}}
+40
View File
@@ -449,3 +449,43 @@ public class IntToVisibilityConverter : IValueConverter
return 0;
}
}
/// <summary>
/// Converts bool to opacity (true = 1.0, false = 0.5)
/// </summary>
public class BoolToOpacityConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value is bool boolValue)
{
return boolValue ? 1.0 : 0.5;
}
return 1.0;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
return false;
}
}
/// <summary>
/// Converts bool to text (true = "Drag to hand", false = "Preview")
/// </summary>
public class BoolToTextConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value is bool boolValue)
{
return boolValue ? "Drag to hand" : "Preview";
}
return "Preview";
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
return false;
}
}
+24 -7
View File
@@ -29,6 +29,7 @@ public class MainViewModel : ViewModelBase
private CardViewModel? _comboResult;
private string _statusMessage = "";
private bool _canCombine;
private bool _isComboLocked;
private int _playerHealth = 30;
private int _playerMaxHealth = 30;
@@ -137,6 +138,12 @@ public class MainViewModel : ViewModelBase
set => SetProperty(ref _canCombine, value);
}
public bool IsComboLocked
{
get => _isComboLocked;
set => SetProperty(ref _isComboLocked, value);
}
public string StatusMessage
{
get => _statusMessage;
@@ -540,23 +547,20 @@ public class MainViewModel : ViewModelBase
return;
}
// Remove combo cards from hand (properly, not via PlayCard which moves to InPlay)
PlayerDeck.DiscardFromHand(ComboCard1.Id);
PlayerDeck.DiscardFromHand(ComboCard2.Id);
// Also remove from ObservableCollection PlayerHand
var card1ToRemove = PlayerHand.FirstOrDefault(c => c.Id == ComboCard1.Id);
var card2ToRemove = PlayerHand.FirstOrDefault(c => c.Id == ComboCard2.Id);
if (card1ToRemove != null) PlayerHand.Remove(card1ToRemove);
if (card2ToRemove != null) PlayerHand.Remove(card2ToRemove);
var newCard = new CardViewModel(result.ResultCard);
PlayerDeck.Hand.Add(result.ResultCard);
PlayerHand.Add(newCard);
CustomCards.Add(newCard);
ComboResult = new CardViewModel(result.ResultCard);
CustomCards.Add(ComboResult);
IsComboLocked = true;
CanCombine = false;
StatusMessage = $"Created {result.ResultCard.Name}!";
ClearCombo();
OnPropertyChanged(nameof(PlayerHand));
}
@@ -566,6 +570,19 @@ public class MainViewModel : ViewModelBase
ComboCard2 = null;
ComboResult = null;
CanCombine = false;
IsComboLocked = false;
}
public void TakeComboResult()
{
if (ComboResult == null || !IsComboLocked) return;
PlayerDeck.Hand.Add(ComboResult.Card);
PlayerHand.Add(ComboResult);
StatusMessage = $"Added {ComboResult.Card.Name} to hand!";
ClearCombo();
OnPropertyChanged(nameof(PlayerHand));
}
public void SetComboCard(CardViewModel card, int slot)
+27 -11
View File
@@ -24,6 +24,9 @@
<Converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
<Converters:RarityToGradientConverter x:Key="RarityToGradientConverter"/>
<Converters:RarityToGlowConverter x:Key="RarityToGlowConverter"/>
<Converters:BoolToOpacityConverter x:Key="BoolToOpacityConverter"/>
<Converters:BoolToTextConverter x:Key="BoolToTextConverter"/>
<Converters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter"/>
<!-- Enhanced Card Border Style with Element Glow -->
<Style x:Key="ElementCardStyle" TargetType="Border">
@@ -779,18 +782,31 @@
BorderThickness="1"
Margin="5,10"
CornerRadius="6"
Height="60"
Visibility="{Binding ComboResult, Converter={StaticResource NullToVisibilityConverter}}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding ComboResult.Name}"
Foreground="{StaticResource AccentBrush}"
FontSize="12" FontWeight="Bold"
HorizontalAlignment="Center"/>
<TextBlock Text="Preview"
Foreground="{StaticResource TextSecondaryBrush}"
Height="70"
Visibility="{Binding ComboResult, Converter={StaticResource NullToVisibilityConverter}}"
Opacity="{Binding IsComboLocked, Converter={StaticResource BoolToOpacityConverter}}"
MouseMove="OnComboResultMouseMove"
AllowDrop="True"
Drop="OnComboResultDrop"
Tag="{Binding ComboResult}">
<Grid>
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding ComboResult.Card.Name}"
Foreground="{StaticResource AccentBrush}"
FontSize="12" FontWeight="Bold"
HorizontalAlignment="Center"/>
<TextBlock Text="{Binding IsComboLocked, Converter={StaticResource BoolToTextConverter}}"
Foreground="{StaticResource TextSecondaryBrush}"
FontSize="10"
HorizontalAlignment="Center"/>
</StackPanel>
<TextBlock Text="Locked"
Foreground="#606060"
FontSize="10"
HorizontalAlignment="Center"/>
</StackPanel>
HorizontalAlignment="Center"
VerticalAlignment="Center"
Visibility="{Binding IsComboLocked, Converter={StaticResource InverseBoolToVisibilityConverter}}"/>
</Grid>
</Border>
<Button Grid.Row="3"
+27 -1
View File
@@ -86,7 +86,7 @@ public partial class GameView : UserControl
private void OnComboSlotDragEnter(object sender, DragEventArgs e)
{
if (sender is Border slot)
if (sender is Border slot && ViewModel?.IsComboLocked != true)
{
slot.Background = new SolidColorBrush(Color.FromRgb(70, 70, 90));
}
@@ -104,6 +104,8 @@ public partial class GameView : UserControl
private void OnComboSlot1Drop(object sender, DragEventArgs e)
{
if (ViewModel?.IsComboLocked == true) return;
if (e.Data.GetDataPresent("CardViewModel"))
{
var card = e.Data.GetData("CardViewModel") as CardViewModel;
@@ -117,6 +119,8 @@ public partial class GameView : UserControl
private void OnComboSlot2Drop(object sender, DragEventArgs e)
{
if (ViewModel?.IsComboLocked == true) return;
if (e.Data.GetDataPresent("CardViewModel"))
{
var card = e.Data.GetData("CardViewModel") as CardViewModel;
@@ -244,4 +248,26 @@ public partial class GameView : UserControl
e.Handled = true;
}
}
private void OnComboResultMouseMove(object sender, System.Windows.Input.MouseEventArgs e)
{
if (e.LeftButton == System.Windows.Input.MouseButtonState.Pressed &&
sender is Border comboSlot &&
ViewModel?.IsComboLocked == true)
{
if (comboSlot.Tag is CardViewModel card)
{
DragDrop.DoDragDrop(comboSlot, card, DragDropEffects.Move);
}
}
}
private void OnComboResultDrop(object sender, DragEventArgs e)
{
if (sender is Border comboSlot && ViewModel?.IsComboLocked == true)
{
ViewModel?.TakeComboResult();
}
e.Handled = true;
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -13,7 +13,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("NewGame.UI")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+03b053f38427a2ac6509ab854d7fd20df24fc705")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d4cd65d81df4739d6b8ba5ba12668d395b04af9d")]
[assembly: System.Reflection.AssemblyProductAttribute("NewGame.UI")]
[assembly: System.Reflection.AssemblyTitleAttribute("NewGame.UI")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
@@ -1 +1 @@
58cc8ed96914de5c8aa9875d38cde1206719e80f9a4d70b118a3260d09c1744a
98453cf5e5b9e2f8018aa8af8d8b9fde431c438cb513fcccc2ec52c93cf071f3
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
{"documents":{"C:\\Users\\atw61\\OneDrive\\Desktop\\new\\*":"https://raw.githubusercontent.com/alexandria121/new/03b053f38427a2ac6509ab854d7fd20df24fc705/*"}}
{"documents":{"C:\\Users\\atw61\\OneDrive\\Desktop\\new\\*":"https://raw.githubusercontent.com/alexandria121/new/d4cd65d81df4739d6b8ba5ba12668d395b04af9d/*"}}
@@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\GameView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "896BC1ED1D4976B00E5EE910E084977C0C3FBF56"
#pragma checksum "..\..\..\..\Views\GameView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "3EAACEC315ECF450A7519FF7354821DF0B5B1754"
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
@@ -43,7 +43,7 @@ namespace NewGame.UI.Views {
public partial class GameView : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
#line 447 "..\..\..\..\Views\GameView.xaml"
#line 450 "..\..\..\..\Views\GameView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Slot0;
@@ -51,7 +51,7 @@ namespace NewGame.UI.Views {
#line hidden
#line 483 "..\..\..\..\Views\GameView.xaml"
#line 486 "..\..\..\..\Views\GameView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Slot1;
@@ -59,7 +59,7 @@ namespace NewGame.UI.Views {
#line hidden
#line 519 "..\..\..\..\Views\GameView.xaml"
#line 522 "..\..\..\..\Views\GameView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Slot2;
@@ -67,7 +67,7 @@ namespace NewGame.UI.Views {
#line hidden
#line 555 "..\..\..\..\Views\GameView.xaml"
#line 558 "..\..\..\..\Views\GameView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Slot3;
@@ -75,7 +75,7 @@ namespace NewGame.UI.Views {
#line hidden
#line 591 "..\..\..\..\Views\GameView.xaml"
#line 594 "..\..\..\..\Views\GameView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Slot4;
@@ -83,7 +83,7 @@ namespace NewGame.UI.Views {
#line hidden
#line 627 "..\..\..\..\Views\GameView.xaml"
#line 630 "..\..\..\..\Views\GameView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border Slot5;
@@ -91,7 +91,7 @@ namespace NewGame.UI.Views {
#line hidden
#line 668 "..\..\..\..\Views\GameView.xaml"
#line 671 "..\..\..\..\Views\GameView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border PlayerWeaponSlot;
@@ -99,7 +99,7 @@ namespace NewGame.UI.Views {
#line hidden
#line 693 "..\..\..\..\Views\GameView.xaml"
#line 696 "..\..\..\..\Views\GameView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border PlayerArmorSlot;
@@ -107,7 +107,7 @@ namespace NewGame.UI.Views {
#line hidden
#line 745 "..\..\..\..\Views\GameView.xaml"
#line 748 "..\..\..\..\Views\GameView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border ComboSlot1;
@@ -115,7 +115,7 @@ namespace NewGame.UI.Views {
#line hidden
#line 760 "..\..\..\..\Views\GameView.xaml"
#line 763 "..\..\..\..\Views\GameView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Border ComboSlot2;
@@ -162,25 +162,25 @@ namespace NewGame.UI.Views {
case 2:
this.Slot0 = ((System.Windows.Controls.Border)(target));
#line 454 "..\..\..\..\Views\GameView.xaml"
#line 457 "..\..\..\..\Views\GameView.xaml"
this.Slot0.Drop += new System.Windows.DragEventHandler(this.OnSlotDrop);
#line default
#line hidden
#line 455 "..\..\..\..\Views\GameView.xaml"
#line 458 "..\..\..\..\Views\GameView.xaml"
this.Slot0.DragEnter += new System.Windows.DragEventHandler(this.OnSlotDragEnter);
#line default
#line hidden
#line 456 "..\..\..\..\Views\GameView.xaml"
#line 459 "..\..\..\..\Views\GameView.xaml"
this.Slot0.DragLeave += new System.Windows.DragEventHandler(this.OnSlotDragLeave);
#line default
#line hidden
#line 457 "..\..\..\..\Views\GameView.xaml"
#line 460 "..\..\..\..\Views\GameView.xaml"
this.Slot0.MouseMove += new System.Windows.Input.MouseEventHandler(this.OnSlotMouseMove);
#line default
@@ -188,7 +188,7 @@ namespace NewGame.UI.Views {
return;
case 3:
#line 463 "..\..\..\..\Views\GameView.xaml"
#line 466 "..\..\..\..\Views\GameView.xaml"
((System.Windows.Controls.Border)(target)).MouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.OnFieldCardRightClick);
#line default
@@ -197,25 +197,25 @@ namespace NewGame.UI.Views {
case 4:
this.Slot1 = ((System.Windows.Controls.Border)(target));
#line 490 "..\..\..\..\Views\GameView.xaml"
#line 493 "..\..\..\..\Views\GameView.xaml"
this.Slot1.Drop += new System.Windows.DragEventHandler(this.OnSlotDrop);
#line default
#line hidden
#line 491 "..\..\..\..\Views\GameView.xaml"
#line 494 "..\..\..\..\Views\GameView.xaml"
this.Slot1.DragEnter += new System.Windows.DragEventHandler(this.OnSlotDragEnter);
#line default
#line hidden
#line 492 "..\..\..\..\Views\GameView.xaml"
#line 495 "..\..\..\..\Views\GameView.xaml"
this.Slot1.DragLeave += new System.Windows.DragEventHandler(this.OnSlotDragLeave);
#line default
#line hidden
#line 493 "..\..\..\..\Views\GameView.xaml"
#line 496 "..\..\..\..\Views\GameView.xaml"
this.Slot1.MouseMove += new System.Windows.Input.MouseEventHandler(this.OnSlotMouseMove);
#line default
@@ -223,7 +223,7 @@ namespace NewGame.UI.Views {
return;
case 5:
#line 499 "..\..\..\..\Views\GameView.xaml"
#line 502 "..\..\..\..\Views\GameView.xaml"
((System.Windows.Controls.Border)(target)).MouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.OnFieldCardRightClick);
#line default
@@ -232,25 +232,25 @@ namespace NewGame.UI.Views {
case 6:
this.Slot2 = ((System.Windows.Controls.Border)(target));
#line 526 "..\..\..\..\Views\GameView.xaml"
#line 529 "..\..\..\..\Views\GameView.xaml"
this.Slot2.Drop += new System.Windows.DragEventHandler(this.OnSlotDrop);
#line default
#line hidden
#line 527 "..\..\..\..\Views\GameView.xaml"
#line 530 "..\..\..\..\Views\GameView.xaml"
this.Slot2.DragEnter += new System.Windows.DragEventHandler(this.OnSlotDragEnter);
#line default
#line hidden
#line 528 "..\..\..\..\Views\GameView.xaml"
#line 531 "..\..\..\..\Views\GameView.xaml"
this.Slot2.DragLeave += new System.Windows.DragEventHandler(this.OnSlotDragLeave);
#line default
#line hidden
#line 529 "..\..\..\..\Views\GameView.xaml"
#line 532 "..\..\..\..\Views\GameView.xaml"
this.Slot2.MouseMove += new System.Windows.Input.MouseEventHandler(this.OnSlotMouseMove);
#line default
@@ -258,7 +258,7 @@ namespace NewGame.UI.Views {
return;
case 7:
#line 535 "..\..\..\..\Views\GameView.xaml"
#line 538 "..\..\..\..\Views\GameView.xaml"
((System.Windows.Controls.Border)(target)).MouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.OnFieldCardRightClick);
#line default
@@ -267,25 +267,25 @@ namespace NewGame.UI.Views {
case 8:
this.Slot3 = ((System.Windows.Controls.Border)(target));
#line 562 "..\..\..\..\Views\GameView.xaml"
#line 565 "..\..\..\..\Views\GameView.xaml"
this.Slot3.Drop += new System.Windows.DragEventHandler(this.OnSlotDrop);
#line default
#line hidden
#line 563 "..\..\..\..\Views\GameView.xaml"
#line 566 "..\..\..\..\Views\GameView.xaml"
this.Slot3.DragEnter += new System.Windows.DragEventHandler(this.OnSlotDragEnter);
#line default
#line hidden
#line 564 "..\..\..\..\Views\GameView.xaml"
#line 567 "..\..\..\..\Views\GameView.xaml"
this.Slot3.DragLeave += new System.Windows.DragEventHandler(this.OnSlotDragLeave);
#line default
#line hidden
#line 565 "..\..\..\..\Views\GameView.xaml"
#line 568 "..\..\..\..\Views\GameView.xaml"
this.Slot3.MouseMove += new System.Windows.Input.MouseEventHandler(this.OnSlotMouseMove);
#line default
@@ -293,7 +293,7 @@ namespace NewGame.UI.Views {
return;
case 9:
#line 571 "..\..\..\..\Views\GameView.xaml"
#line 574 "..\..\..\..\Views\GameView.xaml"
((System.Windows.Controls.Border)(target)).MouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.OnFieldCardRightClick);
#line default
@@ -302,25 +302,25 @@ namespace NewGame.UI.Views {
case 10:
this.Slot4 = ((System.Windows.Controls.Border)(target));
#line 598 "..\..\..\..\Views\GameView.xaml"
#line 601 "..\..\..\..\Views\GameView.xaml"
this.Slot4.Drop += new System.Windows.DragEventHandler(this.OnSlotDrop);
#line default
#line hidden
#line 599 "..\..\..\..\Views\GameView.xaml"
#line 602 "..\..\..\..\Views\GameView.xaml"
this.Slot4.DragEnter += new System.Windows.DragEventHandler(this.OnSlotDragEnter);
#line default
#line hidden
#line 600 "..\..\..\..\Views\GameView.xaml"
#line 603 "..\..\..\..\Views\GameView.xaml"
this.Slot4.DragLeave += new System.Windows.DragEventHandler(this.OnSlotDragLeave);
#line default
#line hidden
#line 601 "..\..\..\..\Views\GameView.xaml"
#line 604 "..\..\..\..\Views\GameView.xaml"
this.Slot4.MouseMove += new System.Windows.Input.MouseEventHandler(this.OnSlotMouseMove);
#line default
@@ -328,7 +328,7 @@ namespace NewGame.UI.Views {
return;
case 11:
#line 607 "..\..\..\..\Views\GameView.xaml"
#line 610 "..\..\..\..\Views\GameView.xaml"
((System.Windows.Controls.Border)(target)).MouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.OnFieldCardRightClick);
#line default
@@ -337,25 +337,25 @@ namespace NewGame.UI.Views {
case 12:
this.Slot5 = ((System.Windows.Controls.Border)(target));
#line 634 "..\..\..\..\Views\GameView.xaml"
#line 637 "..\..\..\..\Views\GameView.xaml"
this.Slot5.Drop += new System.Windows.DragEventHandler(this.OnSlotDrop);
#line default
#line hidden
#line 635 "..\..\..\..\Views\GameView.xaml"
#line 638 "..\..\..\..\Views\GameView.xaml"
this.Slot5.DragEnter += new System.Windows.DragEventHandler(this.OnSlotDragEnter);
#line default
#line hidden
#line 636 "..\..\..\..\Views\GameView.xaml"
#line 639 "..\..\..\..\Views\GameView.xaml"
this.Slot5.DragLeave += new System.Windows.DragEventHandler(this.OnSlotDragLeave);
#line default
#line hidden
#line 637 "..\..\..\..\Views\GameView.xaml"
#line 640 "..\..\..\..\Views\GameView.xaml"
this.Slot5.MouseMove += new System.Windows.Input.MouseEventHandler(this.OnSlotMouseMove);
#line default
@@ -363,7 +363,7 @@ namespace NewGame.UI.Views {
return;
case 13:
#line 643 "..\..\..\..\Views\GameView.xaml"
#line 646 "..\..\..\..\Views\GameView.xaml"
((System.Windows.Controls.Border)(target)).MouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.OnFieldCardRightClick);
#line default
@@ -372,19 +372,19 @@ namespace NewGame.UI.Views {
case 14:
this.PlayerWeaponSlot = ((System.Windows.Controls.Border)(target));
#line 676 "..\..\..\..\Views\GameView.xaml"
#line 679 "..\..\..\..\Views\GameView.xaml"
this.PlayerWeaponSlot.Drop += new System.Windows.DragEventHandler(this.OnWeaponSlotDrop);
#line default
#line hidden
#line 677 "..\..\..\..\Views\GameView.xaml"
#line 680 "..\..\..\..\Views\GameView.xaml"
this.PlayerWeaponSlot.DragEnter += new System.Windows.DragEventHandler(this.OnWeaponSlotDragEnter);
#line default
#line hidden
#line 678 "..\..\..\..\Views\GameView.xaml"
#line 681 "..\..\..\..\Views\GameView.xaml"
this.PlayerWeaponSlot.DragLeave += new System.Windows.DragEventHandler(this.OnWeaponSlotDragLeave);
#line default
@@ -392,7 +392,7 @@ namespace NewGame.UI.Views {
return;
case 15:
#line 683 "..\..\..\..\Views\GameView.xaml"
#line 686 "..\..\..\..\Views\GameView.xaml"
((System.Windows.Controls.Border)(target)).MouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.OnEquipmentRightClick);
#line default
@@ -401,19 +401,19 @@ namespace NewGame.UI.Views {
case 16:
this.PlayerArmorSlot = ((System.Windows.Controls.Border)(target));
#line 701 "..\..\..\..\Views\GameView.xaml"
#line 704 "..\..\..\..\Views\GameView.xaml"
this.PlayerArmorSlot.Drop += new System.Windows.DragEventHandler(this.OnArmorSlotDrop);
#line default
#line hidden
#line 702 "..\..\..\..\Views\GameView.xaml"
#line 705 "..\..\..\..\Views\GameView.xaml"
this.PlayerArmorSlot.DragEnter += new System.Windows.DragEventHandler(this.OnArmorSlotDragEnter);
#line default
#line hidden
#line 703 "..\..\..\..\Views\GameView.xaml"
#line 706 "..\..\..\..\Views\GameView.xaml"
this.PlayerArmorSlot.DragLeave += new System.Windows.DragEventHandler(this.OnArmorSlotDragLeave);
#line default
@@ -421,7 +421,7 @@ namespace NewGame.UI.Views {
return;
case 17:
#line 708 "..\..\..\..\Views\GameView.xaml"
#line 711 "..\..\..\..\Views\GameView.xaml"
((System.Windows.Controls.Border)(target)).MouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.OnEquipmentRightClick);
#line default
@@ -430,19 +430,19 @@ namespace NewGame.UI.Views {
case 18:
this.ComboSlot1 = ((System.Windows.Controls.Border)(target));
#line 754 "..\..\..\..\Views\GameView.xaml"
#line 757 "..\..\..\..\Views\GameView.xaml"
this.ComboSlot1.Drop += new System.Windows.DragEventHandler(this.OnComboSlot1Drop);
#line default
#line hidden
#line 755 "..\..\..\..\Views\GameView.xaml"
#line 758 "..\..\..\..\Views\GameView.xaml"
this.ComboSlot1.DragEnter += new System.Windows.DragEventHandler(this.OnComboSlotDragEnter);
#line default
#line hidden
#line 756 "..\..\..\..\Views\GameView.xaml"
#line 759 "..\..\..\..\Views\GameView.xaml"
this.ComboSlot1.DragLeave += new System.Windows.DragEventHandler(this.OnComboSlotDragLeave);
#line default
@@ -451,21 +451,35 @@ namespace NewGame.UI.Views {
case 19:
this.ComboSlot2 = ((System.Windows.Controls.Border)(target));
#line 769 "..\..\..\..\Views\GameView.xaml"
#line 772 "..\..\..\..\Views\GameView.xaml"
this.ComboSlot2.Drop += new System.Windows.DragEventHandler(this.OnComboSlot2Drop);
#line default
#line hidden
#line 770 "..\..\..\..\Views\GameView.xaml"
#line 773 "..\..\..\..\Views\GameView.xaml"
this.ComboSlot2.DragEnter += new System.Windows.DragEventHandler(this.OnComboSlotDragEnter);
#line default
#line hidden
#line 771 "..\..\..\..\Views\GameView.xaml"
#line 774 "..\..\..\..\Views\GameView.xaml"
this.ComboSlot2.DragLeave += new System.Windows.DragEventHandler(this.OnComboSlotDragLeave);
#line default
#line hidden
return;
case 20:
#line 788 "..\..\..\..\Views\GameView.xaml"
((System.Windows.Controls.Border)(target)).MouseMove += new System.Windows.Input.MouseEventHandler(this.OnComboResultMouseMove);
#line default
#line hidden
#line 790 "..\..\..\..\Views\GameView.xaml"
((System.Windows.Controls.Border)(target)).Drop += new System.Windows.DragEventHandler(this.OnComboResultDrop);
#line default
#line hidden
return;
@@ -484,13 +498,13 @@ namespace NewGame.UI.Views {
{
case 1:
#line 331 "..\..\..\..\Views\GameView.xaml"
#line 334 "..\..\..\..\Views\GameView.xaml"
((System.Windows.Controls.Border)(target)).MouseMove += new System.Windows.Input.MouseEventHandler(this.OnHandCardMouseMove);
#line default
#line hidden
#line 332 "..\..\..\..\Views\GameView.xaml"
#line 335 "..\..\..\..\Views\GameView.xaml"
((System.Windows.Controls.Border)(target)).MouseRightButtonDown += new System.Windows.Input.MouseButtonEventHandler(this.OnHandCardRightClick);
#line default
Binary file not shown.