diff --git a/index.html b/index.html index 6b55d87..b43f163 100644 --- a/index.html +++ b/index.html @@ -32,6 +32,8 @@ + + diff --git a/public/Freeze shop.png b/public/Freeze shop.png new file mode 100644 index 0000000..4d979fc Binary files /dev/null and b/public/Freeze shop.png differ diff --git a/public/shop_Sell1.png b/public/shop_Sell1.png new file mode 100644 index 0000000..0a82d95 Binary files /dev/null and b/public/shop_Sell1.png differ diff --git a/src/data/common.css b/src/data/common.css index 2ac04d5..ce3929a 100644 --- a/src/data/common.css +++ b/src/data/common.css @@ -107,7 +107,6 @@ } .shop { - margin-top: 10vh !important; position: relative; filter: drop-shadow(2px 4px 6px black); } @@ -117,7 +116,7 @@ border-image-slice: 106 53 53 424 fill; border-style: solid; border-width: 5vmin 2.5vmin 2.5vmin 20vmin; - width: 72.5vmin; + width: 54vmin; justify-content: flex-start; align-items: center; } @@ -136,9 +135,12 @@ pointer-events: none; } +.shop > .row > *:first-child { + margin-left: -18vmin; +} + .reroll { - margin-left: -19vmin !important; - margin-top: -1vmin !important; + margin: auto -2vmin; height: 18vmin; cursor: pointer; user-select: none; diff --git a/src/data/projEntry.tsx b/src/data/projEntry.tsx index bb15304..f69ee12 100644 --- a/src/data/projEntry.tsx +++ b/src/data/projEntry.tsx @@ -3,6 +3,7 @@ import Row from "components/layout/Row.vue"; import { jsx } from "features/feature"; import { createParticles } from "features/particles/particles"; import { createReset } from "features/reset"; +import Tooltip from "features/tooltips/Tooltip.vue"; import { globalBus } from "game/events"; import type { BaseLayer, GenericLayer } from "game/layers"; import { createLayer } from "game/layers"; @@ -18,13 +19,15 @@ import mail from "../../public/Mogul Mail Coots.png"; import money from "../../public/Mogul Money Coots.png"; import money_small from "../../public/money_small.png"; import coots from "../../public/Normal Coots.png"; +import star_small from "../../public/presence_small.png"; import qt from "../../public/QT Coots.png"; import shopGif from "../../public/shop.gif"; import shopStill from "../../public/shop1.png"; import stanz from "../../public/Stanz Coots.png"; import startStream from "../../public/start stream.png"; -import star_small from "../../public/presence_small.png"; import vespa from "../../public/Vespa Coots.png"; +import sellShop from "../../public/shop_Sell1.png"; +import freezeShop from "../../public/Freeze shop.png"; import CharacterSlot from "./CharacterSlot.vue"; import "./common.css"; import "./socket"; @@ -700,49 +703,79 @@ export const main = createLayer("main", function (this: BaseLayer) { /> ))} - - 0 ? "" : "color: var(--locked); cursor: not-allowed" - } - onClick={() => { - if (gold.value > 0) { - emit("reroll"); - } - }} - > - - - {shop.value.map((item, i) => ( - { - if (item == null) { - return; + + {selectedCharacter.value != null ? ( + + e.preventDefault()} + onClick={() => emit("sell", selectedCharacter.value!)} + onDrop={() => emit("sell", selectedCharacter.value!)} + > + + + + ) : selectedShopItem.value != null ? ( + + e.preventDefault()} + onClick={() => emit("freeze", selectedShopItem.value!)} + onDrop={() => emit("freeze", selectedShopItem.value!)} + > + + + + ) : ( + + 0 + ? "" + : "color: var(--locked); cursor: not-allowed" } - selectedShopItem.value = - selectedShopItem.value === i ? null : i; - selectedCharacter.value = null; - e.stopPropagation(); - }} - onDragstart={() => { - isDragging.value = true; - selectedCharacter.value = null; - selectedShopItem.value = i; - }} - onDragend={() => { - isDragging.value = false; - selectedCharacter.value = null; - selectedShopItem.value = null; - }} - /> - ))} + onClick={() => { + if (gold.value > 0) { + emit("reroll"); + } + }} + > + + + + )} + + {shop.value.map((item, i) => ( + { + if (item == null) { + return; + } + selectedShopItem.value = + selectedShopItem.value === i ? null : i; + selectedCharacter.value = null; + e.stopPropagation(); + }} + onDragstart={() => { + isDragging.value = true; + selectedCharacter.value = null; + selectedShopItem.value = i; + }} + onDragend={() => { + isDragging.value = false; + selectedCharacter.value = null; + selectedShopItem.value = null; + }} + /> + ))} + {render(particles)}