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).

This commit is contained in:
wagic.jeck
2010-02-08 01:03:07 +00:00
parent 64d592f588
commit 83e2b04547
31 changed files with 4125 additions and 2742 deletions
+45 -2
View File
@@ -727,6 +727,43 @@ MTGSetInfo* MTGSets::getInfo(int setID){
return setinfo[setID];
}
MTGSetInfo* MTGSets::randomSet(int blockId, int atleast){
char * unlocked = (char *)calloc(size(),sizeof(char));
int attempts = 50;
//Figure out which sets are available.
for (int i = 0; i < size(); i++){
unlocked[i] = options[Options::optionSet(i)].number;
}
//No luck randomly. Now iterate from a random location.
int a = 0, iter = 0;
while(iter < 3){
a = rand()%size();
for(int i=a;i<size();i++){
if(unlocked[i]
&& (blockId == -1 || setinfo[i]->block == blockId)
&& (atleast == -1 || setinfo[i]->totalCards() >= atleast)){
free(unlocked);
return setinfo[i];
}
}
for(int i=0;i<a;i++){
if(unlocked[i]
&& (blockId == -1 || setinfo[i]->block == blockId)
&& (atleast == -1 || setinfo[i]->totalCards() >= atleast)){
free(unlocked);
return setinfo[i];
}
}
blockId = -1;
iter++;
if(iter == 2)
atleast = -1;
}
free(unlocked);
return NULL;
}
int blockSize(int blockId);
int MTGSets::Add(const char * name){
int setid = findSet(name);
if(setid != -1)
@@ -781,12 +818,18 @@ string MTGSets::operator[](int id){
return si->id;
}
int MTGSets::getSetNum(MTGSetInfo*i){
int it;
for(it=0;it<size();it++){
if(setinfo[it] == i)
return it;
}
return -1;
}
int MTGSets::size(){
return (int) setinfo.size();
}
//MTGSetInfo
MTGSetInfo::MTGSetInfo(string _id) {
string whitespaces (" \t\f\v\n\r");