From 05a4fcc9848ea1fb9feb5b5bfb7a2733dec3ce40 Mon Sep 17 00:00:00 2001 From: RaindropsSys Date: Fri, 21 Jul 2023 23:00:41 +0200 Subject: Updated 10 files and added 11 files (automated) --- assets/icons/new/emergency.svg | 1 + assets/icons/new/front.svg | 1 + assets/icons/new/letters.svg | 1 + assets/icons/new/pleasure.svg | 1 + assets/icons/new/species.svg | 1 + assets/icons/new/splitting.svg | 1 + assets/icons/new/wakeup.svg | 1 + assets/logo/newlogo-ng.png | Bin 0 -> 101963 bytes assets/species/deer-plush.png | Bin 0 -> 6143 bytes assets/species/deer-robot.png | Bin 0 -> 6143 bytes assets/species/deer.png | Bin 0 -> 6143 bytes includes/components/2023ui.inc | 2 +- includes/components/header.inc | 2 +- includes/components/pleasure.inc | 40 +++------------------------------------ includes/fragments/metadata.inc | 2 ++ includes/pages.json | 2 +- includes/util/banner.inc | 2 ++ pages/alerts.inc | 23 ++++++++++++++++++++++ pages/byspecies.inc | 5 ++++- pages/home.inc | 19 +++++++++++++++++-- pages/lists.inc | 16 ++++++++++++++++ 21 files changed, 77 insertions(+), 43 deletions(-) create mode 100644 assets/icons/new/emergency.svg create mode 100644 assets/icons/new/front.svg create mode 100644 assets/icons/new/letters.svg create mode 100644 assets/icons/new/pleasure.svg create mode 100644 assets/icons/new/species.svg create mode 100644 assets/icons/new/splitting.svg create mode 100644 assets/icons/new/wakeup.svg create mode 100644 assets/logo/newlogo-ng.png create mode 100644 assets/species/deer-plush.png create mode 100644 assets/species/deer-robot.png create mode 100644 assets/species/deer.png diff --git a/assets/icons/new/emergency.svg b/assets/icons/new/emergency.svg new file mode 100644 index 0000000..84b3b5a --- /dev/null +++ b/assets/icons/new/emergency.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/new/front.svg b/assets/icons/new/front.svg new file mode 100644 index 0000000..f72d52d --- /dev/null +++ b/assets/icons/new/front.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/new/letters.svg b/assets/icons/new/letters.svg new file mode 100644 index 0000000..91d00ed --- /dev/null +++ b/assets/icons/new/letters.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/new/pleasure.svg b/assets/icons/new/pleasure.svg new file mode 100644 index 0000000..64bfbaa --- /dev/null +++ b/assets/icons/new/pleasure.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/new/species.svg b/assets/icons/new/species.svg new file mode 100644 index 0000000..4e575c9 --- /dev/null +++ b/assets/icons/new/species.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/new/splitting.svg b/assets/icons/new/splitting.svg new file mode 100644 index 0000000..74cda1d --- /dev/null +++ b/assets/icons/new/splitting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/icons/new/wakeup.svg b/assets/icons/new/wakeup.svg new file mode 100644 index 0000000..08cf946 --- /dev/null +++ b/assets/icons/new/wakeup.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/logo/newlogo-ng.png b/assets/logo/newlogo-ng.png new file mode 100644 index 0000000..78f7bc8 Binary files /dev/null and b/assets/logo/newlogo-ng.png differ diff --git a/assets/species/deer-plush.png b/assets/species/deer-plush.png new file mode 100644 index 0000000..d43fa35 Binary files /dev/null and b/assets/species/deer-plush.png differ diff --git a/assets/species/deer-robot.png b/assets/species/deer-robot.png new file mode 100644 index 0000000..d43fa35 Binary files /dev/null and b/assets/species/deer-robot.png differ diff --git a/assets/species/deer.png b/assets/species/deer.png new file mode 100644 index 0000000..d43fa35 Binary files /dev/null and b/assets/species/deer.png differ diff --git a/includes/components/2023ui.inc b/includes/components/2023ui.inc index 556a8b5..81022d5 100644 --- a/includes/components/2023ui.inc +++ b/includes/components/2023ui.inc @@ -2,7 +2,7 @@
- + Cold Haze Beta diff --git a/includes/components/header.inc b/includes/components/header.inc index 0fa60ae..fdae55a 100644 --- a/includes/components/header.inc +++ b/includes/components/header.inc @@ -70,7 +70,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/util/functions.inc"; <?= $title && $title !== "-" ? $title . " · " : "" ?>Cold Haze - .png" type="image/png"> + .png" type="image/png"> .css" rel="stylesheet"> style="background-color: #000;" style="background-color: var(--palette-1);"> diff --git a/includes/components/pleasure.inc b/includes/components/pleasure.inc index 0939228..b9f9cd0 100644 --- a/includes/components/pleasure.inc +++ b/includes/components/pleasure.inc @@ -1,6 +1,6 @@ -

Sex alert +

Pleasure alert
· @@ -9,7 +9,7 @@
- Notice: Only can use the sex alert. If you wish to wake somepony up, use the wake-up alert instead. + Notice: Only can use the pleasure alert. If you wish to wake somepony up, use the wake-up alert instead.
@@ -45,43 +45,9 @@ - 19) { - $day = date('Y-m-d', time() + 86400); -} else { - $day = date('Y-m-d'); -} - -if (isset($school[$day]) && $school[$day]["firstClass"]["timestamp"] < time() * 1000) { - $day = date('Y-m-d', time() + 86400); -} - -if (!isset($school[$day])) { - echo('
No information about Raindrops\'s school schedule for ' . date('F jS', strtotime($day)) . ' currently, try again later.
'); -} elseif (isset($school[$day]["firstClass"]["timestamp"])) { - $tod = round($school[$day]["firstClass"]["timestamp"] / 1000) - strtotime($day); - $hours = $tod / 3600; - $time = date('g:i a', $tod); - - if ($hours < 8.5) { - echo('
Raindrops starts school at ' . $time . ' (local time) tomorrow (' . date('F jS', strtotime($day)) . '), it is recommended that you don\'t wake them up to have sex.
'); - } else if ($hours < 9.5) { - echo('
Raindrops starts school at ' . $time . ' (local time) tomorrow (' . date('F jS', strtotime($day)) . '), they can be wakened up at night to have sex for at most an hour.
'); - } else { - echo('
Raindrops starts school at ' . $time . ' (local time) tomorrow (' . date('F jS', strtotime($day)) . '), they can be wakened up at night to have sex for over an hour.
'); - } -} else { - echo('
Raindrops does not have school tomorrow (' . date('F jS', strtotime($day)) . '), they can be wakened up at night to have sex for as long as you wish.
'); -} - -?> - class="disabled" data-bs-target="#turn-on" id="btn-on" style="background: #7f0000;font-size: 48px;padding: 10px 50px;border-radius: 10px;width: max-content;display: block;margin-left: auto;margin-right: auto;cursor: pointer;">Turn ON -

Sending next notification never · Local time for Raindrops: --:--
Make sure you run the /sex command on the server before turning the alert on.

+

Sending next notification never · Local time for Raindrops: --:--

+ + +
Wake-up alert
+
+ +
Pleasure alert
+
+

diff --git a/pages/byspecies.inc b/pages/byspecies.inc index 294dee7..4a9ce66 100644 --- a/pages/byspecies.inc +++ b/pages/byspecies.inc @@ -31,6 +31,7 @@ function page() { global $lang; $merpony = []; $human = []; $kirin = []; + $deer = []; foreach ($members as $member) { foreach ($member["_metadata"]["species"] as $species) { @@ -44,6 +45,7 @@ function page() { global $lang; if ($species === "human") $human[] = $member; if ($species === "merpony") $merpony[] = $member; if ($species === "kirin") $kirin[] = $member; + if ($species === "deer") $deer[] = $member; } } @@ -53,7 +55,8 @@ function page() { global $lang; if (count($alicorn) > 0) species($alicorn, "alicorn", $lang["species"]["alicorn"][3]); if (count($batpony) > 0) species($batpony, "batpony", $lang["species"]["batpony"][3]); if (count($crystal) > 0) species($crystal, "crystal", $lang["species"]["crystal"][3]); - if (count($kirin) > 0) species($kirin, "kirin", "Kirin"); + if (count($deer) > 0 ) species($deer, "deer", "Deers"); + if (count($kirin) > 0) species($kirin, "kirin", "Kirins"); if (count($changeling) > 0) species($changeling, "changeling", "Changelings"); if (count($merpony) > 0) species($merpony, "merpony", "Merponies"); if (count($human) > 0) species($human, "human", "Humans"); diff --git a/pages/home.inc b/pages/home.inc index 18acaea..7485cfd 100644 --- a/pages/home.inc +++ b/pages/home.inc @@ -6,9 +6,12 @@ if (isset($_GET["ec"])) { require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/init.inc"; require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc'; global $readOnly; global $isNormallyLoggedIn; global $_PROFILE; global $lang; global $pages; global $isLowerLoggedIn; global $app; global $isLoggedIn; -function banner() { global $isLoggedIn; global $isLowerLoggedIn; $byColor = getMembersByColor(false, true); global $lang; ?> +global $use2023UI; + +function banner() { global $isLoggedIn; global $isLowerLoggedIn; $byColor = getMembersByColor(false, true); global $lang; global $use2023UI; ?>
- .png" style="width:128px;"> + .png" style="width:128px;" class="old-ui"> +

" style="height:32px;position:absolute;z-index:99;">

@@ -200,4 +203,16 @@ function members() { global $isLoggedIn; global $isLowerLoggedIn; global $app; ? ?>
+ + \ No newline at end of file diff --git a/pages/lists.inc b/pages/lists.inc index 2b507f4..c9baf06 100644 --- a/pages/lists.inc +++ b/pages/lists.inc @@ -9,6 +9,22 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/components/header.inc'; ?>
-- cgit