Added Find Battle Unranked

2025-10-27 18:00:03 +00:00 · 2016-02-10 03:10:17 +01:00
parent 398d23a0d6
commit 16ac69171d
23 changed files with 778 additions and 419 deletions
--- a/client/app/css/core.styl
+++ b/client/app/css/core.styl
@@ -14,7 +14,7 @@ html, body
  margin  0
  font-size 100%
  normal-font()
-  background $background-color url("//media.pokebattle.com/img/bg.png")
+  background $background-color blue
  line-height normal

 ul, ol
--- a/client/app/js/concerns/main_buttons.coffee
+++ b/client/app/js/concerns/main_buttons.coffee
@@ -4,6 +4,57 @@ $ ->
  $mainButtons.on 'click', '.teambuilder_button', (e) ->
    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')
@@ -26,6 +77,12 @@ $ ->
      .addClass('icon-spinner spinner-anim')
      .removeClass("icon-earth")

+  $mainButtons.find('.find_battle_non_ranked').on 'challenge', ->
+    $this = $(this)
+    $this.find('.find-icon')
+      .addClass('icon-spinner spinner-anim')
+      .removeClass("icon-earth")
+
  $mainButtons.find('.display_credits').click ->
    $modal = PokeBattle.modal('modals/credits')
    $modal.find('.modal-footer button').first().focus()
@@ -40,11 +97,24 @@ depressFindBattle = ->
    .addClass("icon-earth")
  $mainButtons.find('.find_battle_select_team .select').removeClass('disabled')

+depressFindBattleUnranked = ->
+  $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")
+  $mainButtons.find('.find_battle_select_team .select').removeClass('disabled')
+
 $(window).load ->
  $mainButtons = $('.main_buttons')
  PokeBattle.battles.on 'add', (battle) ->
    if !battle.get('spectating')
      depressFindBattle()
+      depressFindBattleUnranked()

  PokeBattle.primus.on 'findBattleCanceled', depressFindBattle
  PokeBattle.events.on 'findBattleCanceled', depressFindBattle
+
+  PokeBattle.primus.on 'findBattleCanceledUnranked', depressFindBattleUnranked
+  PokeBattle.events.on 'findBattleCanceledUnranked', depressFindBattleUnranked
--- a/client/app/js/helpers/challenge_pane.coffee
+++ b/client/app/js/helpers/challenge_pane.coffee
@@ -1,5 +1,16 @@
 # eventName should be one of "challenge" or "find battle"
 # opts may include whether to enable clauses, for example
+@challengePaneArray = []
+
+class @challengePaneObject
+  constructor: (@object) ->
+    @event = @object.eventName
+    @button = @object.button
+    @populate = @object.populate
+    @clauses = @object.defaultClauses
+    @blockedClauses = @object.blockedClauses
+    
+
@createChallengePane = (opts) ->
  $wrapper = opts.populate
  $button = opts.button
@@ -18,7 +29,7 @@

  selectedTeamId = null
  selectedAlt = null
-
+  $PaneArray = @challengePaneArray
  getSelectedTeam = ->
    PokeBattle.TeamStore.get(selectedTeamId) || PokeBattle.TeamStore.at(0)

@@ -70,11 +81,13 @@
  
  # Implement finding battle/challenging
  $button.on 'click.challenge', ->
+    thisChallenge = _.find($PaneArray, (butt) -> butt.button.selector is $button.selector)
+    console.log(thisChallenge)
    # Start requesting for notify permission here
    PokeBattle.requestNotifyPermission()
-
    format = $selectFormat.data('format')
-    
+    if typeof format == "undefined" and typeof personId == "undefined"
+      format = $('.select-format').data('format')
    # Toggle state when you press the button.
    if !$button.hasClass('disabled')
      team = getSelectedTeam()
@@ -90,7 +103,7 @@
        $clauses = $wrapper.find('input:checked[type="checkbox"]')
        clauses = []
        $clauses.each(-> 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)
      $button.addClass('disabled').trigger('challenge')
--- a/client/app/js/views/battles/battle_view.coffee
+++ b/client/app/js/views/battles/battle_view.coffee
@@ -161,7 +161,7 @@ class @BattleView extends Backbone.View
      team = $this.data('team')
      slot = $this.data('slot')
      pokemon = @model.getPokemon(team, slot)
-      @pokemonPopover($this, pokemon)
+      #@pokemonPopover($this, pokemon)
    @renderTimers()
    this

@@ -278,6 +278,8 @@ class @BattleView extends Backbone.View
    $newPokemon.attr('data-slot', slot)
    $newPokemon.removeClass('hidden')
    @pokemonPopover($newSprite, pokemon)
+    
+    pokemon.set('beeninbattle', true)

    @cannedText('SENT_OUT', player, player, slot)

--- a/client/templates/index.jade
+++ b/client/templates/index.jade
@@ -6,9 +6,13 @@ block content
      .chat
      .main_buttons
        .section
-          .button.big.find_battle
+          .button.big.find_battle_non_ranked
            span.find-icon.icon-earth
            |  Find battle
+          p
+          .button.big.find_battle
+            span.find-icon.icon-earth
+            |  Ranked battle
          .find_battle_select_team
        .section
          .button.teambuilder_button
--- a/client/templates/layout.jade
+++ b/client/templates/layout.jade
@@ -4,7 +4,7 @@ html
    meta(http-equiv="X-UA-Compatible", content="IE=Edge")
    meta(name="viewport", content="width=device-width, initial-scale=1.0, user-scalable=0")
    title PokeBattle
-    link(rel="icon", type="image/png", href="//media.pokebattle.com/img/favicon.png")
+    link(rel="icon", type="image/png", href="../Sprites/favicon.png")
    link(rel="stylesheet", href=asset_path("css/vendor.css"))
    link(rel="stylesheet", href=asset_path("css/main.css"))
  body(class = bodyClass)
--- a/client/views/battle_user_info.jade
+++ b/client/views/battle_user_info.jade
@@ -9,17 +9,32 @@ each team in [ yourTeam, opponentTeam ]
      .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)
-            - var pokemon = teamPokemon[i]
-            if pokemon
-              .icon_wrapper
-                - var origpkmn = orig.findWhere({species: pokemon.species});
-                - var faintClass = (origpkmn.isFainted() ? 'fainted' : '')
-                - var style = window.PokemonIconBackground(origpkmn)
+        - var orig = team.get('pokemon')
+        - var teamPokemon = team.getRandomOrder()
+        - for (var i = 0, len = teamPokemon.length; i < len; i += 1)
+          - var pokemon = teamPokemon[i]
+          if pokemon
+            .icon_wrapper
+              - var origpkmn = orig.findWhere({species: pokemon.species});
+              - var faintClass = (origpkmn.isFainted() ? 'fainted' : '')
+              - var style = window.PokemonIconBackground(origpkmn)
+              if isdef != 'undefined' &&  teamvisible
                a.pokemon_icon(href=window.PokemonIconBackground(origpkmn), target="_blank", class = faintClass, style = style, data-team = teamIndex, data-slot = i)
                if !origpkmn.isFainted()
                  .pokemon_hp_background
                    .pokemon_hp(style="height: " + (origpkmn.getSpecies().id) + "%", class=origpkmn.getHPColor())
+              else
+                - var hasbeeninbattle = origpkmn.get('beeninbattle')
+                if hasbeeninbattle == true
+                  - console.log('hasbeeninbattle')
+                  a.pokemon_icon(href=window.PokemonIconBackground(origpkmn), target="_blank", class = faintClass, style = style, data-team = teamIndex, data-slot = i)
+                  if !origpkmn.isFainted()
+                    .pokemon_hp_background
+                      .pokemon_hp(style="height: " + (origpkmn.getSpecies().id) + "%", class=origpkmn.getHPColor())
+                else
+                  - console.log('hasnoybeeninbattle')
+                  - var newstyle = "background:url('../Sprites/Icons/iconempty.png')!important; background-size: cover!important;"
+                  a.pokemon_icon(href="", target="_blank", class = faintClass, style = newstyle, data-team = teamIndex, data-slot = i)
+                  if !origpkmn.isFainted()
+                    .pokemon_hp_background
+                      .pokemon_hp(style="height: " + (origpkmn.getSpecies().id) + "%", class=origpkmn.getHPColor())