6675a7da31
Implemented a lazy load pattern for the deck stats - when the DeckMenu is displaying decks, it calls LoadStats() for only the ones visible in the list. This helps reduces the lag that occurs each time we attempt to load all the AI decks during match selection. This still could be improved - DeckMetaData's constructor loads an MTGDeck object to parse out the name of a deck from its file. This means that we crack open 106 files on the first attempt to show the list of opponent decks. I started optimizing this, but reverted, as the list itself is sorted alphabetically. Currently, with these mods, it's still taking 4 1/2 seconds on my psp to load the opponent list on the first go around.
wrenczes@gmail.com
2011-01-30 13:06:21 +00:00
e0f7bf26d8
Jeck - First doxygen commit, basic information on WFilter classes. Also added filter price adjustment for some of the newer basic abilities (the CANTLOSE varieties now cost more to filter).
wagic.jeck
2011-01-30 11:14:36 +00:00
329b0cf929
Added 9 cards based on rev2979.
solo81@web.de
2011-01-30 10:39:16 +00:00
ae40e31d04
Fixed the following cards: name=Contested Warzone ==> name=Contested War Zone
guzhenjie1@gmail.com
2011-01-30 08:07:01 +00:00
c4ffc214ab
moved token creator under aequip so i can do the same fix to livingweapon as i did for new target...
omegablast2002@yahoo.com
2011-01-30 00:01:57 +00:00
50aa62675e
adding life loss event sending to damage from creature sources in combat.
omegablast2002@yahoo.com
2011-01-29 22:32:34 +00:00
4103a8964f
fixed an oversight and an error...in lifelostthisturn for a player, if the life gain was less then 0 then i want to ADD the abs pos to the amount, not remove it...and damage from creatures is considered lifelost...
omegablast2002@yahoo.com
2011-01-29 22:21:18 +00:00
853b8ea5c6
fixed gravetitan bug reported, added new keyword "retarget" as another support for newtarget...
omegablast2002@yahoo.com
2011-01-29 21:58:29 +00:00
ed93646785
Reverted one unintended change from last revision.
solo81@web.de
2011-01-29 21:55:02 +00:00
938e31a258
Fixed old helm_of_kaldra.txt.
solo81@web.de
2011-01-29 21:52:53 +00:00
ac3b65995b
- Added MBS. 124 out of 155 could be added (that's over 80%).
solo81@web.de
2011-01-29 20:46:37 +00:00
1c119f2ace
Fixed Helm of Kaldra: auto={1}:aslongas(Sword of Kaldra|mybattlefield) aslongas(Shield of Kaldra|mybattlefield):token(-47449) ==> auto=aslongas(Sword of Kaldra|mybattlefield)aslongas(Shield of Kaldra|mybattlefield)aslongas(Helm of
guzhenjie1@gmail.com
2011-01-29 20:13:44 +00:00
5e4902c229
- Completed code for Helm of Kaldra.
solo81@web.de
2011-01-29 16:05:01 +00:00
11dc8ac671
Fixed Spiritual Asylum: text=@attacking(creature|myBattlefield):sacrifice ==> auto=@attacking(creature|myBattlefield):sacrifice text=Creatures and lands you control have shroud. (They can't be the targets of spells or abilities.) -- When a creature you control attacks, sacrifice Spiritual Asylum.
guzhenjie1@gmail.com
2011-01-29 15:32:32 +00:00
73025806ad
Fixed the following cards: Rally the Troops Remove Scorching Winds Treetop Defense Warrior's Stand restriction=opponentblockeronly ==> restriction=opponentblockersonly
guzhenjie1@gmail.com
2011-01-29 15:25:54 +00:00
74bf7fdab3
Added 8 cards based on rev2963.
solo81@web.de
2011-01-28 23:03:45 +00:00
e74c63bc0b
fixed mem leak
techdragon.nguyen@gmail.com
2011-01-28 22:57:10 +00:00
4d17ab9962
fixed a null pointer for deck editor on creating a new deck.
techdragon.nguyen@gmail.com
2011-01-28 22:23:09 +00:00
610d55d0ba
Fixed several cards with cost alteration.
solo81@web.de
2011-01-28 22:06:31 +00:00
5b2a50fbec
Added 33 cards based on rev2926 (keyword "share").
solo81@web.de
2011-01-28 20:58:29 +00:00
7dfa655323
added support for cantbetargetof(something[optional]) for "this card cant be the target of green spells or abilities" style cards.
omegablast2002@yahoo.com
2011-01-28 19:08:01 +00:00
6af545a797
fixed a bug that arose from giving the Ai the ability to actually interupt with something. found that ai was allowed to run "chooseBlockers()" and has been running this function EVERYTIME even before the update i made, when ever it was choosing actions during blockers. even when its blockers were already choosen and it no longer had proirity.
omegablast2002@yahoo.com
2011-01-28 18:26:34 +00:00
5e651f03b2
moved mulligan code out of GameStateDuel and into Player base class. Taking a mulligan seems better encapsulated as a player function rather than loose code inside the state transitions of GameStateDuel
techdragon.nguyen@gmail.com
2011-01-28 13:30:29 +00:00
3187487987
Minor tweaks to Mike's map of maps cache work on stats. Mostly these changes are stylistic changes that favor more terse code, but there was one bug where a double-delete was happening - GameStateDeckViewer used to allocate its own StatsWrapper, and deleted it as part of teardown - now that the allocation is owned by the deck stats instance, it's not allowed to do the deletion anymore.
wrenczes@gmail.com
2011-01-28 10:21:23 +00:00
f4f1fdcd3d
Another LF property change.
wrenczes@gmail.com
2011-01-28 06:07:14 +00:00
f2cbd883a6
Apply LF line endings as an SVN property, this time on the JGE source files.
wrenczes@gmail.com
2011-01-28 06:03:52 +00:00
32cabc15c2
Forcing LF as the line ending style through SVN properties. No actual code changes here.
wrenczes@gmail.com
2011-01-28 06:00:51 +00:00
8156619d49
added guard around TRACK_FILE_USAGE define to disable it on a PSP build. The related code does not compile for the PSP builds.
techdragon.nguyen@gmail.com
2011-01-27 16:15:12 +00:00
ce7745bfa6
First attempt to reduce load time of player deck selection screens. This change makes use of caching the DeckStats and DeckStatsWrappers into singleton caches that get flushed when you quit the game. The initial load time will be significant as lazy loading has not been coded yet for the ai decks.
techdragon.nguyen@gmail.com
2011-01-27 16:13:40 +00:00
f06f67addf
fixed typo in war elemental
omegablast2002@yahoo.com
2011-01-26 15:00:52 +00:00
60c589ccaa
fixed a bug reported for Ghost Council of Orzhova, involving MTG rulings on such effects...if the target of the effect is no longer in the targetted zone at the time the effect goes to resolve, it will still be put on the stack and resolve to do nothing at all. AKA if you sacrifice Ghost to herself, or use ghost to sacrifice that goblin which has {s}:damage:1 target player...and you interupt that ability to sac the goblin for the one damage...while the ability is on the stack..it should not blink the goblin afterwards...
omegablast2002@yahoo.com
2011-01-26 13:38:21 +00:00
cc6668b632
Erwan - removing the daily build folder. They take too much space in the repository. If you do daily builds, please use the "download" section of the google code page, or update the build to some server (megaupload or your own server), and post it on the forum. Thanks
wagic.the.homebrew@gmail.com
2011-01-26 12:43:43 +00:00
83a340d38e
Fixed the following cards reported by kaioshin in forum: 1. Bant Sureblade 2. Crystallization 3. Esper Stormblade 4. Grixis Grimblade 5. Jund Hackblade 6. Naya Hushblade
guzhenjie1@gmail.com
2011-01-25 11:03:56 +00:00
d439be4f75
Fixed http://code.google.com/p/wagic/issues/detail?id=572, where a card sometimes might not show its tap status correctly. My fix for 550 was slightly off, in that if a card view's position was updated (ie from a zone change, etc), the pos pointer shouldn't be cleared. Only the pos related to the 'this' pointer is the one that can't be referenced anymore, fixed the destructor code.
wrenczes@gmail.com
2011-01-25 07:52:01 +00:00
6100641edd
changed line endings to UNIX style line enidngs. last commit didn't take for some reason.
techdragon.nguyen@gmail.com
2011-01-24 20:19:17 +00:00
7848669702
changed line endings to UNIX style line enidngs
techdragon.nguyen@gmail.com
2011-01-24 19:56:45 +00:00
c6584a9e9d
meant hasType...tho im not really sure its needed(?)
omegablast2002@yahoo.com
2011-01-24 18:26:04 +00:00
0b0da78e30
removed a change that wasnt supposed to be there. sorry!
omegablast2002@yahoo.com
2011-01-24 18:23:02 +00:00
5f2af4413a
fixed the conflicted cards mike reported. saprolings conflict i have not fixed -1924 is saproling, tho i explictly remember replacing all these with token(Saproling,creature saproling,1/1,green) not sure who changed them back, the others are indeed due to incoding.
omegablast2002@yahoo.com
2011-01-24 18:17:43 +00:00
beec00c254
2 changes, first fixed the bug where auras were causing the cards to slide to the right, auras always have targets, so i added a conditional to guiplay to ignore adding it to the horizontal shift as these auras should never be just laying in the battlefield with no target.
omegablast2002@yahoo.com
2011-01-24 17:58:14 +00:00
556df85a31
1. Fixed the Skeleton token of Drudge Spell and Graypelt Refuge in mtg.txt.
guzhenjie1@gmail.com
2011-01-24 11:05:42 +00:00
46891d8de8
added a commit to "thatmuch" variable to explain what its for.
omegablast2002@yahoo.com
2011-01-23 18:23:44 +00:00
48fd6a1bc1
2 changes wrapped my last commit incorrectly, the fix for @targeted...and i added a conditional to keep the "combat bump" hint out of test suite, i found out it slowed test suite down considerably
omegablast2002@yahoo.com
2011-01-23 17:57:37 +00:00
ee29fbc237
removed a unused variable and correct a bug with [share] spells tc's are deleted as they resolve so these effects couldnt take adventage of this type of targeting when the effect ability was a fizzle.
omegablast2002@yahoo.com
2011-01-23 17:29:26 +00:00
12bdaffac1
doc reported that @targeted was not resolving before the spell which triggered it, as per mtg rules, this trigger is a statebased trigger that resolves instantly.
omegablast2002@yahoo.com
2011-01-23 14:34:55 +00:00
2bcf7ecdff
Added 650 new cards based on rev2922.
solo81@web.de
2011-01-23 12:41:11 +00:00
c113c154c1
Erwan - In line Zethfox's idea with WParsedInt objects inside MTGAbilities, deleted some unused variables.
wagic.the.homebrew@gmail.com
2011-01-23 08:28:24 +00:00
f63aa379e7
Erwan - moved all "loseLife/gainLife" duplicated code into 1 Player method
wagic.the.homebrew@gmail.com
2011-01-23 06:59:00 +00:00
14f2e9b0f2
Erwan - simple refactor of "putIn*" functions in MTGGameZones
wagic.the.homebrew@gmail.com
2011-01-23 06:03:37 +00:00
63b3bdfef6
missed a spot to send @targeted events.
omegablast2002@yahoo.com
2011-01-22 22:02:20 +00:00
da8f8dd558
fixeda bug with counter cost when uses with lords/aslongas/foreach/insert any ability other then auto={c(1/1,-1)}:effect....
omegablast2002@yahoo.com
2011-01-22 17:53:30 +00:00
62873dc971
more fixes to the review
omegablast2002@yahoo.com
2011-01-22 17:14:41 +00:00
07802134e8
more fixes from the review...
omegablast2002@yahoo.com
2011-01-22 16:48:55 +00:00
27e60fc605
fixed most of the reviewed code, corrected all danger zone code which could have had bad side effects.
omegablast2002@yahoo.com
2011-01-22 16:12:17 +00:00
946df16af5
removed eradicate ability and replaced it with a far more flexable solution which is
omegablast2002@yahoo.com
2011-01-22 12:30:42 +00:00
d581a72c1d
Erwan - changed "putInPlay" to return "NULL" if the card cannot be found in the "from" zone. The behavior of the function before that prevented to see that we broke the "alternate" cost feature (see test Vine Dryad) - Fixed some memory leaks introduced in r2922
wagic.the.homebrew@gmail.com
2011-01-22 09:43:13 +00:00
094c97dec8
corrected an issue where morphing a creature would overwrite basic abilities granted by lords. it was because i was not ADDING the new basic abilities it gained to the end result of face upping the creature.
omegablast2002@yahoo.com
2011-01-22 02:35:11 +00:00
299bb4f9fa
removing the rest of the originatingZone code mike added, as we already have this variable as card->currentZone
omegablast2002@yahoo.com
2011-01-21 21:55:12 +00:00
473abd9814
im forced to do this commit in whole instead of parts as originally planned, and before my beta test period of the changes is complete BECAUSE there are people doing "clean up" and the MASSIVE amount of conflicts i have to resolve from it is WAY too much for me to take on after nearly 200 hours of coding this patch. i cant seem to get enough respect to have people hold off on "clean up" so this brings me to being forced to do a full commit before playtest period is done, so they can go ahead with there *super important* clean up.
omegablast2002@yahoo.com
2011-01-21 20:18:56 +00:00
b836c97a1b
fix to previous checkin. adding new parameter to specify originating zone of card
techdragon.nguyen@gmail.com
2011-01-21 18:46:13 +00:00
0e49775f27
the back image quad for morph.
omegablast2002@yahoo.com
2011-01-21 18:39:25 +00:00
e53c16f700
No code change just reformatting of header files. finishing up my reformatting of the source from November/December following the guidelines that were posted. some extra things I added: * Any empty virtual declarations were kept to one line. * Enums were split up into separate lines to promote uniformity across all headers. ( each header file had a different style for enums)
techdragon.nguyen@gmail.com
2011-01-21 18:01:14 +00:00
6d3d4c1792
Erwan - refactor of MTGRules.cpp (buyback/flashback/retrace/alternative). This change has been reviewed by myself, Wil, and Mike. The test suite passes. More cleanup can be done, I will work on that later on.
wagic.the.homebrew@gmail.com
2011-01-21 10:27:45 +00:00
b6713c02ec
Fixed two cards' name in ME4 _cards.dat:
guzhenjie1@gmail.com
2011-01-20 10:56:15 +00:00
df77cc584f
Err, sorry, that's not fair - I was forcing this pspsdk change on everyone. Put it back to off by default - to turn on the signing, simply uncomment SIGN_PRX = 1 in the makefile.
wrenczes@gmail.com
2011-01-19 11:05:42 +00:00
0b16401c88
Some tweaks to support automatic signing of the wagic eboot on psp. To use, you'll need to unzip the mods I made into your pspsdk folder - you should end up with two utils in the bin folder, and some slight mods to the build.mak file (under pspsdk/psp/sdk/lib/).
wrenczes@gmail.com
2011-01-19 11:03:09 +00:00
f90709403f
- Fixed scissor bug introduced in r2912. - Adds code to support TapAndHold gesture, it does not seem to work with the N900, but it works fine on Linux. - Removed code checking opengl version as it's no more needed.
Xawotihs
2011-01-16 22:47:07 +00:00
7eaa30e996
add newline @ end of JLogger.h
Ittobaal@gmail.com
2011-01-16 17:48:11 +00:00
04c1ff23dd
Fixed OpenGL 1.1 code with Qt. The Qt version on windows now uses it by default instead of OpenGL 2.0.
Xawotihs
2011-01-16 17:31:24 +00:00
963730536e
Mouse/touch support for the options menu (issue 576). Still missing support for the virtual keyboard.
Xawotihs
2011-01-16 11:05:02 +00:00
44c101bf6b
removed extra variable that I shouldn't have
techdragon.nguyen@gmail.com
2011-01-16 08:27:32 +00:00
1be97b76f8
code cleanup. No code changes - removed unused variables - added line breaks between methods (not everywhere just where i saw it while removing unused variables)
techdragon.nguyen@gmail.com
2011-01-16 07:49:34 +00:00
e5edf779f5
Reworked a patch sent to us (http://wololo.net/forum/viewtopic.php?f=15&t=2464) that replaces the text symbols for the psp buttons with the actual icons. While at it, I found a bunch of issues with the ActionStack's render code (ie when you get the popup menu to interrupt a spell being played & the like) - the bounding rect actually went above the screen's region, clipping problems (the interrupt text was previously drawing over the interrupt effect), alignment problems when the avatar was being drawn, vertical text alignment, fudged alignment numbers for the quads that didn't make any sense, etc.
wrenczes@gmail.com
2011-01-13 09:56:55 +00:00
bd529c3618
this is the base shadow for a fix to multitargetted extracost which i will be commiting as soon as the cards are coded.
omegablast2002@yahoo.com
2011-01-12 20:01:25 +00:00
eac6d74ebd
Added a couple of null guards against invalid quads / textures in the render() call, with JLOG calls to trace this out if we should hit one of these cases. (Reformatted tabbing in the function while I was there.)
wrenczes@gmail.com
2011-01-11 10:36:15 +00:00
2063e27681
Added a debug helper override class for ifstream - this normally washes out to std::ifstream. If #define TRACK_FILE_USAGE_STATS is enabled, it derives from ifstream, but additionally tracks each time we create an instance for a given file name & counts each hit in a map, and dump the statistics on shutdown. This is to help track how often we open up certain files, since i/o is costly on the psp.
wrenczes@gmail.com
2011-01-11 10:11:15 +00:00
ccd972ada3
Eliminated some spurious string copy construction - changed a couple string return functions to return a reference instead.
wrenczes@gmail.com
2011-01-11 09:32:23 +00:00
e0823b82c4
Fix for issue 568. It was a hard one, it probably happened more frequently with the touch/mouse interface, but this bug potentially affected all the platforms.
Xawotihs
2011-01-08 18:26:22 +00:00
07ef902d85
Added newline to end-of-file
Ittobaal@gmail.com
2011-01-08 12:24:39 +00:00
c3b926830a
[Maemo] Readded the resources copy in the postinstall script
Xawotihs
2011-01-06 22:07:28 +00:00
98214db702
[Maemo] references the new launcher in the .desktop file
Xawotihs
2011-01-06 20:33:21 +00:00
5ea6c1b890
[Maemo] Moved the copy of the ressources from the installation into a launcher script
Xawotihs
2011-01-06 20:17:34 +00:00
6b3d1bcbc9
Viridian Lorebearers pump effect was not ending
omegablast2002@yahoo.com
2011-01-06 12:52:20 +00:00
cb7ecbc0e9
updated thelon of havenwood to use exile cost.
omegablast2002@yahoo.com
2011-01-06 12:42:57 +00:00
532261d36c
Fixed Thelon of Havenwood reported in forum by Niegen and Knight Token from Waylay:
guzhenjie1@gmail.com
2011-01-06 12:33:26 +00:00
wrenczes@gmail.com
wagic.jeck
solo81@web.de
guzhenjie1@gmail.com
omegablast2002@yahoo.com
techdragon.nguyen@gmail.com
Xawotihs
wagic.the.homebrew@gmail.com
Ittobaal@gmail.com