Skip to content

Commit

Permalink
Merge pull request #47 from minidogg/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
minidogg authored Apr 9, 2024
2 parents 904c813 + 644d9f5 commit 29ebcb0
Show file tree
Hide file tree
Showing 33 changed files with 812 additions and 293 deletions.
23 changes: 0 additions & 23 deletions crapmessages.js

This file was deleted.

8 changes: 5 additions & 3 deletions credits.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@
<h1 class="section-title">Credits</h1>
<div class="content">
<p>Lead Developer: <a href="https://github.com/minidogg">UnluckyCrafter</a></p>
<li>2nd Developer: <a href="https://github.com/abstractmelon">Abstract Melon</a></li>
<li>CSS: <a href="https://github.com/reallybaddeveloper">Really Bad Dev</a></li>
<br>
<p>Contributors:</p>
<ul>
<li><a href="https://github.com/abstractmelon">Abstract Melon</a></li>
<li><a href="https://github.com/reallybaddeveloper">Really Bad Dev</a></li>
<li><a href="https://github.com/codemob-dev">Codemob</a></li>
</ul>
<br>
<p>why am i in contributors i wanna be 3rd developer adasdafsfsafasfsdfadsfa - Codemob</p>
<br>
<p>
Music and Sound Effects by <a href="https://github.com/abstractmelon">Abstractmelon</a>
Music and Sound Effects by <a href="https://github.com/abstractmelon">Abstractmelon</a>
</p>
<br>
</div>
Expand Down
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ <h1>Welcome to Warehouse INC</h1>
</div>

<div id="crapOfTheDay">
<span style="font-size: 4vmin;color: #a6a7cf;">Quote of the day:</span><br>
<span style="font-size: 4vmin;color: #a6a7cf;">Quote of the minute:</span><br>
<span id="crapContents" style="font-size: 3vmin;"></span>
</div>

<script src="crapmessages.js"></script>
<script src="./src/data/crapmessages.js"></script>

<script>
const firstCrapDate = new Date(2024, 2, 28);
let daysSinceCrapCreation = Math.floor((new Date() - firstCrapDate) / (1000 * 3600 * 24));
let daysSinceCrapCreation = Math.floor((new Date() - firstCrapDate) / (1000 * 60)); // et daysSinceCrapCreation = Math.floor((new Date() - firstCrapDate) / (1000 * 3600 * 24));
const crapContents = document.getElementById("crapContents");

crapContents.innerHTML = crapMessages[daysSinceCrapCreation % crapMessages.length];
Expand Down
1 change: 1 addition & 0 deletions log.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# Logging stuff for better collab
existing - Codemob
143 changes: 143 additions & 0 deletions src/WinStuff/win.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Credits</title>
<style>
body {
margin: 0;
background: linear-gradient(36deg, #3a3a3a, #1b1b1b); /* Set background gradient here */
padding: 0;
background-image: url(../images/credits.jpg);
background-size: cover;
overflow: hidden;
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
}

.credits-container {
position: absolute;
top: 0;
left: 50%;
transform: translate(-50%, 100%);
background-color: rgba(0, 0, 0, 0.8);
color: #fff;
padding: 20px;
border: 2px solid #fff;
max-width: 30%;
overflow-y: hidden;
animation: scrollUp 35s linear forwards;
}

@keyframes scrollUp {
0% {
transform: translate(-50%, 40%);
}
100% {
transform: translate(-50%, -100%);
}
}

.container {
padding: 20px;
}

.section {
margin-bottom: 40px;
border-bottom: 1px solid #fff;
padding-bottom: 20px;
}

.section-title {
font-size: 32px;
margin-bottom: 20px;
text-transform: uppercase;
color: #ffd700;
font-weight: bold;
text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
}

.content {
line-height: 1.6;
}

.content a {
color: rgb(244, 255, 95);
text-decoration: none;
transition: color 0.3s ease;
}

.content a:hover {
color: #ffd700;
}

.content p {
margin-bottom: 15px;
}

.content ul {
list-style-type: none;
padding: 0;
}

.content ul li:before {
content: "•";
color: #ffd700;
display: inline-block;
width: 1em;
margin-left: -1em;
font-size: 1.2em;
}

.content ul li {
margin-bottom: 5px;
padding-left: 1em;
}
</style>
</head>
<body>
<div class="credits-container">
<div class="container">
<div class="section">
<h1 class="section-title">Credits</h1>
<div class="content">
<p>Lead Developer: <a href="https://github.com/minidogg">UnluckyCrafter</a></p>
<p>2nd Developer: <a href="https://github.com/abstractmelon">Abstract Melon</a></p>
<p>CSS: <a href="https://github.com/reallybaddeveloper">Really Bad Dev</a></p>
<p>Contributors:</p>
<ul>
<li><a href="https://github.com/codemob-dev">Codemob</a></li>
<li><a href="">DangerDragon244</a></li>
</ul>
<p>Music and Sound Effects by <a href="https://github.com/abstractmelon">Abstractmelon</a></p>
<p>Art by <a href>Shadow Dev</a></p>
<p>Inspiration by:</p>
<ul>
<li>Toki</a></li>
<li>Ed</a></li>
</ul>
<p>Based off of cookie clicker</p>
<p>Made by a few friends on discord.</p>
</div>
</div>

<div class="section">
<h2 class="section-title">Future</h2>
<div class="content">
<p>Your supplies went on to create one of the most famous bakerys ever, the poeple owning the bakery found out how to click and cookie and have it duplacate. Your supplies then went on to help all of the other cookie companies</p>
</div>
</div>

<div class="section">
<h2 class="section-title">The end....</h2>
<h6>or is it?</h6>
</div>
</div>
</div>

<audio autoplay loop>
<source src="../sfx/music/WinMusic.mp3" type="audio/mp3">
Your browser does not support the audio element.
</audio>
</body>
</html>
1 change: 1 addition & 0 deletions src/WinStuff/win.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 74 additions & 0 deletions src/data/crapmessages.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
const crapMessages = [
'cool feature, huh? :3',
'Harmony harmony = new harmony - melon, 2024',
'\"[singing] npmrundev, npmrundev, npmrundev ... [loudly] LETS GOO IT ALL RUNS OFF OF AN API!!! AND ITS NAME IS BOB!!! npmrundev, npmrundev, npm, run, dev.\" - @ǝlʎʞ :3, 2024',
'\"i eat chiwdwen\" - @uɐƃo˥, 2024',
'Did you know that 9/11 was great horrible?',
'<span style="color:#6bc5b9; font-size:8vmin; font-family:\'Comic Sans MS\', \'Comic Sans\', cursive">E</span>',
'you like kissing boys, <span style="font-size:4vmin;">don\'t you?</span> (owo)',
'<span style="color:#6bc5b9; font-family:\'Comic Sans MS\', \'Comic Sans\', cursive">Comic sans is the superior font</span>',
'Please don\'t look at quotes\" -@ʌǝp pɐq ʎllɐǝɹ :3 2024',
'\"OMG DONT SCROLL UP\" -@ʌǝp pɐq ʎllɐǝɹ :3 2024',
'\"erm \"I mean there\'s mayonnaise cakes, I don\'t know why there wouldn\'t be mayonnaise cookies.\"* they exist\" - d_zrugger :3 — 03/27/2024 3:57 PM',
'\"I\'m fine. I\'m just having a bit of a seisure.\" - @ʌǝp pɐq ʎllɐǝɹ :3 2024',
'\"WHY IS EVERYONE TYPING\" - @ʌǝp pɐq ʎllɐǝɹ :3 2024',
'\"very loud wooshing noises\" @mackywater! 2024',
'\"\"WHY IS EVERYONE TYPING\" - @Beally Dad Rev :3 2024\" - @Codemob 2024',
'\"Its fumkin WIMDHU\" - @mackywater! 2024',
'\"woooshshhshshhhhehrhhrheherhehhhhsrhhshrhrshsrhrsrhsshrhshshrhshsrhrshhsrhsrhsrhr....\" @mackywater! , 2024',
'\"mackywater transcends space and time as his mic becomes a wind turbine and a rocket launch simultaneously rfrsfhfrgfhrghrgfhrghfrfhrfffrhfrhwfwwwwwwffwfhwwhsghwshsw\" - @mackywater!, 2024',
'\"i was about to take a picture of your brother\" - @uɐƃo˥ 2024',
'\"bopl battle theme\" - @MatchBox 2024',
'\"I swear im straight\" - @ʌǝp pɐq ʎllɐǝɹ :3 2024',
'\"I want people. I will eat people\" - @ʌǝp pɐq ʎllɐǝɹ :3 2024',
'\"[in a british accent] Why did you make my thing a quote?\" - @ʌǝp pɐq ʎllɐǝɹ :3 2024',
'\"eats mic\" - @Codemob 2024',
'\"Ill bang it by the end of today\" @mackywater! 2024',
'\"💀\" - @uɐƃo˥ 2024',
'\"sugarsguusergsurgsrugsrug\" - @Codemob 2024',
'\"Mass homicide :3\" - @uɐƃo˥ 2024',
'\"What was that abt again? :3\"',
'\"multi-author mod support with the bot :3\"',
'\"I wanna kms :33\" @mackywater! 2024',
'\"can confirm\"',
'\"you still use comic sans is that\"',
'\"Bruh\"',
'\"yeah\"',
'\"💀\" - @uɐƃo˥ 2024',
'\"I want your children, give me your children\"',
'\"Where are we hiding the bodies, I need bodies\"',
'\"I dont want bodies I need bodies\"',
'\"Straight as a protractor\" - @d_zrugger :3 2024',
'\"dead bodies are fun to bury\"',
'\"its growing\"',
'\"there are dangers in not saying who you are quoting\"',
'\"i forgor\"',
'\"time to grind on some kids\"',
'\"i have inverted my white hole\" @ǝlʎʞ :3 2024',
'\"I will invert your white hole, manually\" @Ninji :3 | #1 Hu Tao lover 2024',
'\"you know i\'m in your asshole right\" @Ninji :3 | #1 Hu Tao lover',
'\"by manually i mean hands on\" @Ninji :3 | #1 Hu Tao lover',
'\"Make it a Macky Water\"',
'\"can confirm\"',
'\"you cant clip my cock if i\'ve already clipped yours\" @Ninji :3 | #1 Hu Tao lover 2024',
'\"Where are your kidneys\" @ʌǝp pɐq ʎllɐǝɹ :3',
'\"daddy uwu fr\" @Ninji :3 | #1 Hu Tao lover 2024',
'\"Hey david, do you remember the measurements for how big it is? - @uɐƃo˥ 2024',
'\"eat children :3\" - @ʌǝp pɐq ʎllɐǝɹ :3 2024',
'\"I love watching things explode\" - @ǝlʎʞ :3, 2024',
'\"Am car in\" - @mackywater!, 2024',
'\"my name is logen\" - @uɐƃo˥ , 2024',
'\"I love being part of the cartel\" - @ʌǝp pɐq ʎllɐǝɹ :3 2024',
'\"Boo wacky, I though you were using gun :(\" - @ǝlʎʞ :3, 2024',
'\"sounds like racism but less racist\" - @uɐƃo˥ 2024',
'\"congrats obstrust on getting trial mod\" - b_zuzzard, 2024',
'\"okay you can start pushing and pulling now\" -@ǝlʎʞ :3, 2024',
'\"i dont get the purpes of people\" - @uɐƃo˥ , 2024',
'\"and its big :(\" - @ǝlʎʞ :3, 2024',
'\"im just doing shit\" - @ʌǝp pɐq ʎllɐǝɹ :3 2024',
'\"I love chomping on big oily men\" - @ʌǝp pɐq ʎllɐǝɹ :3 2024',
'\"It\'s coming out\" - @ʌǝp pɐq ʎllɐǝɹ :3 2024',
'\"balls\" - @ʌǝp pɐq ʎllɐǝɹ :3 2024',
"<span style='color:#800000; font-weight:bold; '>int</span> age <span style='color:#808030; '>=</span> just a number <span style='color:#ba6ca1; '>:3</span>",
'"alberts got a blowtorch" - gordon ramsay, 2024'
];
Empty file added src/data/credits.txt
Empty file.
1 change: 1 addition & 0 deletions src/data/lore.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
stuff goes here
4 changes: 4 additions & 0 deletions src/data/news.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
const newsData = [
{ threshold: 100, content: "News for users with less than 100 sugar" },
{ threshold: 500, content: "News for users with less than 500 sugar" },
];
Binary file added src/images/credits.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/warehouseicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 20 additions & 25 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<link rel="stylesheet" href="stylesheets/notification.css">
<link rel="stylesheet" href="stylesheets/popup.css">
<link rel="stylesheet" href="stylesheets/shop.css">
<link rel="stylesheet" href="stylesheets/topbar.css">

<link rel="icon" type="image/x-icon" href="./images\favicon.ico">
</head>
Expand All @@ -38,6 +39,16 @@ <h1 id="popupHeader">Sussy baka?</h1>
</div>
<button id="popupSubmit">Submit</button>
</div>

<div class="containerWrapper">
<div class="topBar">
<div class="versionInfo">
<p>Warehouse inc <span id="versionNumber">versionNumber</span></p>
</div>
<div id="newsFeed" class="newsFeed"></div>
</div>
</div>


<div class="leftContainer">
<!-- some stuff related to collecting resources -->
Expand All @@ -49,6 +60,8 @@ <h1 id="companyName" class="coolFade">Loading...</h1>
<p class="coolFade resourceCount">Auto Collect Per Second: <span id="ppsCount">0</span></p>
<p class="coolFade resourceCount">Sugar Ready For Collecting: <span id="uncollectedCount">0</span></p>
<button id="clickButton" onclick="sugar.collectSugar();">Collect Sugar</button>
<img src="./images/warehouseicon.png" alt="Clickable Image" onclick="game.sugar += 100;" class="warehouseicon" style="cursor:pointer;">

</span>

</div>
Expand All @@ -74,6 +87,9 @@ <h1 class="coolFade titlebar">Settings</h1>
</div>
</div>
</div>
<div>
<h1 class="coolFade titlebar">Upgrades</h1>
</div>
<div class="rightContainer">
<!-- some stuff related to buying most thing should be here -->
<div class="buyContainer">
Expand All @@ -97,8 +113,8 @@ <h1 class="buyOptionName">Delivery Truck</h1>
</script>

<button id="mainMenuButton" onclick="mainMenuButton()"><div class="burguerer"></div><div class="burguerer"></div><div class="burguerer"></div></button>
<button id="resetBtn" style="bottom: 65px !important;" onclick="saving.save()">Save</button>
<button id="resetBtn" onclick="saving.resetSave()">Reset</button>
<button id="resetBtn" style="bottom: 70px !important;" onclick="saving.save()">Save</button>
<div class="save-icon"></div>
<div class="notification-container"></div>

Expand Down Expand Up @@ -127,31 +143,10 @@ <h1 class="buyOptionName">Delivery Truck</h1>
<script src="scripts/shopitems.js"></script>
<script src="scripts/resources.js"></script>
<script src="scripts/shop.js"></script>
<!-- <script src="scripts/sounds.js"></script> -->
<script src="scripts/sounds.js"></script>
<script src="scripts/menu.js"></script>
<!-- <script type="module" src="scripts/news.js"></script> -->

<script>
var bgMusic = [
'/music/ConceptualFruit.mp3',
'/music/ThemeBGheavy.mp3'
];

const randomMusic = bgMusic[Math.floor(Math.random() * bgMusic.length)];

var finalMusic = new Audio(`./sfx/${randomMusic}`);

document.addEventListener("DOMContentLoaded", function() {
finalMusic.play();
});
/*
const bgMusic = new Audio('./sfx/music/ThemeBGheavy.mp3');
document.addEventListener("DOMContentLoaded", function() {
bgMusic.loop = true;
bgMusic.play();
});
*/
</script>

<!-- This should always be the last script/element here -->
<script>
Expand All @@ -162,4 +157,4 @@ <h1 class="buyOptionName">Delivery Truck</h1>
console.log("Haha E!")
</script>
</body>
</html>
</html>
Loading

0 comments on commit 29ebcb0

Please sign in to comment.