Skip to content

Commit

Permalink
fix issues
Browse files Browse the repository at this point in the history
  • Loading branch information
negue committed Oct 22, 2018
1 parent 456c5e5 commit 16256ee
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions website/client/components/inventory/stable/petItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ div
span.item-content.hatchAgain(v-if="mountOwned && isHatchable")
span.egg(:class="eggClass")
span.potion(:class="potionClass")
span.item-content(v-else, :class="getPetItemClass(item)")
span.item-content(v-else, :class="getPetItemClass()")
span.pet-progress-background(v-if="item.isAllowedToFeed() && progress > 0")
div.pet-progress-bar(v-bind:style="{width: 100 * progress/50 + '%' }")
span.item-label(v-if="label") {{ label }}
Expand Down Expand Up @@ -111,21 +111,21 @@ div
click () {
this.$emit('click', {});
},
getPetItemClass (pet) {
getPetItemClass () {
if (this.mountOwned && !this.isHatchable) {
return `GreyedOut Pet Pet-${pet.key} ${pet.eggKey}`;
return `GreyedOut Pet Pet-${this.item.key} ${this.item.eggKey}`;
}
if (this.isOwned) {
return `Pet Pet-${pet.key} ${pet.eggKey}`;
if (this.item.isOwned()) {
return `Pet Pet-${this.item.key} ${this.item.eggKey}`;
}
if (this.isHatchable) {
return 'PixelPaw';
}
if (this.mountOwned) {
return `GreyedOut Pet Pet-${pet.key} ${pet.eggKey}`;
return `GreyedOut Pet Pet-${this.item.key} ${this.item.eggKey}`;
}
// Can't hatch
Expand All @@ -139,9 +139,6 @@ div
eggClass () {
return `Pet_Egg_${this.item.eggKey}`;
},
isOwned () {
return this.item.isOwned();
},
isHatchable () {
return this.item.isHatchable();
},
Expand Down

0 comments on commit 16256ee

Please sign in to comment.