Commit Graph

41 Commits

Author SHA1 Message Date
jendave
1a651d0217 changed Constants and NewConstants from Interfaces to static classes. 2011-11-03 16:16:33 +00:00
jendave
2aeff7ca02 rename namespaces per Java standards 2011-11-02 15:11:47 +00:00
jendave
b594ba087c rename files to conform with Java standards 2011-11-02 14:45:19 +00:00
jendave
cc3aad44f8 rename files 2011-11-02 05:49:50 +00:00
jendave
734091f364 rename files 2011-11-02 05:27:20 +00:00
jendave
21301e7b5f checkstyle and refactoring 2011-10-30 07:01:52 +00:00
jendave
df80bd64a8 checkstyle 2011-10-29 08:04:51 +00:00
jendave
626fa471ee checkstyle and refactor 2011-10-29 06:24:29 +00:00
jendave
e646a6190e checkstyle and refactor 2011-10-29 06:13:20 +00:00
slapshot5
a65508754d In-game downloading Part 7 (and final):
1) refactor Gui_DownloadPictures_LQ
2) refactor Gui_DownloadSetPictures_LQ
3) remove the [T] before file names in tokens download file
2011-10-25 05:27:22 +00:00
Doublestrike
4e85650dda Removed obsolete win/lose frame files. 2011-10-10 06:53:56 +00:00
Doublestrike
6545bbf276 Finally, all quest and duel decks fully encapsulated with acceptable format.
Helper files completely removed (easy.txt, quests.txt, etc.) and hard-coded quest properties are a thing of the past.

Model and view fully separated for main panel in quest GUI.

Critical file: QuestEventManager can handle instantiation of all decks, once (ideally).
2011-09-17 09:21:43 +00:00
Maxmtg
63de7ff3c1 data for booster generation incorporated into CardSet 2011-09-14 21:54:19 +00:00
Maxmtg
9a7348a437 Removed/renamed excessive booster classes
BoosterPacks in cardshop are functional. Need to discuss and balance their appearance
CardListViewer is caching Card objects to create them a single time. Set of cards shown now exactly matches CardPrinted.
2011-09-14 19:08:43 +00:00
Maxmtg
9988efc847 removed player's picks map from boosterDraft interface (interface should not hold static data)
removed the getCardsNumber function from BoosterGenerator (it doesn't know in advance how many cards caller will ask to generate)
moved upload picks from draft deckeditor to boosterDraft class
added an enum to describe limited game type
tests may start failing - they would need an initialized CardDb
2011-09-14 17:46:24 +00:00
Maxmtg
5b3c267162 removed ReadDraftBoosterPack class - it was used by tests only.
removed BoosterDraftAITest - it didn't succeed anyway (needs to have CardDb initialized to succeed)
2011-09-14 16:00:10 +00:00
Maxmtg
d30f70a140 Working over booster generation - BoosterGenerator became more universal, moved to forge.card for a while, this is still WIP.
Limited game classes have been cleaned (code moved to utility functions in draft, CustomLimited class contains setting to start with custom cardpool or boosters)
Closure introduced to utilities
2011-09-14 15:52:31 +00:00
Maxmtg
911aa3dc2e fix the test 2011-09-14 12:36:43 +00:00
Maxmtg
49b21e09ad CardPool renamed to ItemPool, moved to forge.item, dependencies updated 2011-09-14 05:52:17 +00:00
Maxmtg
d3a51720a8 CardPool is now parametrized, preparing to hold boosters and packaged decks in quest inventory 2011-09-14 05:34:33 +00:00
Maxmtg
2ecc716b83 gameType is now a Enum,
Deckeditors no longer save all decks on close (there may remain minor bugs)
Deckeditors have mostly been cleaned of usage of global variables
OldGuiNewGame updates deck comboboxes properly
Download deck from tcgplayer feature temporary removed
cleaned up some warnings
2011-09-09 11:08:29 +00:00
Maxmtg
582d9ffe16 fixed a bug with deckeditor filters: (1) when you select 6 core types of 7, all 7 are shown anyway, (2) with active set filter didn't show some cards issued in other sets 2011-09-05 22:53:45 +00:00
slapshot5
1c50ed43c0 some fixes in Test classes to fix compile errors. 2011-09-04 19:05:48 +00:00
Maxmtg
a46486c0ad reverting sources to revision 10193
changes from r10200 were kept (not reverted)
2011-09-04 03:13:07 +00:00
Doublestrike
f83f87df5b NOTE: A commit with errors was apparently pushed previous to mine. As a result, my work has been broken also, and will unfortunately take some time to fix. The functionality described below will eventually work.
=====
Big commit: Restructured Quest quests to use dck files.  This required changes in many places.  Among other things:
- Model and view separated for quest main panel items
- Quests and battles all generated from dck files
- dck files all updated to contain metadata, main, sideboard
- Quest dck files updated to contain [ai_extra_cards] and [human_extra_cards]
2011-09-03 10:08:03 +00:00
slapshot5
aac44770c3 change some imports and types in GuiBoosterDraftTest.java and GuiQuestOptionsTest.java (I don't know if the fixes are correct, but it fixes a broken build...) 2011-09-03 07:52:34 +00:00
Maxmtg
54c1b987d2 All deckeditors, decks, boosterdraft, quest switched to lightweight cardPrinted objects, have fun :)
Features dropped: glassPane on deckeditors, separate filter window in deckeditors.
2011-09-01 18:11:00 +00:00
Maxmtg
16d513aa4c previous commit did break the build, this is a patch 2011-08-30 22:55:26 +00:00
Braids
fd25e38c9e Organized imports in src/test/java/forge/model/FModelTest.java 2011-08-29 16:28:46 +00:00
Sloth
0093ad34cf - Random decks for the human will now include cards with RemAIDeck. 2011-08-28 12:20:52 +00:00
Braids
9d8d9a9eea Make progress in segregating game model data; move some fields from forge.AllZone to forge.model.FGameState.
Left delegate methods in AllZone, marking their Javadoc (in English) for future deprecation.
Added some rudimentary tests on forge.model.FModel's getGameState and resetGameState methods.

Bug: 154
2011-08-28 03:01:13 +00:00
Maxmtg
a04d035129 Refactored QuestMatchState
GameInfo is renamed to GameSummary and is now an observer for game state. It's purpose is now to hold statistic data on game and actions performed by players. The former functionality moved to ColorChanger and Phase (all combat damage prevention due to Fog spell). Since then game turns calculation is done properly (no need to add/substract 1)
Total cleanup at Gui_WinLose, removed all references to global objects for quest and match-related entites. 
Some of quest rewards calculations use now special functions in QuestData class.
Tracking of win and lose conditions refactored (see Player and Upkeep classes)
2011-08-22 00:02:22 +00:00
Braids
664a535a47 - Reduce CheckStyle, FindBugs, and PMD output for recently changed files. 2011-08-19 03:48:50 +00:00
Braids
fdb1199223 - Issue 106: Add splash screen just under progress bar, and load all cards at startup. 2011-08-19 02:22:03 +00:00
jendave
f57cb39689 forst cut of 5 color deck generator 2011-08-15 07:55:35 +00:00
Braids
52c33b6468 - Eliminate compiler warnings from the files below. This involved commenting out some variables, among other things.
src/test/java/forge/card/mana/Mana_PartTest.java
src/main/java/forge/card/cardFactory/CardFactory_Sorceries.java
src/main/java/forge/card/cardFactory/CardFactory_Lands.java
src/main/java/forge/card/cardFactory/CardFactory_Auras.java
src/main/java/forge/card/cardFactory/CardFactory_Creatures.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Counters.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Attach.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Token.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Pump.java
src/main/java/forge/card/abilityFactory/AbilityFactory_ChangeZone.java
src/main/java/forge/card/abilityFactory/AbilityFactory_PermanentState.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Debuff.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Copy.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Turns.java
src/main/java/forge/card/abilityFactory/AbilityFactory_Reveal.java
src/main/java/forge/Upkeep.java
src/main/java/forge/GUI_ImportPicture.java
2011-08-14 00:42:05 +00:00
Braids
5a3f6d312c - Issue 106: Refactor Gui_NewGame. Moved preferences to FModel.
* Updated former references to preferences to use FModel in forge.GuiDisplay4 and in forge.view.swing.OldGuiNewGame.
* Added simple unit test.

Bug: 106
2011-08-13 02:38:01 +00:00
Braids
10431c521e - Added programmatic access to BuildID and Version through methods on FModel.getBuildInfo().
- Added class forge.model.BuildInfo with unit test.
- Added unit test for forge.model.FModel.
- Added exception class forge.model.MultipleForgeJarsFoundError.
- Updated forge.view.swing.Main with some preliminary code for progress monitoring.
- Reduced CheckStyle, FindBugs, and PMD violations in these files and in net.slightlymagic.braids.util.testng.BraidsAssertFunctions.
- Added missing package-info in net.slightlymagic.braids.util.testng.
2011-08-12 14:47:37 +00:00
jendave
7746e68b98 update unit tests to make them less painful from command line. Fixed urls in Maven site home page 2011-08-10 19:42:54 +00:00
jendave
78b668297e Fix Maven site links, Make unit test shorter, add svn rev to manifest 2011-08-10 16:57:20 +00:00
jendave
d9a785ee3a init2 2011-08-09 19:34:12 +00:00