Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

seperate tabs

Browse Source 
Misc setting that I added
This commit is contained in:
Anthony Calosa
2017-03-05 21:28:18 +08:00
parent 4bf5943ac5
commit 00da0bd0d1
7 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/mtg/include/MTGCardInstance.h
View File

@@ -273,8 +273,8 @@ public:
int cardistargetted;
bool isTargetter();
int cardistargetter;
int forcedBorder;
int forcedBorder2;
int forcedBorderA;
int forcedBorderB;
int myconvertedcost;
ManaCost * computeNewCost(MTGCardInstance * card,ManaCost * oldCost, ManaCost * refCost,bool noTrinisphere = false);
int countTrini;

21
projects/mtg/src/ActionStack.cpp
View File

@@ -241,7 +241,6 @@ void StackAbility::Render()
MTGCardInstance * source = ability->source;
string alt1 = source->getName();
vector<JQuadPtr> mytargetQuads;
vector<MTGCardInstance*> myClones;
int fmLibrary = 0;
int force = 0;
@@ -251,7 +250,10 @@ void StackAbility::Render()
{
Targetable * t = ability->getActionTc()->getNextTarget();
if (t)
{
source->forcedBorderA = 1;
_target = t;
}
//test vector quads
@@ -264,8 +266,7 @@ void StackAbility::Render()
{
if( ((Damageable *)(tt))->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE )
{
//fill vector
myClones.push_back(((MTGCardInstance*)(tt)));
((MTGCardInstance*)(tt))->forcedBorderB = 1;
if( source->has(Constants::HIDDENFACE) && !observer->isInLibrary(((MTGCardInstance *)(tt))) )
mytargetQuads.push_back( ((Damageable *)(tt))->getIcon() );
@@ -298,20 +299,6 @@ void StackAbility::Render()
}
}
//setborder test
if(myClones.size())
{
source->forcedBorder2 = 1;
for(unsigned int kk = 0; kk < myClones.size(); kk++)
{
if(myClones[kk])
{
myClones[kk]->forcedBorder = 1;
//JRenderer::GetInstance()->DrawLine(myClones[kk]->view->actX,myClones[kk]->view->actY,source->view->actX,source->view->actY,0.5f,ARGB(120, 255, 0, 0));
}
}
}
if(source->has(Constants::HIDDENFACE) && fmLibrary)
force = MTGAbility::HIDDENVIEW;

8
projects/mtg/src/CardGui.cpp
View File

@@ -270,12 +270,12 @@ void CardGui::Render()
//draw border for highlighting
if (game)
{
if (card && (card->isTargetted()||card->forcedBorder) && highlightborder)
if (card && (card->isTargetted()||card->forcedBorderA) && highlightborder)
{
highlightborder->SetColor(ARGB(95,255,0,0));
renderer->RenderQuad(highlightborder.get(), actX, actY, actT, (30 * actZ + 1) / 16, 43 * actZ / 16);
}
if (card && (card->isTargetter()||card->forcedBorder2) && highlightborder)
if (card && (card->isTargetter()||card->forcedBorderB) && highlightborder)
{
highlightborder->SetColor(ARGB(95,0,245,0));
renderer->RenderQuad(highlightborder.get(), actX, actY, actT, (30 * actZ + 1) / 16, 43 * actZ / 16);
@@ -387,7 +387,7 @@ void CardGui::Render()
}
}
if (card && (card->isTargetted()||card->forcedBorder))
if (card && (card->isTargetted()||card->forcedBorderA))
{
if(card->isTapped())
{
@@ -399,7 +399,7 @@ void CardGui::Render()
else
renderer->DrawRoundRect(actX - (scale * quad->mWidth / 2)-2,actY - (scale * quad->mHeight / 2)-2, (scale * quad->mWidth)-0.02f, (scale * quad->mHeight)-0.02f, 1.8f,ARGB(250,255,0,0));
}
if (card && (card->isTargetter()||card->forcedBorder2))
if (card && (card->isTargetter()||card->forcedBorderB))
{
if(card->isTapped())
{

4
projects/mtg/src/GameObserver.cpp
View File

@@ -654,8 +654,8 @@ void GameObserver::gameStateBasedEffects()
{
zone->cards[c]->cardistargetted = 0;
zone->cards[c]->cardistargetter = 0;
zone->cards[c]->forcedBorder = 0;
zone->cards[c]->forcedBorder2 = 0;
zone->cards[c]->forcedBorderA = 0;
zone->cards[c]->forcedBorderB = 0;
}
}

14
projects/mtg/src/GameStateOptions.cpp
View File

@@ -51,13 +51,21 @@ void GameStateOptions::Start()
// optionsList->Add(NEW OptionInteger(Options::INTERRUPTMYABILITIES, "Interrupt my abilities"));
//this is a dev option, not meant for standard play. uncomment if you need to see abilities you own hitting the stack.
optionsList->Add(NEW OptionInteger(Options::INTERRUPT_SECONDMAIN, "Interrupt opponent's end of turn"));
optionsList->Add(NEW OptionInteger(Options::SHOWTOKENS, "Show Tokens in Editor"));
optionsTabs = NEW WGuiTabMenu();
optionsTabs->Add(optionsList);
optionsList = NEW WGuiList("Misc");
optionsList->Add(NEW WGuiHeader("Card Display Options"));
//black border
optionsList->Add(NEW OptionInteger(Options::BLKBORDER, "All Black Border"));
//show tokens in editor
optionsList->Add(NEW OptionInteger(Options::SHOWTOKENS, "Show Tokens in Editor"));
//show large images
optionsList->Add(NEW OptionInteger(Options::GDVLARGEIMAGE, "Show Large Images in Grid Deck View (could crash PSP!)"));
optionsTabs->Add(optionsList);
optionsList = NEW WGuiList("Game");
optionsList->Add(NEW WGuiHeader("Interface Options"));
optionsList->Add(NEW OptionInteger(Options::BLKBORDER, "All Black Border"));
optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::CLOSEDHAND, "Closed hand", 1, 1, 0)));
optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::HANDDIRECTION, "Hand direction", 1, 1, 0)));
optionsList->Add(NEW WDecoEnum(NEW OptionInteger(Options::MANADISPLAY, "Mana display", 3, 1, 0)));
@@ -82,8 +90,6 @@ void GameStateOptions::Start()
optionsList->Add(NEW WGuiSplit(cPrf, cThm));
optionsList->Add(cStyle);
optionsList->Add(NEW WGuiButton(NEW WGuiHeader("New Profile"), -102, GameStateOptionsConst::kNewProfileID, this));
//show large images
optionsList->Add(NEW OptionInteger(Options::GDVLARGEIMAGE, "Show Large Images in Grid Deck View (could crash PSP!)"));
optionsList->Add(NEW WDecoCheat(NEW OptionInteger(Options::CHEATMODE, "Enable Cheat Mode")));
optionsList->Add(NEW WDecoCheat(NEW OptionInteger(Options::OPTIMIZE_HAND, "Optimize Starting Hand")));
optionsList->Add(NEW WDecoCheat(NEW OptionInteger(Options::CHEATMODEAIDECK, "Unlock All Ai Decks")));

4
projects/mtg/src/GuiPlay.cpp
View File

@@ -123,7 +123,7 @@ void GuiPlay::BattleField::reset(float x, float y)
}
void GuiPlay::BattleField::EnstackAttacker(CardView* card)
{
if(card->card->getObserver() && (card->card->getObserver()->getCurrentGamePhase() >= MTG_PHASE_COMBATDAMAGE) && (card->card->getObserver()->getCurrentGamePhase() < MTG_PHASE_ENDOFTURN))
if(card->card->getObserver() && ((card->card->getObserver()->getCurrentGamePhase() >= MTG_PHASE_COMBATDAMAGE) && (card->card->getObserver()->getCurrentGamePhase() < MTG_PHASE_ENDOFTURN)))
return;
//card->x = CARD_WIDTH + 20 + (currentAttacker * (HORZWIDTH) / (attackers+1));
card->x = x + (CARD_WIDTH/2.5f) + baseX;
@@ -140,7 +140,7 @@ void GuiPlay::BattleField::EnstackAttacker(CardView* card)
}
void GuiPlay::BattleField::EnstackBlocker(CardView* card)
{
if(card->card->getObserver() && (card->card->getObserver()->getCurrentGamePhase() >= MTG_PHASE_COMBATDAMAGE) && (card->card->getObserver()->getCurrentGamePhase() < MTG_PHASE_ENDOFTURN))
if(card->card->getObserver() && ((card->card->getObserver()->getCurrentGamePhase() >= MTG_PHASE_COMBATDAMAGE) && (card->card->getObserver()->getCurrentGamePhase() < MTG_PHASE_ENDOFTURN)))
return;
MTGCardInstance * c = card->card;
if (!c)

4
projects/mtg/src/MTGCardInstance.cpp
View File

@@ -71,8 +71,8 @@ MTGCardInstance::MTGCardInstance(MTGCard * card, MTGPlayerCards * arg_belongs_to
LKItoughness = toughness;
cardistargetted = 0;
cardistargetter = 0;
forcedBorder = 0;
forcedBorder2 = 0;
forcedBorderA = 0;
forcedBorderB = 0;
myconvertedcost = getManaCost()->getConvertedCost();
revealedLast = NULL;
MadnessPlay = false;