diff --git a/branding.html b/branding.html index 57a8f7d..f4a314a 100644 --- a/branding.html +++ b/branding.html @@ -18,7 +18,7 @@
- +These titles were added this Fishday.
If FishieMart sounds like what you are looking for, try it out for yourself! FishieMart can be used on Fishii, Fishii U, and partially the magic conch shell.
In case the originals aren't enough, we have also added tons of custom Virtual Tank injects! Just some of the latest titles we've added are The New Fishie, WaterBound, Super Fishie All-Catch + Super Fishie World, and Fishie Kombat.
@@ -177,5 +182,6 @@ function pauseBGM() { } + diff --git a/index.html b/index.html index 6ffdede..ff66624 100644 --- a/index.html +++ b/index.html @@ -18,16 +18,16 @@ - + - +If WiiMart sounds like what you are looking for, try it out for yourself! WiiMart can be used on Wii, Wii U, and partially Dolphin.
In case the originals aren't enough, we have also added tons of custom Virtual Console injects! Just some of the latest titles we've added are The New Tetris, EarthBound, Super Mario All-Stars + Super Mario World, and Mortal Kombat.
diff --git a/info-log.html b/info-log.html index 97333e7..7ecc4aa 100644 --- a/info-log.html +++ b/info-log.html @@ -17,7 +17,7 @@ - + diff --git a/media/FishieMart_logo.png b/media/FishieMart_logo.png new file mode 100644 index 0000000..8fb4c79 Binary files /dev/null and b/media/FishieMart_logo.png differ diff --git a/meta/NEW_bg.png b/meta/NEW_bg.png new file mode 100644 index 0000000..50a0031 Binary files /dev/null and b/meta/NEW_bg.png differ diff --git a/meta/fadebg-bgm.png b/meta/fadebg-bgm.png new file mode 100644 index 0000000..f3b7532 Binary files /dev/null and b/meta/fadebg-bgm.png differ diff --git a/meta/fadebg-wmw.png b/meta/fadebg-wmw.png new file mode 100644 index 0000000..ac69385 Binary files /dev/null and b/meta/fadebg-wmw.png differ diff --git a/meta/favicon-fishie.ico b/meta/favicon-fishie.ico index e0bbfcd..297d314 100644 Binary files a/meta/favicon-fishie.ico and b/meta/favicon-fishie.ico differ diff --git a/meta/main.css b/meta/main.css index cb3a30a..fe1b5ca 100644 --- a/meta/main.css +++ b/meta/main.css @@ -5,7 +5,7 @@ body {scroll-behavior:smooth;text-align: center;font-family: sans-serif;font-fam div.row {width:50%;margin:auto} div.box {line-height:23.3px;background-color:white;border:solid 2px #34BEED;border-radius:5px;box-shadow: 0 0 10px #2525255d;box-sizing:border-box;text-align:center;margin: 0 auto;padding:5px;margin-top: 8px; overflow: auto;} - +#backgroundd {position:fixed;top:0;left:0;width:100%;height:100%; background-image:url('/meta/fadebg-wmw.png'); background-size:cover; z-index:999; user-select:none; pointer-events:none;} h1 {margin-bottom: 10px;} nav {margin-bottom: 20px;line-height: 35px;} footer {color:grey} @@ -44,13 +44,37 @@ img.wb {outline: solid 1px black} .blue {color:#1164E9;} input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {-webkit-appearance: none; margin: 0;} input [type="number"] {-moz-appearance:textfield;} +input { + border-top-width: 2px; + border-right-width: 2px; + border-bottom-width: 2px; + border-left-width: 2px; + border-top-style: solid; + border-right-style: solid; + border-bottom-style: solid; + border-left-style: solid; + border-top-color: #CCCCCC; + border-right-color: #CCCCCC; + border-bottom-color: #EAEAEA; + border-left-color: #CCCCCC; +} mark {color:white;background:#34BEED;font-weight:bold;} -mark.new {background-color: gold;color:orangered;border-radius: 10px; padding-right:5px; padding-left:5px;font-weight:bold;} +mark.new {background-color:#fff090 /* fallback */; background-image:url("/meta/NEW_bg.png"); background-size:cover;border-radius: 5px; padding-right:5px; padding-left:5px;font-weight:bold;} +mark.new #NEWtext {user-select:none; pointer-events:none; color:#ff6700;transform:translateY(1px); animation: NEWtext 2.7s ease-in-out infinite; display:inline-block;} +@keyframes NEWtext +{ + /* ref: https://wiimart.org/meta/NEW_en.gif */ + +0% {/* new is idle with orangey text */ color:#ff6700;transform: translateY(1px);} +50% {/* new go down and get darker */color:#ff5e00;transform: translateY(2px) skewX(4deg); } +70% {/* new goess up and lighter */color:#ff9e5c;transform: translateY(-1px) rotateZ(2deg); } +100% {/* new goes back down and repeat */ color:#ff6700;transform: translateY(1px); } +} /* Gallery */ div.gallery {position:relative;width:100%;box-sizing:border-box;} -img.slide {width:100%; min-height:200px; min-width:100%;border-radius:5px;} +img.slide {background-color:#e6e6e6 /* fallback */; width:100%; min-height:200px; min-width:100%;border-radius:5px;} img.arrow {min-height:68px; position: absolute; top: 50%; transform: translateY(-50%); cursor: pointer; width: 60px; height: auto;} img.left {left: 10px; animation: hoverAnimation 0.5s infinite alternate;} img.right {right: 10px; animation: rightHoverAnimation 0.5s infinite alternate;} @@ -58,16 +82,16 @@ img.right {right: 10px; animation: rightHoverAnimation 0.5s infinite alternate;} @keyframes rightHoverAnimation {0% {transform: translateY(-50%) translateX(0);} 100% {transform: translateY(-50%) translateX(-5px);}} /* Music */ -div#bgmplayer { z-index: 1000;transition:.3s ease-in-out; opacity:25%; position:fixed; bottom:3px; border:2px solid #34BEED; width:60px; height:20px; overflow:hidden;} -div#bgmplayer:hover {cursor:pointer; opacity: 70%; } -.bgmplayerdisplayed{cursor:default !important; opacity: 70%; transition:.3s ease-in-out; height:65px !important; width:120px !important; overflow:auto;scrollbar-width: none;} -.box#bgmplayer #bgmplrtitle{color:#34BEED; font-weight:bold; font-size:18px; font-style:normal; margin-top:-5px; margin-bottom:3px; line-height:18px; } -div#bgmplayer p {line-height:20px;color:#9A9A9A;margin-top:-10px;font-style:italic;font-size:10px; user-select:none; pointer-events:none;} +div#bgmplayer {background-color:#0000; background-size:0px;z-index: 1000;transition:.3s ease-in-out; position:fixed; bottom:3px; border:2px solid #34BEED; width:60px; height:20px; overflow:hidden;} +div#bgmplayer:hover {cursor:pointer; }div#bgmplayer #shopbgm {margin-right:4px;} +.bgmplayerdisplayed{background-image:url("/meta/fadebg-bgm.png"); background-size:100% !important; cursor:default !important; transition:.3s ease-in-out; height:65px !important; width:120px !important; overflow:auto;scrollbar-width: none;} +.box#bgmplayer #bgmplrtitle{color:#24a6d1; background-color:#e4e4e42c; border-radius:20px; font-weight:bold; font-size:18px; font-style:normal; margin-top:-5px; margin-bottom:3px; line-height:18px; } +div#bgmplayer p {line-height:20px;color:#9A9A9A; margin-top:-10px;font-style:italic;font-size:10px; user-select:none; pointer-events:none;} /* Matt! Yea? update day! what?? New-New Wii Titles! What? im in the bathroom! Update day for WiiMart! */ #wednesdaytitles {margin-top:13px; margin-bottom:13px; border:none;position:relative; background-color:#FFF; transition:.3s ease-in-out;} -#whatiswsw {animation:wswpop 0.5s forwards;opacity:0%;position: fixed;top: 50%;left: 50%;transform: translate(-50%, -50%);text-align:center;z-index:999;transition:.3s ease-in-out;} +#whatiswsw {z-index:1001; animation:wswpop 0.5s forwards;opacity:0%;position: fixed;top: 50%;left: 50%;transform: translate(-50%, -50%);text-align:center;z-index:999;transition:.3s ease-in-out;} @keyframes wswpop { 10% { opacity:0%; @@ -86,6 +110,7 @@ div#bgmplayer p {line-height:20px;color:#9A9A9A;margin-top:-10px;font-style:ital { body {background-color: black; color: #e0e0e0;} div.box {background-color: #1e1e1e; box-shadow: 0 0 10px #000000CC;} + .box#bgmplayer #bgmplrtitle {background-color:#dddddd2c;} a.btn {background-color: #587566;color:white} a.btn:hover {background-color: #7da2a3;} span.active {background-color: #313131} @@ -102,4 +127,5 @@ div#bgmplayer p {line-height:20px;color:#9A9A9A;margin-top:-10px;font-style:ital input {background-color: black;border: 2px solid grey;color:white;} mark {color:white} #wednesdaytitles {color:white; background-color:#3b3b3b} + img.slide {background-color: #3d3d3d;} } diff --git a/meta/music.js b/meta/music.js index 0da4476..d881d45 100644 --- a/meta/music.js +++ b/meta/music.js @@ -1,5 +1,5 @@ // Wii Shop BGM Player, suggested by @legamer66 (https://discord.com/channels/1346485785284575335/1346485786039681056/1351527080546009259) - +var checkbgmplayerstatus = true; function hideConsoleControls() { const userAgent = navigator.userAgent.toLowerCase(); const isConsoleBrowser = @@ -9,14 +9,16 @@ function hideConsoleControls() { userAgent.includes('nintendo'); // they can't play music so rip if (isConsoleBrowser) {const bgmPlayerDiv = document.getElementById('bgmplayer'); - if (bgmPlayerDiv) {bgmPlayerDiv.style.display = 'none';} } + if (bgmPlayerDiv) {bgmPlayerDiv.style.display = 'none'; checkbgmplayerstatus = false;} } } var shoploop = new Audio("/meta/shop.wav"); shoploop.loop = true; -shoploop.volume = 0; // prevent clipping +var initialvolume = 0 || 0.0; +shoploop.volume = initialvolume; +/* what idk, only for index.html */ function loadafterwednesdaycheck() { hideConsoleControls(); @@ -26,29 +28,59 @@ function loadafterwednesdaycheck() { shoploop.currentTime = parseFloat(savedTime); } - if (localStorage.getItem("shopmusic") === "playing") { - playBGMonload(); - activatebgmplayer(); + if (localStorage.getItem("wmtwebsiteBGM") === "playing") { + activatebgmplayer(); + bgmplayerfocus(); + document.getElementById("shopbgmselector").href = "javascript:playBGMonload();"; } else { pauseBGM(); deactivatebgmplayer(); } } +/* what idk, only for index.html */ + + + +/* bgm check for all pages */ + + +window.onload = function() { + + +if (checkbgmplayerstatus === true) { + +var wmtwebsiteBGMwasplaying = localStorage.getItem("wmtwebsiteBGM"); + +if (wmtwebsiteBGMwasplaying === 'playing') { + activatebgmplayer(); + bgmplayerfocus(); + document.getElementById("shopbgmselector").href = "javascript:playBGMonload();"; +} + +} + + +}; + +/* bgm check for all pages */ + + window.onbeforeunload = function() { localStorage.setItem("bgmlooppoint", shoploop.currentTime); }; function playBGM() { - shoploop.volume = 0.8; - localStorage.setItem("shopmusic", "playing"); + initialvolume = 0.8; + shoploop.volume = initialvolume; + localStorage.setItem("wmtwebsiteBGM", "playing"); shoploop.play(); document.getElementById("shopbgm").innerText = "Pause"; document.getElementById("shopbgmselector").href = "javascript:pauseBGM();"; } function pauseBGM() { - localStorage.setItem("shopmusic", "paused"); + localStorage.setItem("wmtwebsiteBGM", "paused"); shoploop.pause(); document.getElementById("shopbgm").innerText = "Play"; document.getElementById("shopbgmselector").href = "javascript:playBGM();"; @@ -56,48 +88,35 @@ function pauseBGM() { function playBGMonload() { // this version has it fade in for smoother experince between pages (i could of used set interval, but memory issues?) + initialvolume = 0; fadeinbgm(); - localStorage.setItem("shopmusic", "playing"); + localStorage.setItem("wmtwebsiteBGM", "playing"); shoploop.play(); - document.getElementById("shopbgm").innerText = "Pause"; - document.getElementById("shopbgmselector").href = "javascript:pauseBGM();"; + document.getElementById("shopbgm").innerText = "....."; + document.getElementById("shopbgmselector").href = 'javascript:alert("the bgm is still fading, hold on, you can click once its done!");'; + shoploop.currentTime = localStorage.getItem("bgmlooppoint"); } + + function fadeinbgm() { - shoploop.volume="0.0"; - setTimeout(fade2,10); -} -function fade2() { - shoploop.volume="0.1"; - setTimeout(fade3,10); -} -function fade3() { - shoploop.volume="0.2"; - setTimeout(fade4,10); -} -function fade4() { - shoploop.volume="0.3"; - setTimeout(fade5,10); -} -function fade5() { - shoploop.volume="0.4"; - setTimeout(fade6,10); -} -function fade6() { - shoploop.volume="0.5"; - setTimeout(fade7,10); -} -function fade7() { - shoploop.volume="0.6"; - setTimeout(fade8,10); -} -function fade8() { - shoploop.volume="0.7"; - setTimeout(fade9,10); -} -function fade9() { - shoploop.volume="0.8"; +var volchangee = setTimeout(fadeinbgm,13); +document.getElementById("shopbgm").innerText = "Paus?"; + if (initialvolume < 0.8) { + initialvolume += 0.01; + } + if (initialvolume > 0.8) { + clearTimeout(volchangee); + initialvolume = 0.8; + document.getElementById("shopbgmselector").href = "javascript:pauseBGM();"; + document.getElementById("shopbgm").innerText = "Pause"; + } + shoploop.volume = initialvolume; } + + + + function activatebgmplayer() { document.getElementById('bgmplayer').classList.add('bgmplayerdisplayed'); document.getElementById("bgmplrtitle").innerText="BGM player"; document.getElementById("bgmplrtitle").style.marginTop="0px"; @@ -105,4 +124,11 @@ function activatebgmplayer() { function deactivatebgmplayer() { document.getElementById('bgmplayer').classList.remove('bgmplayerdisplayed'); document.getElementById("bgmplrtitle").innerText="bgm plr.."; document.getElementById("bgmplrtitle").style.marginTop="-5px"; + document.getElementById("bgmplayer").style.backgroundColor="#0000"; document.getElementById("bgmplayer").style.backgroundColor="#0000"; document.getElementById("bgmplayer").style.border="1px solid #34BEED"; +} + +function bgmplayerfocus() { +/* bring attention to the player that you can play where ya left off */ + document.getElementById("bgmplayer").style.opacity="100%";document.getElementById("bgmplayer").style.backgroundColor="#1164E9"; document.getElementById("bgmplayer").style.border="4px solid #34ededff"; document.getElementById("backgroundd").style.display="block"; document.getElementById("backgroundd").style.backgroundImage=('url("/meta/fadebg-bgm.png")'); + setTimeout(function(){ document.getElementById("bgmplayer").style.backgroundImage='url("/meta/fadebg-bgm.png")'; document.getElementById("bgmplayer").style.backgroundColor="#0000"; document.getElementById("bgmplayer").style.border="2px solid #34BEED"; document.getElementById("backgroundd").style.display="none";},500); } \ No newline at end of file diff --git a/specials.html b/specials.html index 851ffec..b5fffed 100644 --- a/specials.html +++ b/specials.html @@ -19,7 +19,7 @@ - +