Commit Graph

2622 Commits

Author SHA1 Message Date
techdragon.nguyen@gmail.com
833bd4714d reformatted indentations as they were slightly off.
refactored latest changes to group similar menu texts.
2010-12-09 01:28:25 +00:00
omegablast2002@yahoo.com
585eae1852 added fancy location based move menutext return to lord...it was a case we must have messed when we were trying to get rid of generic "move" messages...lord returns ability menutext which in case of amover is "move"...and "all(" is a lord. so ran into a deck where i had a couple "move" menus display and i didnt know which i was choosing, moving creatures to hand or moving theirs to grave...
death to generic messages!!!
2010-12-08 20:16:27 +00:00
omegablast2002@yahoo.com
f227c4775d moved phase pass automation into stateeffects() where it should have been from the start, it really shouldnt be run as part of "update()" it bothered me enough to actually move it. 2010-12-08 15:33:02 +00:00
omegablast2002@yahoo.com
682af98bf7 moot pointed out i made a boo boo in STANDARDABILITYGRANT thanks you! forgot to add the "suggest good" part of the condiation...as we dont act to give a creature the ability 2 times. (atleast until stacking abilities are added) 2010-12-08 14:37:39 +00:00
omegablast2002@yahoo.com
079d2dbd22 updated this test as it uses the trigger step, note: the 7 or so trigger based test dont want to actually test in test suite...i tried correct a typo in the _test.txt they have an extra "S"...but still they did not get tested...any ideas? if you can get them testing, please remember the combat ones need an extra next directly before the "next for combatdamage. 2010-12-08 14:34:17 +00:00
omegablast2002@yahoo.com
6348940dc6 added a automatic move forward if trigger step if playmode == test suite...this will still trigger the steps actual functions and test that are using trigger step will require an extra "next" test that are not using trigger step for anything will not need the extra "next" 2010-12-08 14:32:12 +00:00
wagic.the.homebrew@gmail.com
70a1a03fee Erwan - reverting r2779 per my comment in that revision 2010-12-08 14:18:41 +00:00
wrenczes@gmail.com
2a442ad2f5 Swapped the DeckMenu background from a png to a jpg, as the transparency wasn't being used at all in the image, so it wasn't buying us anything. Flipped the rendering order so that the background is now truly drawn in the background (ie first), and everything else is drawn on top.
(Make sure you update your res/graphics folder on your psp!)
2010-12-08 11:02:25 +00:00
guzhenjie1@gmail.com
d638ac28b1 Fix Graypelt Hunter and Doomsday Specter. 2010-12-08 10:51:04 +00:00
techdragon.nguyen@gmail.com
def9a8b229 added additional debug statement to show current turn. 2010-12-08 08:21:54 +00:00
wrenczes@gmail.com
bfb6f396df Removed a spurious call to GetInstance(). 2010-12-08 07:58:20 +00:00
wrenczes@gmail.com
5c819a3b3c Found & fixed a crash while testing trample. The bug: if the AI's player hand dropped to zero cards. This broke in r2696.
Zeth, please review, I put in a comment where there's something that doesn't make sense- probably an early change that's now obsolete.
2010-12-08 07:53:51 +00:00
omegablast2002@yahoo.com
d3a4745686 did a couple things here, fixed issue507 but also, very very very possibly fixed issue548, tho i will leave the closing of those 2 tickets to wololo, as he was the one who originally reported them.
another issue i fixed, when last trigger would be resolving in "trigger" substep, the game was moving to next combatstep before you could finish it, NOW the game correctly finishes resolving any triggers that might have fired off in "Triggers" substep, THEN it adds combatdamage step to the stack. this also fixes an issue where if you were multiblocked and combattriggers fired off, then your trigger would be UNDER the "ordering window" and unresolvable.

added waitingforanwsers return to userRequestNextGamePhase
when youre "waiting for anwsers" that means you have a menu box open and the game is waiting for you to decide....this was one of the causes of the rush to combat damage while youre still selecting something on a menu.

moved Trigger step call to requestnextgamephase into stateEffects() and out of updates, works MUCH better this way. i wonder why this isnt handling more of the automated functions, i suggest we consider moving the autopassphase into stateEffects() also as it will most likely be handled much better in there then in the update function.


also,
adjust Ailessons on Adrawer, it was still getting a little too excited about drawing cards. 
moved around the eff setting on grantingability lessons.
having it set to 0 BEFORE actually giving it a value was conter productive.

added a peice of commented out code in "isintop" function that if you uncomment will allow you to have Ai ALWAYS multiblock you.

im pushing this in as i feel comfortable with the positives and havent really come across an adverse effect yet.
however i am just one person and testing something like this is much easier with alot more then 1 person on it.
2010-12-07 17:58:46 +00:00
wagic.the.homebrew@gmail.com
c28c14171f Erwan
-fix for issue 489 (protection prevents some triggers to happen)
2010-12-07 14:12:04 +00:00
techdragon.nguyen@gmail.com
7676ad5e79 removed blank entry. caused an error to appear in console on startup 2010-12-07 05:43:23 +00:00
Xawotihs
594b3abf1e Qt project fixes on Mac 2010-12-06 22:30:25 +00:00
Xawotihs
13f467a9ef Activated QT image support, removed freetype, jpeg, png, gif libs dependencies in the Qt project. 2010-12-06 20:06:03 +00:00
omegablast2002@yahoo.com
8ba23dd99f Bug Fix for issue 464, multipling the secs you set to interrupt by the amount of unresolved stack actions. this extends you time giving you essentially X sec of interrupt offer for each stack action.
exsample, 3 unresolved stack actions. with interrupt set to 5 secs, will allot you 15 secs to decide the first action, then 10 secs to decide the 2nd action, then 5 secs to decide the last action.

note: its multiplicative, this does not make each stack action into 15 sec interrupt.

as they resolve "extraTime" gets recalculated.
2010-12-06 12:12:53 +00:00
omegablast2002@yahoo.com
336cf0bc32 jace's erasure fix, this is only temporary until i add all the abilitie varibles, currently theres no system beside a workaround we use "thisforeach(varible) effect" to return a value, when im done with the varible returning for abilities then the code will be replaced with @drawn(controller):may deplete:cardamount. for now tho this makes the addDraw send 1 event for each card drawn, essentially making all the @drawn cards 100%. 2010-12-06 11:28:11 +00:00
wrenczes
ed321e2df5 Linux specific changes to allow linking against Boost::threads. Not used by the current build. Also turned off 'unused' warnings in QTCreator to match more closely the warnings that we pay attention to in the psp build. 2010-12-06 07:44:16 +00:00
wrenczes@gmail.com
ffd3b7b074 At Z's request, fixed Issue 184, ExtraCost types with targets such as Siege-Gang Commander/Drowner of secrets combined with targeted abilities bug.
This one was a bit of a doozy to fix correctly, but the actual fix ended up being fairly simple - the upshot is that TargetAbility never checked for whether an extra cost needed setting prior doing a target selection.  While at it, I discovered and fixed another bug:  if you're in the middle of an extra cost choice (like sacrifice, for instance) and hit the next phase button, the game would let you proceed, and then hang in an endless loop.

While at it, did a little cleanup/refactoring around GameObserver's waitForExtraPayment - any time a bool has something that sounds like a verb, it probably deserves to be a function.  Now it is. (I needed to refactor it anyway, as I reused that code for the next phase hang.)

Note that after this fix, I had to patch two test cases (siege_gang_commander.txt & seismic_assault.txt) - since I've change the selection order (ie a target ability with a sacrifice cost requires the cost to be paid up front before picking the target), this means that tests involving targeting & sacrifices need to switch the order of the cards to pass.
2010-12-06 06:49:36 +00:00
solo81@web.de
4de3b4a3c0 Fixed Twisted Image. 2010-12-05 15:23:45 +00:00
wagic.the.homebrew@gmail.com
c7a17a0e57 Erwan
- some code cleanup, as I am trying to figure out the root cause for issue 548
2010-12-05 14:13:42 +00:00
omegablast2002@yahoo.com
59864cbcb7 removed a variable mike readded accidently(?) which i converted into a static local variable 2010-12-04 21:59:08 +00:00
techdragon.nguyen@gmail.com
a7675ec216 issue 547
fixed the bug where the ai "attacks/blocks" its own attackers during the combat phase.
Strangely, creatures only die in this bug when there are two or more suffering from
summoning sickness.

If somebody can double check this code change to make sure that it is appropriate.
My playtesting indicates a success but I don't have the variety of player decks others have.
2010-12-04 21:26:12 +00:00
omegablast2002@yahoo.com
ba3ca7018b reduced the Eff by 50 up from 20 on Adrawer, and reduced to 0 if more then 10 cards in hand, theres too high of a chance that Ai will not be able to actually cast any of that and is just milling himself. 2010-12-04 21:12:58 +00:00
omegablast2002@yahoo.com
e8582e1413 told Ai not to block its own attacking creatures(?), hopefully this is whats happening in issue 547.
its been discovered and maybe even known that Ai can do alot of illegal actions as if the rules we set inplace for the player don't apply to it.
2010-12-04 20:01:22 +00:00
omegablast2002@yahoo.com
7805e52910 Attempt to fix a bug with Ai and how it manages mana, if an ability or effect would add for exsample 3 black to the manapool, the old way this was set up would be either/or but never both, current mana was always just what was in the pool or what it could make.
with this change, currentmana is now what it could make and if anything is in the pool then add whats in the pool as potential mana., if it could potentially make mana then THIS is its currentpool. as getpotentialMana already handles the rest.

i originally added the manapool at the end of potential as my first attempt to stop this behavior, but this either/or if statement really got in the way of producing the result i wanted, which is, if 
Ai has a 3 swamps, and a dark ritual, and it cast darkritual.
in hand Ai has a 5 black drop.

in OLD set up Ai would see it has 3 mana, then it would see it had 2 mana from the untapped swamps. it would pass the phase thinking that it could not cast the creature.

NOW ai looks for how much it has in mana, it see 3 swamps, it cast dark ritual, it now see what it can create on the next call to findcards, it see 2 swamps + 3 mana in pool, it cast the 5 drop creature.


mind you that this does not fix Ai mindlessly casting dark ritual as we have no current system to tell AI "hey dont cast that card now its useless to do so" like the fancy system to tell it what abilities it should use on cards :) *maybe someday*
2010-12-04 19:45:39 +00:00
omegablast2002@yahoo.com
8a49d2af51 moved the gaurds i introduced in r2734 into the function selectAbility() as a static bool as suggested by jean, its much cleaner this way. 2010-12-04 18:25:59 +00:00
omegablast2002@yahoo.com
15e6fabd9f redid the counters menutext function to be more like the one "add mana" uses. makes it easier to read and add to later if needed. 2010-12-04 16:08:51 +00:00
omegablast2002@yahoo.com
bd1253702f fixed the 3 urza's lands, for future refference please dont use card names as subtypes, wagic is completely capable of finding a card by name through targetchooser, thanks! 2010-12-04 14:29:19 +00:00
omegablast2002@yahoo.com
142d6b4609 bug fixs, added colon to "damage" parsing so we can finally not worry about "damage" wanting to build a ability. it now has to look for "damage:" which makes it more consistent with how we made the other abilities. did the same with lifeset however no bug there.
2nd bug fix, 
commented out a peice of code that compared if power and toughness would be cancelled out by a new counter. exsample:
1/1 is cancelled by -1/-1...this is actually extremely incorrect, 

if you "put a 1/1 on a creature"
then you "put a -1/-1" on the same one. it does NOT remove the 1/1 as per MTG rules. the counters all all treated as NEW objects on a card. so a creature that had both those abilities used on it should have BOTH a 1/1 and a -1/-1 counter.
commenting out the section of code corrected this probelm.
modular creature, phantom creatures,sunburst and many many more will now correctly be able to use their counters even if they recieved "cancelling" Counters

last was just an improvement, as i got overly frustraited tonight while fighting with a deck that slaps many different types of counters on cards, i was having a very hard time telling what exactly i was about to put on a creature.

so what i did to correct this is create a much better menuText return on aacounter class.

PLEASE let me know if i missed a case where a counter is not showing correct text.
2010-12-04 12:32:33 +00:00
guzhenjie1@gmail.com
55de150aac Fix following cards:
Chainer, Dementia Master
Golem Artisan
Corpsehatch
Imps' Taunt(Imp's Mischief)
Samurai of the Pale Curtain
Summoning Station
2010-12-04 12:08:19 +00:00
solo81@web.de
9cb05ad07b Fixed Fire Dragon. 2010-12-04 11:09:54 +00:00
omegablast2002@yahoo.com
35742e57a3 opps i typoed in the card code fix lol. 2010-12-04 09:51:45 +00:00
wrenczes@gmail.com
1b876d61af Issue 494: "Valuable Collection" trophy is gone?
The check to give the award was lost in some of Jeck's reorg work (R1825), as ShopItem was deprecated & folded into GameStateShop. While at it, I took the liberty to delete ShopItem.h/cpp since they're not used.
2010-12-04 09:46:31 +00:00
omegablast2002@yahoo.com
7b8a9c851f Heliophial had no actual ability, corrected this. 2010-12-04 09:16:10 +00:00
wrenczes@gmail.com
bb9ad159c3 Fix for Issue 530: wither vs daily regimen = crash?. Turns out that it was a simple missing NULL check in the code that draws counter info on the large format cards. 2010-12-04 09:09:24 +00:00
wrenczes@gmail.com
793f6245f0 Reinstated the call to setExtraCostsAction() in reactToClick, as removing it breaks Basal Sliver (when sacrificing another sliver, it would kill off Basal Sliver instead of the other sliver that inherited the ability). 2010-12-04 08:36:10 +00:00
wrenczes@gmail.com
6e327379fd Fix for Issue 529, May abilities with counters shouldn't present selection dialog when counters == 0.
The problem I found was specific to ManaProducer.  I added an additional check when calling isReactingToClick(), if the cost has an extra cost, check if it can be paid.  For this to work though, I had to change things around a little - there was a hack in the parsing code for ManaProducer abilities, where the cost wasn't being passed into the constructor.  To compensate, the extra cost was being set during reactToClick, but this is too late, as isReactingToClick is called first.  Now, where the hack occurs, after we construct the ManaProducer, if there's a cost, make sure we set the extra cost action immediately.

This seems to work well for the Vivid Creek card case: once the counters are tapped out, the menu system doesn't add the extra card abilities anymore, and you simply get the land tap without the menu popping up.  I'm not seeing any adverse effects so far with other mana producer cards, but I'd appreciate a sanity check from other people here in case there's some other fallout I'm not seeing from this change.
2010-12-04 07:39:32 +00:00
wrenczes@gmail.com
08761d294e The right way to fix the cast warning for PSP. 2010-12-04 06:46:25 +00:00
omegablast2002@yahoo.com
e8e8553cd0 fixed psp compiling. 2010-12-04 06:26:05 +00:00
wrenczes@gmail.com
92bbb78ed1 Fix for [PSP|PC]ability menus and card view switch causes a crash. This broke as a side effect to the addition of the 'details' option that Mike added - the ActionStack had very rigid interpretations of what a valid control ID would be (either -1, or a valid id in its container). As kInfoMenuID is assigned a value of -200, this would crash when attempting to look up that index value in the vector.
I've patched the problem so that ActionLayer checks for a valid ID before doing anything, and does a no-op for IDs it doesn't know how to handle. However, this only fixes the problem during gameplay.  It's quite possible that hitting the triangle button in other places in the app might equally cause a crash.


Issue: 544
2010-12-04 04:25:43 +00:00
omegablast2002@yahoo.com
b5ec029d79 couple changes, first i re-added my fancy getMenuText for becomes/transforms abilities, somewhere in the refactor these were forgotten. Fix "Swap" ueot menutext display, it was returning "ability".
fixed a Ai related bug, taught Ai not to mill itself to death basically. played a few matches which Ai was just destroying himself with a creature that allowed him to draw cards for each(whatever) in play. Ai will be a little more careful not to kill himself by Mill, also not to draw 30 cards in a turn when it clearly cant play them.
2010-12-03 20:59:46 +00:00
omegablast2002@yahoo.com
b07b772c8e MAJOR fix to something was was causing very weird results ingame.
the tag "other " vs tag " other"

using "other " in target choosers will always work, however more often then not using " other" at the end of a line would produce weird effects, this was brought to my attention in a bug report by KF1, i moved all the " other" from outside target chooser into the actual target lines, as this always produces correct results in code, i imagine the tag at end of line was added before "other " was intruduced into targetchooser.

i will leave support for using " other" in code, however, i ask that we try not to use this code unless for some strange reason the targetchooser "other" doesnt take to the code.

stranger was that i noticed alot of mixed code, as in lord(other blahblah) 1/1 and this version with other tag at end, it was very inconsistent aside from causing weird weird results in game which i was actually able to confirm.

please update your primitive!!! this was ALOT of work.

correct syntax for "other "
lord(other blah)
all(other blah,blah,blah)
damage:1 target(other blah)
target(other *|somewhere)
notice its always first followed by a space. you only need one instence "other " in a targetchooser.
2010-12-03 13:08:53 +00:00
omegablast2002@yahoo.com
336b25c0f5 init'ed the variable "mFindingAbility" bool in Aiplayer constructor and changed its name from previous name "findingAbility" to keep in line with recent code rules.
added COMMENTS to explain the variable.
2010-12-03 12:10:35 +00:00
guzhenjie1@gmail.com
e71fb8ff46 Add text for follow duel lands:
Blackcleave Cliffs
Copperline Gorge
Darkslick Shores
Razorverge Thicket
Seachrome Coast
2010-12-03 11:09:08 +00:00
techdragon.nguyen@gmail.com
fab5f9da29 fixed formatting 2010-12-03 01:09:30 +00:00
omegablast2002@yahoo.com
0f419144b5 Fixed a bug where Ai was able to do actions such as sacrifice Mogg fanatic 3 time in a row by tripping over its own clickstream, added gaurds to selectAbility() function calls to prevent Ai from running multiple instences of selectAbility before its completed running another which occurs when Ai is offered an interupt after player cast/does an action.
this also fixes the spamming of Abilities like Ai atempting to untap something more then once, or Ai uses regenerate ability multiple times on the same creature.

there will be no noticible difference in Ai game play except now it actually doesnt do the above mentioned bugs.
2010-12-02 21:30:14 +00:00
Xawotihs
802937573d Fixed a crash occuring when trying to select card with the mouse in an empty list 2010-12-02 20:35:42 +00:00