Added Find Battle Unranked

public/js/app.js

@@ -3146,8 +3146,7 @@
           $this = $(el);
           team = $this.data('team');
           slot = $this.data('slot');
-          pokemon = _this.model.getPokemon(team, slot);
-          return _this.pokemonPopover($this, pokemon);
+          return pokemon = _this.model.getPokemon(team, slot);
         };
       })(this));
       this.renderTimers();
@@ -3338,6 +3337,7 @@
       $newPokemon.attr('data-slot', slot);
       $newPokemon.removeClass('hidden');
       this.pokemonPopover($newSprite, pokemon);
+      pokemon.set('beeninbattle', true);
       this.cannedText('SENT_OUT', player, player, slot);
       if (this.skip != null) {
         $oldPokemon.css({
@@ -7476,8 +7476,24 @@
 (function() {
   var __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
+  this.challengePaneArray = [];
+
+  this.challengePaneObject = (function() {
+    function challengePaneObject(object) {
+      this.object = object;
+      this.event = this.object.eventName;
+      this.button = this.object.button;
+      this.populate = this.object.populate;
+      this.clauses = this.object.defaultClauses;
+      this.blockedClauses = this.object.blockedClauses;
+    }
+
+    return challengePaneObject;
+
+  })();
+
   this.createChallengePane = function(opts) {
-    var $accept, $button, $buttons, $checkboxes, $format, $reject, $selectFormat, $wrapper, acceptEventName, altCreatedEvent, blockedClauses, cancelChallenge, cancelEventName, capitalizedEventName, defaultClauses, disableButtons, enableButtons, eventName, generation, getSelectedTeam, isAttachedToDom, personId, rejectEventName, renderCurrentTeam, selectedAlt, selectedTeamId, teamUpdated, toggleAltInput, _ref;
+    var $PaneArray, $accept, $button, $buttons, $checkboxes, $format, $reject, $selectFormat, $wrapper, acceptEventName, altCreatedEvent, blockedClauses, cancelChallenge, cancelEventName, capitalizedEventName, defaultClauses, disableButtons, enableButtons, eventName, generation, getSelectedTeam, isAttachedToDom, personId, rejectEventName, renderCurrentTeam, selectedAlt, selectedTeamId, teamUpdated, toggleAltInput, _ref;
     $wrapper = opts.populate;
     $button = opts.button;
     $accept = opts.acceptButton || $();
@@ -7494,6 +7510,7 @@
     blockedClauses = (_ref = opts.blockedClauses) != null ? _ref : false;
     selectedTeamId = null;
     selectedAlt = null;
+    $PaneArray = this.challengePaneArray;
     getSelectedTeam = function() {
       return PokeBattle.TeamStore.get(selectedTeamId) || PokeBattle.TeamStore.at(0);
     };
@@ -7554,9 +7571,16 @@
     }));
     $selectFormat = $wrapper.find(".select-format");
     $button.on('click.challenge', function() {
-      var $clauses, clauses, format, team, teamJSON;
+      var $clauses, clauses, format, team, teamJSON, thisChallenge;
+      thisChallenge = _.find($PaneArray, function(butt) {
+        return butt.button.selector === $button.selector;
+      });
+      console.log(thisChallenge);
       PokeBattle.requestNotifyPermission();
       format = $selectFormat.data('format');
+      if (typeof format === "undefined" && typeof personId === "undefined") {
+        format = $('.select-format').data('format');
+      }
       if (!$button.hasClass('disabled')) {
         team = getSelectedTeam();
         if (!team) {
@@ -7572,7 +7596,7 @@
           $clauses.each(function() {
             return clauses.push(parseInt($(this).val(), 10));
           });
-          PokeBattle.primus.send(eventName, personId, format, teamJSON, clauses, selectedAlt);
+          PokeBattle.primus.send(eventName, personId, format, teamJSON, thisChallenge.clauses, selectedAlt);
         } else {
           PokeBattle.primus.send(eventName, format, teamJSON, selectedAlt);
         }
@@ -11062,14 +11086,39 @@
 }).call(this);
 
 (function() {
-  var depressFindBattle;
+  var depressFindBattle, depressFindBattleUnranked;
 
   $(function() {
-    var $mainButtons;
+    var $mainButtons, challengeobj, challengeobjunranked, challengepaneobj, challengepaneobjunranked;
     $mainButtons = $('.main_buttons');
     $mainButtons.on('click', '.teambuilder_button', function(e) {
       return PokeBattle.navigation.showTeambuilder();
     });
+    challengeobjunranked = {
+      eventName: "findBattleunranked",
+      populate: $mainButtons.find('.find_battle_select_team'),
+      button: $mainButtons.find('.find_battle_non_ranked'),
+      defaultClauses: [Conditions.SLEEP_CLAUSE, Conditions.EVASION_CLAUSE, Conditions.SPECIES_CLAUSE, Conditions.OHKO_CLAUSE, Conditions.PRANKSTER_SWAGGER_CLAUSE, Conditions.UNRELEASED_BAN, Conditions.TIMED_BATTLE],
+      blockedClauses: true
+    };
+    challengeobj = {
+      eventName: "findBattle",
+      populate: $mainButtons.find('.find_battle_select_team'),
+      button: $mainButtons.find('.find_battle'),
+      defaultClauses: [Conditions.SLEEP_CLAUSE, Conditions.EVASION_CLAUSE, Conditions.SPECIES_CLAUSE, Conditions.OHKO_CLAUSE, Conditions.PRANKSTER_SWAGGER_CLAUSE, Conditions.UNRELEASED_BAN, Conditions.RATED_BATTLE, Conditions.TIMED_BATTLE],
+      blockedClauses: true
+    };
+    challengepaneobjunranked = new challengePaneObject(challengeobjunranked);
+    challengePaneArray.push(challengepaneobjunranked);
+    challengepaneobj = new challengePaneObject(challengeobj);
+    challengePaneArray.push(challengepaneobj);
+    createChallengePane({
+      eventName: "findBattleunranked",
+      populate: $mainButtons.find('.find_battle_select_team'),
+      button: $mainButtons.find('.find_battle_non_ranked'),
+      defaultClauses: [Conditions.SLEEP_CLAUSE, Conditions.EVASION_CLAUSE, Conditions.SPECIES_CLAUSE, Conditions.OHKO_CLAUSE, Conditions.PRANKSTER_SWAGGER_CLAUSE, Conditions.UNRELEASED_BAN, Conditions.TIMED_BATTLE],
+      blockedClauses: true
+    });
     createChallengePane({
       eventName: "findBattle",
       populate: $mainButtons.find('.find_battle_select_team'),
@@ -11082,6 +11131,11 @@
       $this = $(this);
       return $this.find('.find-icon').addClass('icon-spinner spinner-anim').removeClass("icon-earth");
     });
+    $mainButtons.find('.find_battle_non_ranked').on('challenge', function() {
+      var $this;
+      $this = $(this);
+      return $this.find('.find-icon').addClass('icon-spinner spinner-anim').removeClass("icon-earth");
+    });
     return $mainButtons.find('.display_credits').click(function() {
       var $modal;
       $modal = PokeBattle.modal('modals/credits');
@@ -11098,16 +11152,28 @@
     return $mainButtons.find('.find_battle_select_team .select').removeClass('disabled');
   };
 
+  depressFindBattleUnranked = function() {
+    var $button, $mainButtons;
+    $mainButtons = $('.main_buttons');
+    $button = $mainButtons.find('.find_battle_non_ranked');
+    $button.removeClass("disabled");
+    $button.find('.find-icon').removeClass("icon-spinner spinner-anim").addClass("icon-earth");
+    return $mainButtons.find('.find_battle_select_team .select').removeClass('disabled');
+  };
+
   $(window).load(function() {
     var $mainButtons;
     $mainButtons = $('.main_buttons');
     PokeBattle.battles.on('add', function(battle) {
       if (!battle.get('spectating')) {
-        return depressFindBattle();
+        depressFindBattle();
+        return depressFindBattleUnranked();
       }
     });
     PokeBattle.primus.on('findBattleCanceled', depressFindBattle);
-    return PokeBattle.events.on('findBattleCanceled', depressFindBattle);
+    PokeBattle.events.on('findBattleCanceled', depressFindBattle);
+    PokeBattle.primus.on('findBattleCanceledUnranked', depressFindBattleUnranked);
+    return PokeBattle.events.on('findBattleCanceledUnranked', depressFindBattleUnranked);
   });
 
 }).call(this);

public/js/data.js

@@ -1,3 +1,3 @@
-var Generations = {"RB":{"SpeciesData":{"Abomasnow":{"eggGroups":["monster","grass"],"evolvedFrom":"Snover","genderRatio":4,"generation":4,"id":460},"Abra":{"eggGroups":["human-like"],"evolvesInto":["Kadabra"],"genderRatio":2,"generation":1,"id":63},"Absol":{"eggGroups":["field"],"genderRatio":4,"generation":3,"id":359},"Accelgor":{"eggGroups":["bug"],"evolvedFrom":"Shelmet","genderRatio":4,"generation":5,"id":617},"Aerodactyl":{"eggGroups":["flying"],"genderRatio":1,"generation":1,"id":142},"Aggron":{"eggGroups":["monster"],"evolvedFrom":"Lairon","genderRatio":4,"generation":3,"id":306},"Aipom":{"eggGroups":["field"],"evolvesInto":["Ambipom"],"genderRatio":4,"generation":2,"id":190},"Alakazam":{"eggGroups":["human-like"],"evolvedFrom":"Kadabra","genderRatio":2,"generation":1,"id":65},"Alomomola":{"eggGroups":["water1","water2"],"genderRatio":4,"generation":5,"id":594},"Altaria":{"eggGroups":["flying","dragon"],"evolvedFrom":"Swablu","genderRatio":4,"generation":3,"id":334},"Ambipom":{"eggGroups":["field"],"evolvedFrom":"Aipom","genderRatio":4,"generation":4,"id":424},"Amoonguss":{"eggGroups":["grass"],"evolvedFrom":"Foongus","genderRatio":4,"generation":5,"id":591},"Ampharos":{"eggGroups":["monster","field"],"evolvedFrom":"Flaaffy","genderRatio":4,"generation":2,"id":181},"Anorith":{"eggGroups":["water3"],"evolvesInto":["Armaldo"],"genderRatio":1,"generation":3,"id":347},"Arbok":{"eggGroups":["field","dragon"],"evolvedFrom":"Ekans","genderRatio":4,"generation":1,"id":24},"Arcanine":{"eggGroups":["field"],"evolvedFrom":"Growlithe","genderRatio":2,"generation":1,"id":59},"Arceus":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":4,"id":493},"Archen":{"eggGroups":["flying","water3"],"evolvesInto":["Archeops"],"genderRatio":1,"generation":5,"id":566},"Archeops":{"eggGroups":["flying","water3"],"evolvedFrom":"Archen","genderRatio":1,"generation":5,"id":567},"Ariados":{"eggGroups":["bug"],"evolvedFrom":"Spinarak","genderRatio":4,"generation":2,"id":168},"Armaldo":{"eggGroups":["water3"],"evolvedFrom":"Anorith","genderRatio":1,"generation":3,"id":348},"Aron":{"eggGroups":["monster"],"evolvesInto":["Lairon"],"genderRatio":4,"generation":3,"id":304},"Articuno":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":1,"id":144},"Audino":{"eggGroups":["fairy"],"genderRatio":4,"generation":5,"id":531},"Axew":{"eggGroups":["monster","dragon"],"evolvesInto":["Fraxure"],"genderRatio":4,"generation":5,"id":610},"Azelf":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":4,"id":482},"Azumarill":{"eggGroups":["water1","fairy"],"evolvedFrom":"Marill","genderRatio":4,"generation":2,"id":184},"Azurill":{"eggGroups":["undiscovered"],"evolvesInto":["Marill"],"genderRatio":6,"generation":3,"id":298},"Bagon":{"eggGroups":["dragon"],"evolvesInto":["Shelgon"],"genderRatio":4,"generation":3,"id":371},"Baltoy":{"eggGroups":["mineral"],"evolvesInto":["Claydol"],"genderRatio":-1,"generation":3,"id":343},"Banette":{"eggGroups":["amorphous"],"evolvedFrom":"Shuppet","genderRatio":4,"generation":3,"id":354},"Barboach":{"eggGroups":["water2"],"evolvesInto":["Whiscash"],"genderRatio":4,"generation":3,"id":339},"Basculin":{"eggGroups":["water2"],"genderRatio":4,"generation":5,"id":550},"Bastiodon":{"eggGroups":["monster"],"evolvedFrom":"Shieldon","genderRatio":1,"generation":4,"id":411},"Bayleef":{"eggGroups":["monster","grass"],"evolvedFrom":"Chikorita","evolvesInto":["Meganium"],"genderRatio":1,"generation":2,"id":153},"Beartic":{"eggGroups":["field"],"evolvedFrom":"Cubchoo","genderRatio":4,"generation":5,"id":614},"Beautifly":{"eggGroups":["bug"],"evolvedFrom":"Silcoon","genderRatio":4,"generation":3,"id":267},"Beedrill":{"eggGroups":["bug"],"evolvedFrom":"Kakuna","genderRatio":4,"generation":1,"id":15},"Beheeyem":{"eggGroups":["human-like"],"evolvedFrom":"Elgyem","genderRatio":4,"generation":5,"id":606},"Beldum":{"eggGroups":["mineral"],"evolvesInto":["Metang"],"genderRatio":-1,"generation":3,"id":374},"Bellossom":{"eggGroups":["grass"],"evolvedFrom":"Gloom","genderRatio":4,"generation":2,"id":182},"Bellsprout":{"eggGroups":["grass"],"evolvesInto":["Weepinbell"],"genderRatio":4,"generation":1,"id":69},"Bibarel":{"eggGroups":["water1","field"],"evolvedFrom":"Bidoof","genderRatio":4,"generation":4,"id":400},"Bidoof":{"eggGroups":["water1","field"],"evolvesInto":["Bibarel"],"genderRatio":4,"generation":4,"id":399},"Bisharp":{"eggGroups":["human-like"],"evolvedFrom":"Pawniard","genderRatio":4,"generation":5,"id":625},"Blastoise":{"eggGroups":["monster","water1"],"evolvedFrom":"Wartortle","genderRatio":1,"generation":1,"id":9},"Blaziken":{"eggGroups":["field"],"evolvedFrom":"Combusken","genderRatio":1,"generation":3,"id":257},"Blissey":{"eggGroups":["fairy"],"evolvedFrom":"Chansey","genderRatio":8,"generation":2,"id":242},"Blitzle":{"eggGroups":["field"],"evolvesInto":["Zebstrika"],"genderRatio":4,"generation":5,"id":522},"Boldore":{"eggGroups":["mineral"],"evolvedFrom":"Roggenrola","evolvesInto":["Gigalith"],"genderRatioLine truncated
+var Generations = {"RB":{"SpeciesData":{"Abomasnow":{"eggGroups":["monster","grass"],"evolvedFrom":"Snover","genderRatio":4,"generation":4,"id":460},"Abra":{"eggGroups":["human-like"],"evolvesInto":["Kadabra"],"genderRatio":2,"generation":1,"id":63},"Absol":{"eggGroups":["field"],"genderRatio":4,"generation":3,"id":359},"Accelgor":{"eggGroups":["bug"],"evolvedFrom":"Shelmet","genderRatio":4,"generation":5,"id":617},"Aerodactyl":{"eggGroups":["flying"],"genderRatio":1,"generation":1,"id":142},"Aggron":{"eggGroups":["monster"],"evolvedFrom":"Lairon","genderRatio":4,"generation":3,"id":306},"Aipom":{"eggGroups":["field"],"evolvesInto":["Ambipom"],"genderRatio":4,"generation":2,"id":190},"Alakazam":{"eggGroups":["human-like"],"evolvedFrom":"Kadabra","genderRatio":2,"generation":1,"id":65},"Alomomola":{"eggGroups":["water1","water2"],"genderRatio":4,"generation":5,"id":594},"Altaria":{"eggGroups":["flying","dragon"],"evolvedFrom":"Swablu","genderRatio":4,"generation":3,"id":334},"Ambipom":{"eggGroups":["field"],"evolvedFrom":"Aipom","genderRatio":4,"generation":4,"id":424},"Amoonguss":{"eggGroups":["grass"],"evolvedFrom":"Foongus","genderRatio":4,"generation":5,"id":591},"Ampharos":{"eggGroups":["monster","field"],"evolvedFrom":"Flaaffy","genderRatio":4,"generation":2,"id":181},"Anorith":{"eggGroups":["water3"],"evolvesInto":["Armaldo"],"genderRatio":1,"generation":3,"id":347},"Arbok":{"eggGroups":["field","dragon"],"evolvedFrom":"Ekans","genderRatio":4,"generation":1,"id":24},"Arcanine":{"eggGroups":["field"],"evolvedFrom":"Growlithe","genderRatio":2,"generation":1,"id":59},"Arceus":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":4,"id":493},"Archen":{"eggGroups":["flying","water3"],"evolvesInto":["Archeops"],"genderRatio":1,"generation":5,"id":566},"Archeops":{"eggGroups":["flying","water3"],"evolvedFrom":"Archen","genderRatio":1,"generation":5,"id":567},"Ariados":{"eggGroups":["bug"],"evolvedFrom":"Spinarak","genderRatio":4,"generation":2,"id":168},"Armaldo":{"eggGroups":["water3"],"evolvedFrom":"Anorith","genderRatio":1,"generation":3,"id":348},"Aron":{"eggGroups":["monster"],"evolvesInto":["Lairon"],"genderRatio":4,"generation":3,"id":304},"Articuno":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":1,"id":144},"Audino":{"eggGroups":["fairy"],"genderRatio":4,"generation":5,"id":531},"Axew":{"eggGroups":["monster","dragon"],"evolvesInto":["Fraxure"],"genderRatio":4,"generation":5,"id":610},"Azelf":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":4,"id":482},"Azumarill":{"eggGroups":["water1","fairy"],"evolvedFrom":"Marill","genderRatio":4,"generation":2,"id":184},"Azurill":{"eggGroups":["undiscovered"],"evolvesInto":["Marill"],"genderRatio":6,"generation":3,"id":298},"Bagon":{"eggGroups":["dragon"],"evolvesInto":["Shelgon"],"genderRatio":4,"generation":3,"id":371},"Baltoy":{"eggGroups":["mineral"],"evolvesInto":["Claydol"],"genderRatio":-1,"generation":3,"id":343},"Banette":{"eggGroups":["amorphous"],"evolvedFrom":"Shuppet","genderRatio":4,"generation":3,"id":354},"Barboach":{"eggGroups":["water2"],"evolvesInto":["Whiscash"],"genderRatio":4,"generation":3,"id":339},"Basculin":{"eggGroups":["water2"],"genderRatio":4,"generation":5,"id":550},"Bastiodon":{"eggGroups":["monster"],"evolvedFrom":"Shieldon","genderRatio":1,"generation":4,"id":411},"Bayleef":{"eggGroups":["monster","grass"],"evolvedFrom":"Chikorita","evolvesInto":["Meganium"],"genderRatio":1,"generation":2,"id":153},"Beartic":{"eggGroups":["field"],"evolvedFrom":"Cubchoo","genderRatio":4,"generation":5,"id":614},"Beautifly":{"eggGroups":["bug"],"evolvedFrom":"Silcoon","genderRatio":4,"generation":3,"id":267},"Beedrill":{"eggGroups":["bug"],"evolvedFrom":"Kakuna","genderRatio":4,"generation":1,"id":15},"Beheeyem":{"eggGroups":["human-like"],"evolvedFrom":"Elgyem","genderRatio":4,"generation":5,"id":606},"Beldum":{"eggGroups":["mineral"],"evolvesInto":["Metang"],"genderRatio":-1,"generation":3,"id":374},"Bellossom":{"eggGroups":["grass"],"evolvedFrom":"Gloom","genderRatio":4,"generation":2,"id":182},"Bellsprout":{"eggGroups":["grass"],"evolvesInto":["Weepinbell"],"genderRatio":4,"generation":1,"id":69},"Bibarel":{"eggGroups":["water1","field"],"evolvedFrom":"Bidoof","genderRatio":4,"generation":4,"id":400},"Bidoof":{"eggGroups":["water1","field"],"evolvesInto":["Bibarel"],"genderRatio":4,"generation":4,"id":399},"Bisharp":{"eggGroups":["human-like"],"evolvedFrom":"Pawniard","genderRatio":4,"generation":5,"id":625},"Blastoise":{"eggGroups":["monster","water1"],"evolvedFrom":"Wartortle","genderRatio":1,"generation":1,"id":9},"Blaziken":{"eggGroups":["field"],"evolvedFrom":"Combusken","genderRatio":1,"generation":3,"id":257},"Blissey":{"eggGroups":["fairy"],"evolvedFrom":"Chansey","genderRatio":8,"generation":2,"id":242},"Blitzle":{"eggGroups":["field"],"evolvesInto":["Zebstrika"],"genderRatio":4,"generation":5,"id":522},"Boldore":{"eggGroups":["mineral"],"evolvedFrom":"Roggenrola","evolvesInto":["Gigalith"],"genderRatioLine truncated
 EventPokemon = {"Absol":[{"generation":3,"level":5,"moves":["Scratch","Leer","Wish"],"forme":"default"},{"generation":3,"level":5,"moves":["Scratch","Leer","Spite"],"forme":"default"},{"generation":3,"level":35,"moves":["Razor Wind","Bite","Swords Dance","Spite"],"forme":"default"},{"generation":3,"level":70,"moves":["Double Team","Slash","Future Sight","Perish Song"],"forme":"default"}],"Aerodactyl":[{"generation":5,"level":15,"gender":"M","isDW":false,"abilities":["Pressure"],"moves":["Steel Wing","Ice Fang","Fire Fang","Thunder Fang"],"pokeball":"Cherish Ball","forme":"default"}],"Aggron":[{"generation":3,"level":100,"moves":["Iron Tail","Protect","Metal Sound","Double-Edge"],"forme":"default"},{"generation":3,"level":50,"moves":["Take Down","Iron Tail","Protect","Metal Sound"],"forme":"default"}],"Aipom":[{"generation":3,"level":10,"gender":"M","moves":["Scratch","Tail Whip","Sand-Attack"],"forme":"default"}],"Alakazam":[{"generation":3,"level":70,"moves":["Future Sight","Calm Mind","Psychic","Trick"],"forme":"default"}],"Altaria":[{"generation":3,"level":45,"moves":["Take Down","DragonBreath","Dragon Dance","Refresh"],"forme":"default"},{"generation":3,"level":36,"moves":["Heal Bell","DragonBreath","SolarBeam","Aerial Ace"],"forme":"default"},{"generation":5,"level":35,"gender":"M","isDW":true,"moves":["Take Down","Natural Gift","DragonBreath","False Swipe"],"forme":"default"}],"Anorith":[{"generation":5,"level":15,"gender":"M","isDW":false,"moves":["Harden","Mud Sport","Water Gun","Cross Poison"],"pokeball":"Cherish Ball","forme":"default"}],"Arbok":[{"generation":3,"level":33,"moves":["Refresh","Sludge Bomb","Glare","Bite"],"forme":"default"}],"Arceus":[{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"}Line truncated
 HelpDescriptions = {"1":{"rating":" <i>Also /ranking, /rank. </i>Gets a single username's rating on this server. Usage: /rating username","battles":"Finds all the battles a username is playing in on this server.      Usage: /battles username"},"3":{"mute":"Default length is 10 minutes, up to a maximum of two days. To specify different lengths, use 1m2h3d4w (minute, hour, day, week). Usage: /mute username, length, reason","unmute":"Unmutes a username. Usage: /unmute username","ban":"Default length is one hour, up to a maximum of one day. To specify different lengths, use 1m2h3d (minute, hour, day). Usage: /ban username, length, reason","unban":"Unbans a username. Usage: /unban username","ip":"Finds the current ips under use by a user","wall":" <i>Also /announce. </i>Announces something to the entire server. Usage: /wall message","whois":"Finds all alts associated with a username, or the main username of an alt"},"4":{"lockdown":"Prevents new battles from starting. Usage: /lockdown [on|off]","voice":" <i>Also /driver. </i>Voices a username permanently. Usage: /voice username","mod":"Mods a username permanently. Usage: /mod username","topic":"Changes the topic message. Usage: /topic message"},"5":{"admin":"Admins a username permanently. Usage: /admin username","deauth":"Deauthes a username permanently. Usage: /deauth username","eval":"Evaluates a script in the context of the server."}};

public/js/replays.js

@@ -2872,8 +2872,7 @@
           $this = $(el);
           team = $this.data('team');
           slot = $this.data('slot');
-          pokemon = _this.model.getPokemon(team, slot);
-          return _this.pokemonPopover($this, pokemon);
+          return pokemon = _this.model.getPokemon(team, slot);
         };
       })(this));
       this.renderTimers();
@@ -3064,6 +3063,7 @@
       $newPokemon.attr('data-slot', slot);
       $newPokemon.removeClass('hidden');
       this.pokemonPopover($newSprite, pokemon);
+      pokemon.set('beeninbattle', true);
       this.cannedText('SENT_OUT', player, player, slot);
       if (this.skip != null) {
         $oldPokemon.css({
@@ -5208,8 +5208,24 @@
 (function() {
   var __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
+  this.challengePaneArray = [];
+
+  this.challengePaneObject = (function() {
+    function challengePaneObject(object) {
+      this.object = object;
+      this.event = this.object.eventName;
+      this.button = this.object.button;
+      this.populate = this.object.populate;
+      this.clauses = this.object.defaultClauses;
+      this.blockedClauses = this.object.blockedClauses;
+    }
+
+    return challengePaneObject;
+
+  })();
+
   this.createChallengePane = function(opts) {
-    var $accept, $button, $buttons, $checkboxes, $format, $reject, $selectFormat, $wrapper, acceptEventName, altCreatedEvent, blockedClauses, cancelChallenge, cancelEventName, capitalizedEventName, defaultClauses, disableButtons, enableButtons, eventName, generation, getSelectedTeam, isAttachedToDom, personId, rejectEventName, renderCurrentTeam, selectedAlt, selectedTeamId, teamUpdated, toggleAltInput, _ref;
+    var $PaneArray, $accept, $button, $buttons, $checkboxes, $format, $reject, $selectFormat, $wrapper, acceptEventName, altCreatedEvent, blockedClauses, cancelChallenge, cancelEventName, capitalizedEventName, defaultClauses, disableButtons, enableButtons, eventName, generation, getSelectedTeam, isAttachedToDom, personId, rejectEventName, renderCurrentTeam, selectedAlt, selectedTeamId, teamUpdated, toggleAltInput, _ref;
     $wrapper = opts.populate;
     $button = opts.button;
     $accept = opts.acceptButton || $();
@@ -5226,6 +5242,7 @@
     blockedClauses = (_ref = opts.blockedClauses) != null ? _ref : false;
     selectedTeamId = null;
     selectedAlt = null;
+    $PaneArray = this.challengePaneArray;
     getSelectedTeam = function() {
       return PokeBattle.TeamStore.get(selectedTeamId) || PokeBattle.TeamStore.at(0);
     };
@@ -5286,9 +5303,16 @@
     }));
     $selectFormat = $wrapper.find(".select-format");
     $button.on('click.challenge', function() {
-      var $clauses, clauses, format, team, teamJSON;
+      var $clauses, clauses, format, team, teamJSON, thisChallenge;
+      thisChallenge = _.find($PaneArray, function(butt) {
+        return butt.button.selector === $button.selector;
+      });
+      console.log(thisChallenge);
       PokeBattle.requestNotifyPermission();
       format = $selectFormat.data('format');
+      if (typeof format === "undefined" && typeof personId === "undefined") {
+        format = $('.select-format').data('format');
+      }
       if (!$button.hasClass('disabled')) {
         team = getSelectedTeam();
         if (!team) {
@@ -5304,7 +5328,7 @@
           $clauses.each(function() {
             return clauses.push(parseInt($(this).val(), 10));
           });
-          PokeBattle.primus.send(eventName, personId, format, teamJSON, clauses, selectedAlt);
+          PokeBattle.primus.send(eventName, personId, format, teamJSON, thisChallenge.clauses, selectedAlt);
         } else {
           PokeBattle.primus.send(eventName, format, teamJSON, selectedAlt);
         }

public/js/templates.js

@@ -383,8 +383,6 @@ var teamIndex = (team === yourTeam ? yourIndex : 1 - yourIndex)
 buf.push("<div" + (jade.attrs({ "class": [('bg-faded-blue'),('fill-' + leftOrRight)] }, {"class":true})) + "><div" + (jade.attrs({ "class": [(leftOrRight)] }, {"class":true})) + "><div class=\"owner_name\">" + (jade.escape(null == (jade.interp = team.get('owner')) ? "" : jade.interp)) + "</div><div class=\"battle-timer frozen-timer hidden\"></div><div class=\"battle-timer remaining-timer\"></div><div class=\"pokemon_icons\">");
 var teamvisible = team.collection.parents[0].get('visibleteam')
 var isdef = typeof teamvisible
-if ( isdef != 'undefined' && teamvisible)
-{
 var orig = team.get('pokemon')
 var teamPokemon = team.getRandomOrder()
 for (var i = 0, len = teamPokemon.length; i < len; i += 1)
@@ -396,13 +394,38 @@ buf.push("<div class=\"icon_wrapper\">");
 var origpkmn = orig.findWhere({species: pokemon.species});
 var faintClass = (origpkmn.isFainted() ? 'fainted' : '')
 var style = window.PokemonIconBackground(origpkmn)
+if ( isdef != 'undefined' &&  teamvisible)
+{
 buf.push("<a" + (jade.attrs({ 'href':(window.PokemonIconBackground(origpkmn)), 'target':("_blank"), 'style':(style), 'data-team':(teamIndex), 'data-slot':(i), "class": [('pokemon_icon'),(faintClass)] }, {"class":true,"href":true,"target":true,"style":true,"data-team":true,"data-slot":true})) + "></a>");
 if ( !origpkmn.isFainted())
 {
 buf.push("<div class=\"pokemon_hp_background\"><div" + (jade.attrs({ 'style':("height: " + (origpkmn.getSpecies().id) + "%"), "class": [('pokemon_hp'),(origpkmn.getHPColor())] }, {"class":true,"style":true})) + "></div></div>");
 }
-buf.push("</div>");
 }
+else
+{
+var hasbeeninbattle = origpkmn.get('beeninbattle')
+if ( hasbeeninbattle == true)
+{
+console.log('hasbeeninbattle')
+buf.push("<a" + (jade.attrs({ 'href':(window.PokemonIconBackground(origpkmn)), 'target':("_blank"), 'style':(style), 'data-team':(teamIndex), 'data-slot':(i), "class": [('pokemon_icon'),(faintClass)] }, {"class":true,"href":true,"target":true,"style":true,"data-team":true,"data-slot":true})) + "></a>");
+if ( !origpkmn.isFainted())
+{
+buf.push("<div class=\"pokemon_hp_background\"><div" + (jade.attrs({ 'style':("height: " + (origpkmn.getSpecies().id) + "%"), "class": [('pokemon_hp'),(origpkmn.getHPColor())] }, {"class":true,"style":true})) + "></div></div>");
+}
+}
+else
+{
+console.log('hasnoybeeninbattle')
+var newstyle = "background:url('../Sprites/Icons/iconempty.png')!important; background-size: cover!important;"
+buf.push("<a" + (jade.attrs({ 'href':(""), 'target':("_blank"), 'style':(newstyle), 'data-team':(teamIndex), 'data-slot':(i), "class": [('pokemon_icon'),(faintClass)] }, {"class":true,"href":true,"target":true,"style":true,"data-team":true,"data-slot":true})) + "></a>");
+if ( !origpkmn.isFainted())
+{
+buf.push("<div class=\"pokemon_hp_background\"><div" + (jade.attrs({ 'style':("height: " + (origpkmn.getSpecies().id) + "%"), "class": [('pokemon_hp'),(origpkmn.getHPColor())] }, {"class":true,"style":true})) + "></div></div>");
+}
+}
+}
+buf.push("</div>");
 }
 }
 buf.push("</div></div></div>");
@@ -418,8 +441,6 @@ var teamIndex = (team === yourTeam ? yourIndex : 1 - yourIndex)
 buf.push("<div" + (jade.attrs({ "class": [('bg-faded-blue'),('fill-' + leftOrRight)] }, {"class":true})) + "><div" + (jade.attrs({ "class": [(leftOrRight)] }, {"class":true})) + "><div class=\"owner_name\">" + (jade.escape(null == (jade.interp = team.get('owner')) ? "" : jade.interp)) + "</div><div class=\"battle-timer frozen-timer hidden\"></div><div class=\"battle-timer remaining-timer\"></div><div class=\"pokemon_icons\">");
 var teamvisible = team.collection.parents[0].get('visibleteam')
 var isdef = typeof teamvisible
-if ( isdef != 'undefined' && teamvisible)
-{
 var orig = team.get('pokemon')
 var teamPokemon = team.getRandomOrder()
 for (var i = 0, len = teamPokemon.length; i < len; i += 1)
@@ -431,13 +452,38 @@ buf.push("<div class=\"icon_wrapper\">");
 var origpkmn = orig.findWhere({species: pokemon.species});
 var faintClass = (origpkmn.isFainted() ? 'fainted' : '')
 var style = window.PokemonIconBackground(origpkmn)
+if ( isdef != 'undefined' &&  teamvisible)
+{
 buf.push("<a" + (jade.attrs({ 'href':(window.PokemonIconBackground(origpkmn)), 'target':("_blank"), 'style':(style), 'data-team':(teamIndex), 'data-slot':(i), "class": [('pokemon_icon'),(faintClass)] }, {"class":true,"href":true,"target":true,"style":true,"data-team":true,"data-slot":true})) + "></a>");
 if ( !origpkmn.isFainted())
 {
 buf.push("<div class=\"pokemon_hp_background\"><div" + (jade.attrs({ 'style':("height: " + (origpkmn.getSpecies().id) + "%"), "class": [('pokemon_hp'),(origpkmn.getHPColor())] }, {"class":true,"style":true})) + "></div></div>");
 }
-buf.push("</div>");
 }
+else
+{
+var hasbeeninbattle = origpkmn.get('beeninbattle')
+if ( hasbeeninbattle == true)
+{
+console.log('hasbeeninbattle')
+buf.push("<a" + (jade.attrs({ 'href':(window.PokemonIconBackground(origpkmn)), 'target':("_blank"), 'style':(style), 'data-team':(teamIndex), 'data-slot':(i), "class": [('pokemon_icon'),(faintClass)] }, {"class":true,"href":true,"target":true,"style":true,"data-team":true,"data-slot":true})) + "></a>");
+if ( !origpkmn.isFainted())
+{
+buf.push("<div class=\"pokemon_hp_background\"><div" + (jade.attrs({ 'style':("height: " + (origpkmn.getSpecies().id) + "%"), "class": [('pokemon_hp'),(origpkmn.getHPColor())] }, {"class":true,"style":true})) + "></div></div>");
+}
+}
+else
+{
+console.log('hasnoybeeninbattle')
+var newstyle = "background:url('../Sprites/Icons/iconempty.png')!important; background-size: cover!important;"
+buf.push("<a" + (jade.attrs({ 'href':(""), 'target':("_blank"), 'style':(newstyle), 'data-team':(teamIndex), 'data-slot':(i), "class": [('pokemon_icon'),(faintClass)] }, {"class":true,"href":true,"target":true,"style":true,"data-team":true,"data-slot":true})) + "></a>");
+if ( !origpkmn.isFainted())
+{
+buf.push("<div class=\"pokemon_hp_background\"><div" + (jade.attrs({ 'style':("height: " + (origpkmn.getSpecies().id) + "%"), "class": [('pokemon_hp'),(origpkmn.getHPColor())] }, {"class":true,"style":true})) + "></div></div>");
+}
+}
+}
+buf.push("</div>");
 }
 }
 buf.push("</div></div></div>");