Commit Graph

57 Commits

Author SHA1 Message Date
Braids
1df5c1aa55 Fixed compatibility with Java 7.
Problem was due to inability to deserialize display_new_layout.xml. I changed that file's default serializer to XStream. This fix maintains compatibility with existing display_new_layout.xml when possible, and uses an XStream-generated display_layout.xml when it cannot parse the former.

Note this updates the default display_layout.xml, which looks OK under Windows XP with resolution 1024x768.

Bug: 144
2011-08-22 01:54:21 +00:00
Braids
6afac1c7e0 Issue 117: Load from default display_layout.xml when user's customized display_new_layout.xml does not exist.
* Updated the default display_layout.xml to look good on a Windows XP 1024x768 display.
* Updated GuiDisplay4.java to load from default layout if user's "new" layout does not exist.
* We have not had display_new_layout.xml in the repository for some time, but that is a related change.

Bug: 117
2011-08-21 16:05:15 +00:00
Braids
633ee9a097 - Update svn:ignore on more files; delete display_new_layout.xml (which gets recreated every game). 2011-08-12 21:48:43 +00:00
jendave
d9a785ee3a init2 2011-08-09 19:34:12 +00:00
jendave
c46aa10af5 reset repo 2011-08-09 19:06:11 +00:00
jendave
f753e95178 upload 2011-08-07 06:51:32 +00:00
jendave
33b1ab951c 2011-08-07 01:48:06 +00:00
jendave
e678980a46 - Added the optional ability to specify a set for each card spawned through Setup Game State - for example, just Forest will spawn a "Forest" card using the last set available for it, while Forest@4ED will spawn a "Forest" card from the 4th Edition.
- Refactored the Setup Game State code (moved the repetitive code block out into a separate function, simplified the code).
2011-08-07 01:05:58 +00:00
jendave
9b696679db - Small fix Vendilion Clique. 2011-08-07 00:58:58 +00:00
jendave
b042368fc8 - Added a "Setup Battlefield" menu item to the Developer menu, currently doing nothing - to be expanded later for use to set up the battlefield for my AI experiments and improvement project 2011-08-07 00:41:37 +00:00
jendave
deb6409a44 - Added Divine Retribution 2011-08-06 21:38:12 +00:00
jendave
1c6f49f72a - Fixed Mesmeric Orb and Battered Golem. 2011-08-06 18:56:44 +00:00
jendave
6f5970f34e - Converted all the mighty Honden Shrines to script. 2011-08-06 18:43:22 +00:00
jendave
7a0d2bc0e7 - Converted Ichor Slick to script. 2011-08-06 18:26:09 +00:00
jendave
ad3e26d97d *Fixed calls to runTrigger regarding Taps and Untaps.
*Removed End-of-phase trigger option.
*Triggerhandler now runs all triggers in APNAP order.
2011-08-06 15:01:15 +00:00
jendave
cc61de4b3b *Added IsPresent requirement to triggers. Thanks, Sloth!
*More uniformity in common parameter names.
2011-08-06 14:54:19 +00:00
jendave
402f45a136 *Added Lurking Predators. 2011-08-06 14:30:15 +00:00
jendave
7fb8c169f6 *converted a few more spCounter cards to AF. (Turns out subabilities were implemented! Thanks, zenchristo!) 2011-08-06 13:05:47 +00:00
jendave
38c00e879c *Added CC-prefix to ExtraActions of spCounter
*Fixed Cancel not having anything in it's TargetingRestriction section.
2011-08-06 05:48:31 +00:00
jendave
9f88004d2a * separate layout save of new and old GUI 2011-08-06 05:40:46 +00:00
jendave
97beef82b8 * new play area, there might still be some rendering glitches 2011-08-06 05:31:14 +00:00
jendave
15506f29e9 * fix shuffle graveyard keyword 2011-08-06 04:42:41 +00:00
jendave
e2a5d87045 1) Corrected the P/T for Sedraxis Specter and moved to top of file.
2) The enPumpCurse AI will no longer enchant a creature with the Bound in Silence or Cessation auras if the target can not attack.
2011-08-06 04:41:28 +00:00
jendave
4f7d13ccbc Added Sovereigns of Lost Alara and fixed AI targeting for Temporal Fissure 2011-08-06 04:40:38 +00:00
jendave
e12b1d6648 Added Foundations for Storm 2011-08-06 04:39:52 +00:00
jendave
2ac48e0471 - Added Broodwarden.
- Fixed Ajani Vengeant (will not ask to pay mana for its second ability).
2011-08-06 04:35:20 +00:00
jendave
c0cab338a4 - Fixed LQ card-pictures link. 2011-08-06 03:54:45 +00:00
jendave
7b89277218 - Added Putrid Leech. 2011-08-06 03:47:28 +00:00
jendave
cba13e1230 - Fixed Global Ruin (I think?)
- Few small quest updates.
- Added Darksteel Forge.
2011-08-06 03:47:08 +00:00
jendave
936ee0bcde - Changed a bunch of things in the checkDeclareBlockers code (for some reason it gets called multiple times). 2011-08-06 03:42:20 +00:00
jendave
f91467f172 fixed bug with missing images in the deck editor. small images don't show any more on mouse over 2011-08-06 03:28:37 +00:00
jendave
c595bca3db Fixed the token image bug in ImageCache
Changed CardDetailPanel to display all the info in separate lines
added support for multiselect dialogs in Display, adapted it in Devour
2011-08-06 03:27:22 +00:00
jendave
e6fcccea92 Code cleanup:
-removed obsolete image-related classes
-resolved all warnings in the forge packages
2011-08-06 03:26:49 +00:00
jendave
c4e118f5f2 minimal nonfunctional change 2011-08-06 03:25:27 +00:00
jendave
7c23c0bb3f Big change that should solve the memory leak
-replaced the old ImageCache class with ImageCache2
-extracted the card picture- and detail code from GuiDisplay/DeckEditor into separate classes (in forge.gui.game). therefore, CardDetailUtil and forge.CardPanel were deleted. GuiDisplayUtil is no longer used to create the card panels.

TESTS:
-confirmed all changed GUIs (but the quest deck editor - changes are the same as normal deck editor) to show details and pictures.
-I played a game with reduced heap size (-Xmx200M). Occasionally the image cache size shrinked along with the used memory.
-In a game without reduced heap size (memory usage ~500M, over 1000 cached images), i noticed slowdown when some images were missing.
-I noticed the stack elements now having a border with the card's color; this doesn't hurt IMO.

NOT WORKING
I wasn't able to adapt one thing: GUI_PictureHQ, i just didn't know what it does. for everything else to work, some code sections were commented out and tagged with "TODO reenable"
2011-08-06 03:25:05 +00:00
jendave
35c06ce201 - Hopefully the AI will lose right away now after losing life into lethal levels from Phyr?\127exian Arena.
- Made a fix on Kiki-Jiki, Mirror Breaker: if it uses its ability on a stolen creature (Control Magic, Sower etc.), "leavesPlay triggers" should affect the correct player now (e.g. Meadowboon).
- Fixed Sower of Temptation: its ability will now trigger as it enters the battlefield. This allows for comboing with cards like Kiki-Jiki, Mirror Breaker.
- Added some new Worldwake cards: Avenger of Zendikar and Bestial Menace.
2011-08-06 03:18:59 +00:00
jendave
254944dc9d - Fixed Karmic Guide.
- Eviscerator should only be played by the AI if his lifetotal is larger than 7. 
- Fixed Merfolk Sovereign AI targeting.
- Fixed Sarkhan Vol second ability. 
- Added some code to Knight of the Reliquary which should make it attack more often.
2011-08-06 03:11:35 +00:00
jendave
9f3fdf429f - Fixed Pit Scorpion.
- Fixed some of the "Sacrifice a creature" spells ("destroy" effects would sometimes not happen). 
- Added a few cards: Propaganda, Ghostly Prison, Windborn Muse, Arctic Nishoba, Peacekeeper, Marsh Viper.
- Yet another fix to Force of Will.
2011-08-06 03:10:05 +00:00
jendave
6fa2eea57f - Added The Tabernacle at Pendrell Vale and Magus of the Tabernacle.
- Fixed Bog Initiate Manacost.
- Some slight performance improvements for displaying cards (not sure if it helps much).
- A bunch of Adarkar Valkyrie bugs should be fixed now.
2011-08-06 03:06:38 +00:00
jendave
9b23d90ec2 - Gaining control of a creature equipped with Umezawa's Jitte and attacking with it shouldn't crash the game anymore. However, if you use this on the AI, you can use its abilities (gain life ability will give the AI life though).
- Added some kind of caching algorithm, hopefully it will actually make a difference.
- Rebel / Merc searches shouldn't fetch non-permanents (with Changeling) anymore.
2011-08-06 03:05:49 +00:00
jendave
7ce6d0bb3c - Fixed AEther Web and other Auras with Flash (it was actually possible to cast them as they were in play already - getting infinitely more copies).
- Fixed Shadowmage Infiltrator, Thieving Magpie, Lu Xun, Scholar General, Augury Adept, Hypnotic Specter, (when control changes, the correct player should draw/discard cards).
- Fixed a bug where lands could be played with other spells/abilities on the stack.
2011-08-06 03:05:28 +00:00
jendave
c80fa9b374 - Radiant, Archangel is a 3/3 now.
- Discarding when controlling Necropotence should exile the card.
- Fixed a bug in the combat code where if a creature has received equal to its toughness, it will die no matter what.
- Umezawa's Jitte should trigger now when attacking a planeswalker.
- Added Pit Scorpion and Serpent Generator.
2011-08-06 03:04:18 +00:00
jendave
e98cfe0f20 - Treva, the Renewer, Rith, the Awakener and Oros, the Avenger are usable by the AI now, and fixed a bug involving Control Magic and either of these cards. 2011-08-06 03:02:29 +00:00
jendave
17e08af9ec - Added a small fix for Scion of Oona (should pump other Scions correctly now). 2011-08-06 03:01:41 +00:00
jendave
ed83d3132d - Major combat code rewrite, added Swans of Bryn Argoll and Dromad Purebred.
- Exploration / Fastbond effects shouldn't carry over anymore.
- Vendilion Clique CIP ability should work now.
- AI playing Flight or Launch shouldn't target creatures with flying anymore.
- Small fix to Dovescape.
- Needlestorm, Oros, the Avenger, Incendiary Command and Spitting Spider shouldn't be able to damage creatures with protection anymore.
- Timber Protector should work correctly now.
2011-08-06 02:58:04 +00:00
jendave
006b514e00 - Umezawa's Jitte +2/+2 ability shouldn't be targeted anymore.
- Added Chainer, Dementia Master, Vorosh, the Hunter, Rith, the Awakener.
- AEther Web should be castable at any time now (flash).
- AI should be able to use Tezzeret's first ability now.
2011-08-06 02:57:04 +00:00
jendave
79746b6d94 - Added Meddling Mage, Gaddoc?\127k Teeg and Iona, Shield of Emeria.
- Changed spDamageCP and spDamageP to spDamageTgtCP and spDamageTgtP in cards.txt.
2011-08-06 02:56:01 +00:00
jendave
94b9177628 - Garruk Wildspeaker shouldn't be able to target untargettable lands anymore.
- Fixed a few issues in the GUI code, where Moxes that turn into creatures would show up twice.
- Adun Oakenshield's ability shouldn't be playable from hand anymore.
- Added Tezzeret the Seeker.
2011-08-06 02:51:54 +00:00
jendave
ca510897b0 - Umezawa's Jitte is now Legendary, Auramancer a Wizard.
- Fixed an issue with the AI countering spells that trigger on cast (Sigil of the Empty Throne, Standstill, etc.).
- Timetwister shouldn't show up in both graveyards anymore.
- Figure of Destiny's 2nd and 3rd abilities should work if the creature has changeling, plus a check for the prerequisites is performed on resolution.
- Fixed Dryad Arbor / Mutavault / Mishra's Factory summoning sickness issues.
- Fixed Umara Raptor manacost.
- Added Vasiliy's Deck editor filter, and it works now! It's much easier to find cards now with the card text search feature.
- Fetching Bound in Silence with a rebel should be allowed to be attached to any creature.
- Demonic Tutor shouldn't be castable with other spells on the stack anymore.
- Added a property for token images (currently set to 'pics/tokens' - just set to 'pics' to keep it the way it always was).
2011-08-06 02:51:31 +00:00
jendave
9ba9b33126 - Fixed Rebel/Merc fetch, can only get permanents now.
- Added the rest of the Harbingers.
- Added Meekstone and Qasali Pridemage.
2011-08-06 02:50:22 +00:00