Merge branch 'develop' of https://github.com/lynnyliz/habitrpg into lynnyliz-develop

Conflicts:
	views/options/inventory/stable.jade

public/css/inventory.styl

@@ -27,10 +27,18 @@ menu.pets div
   display: inline-block
   vertical-align: top
 
+menu.mounts div
+  display: inline-block
+  padding-top: -30px
+
 .current-pet
     left: 0px
     bottom: 0px
 
+.current-mount
+	left: 0px
+	bottom: 0px
+
 .item-drop-icon
     float:left
     padding-right:20px

views/options/inventory/stable.jade

@@ -1,38 +1,3 @@
-script(type='text/ng-template', id='partials/options.inventory.mounts.html')
-  .container-fluid
-    .stable.row
-      .col-md-2
-        div(class="#{env.worldDmg.stables ? 'npc_matt_broken' : 'npc_matt'}")
-      .col-md-10
-        .popover.static-popover.fade.right.in
-          .arrow
-          h3.popover-title
-            a(target='_blank', href='http://www.kickstarter.com/profile/mattboch')=env.t('mattBoch')
-          .popover-content
-            p=env.t('mattShall', {name: "{{user.profile.name}}"})
-            h4= '{{Shared.countMounts(null,User.user.items.mounts) || 0}} / {{totalMounts}} ' + env.t('mountsTamed')
-      .col-md-12
-        menu.pets(type='list')
-          each egg in env.Content.eggs
-            -if(!egg.noMount) {
-              li.customize-menu
-                menu
-                  each potion in env.Content.hatchingPotions
-                    - mount = egg.key+"-"+potion.key
-                    div(popover-trigger='mouseenter', popover=env.t('mountName', {potion: potion.text(env.language.code), mount: egg.mountText(env.language.code)}), popover-placement='bottom')
-                      button(class="pet-button Mount_Head_#{mount}", ng-show='user.items.mounts["#{mount}"]', ng-class='{active: user.items.currentMount == "#{mount}"}', ng-click='chooseMount("#{egg.key}", "#{potion.key}")')
-                        //div(class='Mount_Head_{{mount}}')
-                      button(class="pet-button pet-not-owned", ng-hide='user.items.mounts["#{mount}"]')
-                        .PixelPaw
-            -}
-      .col-md-12
-        h4=env.t('rareMounts')
-        menu
-          div
-            each t,k in env.Content.specialMounts
-              - var animal = k.split('-')[0], color = k.split('-')[1]
-              button(ng-if='user.items.mounts["#{animal}-#{color}"]', class="pet-button Mount_Head_#{animal}-#{color}", ng-class='{active: user.items.currentMount == "#{animal}-#{color}"}', ng-click='chooseMount("#{animal}", "#{color}")', popover=env.t(t), popover-trigger='mouseenter', popover-placement='bottom')
-
 mixin petList(source)
   menu.pets(type='list')
     each egg in source
@@ -48,6 +13,49 @@ mixin petList(source)
                 .PixelPaw
               button(class="pet-evolved pet-button Pet-#{pet}", ng-if='user.items.pets["#{pet}"]<0')
 
+mixin mountList(source)
+  menu.pets(type='list')
+    each egg in env.Content.dropEggs
+      li.customize-menu
+        menu
+          each potion in env.Content.hatchingPotions
+            - mount = egg.key+"-"+potion.key
+            div(popover-trigger='mouseenter', popover=env.t('mountName', {potion: potion.text(env.language.code), mount: egg.mountText(env.language.code)}), popover-placement='bottom')
+              button(class="pet-button Mount_Head_#{mount}", ng-show='user.items.mounts["#{mount}"]', ng-class='{active: user.items.currentMount == "#{mount}"}', ng-click='chooseMount("#{egg.key}", "#{potion.key}")')
+                //div(class='Mount_Head_{{mount}}')
+              button(class="pet-button pet-not-owned", ng-hide='user.items.mounts["#{mount}"]')
+                .PixelPaw
+
+
+script(type='text/ng-template', id='partials/options.inventory.mounts.html')
+  .container-fluid
+    .stable.row
+      .col-md-2
+        div(class="#{env.worldDmg.stables ? 'npc_matt_broken' : 'npc_matt'}")
+      .col-md-10
+        .popover.static-popover.fade.right.in
+          .arrow
+          h3.popover-title
+            a(target='_blank', href='http://www.kickstarter.com/profile/mattboch')=env.t('mattBoch')
+          .popover-content
+            p=env.t('mattShall', {name: "{{user.profile.name}}"})
+            h4= '{{Shared.countMounts(null,User.user.items.mounts) || 0}} / {{totalMounts}} ' + env.t('mountsTamed')
+      .col-md-12
+        +mountList(env.Content.dropEggs)
+      .col-md-12
+        h4=env.t('questMounts')
+        +petList(env.Content.questEggs)
+      .col-md-12
+        h4=env.t('rareMounts')
+        menu
+          div
+            each t,k in env.Content.specialMounts
+              - var animal = k.split('-')[0], color = k.split('-')[1]
+              button(ng-if='user.items.mounts["#{animal}-#{color}"]', class="pet-button Mount_Head_#{animal}-#{color}", ng-class='{active: user.items.currentMount == "#{animal}-#{color}"}', ng-click='chooseMount("#{animal}", "#{color}")', popover=env.t(t), popover-trigger='mouseenter', popover-placement='bottom')
+              button(class="pet-button pet-not-owned", ng-hide='user.items.mounts["#{mount}"]')
+                .PixelPaw
+
+
 script(type='text/ng-template', id='partials/options.inventory.pets.html')
   .container-fluid
     .stable.row