OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

rarity index fix for egg crates

Browse Source
This commit is contained in:
FinnHornhoover 2021-03-31 20:08:24 -07:00 committed by Gent Semaj
parent 8a871f7045
commit 6f636b77f2
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Items.cpp
View File

@ -138,7 +138,11 @@ static int getRarity(int crateId, int itemSetId) {
relevantWeights.push_back(rarityWeights[index]); relevantWeights.push_back(rarityWeights[index]);
// now return a random rarity number (starting from 1) // now return a random rarity number (starting from 1)
return Rand::randWeighted(relevantWeights) + 1; int rarityChoice = Rand::randWeighted(relevantWeights);
auto it = rarityIndices.begin();
std::advance(it, rarityChoice);
return *it + 1;
} }
static int getCrateItem(sItemBase* result, int itemSetId, int rarity, int playerGender) { static int getCrateItem(sItemBase* result, int itemSetId, int rarity, int playerGender) {
@ -562,18 +566,26 @@ static void chestOpenHandler(CNSocket *sock, CNPacketData *data) {
int validCrateId = getValidCrateId(chest->iID); int validCrateId = getValidCrateId(chest->iID);
bool failing = (validCrateId == -1); bool failing = (validCrateId == -1);
std::cout << "validCrateId " << validCrateId << std::endl;
if (!failing) if (!failing)
validItemSetId = getValidItemSetId(validCrateId); validItemSetId = getValidItemSetId(validCrateId);
failing = (validItemSetId == -1); failing = (validItemSetId == -1);
std::cout << "validItemSetId " << validItemSetId << std::endl;
if (!failing) if (!failing)
rarity = getRarity(validCrateId, validItemSetId); rarity = getRarity(validCrateId, validItemSetId);
failing = (rarity == -1); failing = (rarity == -1);
std::cout << "rarity " << rarity << std::endl;
if (!failing) if (!failing)
ret = getCrateItem(&item->sItem, validItemSetId, rarity, plr->PCStyle.iGender); ret = getCrateItem(&item->sItem, validItemSetId, rarity, plr->PCStyle.iGender);
failing = (ret == -1); failing = (ret == -1);
std::cout << "ret " << ret << std::endl;
// if we failed to open a crate, at least give the player a gumball (suggested by Jade) // if we failed to open a crate, at least give the player a gumball (suggested by Jade)
if (failing) { if (failing) {
item->sItem.iType = 7; item->sItem.iType = 7;