-
+
@@ -156,10 +156,10 @@
class="box"
:class="{white: user.items.currentMount}"
>
-
+
@@ -330,6 +330,7 @@ import statsComputed from '@/../../common/script/libs/statsComputed';
import { mapState } from '@/libs/store';
import attributesGrid from '@/components/inventory/equipment/attributesGrid';
import toggleSwitch from '@/components/ui/toggleSwitch';
+import Sprite from '@/components/ui/sprite';
const DROP_ANIMALS = keys(Content.pets);
const TOTAL_NUMBER_OF_DROP_ANIMALS = DROP_ANIMALS.length;
@@ -337,6 +338,7 @@ export default {
components: {
toggleSwitch,
attributesGrid,
+ Sprite,
},
props: ['user', 'showAllocation'],
data () {
@@ -417,6 +419,9 @@ export default {
},
methods: {
+ isUsed (items, key) {
+ return items[key] && items[key].indexOf('base_0') === -1;
+ },
getGearTitle (key) {
return this.flatGear[key].text();
},
diff --git a/website/client/src/libs/createAnimal.js b/website/client/src/libs/createAnimal.js
index 8eebf2eb58..f5d59efc86 100644
--- a/website/client/src/libs/createAnimal.js
+++ b/website/client/src/libs/createAnimal.js
@@ -37,6 +37,7 @@ export function createAnimal (egg, potion, type, _content, userItems) {
return {
key: animalKey,
class: type === 'pet' ? `Pet Pet-${animalKey}` : `Mount_Icon_${animalKey}`,
+ imageName: type === 'pet' ? `stable_Pet-${animalKey}` : `stable_Mount_Icon_${animalKey}`,
eggKey: egg.key,
eggName: getText(egg.text),
potionKey: potion.key,
diff --git a/website/client/src/mixins/avatarEditUtilities.js b/website/client/src/mixins/avatarEditUtilities.js
index f8214a91f7..e595166303 100644
--- a/website/client/src/mixins/avatarEditUtilities.js
+++ b/website/client/src/mixins/avatarEditUtilities.js
@@ -32,7 +32,7 @@ export const avatarEditorUtilities = { // eslint-disable-line import/prefer-defa
option.key = key;
option.pathKey = pathKey;
option.active = userPreference === key;
- option.class = this.createClass(type, subType, key);
+ option.imageName = this.createImageName(type, subType, key);
option.click = optionParam => (option.gemLocked ? this.unlock(`${optionParam.pathKey}.${key}`) : this.set({ [`preferences.${optionParam.pathKey}`]: optionParam.key }));
option.text = subType ? appearances[type][subType][key].text()
: appearances[type][key].text();
@@ -60,8 +60,8 @@ export const avatarEditorUtilities = { // eslint-disable-line import/prefer-defa
return option;
},
- createClass (type, subType, key) {
- let str = `${type} ${subType} `;
+ createImageName (type, subType, key) {
+ let str = '';
switch (type) {
case 'shirt': {
@@ -74,14 +74,14 @@ export const avatarEditorUtilities = { // eslint-disable-line import/prefer-defa
}
case 'hair': {
if (subType === 'color') {
- str += `icon_hair_bangs_${this.user.preferences.hair.bangs || 1}_${key}`;
+ str += `color_hair_bangs_${this.user.preferences.hair.bangs || 1}_${key}`;
} else {
- str += `icon_hair_${subType}_${key}_${this.user.preferences.hair.color}`;
+ str += `hair_${subType}_${key}_${this.user.preferences.hair.color}`;
}
break;
}
case 'skin': {
- str += `skin skin_${key}`;
+ str += `skin_${key}`;
break;
}
default: {
diff --git a/website/common/script/content/constants/gifSprites.js b/website/common/script/content/constants/gifSprites.js
new file mode 100644
index 0000000000..aaaef8e6e3
--- /dev/null
+++ b/website/common/script/content/constants/gifSprites.js
@@ -0,0 +1,40 @@
+export default [
+ 'head_special_1',
+ 'broad_armor_special_1',
+ 'slim_armor_special_1',
+ 'head_special_0',
+ 'slim_armor_special_0',
+ 'broad_armor_special_0',
+ 'weapon_special_critical',
+ 'weapon_special_0',
+ 'shield_special_0',
+ 'Pet-Wolf-Cerberus',
+ 'stable_Pet-Wolf-Cerberus',
+ 'armor_special_ks2019',
+ 'slim_armor_special_ks2019',
+ 'broad_armor_special_ks2019',
+ 'eyewear_special_ks2019',
+ 'head_special_ks2019',
+ 'shield_special_ks2019',
+ 'weapon_special_ks2019',
+ 'Pet-Gryphon-Gryphatrice',
+ 'stable_Pet-Gryphon-Gryphatrice',
+ 'Mount_Head_Gryphon-Gryphatrice',
+ 'Mount_Body_Gryphon-Gryphatrice',
+ 'background_clocktower',
+ 'background_airship',
+ 'background_steamworks',
+ 'Pet_HatchingPotion_Veggie',
+ 'Pet_HatchingPotion_Dessert',
+ 'Pet-HatchingPotion-Dessert',
+ 'quest_windup',
+ 'Pet-HatchingPotion_Windup',
+ 'Pet_HatchingPotion_Windup',
+ 'quest_solarSystem',
+ 'quest_virtualpet',
+ 'Pet_HatchingPotion_VirtualPet',
+ 'Pet-Gryphatrice-Jubilant',
+ 'stable_Pet-Gryphatrice-Jubilant',
+ 'back_special_heroicAureole',
+ 'Pet-HatchingPotion-Funghi',
+];