Skip to content

Flip cards in opponent's hand #37984

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
diquoks wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −6
Open

Flip cards in opponent's hand #37984

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
4 changes: 2 additions & 2 deletions osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/Hand/HandOfCards.HandCard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ public int Order

public RankedPlayCardWithPlaylistItem Item => Card.Item;

public HandCard(RankedPlayCard card)
public HandCard(RankedPlayCard card, bool flipped)
{
Size = card.DrawSize;

card.Anchor = Anchor.Centre;
card.Origin = Anchor.Centre;
card.Position = Vector2.Zero;
card.Rotation = 0;
card.Rotation = flipped ? 180 : 0;
card.Scale = Vector2.One;

AddInternal(Card = card);
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/Hand/HandOfCards.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public bool RemoveCard(RankedPlayCardWithPlaylistItem item, [MaybeNullWhen(false
return true;
}

protected virtual HandCard CreateHandCard(RankedPlayCard card) => new HandCard(card);
protected virtual HandCard CreateHandCard(RankedPlayCard card) => new HandCard(card, Flipped);

protected virtual void OnCardStateChanged(HandCard card, ValueChangedEvent<RankedPlayCardState> evt)
{
Expand Down
4 changes: 2 additions & 2 deletions osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/Hand/PlayerHandOfCards.PlayerHandCard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ public Action? PlayAction

public readonly ShearedButton PlayButton;

public PlayerHandCard(RankedPlayCard card)
: base(card)
public PlayerHandCard(RankedPlayCard card, bool flipped)
: base(card, flipped)
{
AddRangeInternal(new Drawable[]
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Screens/OnlinePlay/Matchmaking/RankedPlay/Hand/PlayerHandOfCards.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ private void load(AudioManager audio)
cardDeselectSamples[i] = audio.Samples.Get(@$"Multiplayer/Matchmaking/Ranked/card-deselect-{i + 1}");
}

protected override HandCard CreateHandCard(RankedPlayCard card) => new PlayerHandCard(card)
protected override HandCard CreateHandCard(RankedPlayCard card) => new PlayerHandCard(card, Flipped)
{
Clicked = cardClicked,
Dragged = cardDragged,
Expand Down
Loading