Collectible Card Game Headquarters

We've been discussing tracker that has not been used for months.

There are other tools in cardforge.org that have been abandoned and not used for a long time.

see for instance duplication detector module: http://cardforge.org/releases/site/cpd.html

There are also dependency listing modules like http://cardforge.org/releases/site/plug ... eport.html


Checkstyle report - http://cardforge.org/releases/site/checkstyle.html - I think its rules should be reconsidered to produce less errors.

And there's more to see.

Code: Select all

forge/card/replacement/ReplacementEffect.java:267
forge/card/trigger/Trigger.java:385

Adressed by r20352

hey Max, could you possibly hold off on code cleanup until after I've merged my branch? I actually spent a good amount of time doing cleanup in there, and it would make things a little easier not to have to manage our merge conflicts.

Testing in there is coming along well, and it won't be too much longer before I can merge it.

Thanks for the pointer to the maven-generated code analysis, btw! It does really highlight the duplication problem we have.

You've asked me to hold off any development in trunk, without even specifying which modules are problematic to merge for you.
That's not how the branches are supposed to work.

Don't bother too much with the AI ability classes Max. Some of the functions are just copy and pasted stubs from other abilities that are meant to be expanded/rewritten one day.

myk wrote:hey Max, could you possibly hold off on code cleanup until after I've merged my branch? I actually spent a good amount of time doing cleanup in there, and it would make things a little easier not to have to manage our merge conflicts.

Testing in there is coming along well, and it won't be too much longer before I can merge it.

 
I think that you and I have ran about as many tests as we could come up with and it appears to be working really well at this time from what I can see.

I would suggest that the merge into the trunk be done this weekend if you have the time. This in turn will increase the number of testers that we have as those people who download the daily snapshots will then have a chance to explore this new feature.

Will the merge have all decks and quests deleted?
Once I tried to switch to that branch and surprisingly lost all decks in res folder

Max mtg wrote:Will the merge have all decks and quests deleted?
Once I tried to switch to that branch and surprisingly lost all decks in res folder

 
I ran a number of tests over the last few days with several different but recent builds from his branch and my decks were transferred and were not lost. Lets take a look, Constructed, Planar, Scheme and my quest data were transferred.

I had to reselect the deck in my quest file to continue my quest. But the quest data deck was there and my quest deck was listed, just had to double click on it to get it to the point where I would have opponents to face.

If you are curious you can try the most recent version at new branch build version here.

Max mtg wrote:Will the merge have all decks and quests deleted?
Once I tried to switch to that branch and surprisingly lost all decks in res folder

In merging, I see what you mean. Subversion is removing unversioned files instead of just removing the directory from version control. I'll add the (empty) directories back in to avoid the problem that you discovered. We can remove them again later after the people who update via subversion have all migrated their data. I apologize if the branch switch made you lose any data.

Yes, this is what I meant. I used a secondary copy of sources to experiment with branches, so there was a primary copy to restore from.

Thank you for arranging this problem

I really do apologize. This was a side effect I did not anticipate. Most revision control systems will leave unversioned files untouched when their parent directories are removed form source control.

Oops, looks like "arranging" is not a synonym to "fixing"... =(

I meant to say that despite of deletion of decks folder my personal losses were minimal due to presence of another copy.

haha : ) understood.