Commit Graph

4125 Commits

Author SHA1 Message Date
jean.chalard 16ca1a929f J :
* Some interface for key bindings
2010-02-15 14:32:56 +00:00
wagic.jeck 350f06fab8 Jeck - Jean, please review for cross-platform compatibility. Fix stupid error in GameStateDeckViewer.cpp, also fix windows compile of JGE.cpp. 2010-02-14 18:41:08 +00:00
wagic.jeck cd746e7cbc Jeck - Fix potential memory leak. 2010-02-14 17:40:52 +00:00
jean.chalard ac29f9715c J :
* Seems Visual doesn't understand #elsif... lol
2010-02-14 14:25:23 +00:00
jean.chalard 56ce4a14ae J :
* Create the subsystem for keybindings.
2010-02-14 13:21:12 +00:00
wagic.jeck 4913eec2fb Jeck - fix for cheat menu. No longer checks for "has 1 of each card" (we wanted "has 4 of each card", but I think the value of writing a specific check for that is pretty low in this case). 2010-02-14 12:19:00 +00:00
wagic.jeck a4bd6728f6 Jeck - Minor updates to GameStateDeckViewer.cpp. Cosmetic change to cheat placement, possible fix for statistics. 2010-02-14 10:02:33 +00:00
Psyyringe 4911ee05a9 Psringe - fixed mantle of Leadership (thanks to arcaneous for bug report and solution) 2010-02-11 22:43:02 +00:00
wagic.jeck 470e3321e4 Jeck - Potential crash fix, removed unused variable. 2010-02-11 21:03:27 +00:00
wagic.jeck b7c66657f6 Jeck - Quick fix to pack loading in cases where no pack directory exists. 2010-02-11 19:04:12 +00:00
wagic.jeck ab34fc16f9 Jeck - Added custom booster packs (see miki), numerous small fixes. Once we hit feature-freeze I'll be reviewing this stuff in depth, as again there's likely a lot of room for cleaning... just wanted to get it in first :).
I cut some bits out that weren't ready for SVN, hopefully I've committed everything correctly.
2010-02-11 18:32:44 +00:00
solo81@web.de 103a3d2822 Fixed issue323, issue327 and issue 329. 2010-02-11 18:22:18 +00:00
Psyyringe 1e5acc6ade Psyringe - added some Metadata (thanks to Niegen for reporting the sets which lacked it). BRB and BTD have been added to the "Duel" block, which is questionable, but imho better than leaving them without a block. 2010-02-11 10:39:18 +00:00
Psyyringe 3b7281cfe8 Psyringe - fixed bugs with Yavimaya Dryad (thanks PrimsSoup), Ogre Arsonist and Crosis's Charm (thanks Niegen), and added a missing text= identifier to "Call of the Herd" (in mtg_todo.dat) 2010-02-11 07:54:09 +00:00
solo81@web.de 64cc648179 Fixed Mercenary Knight. 2010-02-10 16:40:44 +00:00
wagic.jeck cf03d4cc64 Jeck - fix to issue 318. 2010-02-10 15:48:38 +00:00
wagic.jeck 4189c238b9 Jeck - Fix for issue 315. 2010-02-10 15:36:09 +00:00
wagic.jeck 3d6829a7d1 Jeck - fix for issue 317. 2010-02-10 14:50:01 +00:00
wagic.jeck e59aca67b7 Jeck - Fix for issue 320, also fix for countByName. 2010-02-10 14:46:10 +00:00
wagic.jeck 9806edc6d0 Jeck - Fix for issue 316 (shop selection not cyclical). 2010-02-10 14:03:08 +00:00
wagic.jeck 7fd2956399 Jeck - Added option to disable screen transitions. 2010-02-10 02:38:41 +00:00
wagic.jeck f962297d6b Jeck - Repair faulty merge from r1845. 2010-02-09 19:37:25 +00:00
wagic.jeck 4be2dddaf9 Jeck - Cleaned up filters a tiny bit (they no longer use idiotically duplicated vector<pair<string,string>>'s), added colorless mana filter ability, "exclusively X color" filter. 2010-02-09 19:25:53 +00:00
wagic.jeck 3c2d57508e Jeck - Increased shop "text list" fade-in time, changed alternateRender to display "Land" rarity as well as common-mythic. 2010-02-09 17:13:49 +00:00
wagic.jeck 2a2bcef71a Jeck - Hooked economic difficulty into booster prices. 2010-02-09 16:56:39 +00:00
wagic.jeck 5444c4e507 Jeck - Changed filter pricing scheme- filter tax is now inversely proportional to the amount of results. Added preliminary "economic difficulty" option. Note that it requires difficulty modes to be unlocked (at least to appear in the gui). Should we make it available from the start? 2010-02-09 16:23:29 +00:00
Psyyringe 8de2d4a892 Psyringe - bugfix to r1843 (one text= identifier was missing). Also fixed added one missing "auto=trample" to Vorrac battlehorns. Cosmetic change: Reordered the lines added in r1844 to keep current order (anything derived from the card's rules text gets written before the text= line) consistent. That's not compulsory by any means, I just like the efficiency of not having to look at anything below the text= line when checking / debugging / updating cards. :) 2010-02-09 01:46:55 +00:00
wagic.jeck 69967b6d9c Jeck - Added 7 primitives with the "can't be blocked by more than one blocker" ability: Charging Rhino, Familiar Ground, "Huang Zhong, Shu General", Ironhoof Ox, Norwood Riders, Vorrac Battlehorns, "Yuan Shao, the indecisive". 2010-02-09 01:17:02 +00:00
Psyyringe d84ce36c55 Psyringe - complete wording update for all cards in mtg.txt and mtg_todo.dat. As a side effect, there shouldn't be any non-basic-ASCII characters left in these files anymore.
Note: I replaced paragraphs (which Wagic can't display at the moment) with the sequence " -- ". If that's not desired, they can be easily replaced, but I think they improve readability. Previously, paragraphs where transcribed into slightly larger spaces, and I found that slightly confusing when reading the texts in-game.
2010-02-09 00:28:20 +00:00
wagic.jeck 2508a64634 Jeck - Completing a collection using the cheat profile now also unlocks all sets in trophy room. 2010-02-08 23:53:04 +00:00
wagic.jeck e5be940766 Jeck - Added filtering by card's first letter. This is pretty much the last filter I can think of, except possibly some more complex ones like the mana producer filter. 2010-02-08 23:10:45 +00:00
wagic.jeck 251f89d7b9 Jeck - Consolidated card price functions from deckviewer/shop into PriceList. Also moved price discount hash variable. (As of around r1825, price discount has been based on (mtgid + static int randomKey) % 20. randomKey updates at the end of any won game, making prices for a given fixed between visits to the shop on the same "day") 2010-02-08 20:13:48 +00:00
wagic.jeck 907c0b7b5d Jeck - Test for Oneblocker ability, r1837. 2010-02-08 18:32:42 +00:00
wagic.jeck b348ab5d24 Jeck - Added and tested "oneblocker" ability, which allows for cards that "can't be blocked by more than one creature.". I've put in Stalking Tiger (I think... these primitives are cool! I just added the prim and all of a sudden it was in 10E), but this should also add Charging Rhino, Familiar Ground, "Huang Zhong, Shu General", Ironhoof Ox, Krosan Vorine, Norwood Riders, Vorrac Battlehorns, "Yuan Shao, the indecisive".
Test and more cards (the ones I can figure out how to do) forthcoming.
2010-02-08 18:18:44 +00:00
wagic.jeck 4279658379 Jeck - Removed parts of code that were mistakenly committed. 2010-02-08 14:03:46 +00:00
wagic.jeck 8c187f8d12 Jeck - Updated some metadata. Gave a few sets an appropriate block name. 2010-02-08 10:08:50 +00:00
wagic.jeck 5a597dfc65 Jeck - Fix to shop. 2010-02-08 09:37:32 +00:00
wagic.jeck 76f012cc99 Jeck - More fixes to r1827. 2010-02-08 09:05:09 +00:00
wagic.jeck a747d4ef1d Jeck - Fixed leak introduced in r1827. 2010-02-08 09:01:44 +00:00
wagic.jeck e96d4b9a07 Jeck - Cleaned up and reordered some menus, fixed potential heap corruption in GameStateShop. 2010-02-08 08:54:55 +00:00
wagic.jeck 74254e4721 Jeck - Fixes to deck-viewer loading. 2010-02-08 07:07:37 +00:00
wagic.jeck bf4595ee70 Jeck - Added filter for mana-producing abilities. 2010-02-08 06:08:29 +00:00
wagic.jeck 07ebd926fe Jeck - Added 4 additional filters: CMC, Power, Toughness, and "Exclusively this color". That last one isn't hooked into the gui, as it might be confusing for too little gain... but it's there for future use of filters as a deck/format validation tool. 2010-02-08 05:36:51 +00:00
wagic.jeck 513795b316 Jeck - Fix for booster pack purchases not saving. 2010-02-08 02:16:39 +00:00
wagic.jeck bdf958de34 Jeck - Daily build, fixed alignment issue in shop prices. 2010-02-08 01:35:16 +00:00
wagic.jeck 83e2b04547 Jeck - Added full filtering system to deck editor and shop. I've spent 24hours on pure debugging, but there are likely a couple bugs I've missed. So please, if you find something, make an issue of it! :P Also split OptionItem classes into separate files, and added support for mixed-set boosters (which I think are way, way cool). 2010-02-08 01:03:07 +00:00
Psyyringe 64d592f588 Psyringe - small addition to r1823: fixed 4 bugs in WWK cards (which I hadn't checked for the previous update, now these are checked too). 2010-02-07 22:02:03 +00:00
Psyyringe 70ac1e5d52 Psyringe - Checked the manacost, color, type, subtype, power, toughness, and loyalty data of all cards in mtg.txt and mtg_todo.dat, and did about 200 bugfixes, optimizations, and cosmetic changes. All cards in both files should now have correct values for the keywords mentioned above.
Note: I checked all changes manually, so in the cases where the value *has* to be different for the card to work (e.g.Covetous Dragon), I left the values as they were. In these cases I added a comment to the card code which notes why the values need to be different, so that no one else breaks the card by "correcting" them.

Note 2: You may have noticed that I used a fixed sequence of lines for all cards. That was a byproduct of the file unification process, but I think it's also rather useful. Above the "text=" line are the lines that we need to code (abilities=, target=, auto= etc.). Below the "text=" line are the fixed values (mana=, type=, power= etc.) which we only need to touch if either the card gets errata'd, or we need to do some tricky coding (e.g. Covetous Dragon). So, in other words, everything below the "text=" line should be okay now in both files, and doesn't need to be checked when implementing or debugging a card.
2010-02-07 20:57:51 +00:00
Psyyringe af585ab2d6 Psyringe - fixed a bug with Sun Quan, thanks to coolguy824 for the bug report. 2010-02-07 09:41:09 +00:00
Psyyringe 26bcdb11d6 Psyringe - removed a wrong "fix" 2010-02-06 22:10:45 +00:00