Commit Graph

3745 Commits

Author SHA1 Message Date
omegablast2002@yahoo.com
a3c22ddd32 updated mytypemin to use the new syntax, the restriction should now work correctly again when comparing values between players. 2011-07-07 11:40:15 +00:00
omegablast2002@yahoo.com
f88178f2cf refactored the typemin: cast restriction, there was a reported bug with it and while debugging it screamed refactor.
so i converted it from string comparisons and counting the battlefield..into targetchoosers with declarable operator.
simplified the code from the mess it was before into something alot easier to card code with.

example before:
mytypemin:less type(land),opponenttypemin:* type(land)
becomes
type(land|mybattlefield)~lessthan~type(land|opponentbattlefield)

the new syntax is:
type(targetchooser)~operator~number
type(targetchooser)~operator~type(targetchooser)
the operator are:
morethan
lessthan
equalto
2011-07-07 11:39:06 +00:00
wrenczes@gmail.com
463a64521f Switched another case of the psp icons to (explicitly) use the managed cache. 2011-07-07 08:26:01 +00:00
wrenczes@gmail.com
c5963c3c23 Three improvements involving image caching:
1) prevent the textureQuad map from containing references to cards when we're returning a temp (card backdrop) image in the threaded version.
2) we had two copies of the pspicon image in the cache (ie the regular & managed).  Changed the reference in the DeckMenu code to use the managed instance.
3) Fixed a problem with a default constructor param that would set RESOURCE_LOCKED on certain images.  I noticed that the 'NEW' image was locking itself in the cache because no resource modes was being passed in, so the default constructor param was setting it to locked.  This seems like a bad idea - if you're not explicitly locking a resource in the call, that shouldn't be the default behaviour.

Also added an assert safeguard to catch the possibility of 'overlocking' an image resource, as this probably means the image fetching routine is being abused somehow.
2011-07-07 07:37:17 +00:00
jean.chalard
93d96fe52b Revert a careless change
Seems I did something wrong with SVN. Revert the changed parts
that should not have been changed.
2011-07-07 03:41:51 +00:00
jean.chalard
c5cd81f6a1 Fix the double key bindings problem.
The problem was, the game would initialize first, reading the
keybindings from the configuration, and THEN set up the default key
bindings.
I think this affects only PSP, X, SDL and Qt. A quick scan of the
windows version code looks to me that the order is correct and the
problem should not exist, but I may be mistaken. The iPhone version
looks to me like it has no keybindings at all, though the call is
there ; I put the call in the right order so that the problem does
not happen in the future if we implement some key bindings for it.
If someone can check for windows...
2011-07-07 03:35:26 +00:00
omegablast2002@yahoo.com
a59dec1500 added "once" support for the remaining triggers that did not have it.
this is basically one activation for the existence of the trigger, meaning if it is used on a card, and the trigger exist for inplay, it will only activate one time while that card is inplay, it will activate again if the card leaves play and is put back in play again by another effect, 
this was originally added for cards such as the hidden enchantment cycle.
2011-07-05 14:14:18 +00:00
wagic.the.homebrew
c3ae216f62 - Fix issue 694
- Bump version number to 0.16.0 for upcoming release
2011-07-05 13:02:41 +00:00
Xawotihs
c25dfe426f Fixed issue 677 2011-07-04 19:09:19 +00:00
guzhenjie1@gmail.com
25be470f4b Corrected Sedraxis Specter. 2011-07-04 12:05:11 +00:00
wagic.the.homebrew
52b83a135c - Added TutorialMessage ability
-- Tutorial Messages are an ability like any other, except it can only be displayed once. Subsequent calls are ignored, the ability is removed from the game as soon as it is added
-- This allows to add event triggered messages ingame. Messages are either text, or images (I don't have an image sample, but rules/classic.txt has a few examples that might help)
-- only tested on Windows, although I made sure the PSP version compiles. Hopefully I also made the necessary for it to work in the touch version (touching the screen should be enough to close the tuto message)
-- Room for improvement: possibility to choose a title in text mode, possibility to have some messages depending on others (e.g.: don't show message X until message Y has been shown), improve some of the abilities and triggers to give more flexibility, add events outside of game, to allow tuto messages in deck creator, etc...
2011-07-03 08:47:51 +00:00
punkeduard@gmail.com
72c795c24b Afterlife - Change the logic, the caster of the spell used to get the spirit, it should be the controller of the creature
Faceless Devourer - It should not be able to target itself 
Sunscape Familiar - abilities=flying -> defender
diamond valley - Sacrifice only creatures you control
Vow of Lightning - typo in the name
Sporeback Troll - fixed mana cost
Crovax the Cursed - fixed card text
2011-07-03 05:46:12 +00:00
Xawotihs
bfa9b6c813 Fixed issue 691. 2011-07-01 21:59:35 +00:00
Xawotihs
8f9619e21a Added support for wheel mouse events 2011-06-27 21:18:16 +00:00
guzhenjie1@gmail.com
e9ce17fa7b Corrected Ashenmoor Liege, Cloud Cover, Retromancer and Spinal Graft. 2011-06-27 13:28:49 +00:00
Xawotihs
7bb49068b1 Use Will's scrolling support to add next phase (scroll up) and interrupt (scroll down) in the duel state. 2011-06-26 20:51:45 +00:00
guzhenjie1@gmail.com
bac4050de7 Corrected Dread Cacodemon and text of Acorn Catapult and Champion's Helm. 2011-06-25 13:57:32 +00:00
guzhenjie1@gmail.com
4eb9df29ef Corrected some typos and wrong ID in CMD. 2011-06-25 13:14:25 +00:00
guzhenjie1@gmail.com
81b50e0c19 Corrected text of Kiki-Jiki, Mirror Breaker. 2011-06-25 12:53:40 +00:00
solo81@web.de
4b4c6f4981 Fixed my last commit. 2011-06-25 11:50:16 +00:00
solo81@web.de
e8f1314d0f Added Magic the Gathering: Commander (22 new cards). 2011-06-25 11:40:26 +00:00
guzhenjie1@gmail.com
5820124662 Corrected two typos and added missed Dragon Whelp in KVD. 2011-06-25 04:21:32 +00:00
wrenczes@gmail.com
a1fd7bd508 Added a simple hack so that '1 Player' will show up as the default selection for the Play menu instead of the last item in the list - in my case, the Test Suite. 2011-06-22 05:06:54 +00:00
guzhenjie1@gmail.com
c73de33c19 Corrected Wargate. 2011-06-18 10:05:16 +00:00
guzhenjie1@gmail.com
d9ee0e015a Added Sky Hussar. 2011-06-17 14:30:48 +00:00
guzhenjie1@gmail.com
fe3aaeabbf Corrected Brainspoil. 2011-06-16 15:08:02 +00:00
wrenczes@gmail.com
741f662bb0 Tied in my recent Android flick gesture addition to a Scroll() function. GameState now has a virtual function OnScroll() call that, by default is a no-op; each game state can choose to override how to respond to flick gestures. I've added one such override in the Deck Editor so that a flick up/down acts like the psp button up/down for scrolling between color filters. 2011-06-15 09:52:11 +00:00
wrenczes@gmail.com
e1dc1afa74 Another usability improvement to the touch interface: added a timer for the delta between finger down/up. A 'tap' has to be under a 1/4 second for it to act as a double-click. 2011-06-15 09:01:26 +00:00
guzhenjie1@gmail.com
c49595bbf2 Corrected Shrine of Burning Rage and Shrine of Loyal Legions. 2011-06-14 15:31:27 +00:00
guzhenjie1@gmail.com
031d13b774 Corrected Dismember, Fleshwrither, Leonin Relic-Warder and Spire Monitor. 2011-06-13 12:26:16 +00:00
wrenczes@gmail.com
9e6154076b Added the concept of a 'flick' gesture. This uses the VelocityTracker object in Android and passes the velocity info down as an SDL joystick trackball event. We can then reinterpret this event in whatever way we like, such as up/down swipes in the deck editor (that was my initial thought, at any rate).
TBD:  right now every up finger generates this event.  We probably want to throttle it to only be an event if the velocity exceeds some arbitrary threshold;  similarly, if we generate a flick event, we probably don't want to simultaneously generate a finger up action (ie JGE_BTN_OK).
2011-06-11 10:30:38 +00:00
wrenczes@gmail.com
b2eaa3cb8d Multiple finger events now translate correctly into an SDL_MULTIGESTURE. I still haven't mapped this into anything meaningful, but all least the wiring is now present. 2011-06-11 09:03:21 +00:00
wrenczes@gmail.com
56a8bed0e3 More work on Android touch events. Fixed the issues I was having with busted float coords, and added some logic for a different way to deal with selection. Doubleclicking is no longer required; instead, if you generate a finger up event within 50 pixels of where you fingered down, this will be treated as an JGE_BTN_OK event. I think this feels more natural, as you can drag around in a menu or to various cards; then when you find your selection, simply touching it again once triggers the selection. 2011-06-11 06:59:32 +00:00
wrenczes
97dfc9f4bc Fix up passing by address on the float values. This is leftover crud from my attempts to pass float* instead of by value. I still can't make sense of what's wrong with the FingerDown calls - the mouse calls pass values in correctly, but the touch calls seem to corrupt the stack. 2011-06-08 09:57:43 +00:00
wrenczes@gmail.com
c859d35c0b More incremental work on getting touch commands on Android. I've pinpointed a nasty problem that looks possibly like a compiler bug - the float values that are passed into SDL_SendFingerDown() are coming out junk on the other end. Probably an extra push of something on the stack, as when I tried using pointers to floats instead, the y value showed up in the x position. 2011-06-07 16:43:44 +00:00
guzhenjie1@gmail.com
4568f66a66 Corrected Storm World. 2011-06-07 12:22:36 +00:00
wrenczes
f7cad41013 Checkpoint on getting touch events to come through SDL. This (deliberately) breaks the mouse emulation & cripples input on Android, as those calls are being replaced with real finger down/up/motion commands instead. More to come... 2011-06-07 00:32:26 +00:00
wrenczes
92dd1f2d40 Cleanup - unused files. 2011-06-07 00:27:13 +00:00
Xawotihs
4bf255596f Activated mouse tracking in option and award menus. Activated offset support in SimpleMenu, it should help for issue 674 2011-06-04 16:22:45 +00:00
solo81@web.de
715d498bce Added Shimmer Myr and a test for 'forcedalive'. 2011-06-03 20:16:41 +00:00
Xawotihs
40208c4835 Fixed issue 674 for deck selection in menu by mouse/touch 2011-06-03 20:01:50 +00:00
wrenczes@gmail.com
a4964f944c Fixed my centering code - I forgot that we always draw in terms of psp sizes, so when I'd toggle to doublesize / full screen, the centering code was way off for the menu as it was using screen resolution instead. 2011-06-03 02:29:06 +00:00
wrenczes@gmail.com
bed971c84c Last of my warning cleanup - as of this revision, all warnings in the windows build are gone. I've turned on the 'treat warnings as errors' option in the mtg project to mirror our makefile behaviour on psp. 2011-06-03 01:07:48 +00:00
omegablast2002@yahoo.com
cb9e5f2e95 as requested by doc, added a tag for lords to allow an over-ride for effect so theyre not removed from the game by GameObserver until the lords remove it themselves.
ie:
Card Name:
Quick Sliver
Mana Cost:
Converted Mana Cost:2
Types:Creature — Sliver
Card Text:Flash
Any player may cast Sliver cards as though they had flash.

without an over-ride testdestroy removes the observer before it can be any use to us.

i only enabled this for the lords/this'es....
2011-06-02 23:46:44 +00:00
wrenczes@gmail.com
2b512f1f92 Stubbed out the auto-generated afx includes. They're not strictly needed for the icon inclusion. 2011-06-02 20:30:09 +00:00
wrenczes@gmail.com
842ba7aa56 Added a 'W' application icon for the Windows version. Could be improved - I didn't spend much time on it, and I also didn't bother with making versions for large icon mode, but better than nothing. 2011-06-02 18:29:23 +00:00
wrenczes@gmail.com
945c2601d0 Fixed the SimpleMenu to recenter itself as its default behaviour during construction. (You can still override it to position it explicitly if needed.) This fixes the bad alignment of the menu when you'd select single player & the hermit mode was unlocked. 2011-06-02 18:27:00 +00:00
wrenczes@gmail.com
7c65191faa Fix the build - missed submitting a change that was a part of my warnings cleanup, was open in another changelist. 2011-06-02 17:11:10 +00:00
guzhenjie1@gmail.com
383e5ed9bb Corrected Sylvan Might and Troubled Healer. 2011-06-02 13:49:28 +00:00
wrenczes@gmail.com
5b8ecd0cf7 More warning cleanup - converted certain class functions to return bool instead of int where appropriate. Also fixed the sdl update() tickCount assignment that I just broke in my last checkin. 2011-06-02 07:01:42 +00:00