diff --git a/assets/Sounds/Lotus Waters.ogg b/assets/Sounds/Lotus Waters.ogg
index 8065a1a..e943e6e 100644
Binary files a/assets/Sounds/Lotus Waters.ogg and b/assets/Sounds/Lotus Waters.ogg differ
diff --git a/assets/Sounds/Triple Baka.ogg b/assets/Sounds/Triple Baka.ogg
deleted file mode 100644
index 3e7d58c..0000000
Binary files a/assets/Sounds/Triple Baka.ogg and /dev/null differ
diff --git a/constants.json b/constants.json
index 96e43c3..e7bafbb 100644
--- a/constants.json
+++ b/constants.json
@@ -161,22 +161,9 @@
"color": "rgb(255, 100, 100)",
"caseInsensitive": true
},
- "Teto Territory": {
- "color": "rgb(255, 100, 100)",
- "caseInsensitive": true
- },
"Teto": {
"color": "rgb(255, 100, 100)",
"caseInsensitive": true
- },
- "Kasane": {
- "color": "rgb(255, 100, 100)",
- "caseInsensitive": true
- },
- "Ryouiki Tenkai": {
- "bold": true,
- "italicized": true,
- "caseInsensitive": true
}
}
}
\ No newline at end of file
diff --git a/pageUpdater.js b/pageUpdater.js
index 6a05521..6824cc7 100644
--- a/pageUpdater.js
+++ b/pageUpdater.js
@@ -47,6 +47,8 @@ function converter(html) {
var config = JSON.parse(fs.readFileSync(path.join(__dirname, 'config/config.json')))
+ var statusText = ""
+
var bnchName = "Beta"
var bnchSub = "beta."
@@ -96,44 +98,13 @@ function converter(html) {
},
"SPINCOUNT": globalSpins,
"UPTIME": timeFormatter((Date.now() - uptime) / 1000),
- "LAST_LANYARD": timeFormatter((Date.now() - lastLanyardUpdate) / 1000),
"WEATHER_MODIFIER": randomThemer.returnTheme(),
"WEATHER_TEXT": "",
"ANNOUNCEMENT": fs.readFileSync(path.join(__dirname, "config/announcement.html")),
- "ACTIVITIES": activityToHTML.activitiesToHTML(lanyardData),
- "SOCIALS": () => {
- var socials = lanyardData.socials
- var html = ""
- if (socials) {
- var socialsTable = Object.keys(socials)
- for (var i = 0; i < socialsTable.length; i++) {
- var category = socialsTable[i]
- var sites = socials[category]
- var sitesTable = Object.keys(sites)
- html += `
${category}
`
- for (var x = 0; x < sitesTable.length; x++) {
- var siteName = sitesTable[x]
- var siteData = sites[siteName]
- if (siteData.url) {
- html += `
${siteName}: ${siteData.name}`
- }
- }
- html += "
"
- }
- }
- return html
- }
+ "CACHED_IMAGES": fs.readdirSync(path.join(__dirname, "cached")).length.toString(),
+ "ACTIVITIES": activityToHTML.activitiesToHTML(lanyardData)
}
- //
-
replacers.ALL_KEYWORDS = "{" + Object.keys(replacers).join("}{") + "} "
while (html.includes("{PATH_")) {
@@ -200,33 +171,10 @@ function converter(html) {
var endContent = element.content.substring(termIndex + termKey.length, spanEnd)
- var spanStart = element.content.substring(0, termIndex).lastIndexOf(" ") + 1
- var startContent = element.content.substring(spanStart - 1, termIndex)
-
- var style = termProps.style || ""
- var classes = termProps.classes || ""
-
- if (termProps.color) {
- style += `color: ${termProps.color};`
- }
-
- if (termProps.italicized) {
- style += "font-style: italic;"
- }
-
- if (termProps.bold) {
- classes += "bold"
- }
-
- if (style.length > 2) {
- style = `style="${style}"`
- }
-
- if (classes.length > 2) {
- classes = `class="${classes}"`
- }
-
- var replacement = `${startContent + highTable[index] + endContent}`
+ var spanStart = element.content.substring(0, termIndex).lastIndexOf(" ")
+ var startContent = element.content.substring(spanStart, termIndex)
+
+ var replacement = `${startContent + highTable[index] + endContent}`
element.content = element.content.substring(0, spanStart) + replacement + element.content.substring(spanEnd)
}
@@ -307,7 +255,7 @@ async function updateCommits() {
var commits = siteResponse.substring(0, siteResponse.indexOf("Commits"))
commits = commits.substring(commits.lastIndexOf("") + 3, commits.lastIndexOf(""))
- // ^ this works for Forgejo (basically everything i use that isnt Github, E.G. Codeberg)
+ // ^ this works for Forgejo (basically everything i use that isnt Github E.G. Codeberg)
// commits = commits.substring(commits.lastIndexOf(">") + 1)
// ^ This works for Github (fuck you Github)
diff --git a/static/main.js b/static/main.js
index ce0bb12..a8648c4 100644
--- a/static/main.js
+++ b/static/main.js
@@ -18,27 +18,15 @@ const discStatuses = {
}
const spinSpeed = 30
-var spinFactor = 3
-
-var date = new Date()
-
-var teto = false
-
-if (date.getDay() == 2) {
- teto = true
-}
var pfp
-var music
-
-if (teto) {
- music = new Audio("/snds/Triple Baka.ogg")
-} else {
- music = new Audio("/snds/Lotus Waters.ogg")
-}
-
+var music = new Audio("/snds/Lotus Waters.ogg")
+music.preservesPitch = false
music.loop = true
+music.playbackRate = 0
+// var whipLash = new Audio("/snds/johnny-test-whip-crack.mp3")
+// whipLash.volume = 0.25
var sock
@@ -66,17 +54,12 @@ function spinLoop() {
spinWaiting = false
if (spinning) {
music.volume = 0.5
- if (music.currentTime > 6.5 && teto) {
- spinFactor = 0.25
- } else {
- spinFactor = 3
- }
- // music.playbackRate = lerp(music.playbackRate, 1, 1/spinSpeed)
+ music.playbackRate = lerp(music.playbackRate, 1, 1/spinSpeed)
if (spins > 1) {
document.querySelector(".spinnyCount").style.display = "block"
document.querySelector(".localSpins").innerHTML = Math.ceil(spins - 1);
}
- spins += 1/spinSpeed / spinFactor
+ spins += 1/spinSpeed / 3
if (Math.floor(spins) != lastSent && sock && sock.OPEN) {
document.querySelector(".globalSpins").innerHTML = globalSpins + 1
lastSent = Math.floor(spins)
@@ -85,9 +68,8 @@ function spinLoop() {
console.log("Spin Sent!")
}
} else {
- // music.playbackRate = lerp(music.playbackRate, 0.5, 1/spinSpeed)
- music.pause()
- music.currentTime = 1.5
+ music.playbackRate = lerp(music.playbackRate, 0.5, 1/spinSpeed)
+ music.volume = lerp(music.volume, 0, 1/spinSpeed * 4)
spins = lerp(spins, Math.round(spins), 1 / spinSpeed * 3)
}
document.querySelector(".pfp").style.rotate = (spins * 360) + "deg"
diff --git a/static/socials/index.html b/static/socials/index.html
index 6e207f9..fc22499 100644
--- a/static/socials/index.html
+++ b/static/socials/index.html
@@ -31,13 +31,12 @@
Here's most of the sites you can find me on-
if you needed that for some reason?
@@ -64,7 +63,7 @@
Steam: {Violet}
Roblox: @bingus_violet
- -->
+
diff --git a/static/stats/index.html b/static/stats/index.html
index a367cc8..b4dab19 100644
--- a/static/stats/index.html
+++ b/static/stats/index.html
@@ -37,7 +37,6 @@
- Page generation time: {LOAD_TIME}
- Uptime: {UPTIME}
- - Last Lanyard update: {LAST_LANYARD}
diff --git a/static/style.css b/static/style.css
index ddc5f4e..b56c785 100644
--- a/static/style.css
+++ b/static/style.css
@@ -328,7 +328,7 @@ em, b, s {
color: inherit;
}
-b, b > *, .activityTitle, .activityTitle > *, .bold {
+b, b > *, .activityTitle, .activityTitle > * {
font-family: "RubikBold", Verdana, Geneva, Tahoma, sans-serif;
}