diff --git a/dist/habitrpg-shared.js b/dist/habitrpg-shared.js index 3587208b2b..af8aa1be43 100644 --- a/dist/habitrpg-shared.js +++ b/dist/habitrpg-shared.js @@ -15633,17 +15633,21 @@ api.wrap = function(user, main) { return typeof cb === "function" ? cb(null, user) : void 0; }, releaseBoth: function(req, cb) { - var animal; + var animal, giveTriadBingo; if (user.balance < 1.5) { return typeof cb === "function" ? cb({ code: 401, message: i18n.t('notEnoughGems', req.language) }) : void 0; } else { + giveTriadBingo = true; user.balance -= 1.5; user.items.currentMount = ""; user.items.currentPet = ""; for (animal in content.pets) { + if (user.items.pets[animal] === -1) { + giveTriadBingo = false; + } user.items.pets[animal] = 0; user.items.mounts[animal] = null; } @@ -15655,6 +15659,12 @@ api.wrap = function(user, main) { user.achievements.mountMasterCount = 0; } user.achievements.mountMasterCount++; + if (giveTriadBingo) { + if (!user.achievements.triadBingoCount) { + user.achievements.triadBingoCount = 0; + } + user.achievements.triadBingoCount++; + } } return typeof cb === "function" ? cb(null, user) : void 0; }, diff --git a/script/index.coffee b/script/index.coffee index 75e1023746..df95a3bef1 100644 --- a/script/index.coffee +++ b/script/index.coffee @@ -762,10 +762,12 @@ api.wrap = (user, main=true) -> if user.balance < 1.5 return cb? {code:401,message: i18n.t('notEnoughGems', req.language)} else + giveTriadBingo = true user.balance -= 1.5 user.items.currentMount = "" user.items.currentPet = "" for animal of content.pets + giveTriadBingo = false if user.items.pets[animal] == -1 user.items.pets[animal] = 0 user.items.mounts[animal] = null if not user.achievements.beastMasterCount @@ -774,6 +776,10 @@ api.wrap = (user, main=true) -> if not user.achievements.mountMasterCount user.achievements.mountMasterCount = 0 user.achievements.mountMasterCount++ + if giveTriadBingo + if not user.achievements.triadBingoCount + user.achievements.triadBingoCount = 0 + user.achievements.triadBingoCount++ cb? null, user # buy is for gear, purchase is for gem-purchaseables (i know, I know...)