From ec179182e7911ca4e771541e70ea1860e97e8eee Mon Sep 17 00:00:00 2001 From: Julius Jung Date: Tue, 5 Dec 2017 15:22:59 -0500 Subject: [PATCH] submit initial working solution to disallow selling of Saddle (#9663) --- website/client/components/shops/market/sellModal.vue | 11 +++++++++-- website/common/locales/en/content.json | 1 + website/common/script/content/index.js | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/website/client/components/shops/market/sellModal.vue b/website/client/components/shops/market/sellModal.vue index 0d3753a1d8..8eee123848 100644 --- a/website/client/components/shops/market/sellModal.vue +++ b/website/client/components/shops/market/sellModal.vue @@ -7,9 +7,16 @@ div.close span.svg-icon.inline.icon-10(aria-hidden="true", v-html="icons.close", @click="hideDialog()") - div.content(v-if="item != null") + div.content(v-if="item") - div.inner-content + div.inner-content(v-if="item.sellWarningNote") + slot(name="item", :item="item") + + h4.title {{ text ? text : item.text() }} + div.text {{ item.sellWarningNote() }} + br + + div.inner-content(v-else) slot(name="item", :item="item") h4.title {{ text ? text : item.text() }} diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json index 21f4b81c07..b1be9a356b 100644 --- a/website/common/locales/en/content.json +++ b/website/common/locales/en/content.json @@ -286,6 +286,7 @@ "foodSaddleText": "Saddle", "foodSaddleNotes": "Instantly raises one of your pets into a mount.", + "foodSaddleSellWarningNote": "Hey! This is a pretty useful item! Are you familiar with how to use a Saddle with your Pets?", "foodNotes": "Feed this to a pet and it may grow into a sturdy steed." } diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js index 4f43631f88..d1eaa35c1c 100644 --- a/website/common/script/content/index.js +++ b/website/common/script/content/index.js @@ -353,6 +353,7 @@ api.food = { canBuy () { return true; }, + sellWarningNote: t('foodSaddleSellWarningNote'), text: t('foodSaddleText'), value: 5, notes: t('foodSaddleNotes'),