Merge pull request #442 from HabitRPG/triad-bingo

Triad bingo

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;
       },

locales/en/pets.json

@@ -37,6 +37,10 @@
     "mountMasterText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)",
     "mountMasterText2": " and has released all 90 of their mounts a total of <%= count %> times",
     "beastMountMasterName": "Beast Master and Mount Master",
+    "triadBingoName": "Triad Bingo",
+    "triadBingoText": "Has found all 90 pets, all 90 mounts, and found all 90 pets AGAIN (HOW DID YOU DO THAT!)",
+    "triadBingoText2": " and has released a full stable a total of <%= count %> times",
+    "triadBingoAchievement": "You have earned the \"Triad Bingo\" achievement for finding all the pets, taming all the mounts, and finding all the pets again!",
     "dropsEnabled": "Drops Enabled!",
     "itemDrop": "An item has dropped!",
     "firstDrop": "You've unlocked the Drop System! Now when you complete tasks, you have a small chance of finding an item. You just found a <strong><%= eggText %> Egg</strong>! <%= eggNotes %>",
@@ -51,7 +55,7 @@
     "petKeyBegin": "Key to the Kennels: Experience <%= title %> Once More!",
     "petKeyInfo": "Miss the thrill of collecting pets? Now you can let them go, and have those drops be meaningful again!",
     "petKeyInfo2": "Use the Key to the Kennels to reset your non-quest collectible pets and/or mounts to zero. (Quest-only and Rare pets and mounts are not affected.)",
-    "petKeyInfo3": "There are three Keys to the Kennels: Release Pets Only (4 Gems), Release Mounts Only (4 Gems), or Release Both Pets and Mounts (6 Gems).  Using a Key lets you stack the Beast Master and Mount Master achievements, showing the world just how much of collection master you are! But choose wisely, because once you use a Key and open the kennel or stable doors, you won't be able to get them back without collecting them all again...",
+    "petKeyInfo3": "There are three Keys to the Kennels: Release Pets Only (4 Gems), Release Mounts Only (4 Gems), or Release Both Pets and Mounts (6 Gems). Using a Key lets you stack the Beast Master and Mount Master achievements. The Triad Bingo achievement will only stack if you use the \"Release Both Pets and Mounts\" key and have collected all 90 pets a second time. Show the world just how much of collection master you are! But choose wisely, because once you use a Key and open the kennel or stable doors, you won't be able to get them back without collecting them all again...",
     "petKeyPets": "Release My Pets",
     "petKeyMounts": "Release My Mounts",
     "petKeyBoth": "Release Both",

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