jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-11 00:24:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Mulligan added to Client

Browse source
This commit is contained in:
marcus 2009-10-19 17:52:42 +02:00
parent 30079a71ff
commit 5cf970f0f3
3 changed files with 96 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cockatrice/src/player.cpp
View file

@ -8,6 +8,7 @@
#include "pilezone.h"
#include "tablezone.h"
#include "handzone.h"
#include "cardlist.h"
#include <QSettings>
#include <QPainter>
#include <QMenu>
@ -113,12 +114,15 @@ Player::Player(const QString &_name, int _id, bool _local, CardDatabase *_db, Cl
connect(aDrawCards, SIGNAL(triggered()), this, SLOT(actDrawCards()));
aShuffle = new QAction(this);
connect(aShuffle, SIGNAL(triggered()), this, SLOT(actShuffle()));
aMulligan = new QAction(this);
connect(aMulligan, SIGNAL(triggered()), this, SLOT(actMuligan()));
}
playerMenu = new QMenu(QString());
if (local) {
handMenu = playerMenu->addMenu(QString());
handMenu->addAction(aMulligan);
handMenu->addAction(aMoveHandToTopLibrary);
handMenu->addAction(aMoveHandToBottomLibrary);
handMenu->addAction(aMoveHandToGrave);
@ -189,6 +193,8 @@ Player::Player(const QString &_name, int _id, bool _local, CardDatabase *_db, Cl
sbMenu = 0;
}
cardsInHand = 0;
retranslateUi();
}
@ -240,6 +246,8 @@ void Player::retranslateUi()
aDrawCard->setShortcut(tr("Ctrl+D"));
aDrawCards->setText(tr("D&raw cards..."));
aDrawCards->setShortcut(tr("Ctrl+E"));
aMulligan->setText(tr("Take &mulligan..."));
aMulligan->setShortcut(tr("Ctrl+M"));
aShuffle->setText(tr("&Shuffle"));
aShuffle->setShortcut(tr("Ctrl+S"));
@ -324,13 +332,27 @@ void Player::actShuffle()
void Player::actDrawCard()
{
client->drawCards(1);
cardsInHand++;
}
void Player::actMuligan()
{
if(cardsInHand >= 0) return;
CardList handCards = hand->getCards();
for(int i = 0; i < handCards.size(); i++){
client->moveCard(handCards.at(i)->getId(),"hand","deck",0);
}
client->shuffle();
client->drawCards(--cardsInHand);
}
void Player::actDrawCards()
{
int number = QInputDialog::getInteger(0, tr("Draw cards"), tr("Number:"));
if (number)
if (number){
client->drawCards(number);
cardsInHand += number;
}
}
void Player::actUntapAll()
@ -467,6 +489,12 @@ void Player::gameEvent(const ServerEventData &event)
qDebug(QString("target zone invalid: %1").arg(data[4]).toLatin1());
break;
}
/* if(startZone == zones.value("hand")){
cardsInHand--;
qDebug() << "<<<<<<<<<<<<<<<<<<<< Karte aus hand entfernt";
qDebug() << "<<<<<<<<<<<<<<<<<<<<< Handkartenanzahl: " << cardsInHand;
}*/
int x = data[5].toInt();
int y = data[6].toInt();
bool facedown = data[7].toInt();