OpenPunk
/
OpenFusion
mirror of https://github.com/OpenFusionProject/OpenFusion.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revised getRarity set logic

This commit is contained in:
FinnHornhoover 2021-03-31 23:34:36 -07:00 committed by Gent Semaj
parent 80b11b4364
commit 527ca817d5
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Items.cpp
View File

@ -133,16 +133,15 @@ static int getRarity(int crateId, int itemSetId) {
return -1;
}
std::vector<int> relevantWeights;
for (int index : rarityIndices)
relevantWeights.push_back(rarityWeights[index]);
std::vector<int> relevantWeights(rarityWeights.size(), 0);
for (int index : rarityIndices) {
// sanity check
if (index >= 0 && index < rarityWeights.size())
relevantWeights[index] = rarityWeights[index];
}
// now return a random rarity number (starting from 1)
int rarityChoice = Rand::randWeighted(relevantWeights);
auto it = rarityIndices.begin();
std::advance(it, rarityChoice);
return *it + 1;
return Rand::randWeighted(relevantWeights) + 1;
}
static int getCrateItem(sItemBase* result, int itemSetId, int rarity, int playerGender) {