diff --git a/website/client/components/creatorIntro.vue b/website/client/components/creatorIntro.vue index 3b7a927711..2ca2aae67c 100644 --- a/website/client/components/creatorIntro.vue +++ b/website/client/components/creatorIntro.vue @@ -222,7 +222,7 @@ b-modal#avatar-modal(title="", :size='editing ? "lg" : "md"', :hide-header='true .col-12.customize-options .option(@click='set({"preferences.chair": "none"})', :class='{active: user.preferences.chair === "none"}') | None - .option(v-for='option in ["black", "blue", "green", "pink", "red", "yellow"]', + .option(v-for='option in chairKeys', :class='{active: user.preferences.chair === option}') .chair.sprite.customize-option(:class="`button_chair_${option}`", @click='set({"preferences.chair": option})') #flowers.row(v-if='activeSubPage === "flower"') @@ -856,7 +856,7 @@ import isPinned from 'common/script/libs/isPinned'; const skinsBySet = groupBy(appearance.skin, 'set.key'); const hairColorBySet = groupBy(appearance.hair.color, 'set.key'); -let tasksByCategory = { +const tasksByCategory = { work: [ { type: 'habit', @@ -1014,6 +1014,7 @@ export default { baseHair5Keys: [1, 2], baseHair6Keys: [1, 2, 3], animalEarsKeys: ['bearEars', 'cactusEars', 'foxEars', 'lionEars', 'pandaEars', 'pigEars', 'tigerEars', 'wolfEars'], + chairKeys: ['black', 'blue', 'green', 'pink', 'red', 'yellow', 'handleless_black', 'handleless_blue', 'handleless_green', 'handleless_pink', 'handleless_red', 'handleless_yellow'], icons: Object.freeze({ logoPurple, bodyIcon, diff --git a/website/common/locales/en/character.json b/website/common/locales/en/character.json index 47b89145f0..7e94958747 100644 --- a/website/common/locales/en/character.json +++ b/website/common/locales/en/character.json @@ -214,16 +214,11 @@ "editProfile": "Edit Profile", "challengesWon": "Challenges Won", "questsCompleted": "Quests Completed", - "equipment": "Equipment", - "costume": "Costume", "headAccess": "Head Access.", "backAccess": "Back Access.", "bodyAccess": "Body Access.", "mainHand": "Main-Hand", "offHand": "Off-Hand", - "level": "Level", - "allocated": "Allocated", - "buffs": "Buffs", "statPoints": "Stat Points", "pts": "pts" } diff --git a/website/common/script/content/appearance/chair.js b/website/common/script/content/appearance/chair.js index ab52b334ea..4827b8caf4 100644 --- a/website/common/script/content/appearance/chair.js +++ b/website/common/script/content/appearance/chair.js @@ -8,4 +8,12 @@ export default prefill({ pink: {}, red: {}, yellow: {}, + /* eslint-disable quote-props */ + 'handleless_black': {}, + 'handleless_blue': {}, + 'handleless_green': {}, + 'handleless_pink': {}, + 'handleless_red': {}, + 'handleless_yellow': {}, + /* eslint-enable quote-props */ }); diff --git a/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_black.png b/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_black.png new file mode 100644 index 0000000000..efdb07ae15 Binary files /dev/null and b/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_black.png differ diff --git a/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_blue.png b/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_blue.png new file mode 100644 index 0000000000..f59e3669ca Binary files /dev/null and b/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_blue.png differ diff --git a/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_green.png b/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_green.png new file mode 100644 index 0000000000..07b7881e18 Binary files /dev/null and b/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_green.png differ diff --git a/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_pink.png b/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_pink.png new file mode 100644 index 0000000000..16b7231698 Binary files /dev/null and b/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_pink.png differ diff --git a/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_red.png b/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_red.png new file mode 100644 index 0000000000..1cb72a1ab1 Binary files /dev/null and b/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_red.png differ diff --git a/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_yellow.png b/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_yellow.png new file mode 100644 index 0000000000..5dbe804282 Binary files /dev/null and b/website/raw_sprites/spritesmith/customize/chairs/button_chair_handleless_yellow.png differ diff --git a/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_black.png b/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_black.png new file mode 100644 index 0000000000..840c6f5943 Binary files /dev/null and b/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_black.png differ diff --git a/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_blue.png b/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_blue.png new file mode 100644 index 0000000000..ef59be618f Binary files /dev/null and b/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_blue.png differ diff --git a/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_green.png b/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_green.png new file mode 100644 index 0000000000..ab1f4d6d37 Binary files /dev/null and b/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_green.png differ diff --git a/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_pink.png b/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_pink.png new file mode 100644 index 0000000000..72cfcc05f0 Binary files /dev/null and b/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_pink.png differ diff --git a/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_red.png b/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_red.png new file mode 100644 index 0000000000..18e8e03240 Binary files /dev/null and b/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_red.png differ diff --git a/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_yellow.png b/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_yellow.png new file mode 100644 index 0000000000..fb2f81e9a7 Binary files /dev/null and b/website/raw_sprites/spritesmith/customize/chairs/chair_handleless_yellow.png differ