Commit Graph

671 Commits

Author SHA1 Message Date
d32.wagic af343a4a7f Some additions to the deck statistics.
- Displaying title for each page
- In screen showing games against AI, displaying actual number of games won/played in addition to percentage
- Added two new screens (3,4) - mana cost/color breakdown for creatures (3) and non-creature spells (4)

More to come...
2009-11-07 20:04:09 +00:00
wagic.the.homebrew@gmail.com a43c779d1f Erwan
-fixed graphical glitches in the shop when going to fullscreen (issues with bilinear filtering, as usual...)
2009-11-04 13:53:01 +00:00
wagic.the.homebrew@gmail.com f33d37d9f2 Erwan
-attempt at fixing shop crash introduced in r1231 (size needed in ram divided by 4)
2009-11-04 13:33:21 +00:00
Psyyringe 500c1fc1a2 Psyringe - major update/rewrite for the German translation. Added a lot of missing strings, removed some obsolete ones, corrected some spelling / grammar / translation mistakes, addressed the player consistently with the informal "Du" (previously there was a mix of "Du" and the more formal "Sie"), added the cards from M10, PLC, and ZEN along with their German names, repaired a wagonload of lowercase umlauts in the existing card names (please use case sensitive fuctions when replacing umlauts), and provided translations for all 251 types, subtypes, and supertypes in the game. Also, totally restructured the file so that it now follows the structire of the in-game menus. I think the file is in good shape now and might be useful as a base for other translation efforts. I can't guarantee that I caught every single string, but I'm pretty sure that this is now the most complete translation available.
Please note that I don't plan to update this file for future Wagic versions, so if anybody wants to take over, please do. :)

Some files were updated in the process:

- CardGui.cpp - exposed the card rarity info on the alternate render cards to the translation engine. Also switched the color of said info to white on green and blue cards, imho they are much easier to read now.

- GameStateDeckViewer.cpp - exposed the term "Collection" (shown under the scrollbar) to the translation engine.

- GuiPhaseBar.cpp - exposed the strings denoting "your turn", "opponent's turn", "you play", "opponent plays", to the translation engine.

- SimplePad.cpp - exposed the special keys ("Spacebar", "Confirm" etc.) to the translation engine. Had to increase the keypad width to make room for "Abbrechen" (Cancel). I couldn't translate it differently because there's also a *spell* called cancel, and to have a different translation in SimplePad, I would have had to change the official German name of the Cancel spell, which wasn't an option.

- MTGAbility.cpp - exposed the words from which the text of mana-producing abilities is constructed to the translation engine. Please review this one and suggest a better solution - the one I chose is somewhat awkward. The translation works, but when the whole translated sentence is constructed and gets returned, the calling procedure tries to translate it again (all other ability descriptions work this way, translation takes place *after* the string has been returned). However, for mana producing abilities this doesn't work, since the costructed string can take an infinite number of diffeent forms, depending on the mana produced, and we can't translate that. Hence I chose to translate the individual words during construction, with the described side effect that the engine now tries to translate them again later in the process (and the sentence ends up in missing.txt).

- Also, cheat mode menu items now aren't denoted by the ugly "(cheat)" appended to them, instead they are enclosed by asterisks. Uses less space.
2009-11-03 22:25:16 +00:00
wagic.jeck ffa8408a5f Jeck - The shop anti-aliasing stuff is rendered inside of shop->Render(), so that it renders on top of the cards, but under other UI elements handled by ShopItems (the price dialog, etc). Moved the light flicker inside of ShopItems instead (for now, as this is pretty damn inelegant). As far as the 5551 issue goes, I don't see how using a jpeg would do much harm, but leave the decision up to others :) 2009-11-03 20:55:04 +00:00
wagic.the.homebrew@gmail.com 60e9b2c1df Erwan
-fix issue 146
2009-11-03 10:31:57 +00:00
wagic.the.homebrew@gmail.com d2bcb90799 Erwan
-fix for issue 120
2009-11-03 10:12:01 +00:00
wagic.the.homebrew@gmail.com 9de98c3032 Erwan
- "Fix" issue 152. Please review. There is an extra cost when loading the shop...could probably be improved...the image is huge, and it's a png (so no 5551 improvement here...should we switch to a jpeg ?)
2009-11-03 09:18:52 +00:00
wagic.the.homebrew@gmail.com befb3f246b Erwan
- fix issue 149
2009-11-03 07:40:14 +00:00
wagic.the.homebrew@gmail.com 1d20f37ded Erwan
- fix issue 151 (I hope)
- small french translation Update
- Nezumi Cutthroat fix
2009-11-03 03:51:05 +00:00
wagic.jeck e10130b718 Jeck - Whoops. Forgot to make invisible cheats unselectable. Fixed. 2009-11-02 06:25:03 +00:00
wagic.jeck 6946544a2a Jeck - Minor language support fiddling, gui decorator for cheat-profile only options. 2009-11-02 06:15:37 +00:00
Psyyringe 779921a53f Psyringe - This revision adds "cheat mode", as suggested and pre-reviewed here:
http://wololo.net/forum/viewtopic.php?f=15&t=730

Although the feature is named "cheat mode", its main purpose is to provide a toolbox for content creators. Currently this means to help AI deck creators, but the cheat mode is easily extensible.

Features:
- To enable cheat mode, create a new profile with the super secret cheat name (shouldn't be hard to find - or just mail me if you don't want to look). Then, leave and re-enter the Options menu. You can now enable cheat mode on the first tab. Note: The secret profile name is *not* my original suggestion from the forum, I went with Jeck's alternative suggestion so that he won't have to cringe over bad puns everytime he's using it. ;)

- Complete collection: In cheat mode, there's a new option in the deck viewer, which makes sure that you have at least 4 of any card available.

- Deck integrity: When in cheat mode, and you load a deck with cards that are not present in your collection, then these cards won't be stripped from your deck any more. Instead, they are added to your collection.

- Money cheat: In cheat mode, when you click on an item in the shop, you get the option to steal 1,000 credits from the shopkeeper.

Please review my code - I just started with C++, I may make very obvious mistakes or use inelegant style. The sooner you point this out, the sooner I'll improve.

thanks to wololo and jeck for comments and suggestions.

Jeck: Do the setVisible and setHidden methods currently work? I tried to use them to hide a menu item, but they all seem to lead to empty methods - Perhaps placeholders for a not yet implemented functionality?
2009-11-02 04:27:14 +00:00
wagic.jeck a4a19a1c9a Jeck - Fix to r1220. Apparently, _() doesn't like \n. 2009-11-01 23:13:30 +00:00
wagic.jeck 29219be4df Jeck - Added "# of unlocked sets" info to profile switcher, ran profile stats through _(). 2009-11-01 23:01:19 +00:00
wagic.jeck f3ad432d9b Jeck - Applied booster rarity sorting patch (issue 133), added horsemanship ability.
* The horsemanship ability literally required only one line of code, and could add an additional ~36 cards to Dr. Solomat's PT3 set. It seems functional, but someone please double check it anyways, as I've not worked with much of the actual game code yet.
2009-11-01 20:21:32 +00:00
wagic.the.homebrew@gmail.com 18293ba07c Erwan
-fix Issue 150 (hypnotic specter)
2009-11-01 12:15:37 +00:00
wagic.the.homebrew@gmail.com 5b92639cca Erwan
- Translation updates
- JGE: DrawString now allows std::string objects
2009-11-01 02:52:41 +00:00
wagic.the.homebrew@gmail.com 01c949f881 Erwan
- Fixed a few tranlsation issues in the code
- Updated French translation
2009-10-31 07:58:21 +00:00
wagic.the.homebrew@gmail.com d7dae0dcd9 Erwan
- Added -O2 option in the PSP Makefile. In my tests, this highly increases the probability of getting a purple screen. Fixing this bug is THE priority :)
2009-10-29 13:12:16 +00:00
jean.chalard 0e4832dcd6 J :
* Fix a bug where a variable would be used uninitialized.
2009-10-28 18:51:53 +00:00
wagic.jeck 3347fd020b Jeck - Removed some unused bits of code, added zip support to themes' card overrides. @Jean, please check WResourceManager::dirOK() on Linux.
This needs some impact testing, to be certain it doesn't noticeably slow anything down. In a future version I'd like to memoize checking for zip file existence in each "Res/sets/XXX/" directory once during boot, and in the themed directory whenever switching themes.
2009-10-28 04:06:45 +00:00
wagic.the.homebrew@gmail.com 75b0044f11 Erwan
-Load shop and backdrop in 5551. @Jeck feel free to implement the "default as 5551" for jpegs as well if you think it's worth it. I think this change is the safest for the time being, but that's mostly because I'm too lazy to touch JGE
2009-10-27 13:50:31 +00:00
wagic.jeck fea10bdf21 Jeck - Quad locking restored, minor cache fiddling.
* Restored quad locking to textures, but ignore quad locks when Release(JTexture*) is explicitly called. (I just copied and modified the code from the template, rather than do anything elegant). 
* Some minor fiddling with cache error states.
2009-10-27 07:00:16 +00:00
wagic.jeck f7d25cfe2e Jeck - Uncommenting the last resort code from r1192 (removes any misses for shop background when entering shop). 2009-10-27 03:09:02 +00:00
wagic.jeck fb7f48f26b Jeck - Please review: this makes minor changes to a lot of files, and major changes to the WCache flatten() function.
* Removed all calls to Release(JQuad*).
* Updated flatten(). Prior flatten was buggy beyond belief.
* Done some extensive testing, but if this causes more trouble than it fixes, we'll have to revert. It's too close to release time.
2009-10-27 02:46:39 +00:00
wagic.the.homebrew@gmail.com e762a5f983 Erwan
- revert r1187
- fix a bug with "@damaged" (see slith bloodletter test)
2009-10-26 13:31:30 +00:00
wagic.laurent 772ddd9ced Laurent - fixed a bug with @damaged.
Without this quick and dirty fix if you have 2 thieving magpie in play you get twice the bonus if only 1 deals damage (also you draw 2 cards instead of 1).
2009-10-26 13:20:08 +00:00
wagic.jeck 8e0bcef6e9 Jeck - Removed a ton of unreached or unused code from the cache, to make debugging easier. None of this actually effects execution at all. Some of these functions (though not many) are potentially useful, but as they aren't actually used there's no reason to have them cluttering up the files. 2009-10-26 05:55:52 +00:00
wagic.jeck eefd03ad84 Jeck - Reverting r1183. 2009-10-26 05:10:06 +00:00
wagic.jeck 8a6162ba15 Jeck - Please review.
Disconcertingly enough, this seems to resolve issue 109. Ran demo mode for 1 hour (w00t no crashes!), played five manual games, shop appeared fine... but why would an mObject ever be null? I'm not so sure about this commit. It "fixes" the issue, but doesn't do anything for the underlying cause. For all I know, I might just not have re-encountered issue 109 yet... still, it's not a /bad/ commit. In the worst case, it does some unnecessary sanity checking. There's potential for a a hang if item is NULL in Update(), if input doesn't get passed along in a way that allows the player to exit... But I think that's what the call to JGuiController::Update is for.

Thoughts?
2009-10-26 02:27:55 +00:00
wagic.the.homebrew@gmail.com dd7c307c7a Erwan
-Fix issue 107 as well as another issue with doesnotuntap mentioned by leungcl
-Changed wording for Paralyzing Graps (to match oracle), please verify
2009-10-25 14:01:25 +00:00
wagic.the.homebrew@gmail.com 24ea5b7b6a Erwan
- Fix issue 42
2009-10-25 08:55:56 +00:00
wagic.jeck cc0b67fb17 Jeck - Fix to issue 136, which caused the "unlocked set/mode" noise to play regardless of SFX volume. 2009-10-25 07:19:42 +00:00
wagic.jeck 0efb205469 Jeck - Final theme updates. Reverted backdrop.jpg to 255H, expanded wood.png to 32H, though only 28 are used (to prevent gray box issue). Also minor change to OptionItem.cpp so that themeinfo.txt loads on Default theme. 2009-10-25 01:37:23 +00:00
wagic.jeck 80be924614 Jeck - Some theme work. Reverted default theme background. Added Jade theme, mana colors for Inverted.
* In GuiBackground, we now load and use all of backdrop.jpg. This is for effects like that in Jade. It's an extremely minor change, so shouldn't effect stability.
2009-10-24 23:42:06 +00:00
wagic.the.homebrew@gmail.com 8d0f3a4c81 Erwan
- minor string corrections
2009-10-24 14:59:35 +00:00
wagic.the.homebrew@gmail.com 6f1772e938 Erwan
-fix issue mentioned at http://wololo.net/forum/viewtopic.php?f=4&t=371&p=6296#p6296 . I touched a very sensitive area of the code so please let me know if something goes wrong with this revision with spells or abilities that involve targets and/or sacrifice
2009-10-24 14:15:08 +00:00
wagic.the.homebrew@gmail.com 60845ee3b3 Erwan
- fix issue 111
2009-10-24 13:06:02 +00:00
wagic.the.homebrew@gmail.com fb52ea5452 Erwan
- fix for issue 113
2009-10-24 11:52:55 +00:00
wagic.the.homebrew@gmail.com da6d650c3d Erwan
-fix issue 128
2009-10-24 11:17:38 +00:00
wagic.jeck 19913b8a63 Jeck - Quick spellcheck to r1159 2009-10-24 02:23:57 +00:00
wagic.the.homebrew@gmail.com b41a03f332 Erwan
- Updated credits, please let me know if I misspelled your name, or if I forgot someone you think is important (don't feel offended if I did, I have bad memory)
2009-10-24 01:54:01 +00:00
wagic.jeck f117b04dea Jeck - And this is why I shouldn't code at 3 AM. Fix to r1152, which potentially closed a non-existent file descriptor. Not a major bug, but it's better to do it this way. 2009-10-23 07:29:21 +00:00
wagic.jeck c552a47087 Jeck - Fix to r1151, which left an open file descriptor. 2009-10-23 07:26:12 +00:00
wagic.jeck c87343a7f2 Jeck - Simplistic solution to issue 131. Reads only the first line of themeinfo.txt and uses the first 16 characters as the author name, if present. The rest of the file is completely ignored. Not exactly the most elegant solution, but I don't think we really need much metadata beyond who the theme's author is. My suggestion would be to let the authors use the rest of the file as a "Readme.txt" with whatever details they want to put in it. (Art credits, etc.).
The next version of Wagic will use XML-like themes, so I think it's alright to use such a non-extensible format.
2009-10-23 07:16:58 +00:00
wagic.the.homebrew@gmail.com f0124ce53a Erwan
- fix issue 125 (Ondu Cleric)
2009-10-22 13:57:49 +00:00
wagic.the.homebrew@gmail.com 2c1a44ed43 Erwan
-fix for issue 123 (Cockatrice)
2009-10-22 13:08:33 +00:00
wagic.jeck 4dc217edcb Jeck - Potential fix to issue 109, issue 112. Looks hopeful so far, please confirm (or confirm failure).
* We only want to record misses when the file doesn't exist. Item can be null if we're out of memory for whatever reason, resulting in an invalid miss.
2009-10-22 09:33:16 +00:00
wagic.jeck f005aabe30 Jeck - Possible fix for issue 112. 2009-10-22 07:11:07 +00:00