Skip to content

Commit

Permalink
remove puppy :o
Browse files Browse the repository at this point in the history
  • Loading branch information
@onlypuppy7
onlypuppy7 committed Oct 9, 2024
1 parent bb6312a commit 3236339
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 18 deletions.
18 changes: 9 additions & 9 deletions server-client/src/client-static/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
<link rel="icon" type="image/png" href="/favicon.png">
<meta charset="UTF-8" />
<meta name="description"
content="Welcome to Shell Shockers, the world's most advanced egg-based multiplayer shooter! It's like your favorite battlefield game but... with eggs." />
<meta property="og:url" content="https://www.legacy.onlypuppy7.online" />
content="Welcome to LegacyShell, the world's most advanced egg-based private server! It's like your favorite egg-based multiplayer shooter but... older!" />
<meta property="og:url" content="https://LEGACYSHELLCLIENTURL" />
<meta property="og:type" content="website" />
<meta property="og:title" content="LegacyShell | Play in your browser for Free!" />
<meta property="og:description"
content="Welcome to LegacyShell, the world's most advanced egg-based multiplayer shooter! It's like your favorite egg shooter but... older!" />
<meta property="og:image" content="https://www.legacy.onlypuppy7.online/img/shellshockers_egglife.jpg" />
content="Welcome to LegacyShell, the world's most advanced egg-based private server! It's like your favorite egg-based multiplayer shooter but... older!" />
<meta property="og:image" content="https://LEGACYSHELLCLIENTURL/img/logo.png" />
<link rel="manifest" href="/manifest.json" />


Expand All @@ -31,7 +31,7 @@
["game_subtitle", "Play in your browser for Free!"],
["game_description", "Welcome to Shell Shockers, the world's most advanced egg-based multiplayer shooter! It's like your favorite battlefield game but... with eggs."],
[null],
["game_specialmessage_hide", "Testing timed rounds and other things at <a href=\\\"http:\/\/dev.legacy.onlypuppy7.online\\\">dev.legacy.onlypuppy7.online<\/a>!"],
["game_specialmessage_hide", "Testing timed rounds and other things at <a href=\\\"http:\/\/dev.shellshock.io\\\">dev.shellshock.io<\/a>!"],
[null],
[""],
[null],
Expand Down Expand Up @@ -94,7 +94,7 @@
[null],
["---------------------- Feedback -----------------------"],
[null],
["ui_feedback_line1", "Please check the <a href=\"https:\/\/legacy.onlypuppy7.online\/faq.html?v=1\" target=\"_window\">FAQ<\/a> before submitting. Your question or issue may have already been addressed!"],
["ui_feedback_line1", "Please check the <a href=\"https:\/\/LEGACYSHELLCLIENTURL\/faq.html?v=1\" target=\"_window\">FAQ<\/a> before submitting. Your question or issue may have already been addressed!"],
["ui_feedback_line2", "Your email address will never be distributed!"],
["ui_feedback_opt_questions", "Comments & Questions"],
["ui_feedback_opt_features", "Feature Requests"],
Expand Down Expand Up @@ -279,7 +279,7 @@
{
"@context": "http://schema.org",
"name": "Shell Shockers | Play in your browser for Free!",
"url": "https://legacy.onlypuppy7.online",
"url": "https://LEGACYSHELLCLIENTURL",
"sameAs": ["https://www.facebook.com/ShellShockersGame", "https://twitter.com/eggcombat"],
"description": "Welcome to Shell Shockers, the world's most advanced egg-based multiplayer shooter! It's like your favorite battlefield game but... with eggs.",
"@type": "VideoGame",
Expand All @@ -304,7 +304,7 @@
<!-- AdInPlay (BLOAT) -->
<meta name="viewport"
content="minimal-ui, user-scalable=no, initial-scale=1, maximum-scale=1, width=device-width" />
<!-- <script async src="//api.adinplay.com/libs/aiptag/pub/SSK/legacy.onlypuppy7.online/tag.min.js"></script> -->
<!-- <script async src="//api.adinplay.com/libs/aiptag/pub/SSK/LEGACYSHELLCLIENTURL/tag.min.js"></script> -->
<!-- <script>
var aiptag = aiptag || {};
aiptag.cmd = aiptag.cmd || [];
Expand Down Expand Up @@ -396,7 +396,7 @@
<!-- Feedback -->
<div id="feedback" class="hideme">

<p>Please check the <a href="https://legacy.onlypuppy7.online/faq.html?v=1" target="_window">FAQ</a> before
<p>Please check the <a href="/faq.html?v=0" target="_window">FAQ</a> before
submitting. Your question or issue may have already been addressed!</p>
<p>Your email address will never be distributed!</p>

Expand Down
14 changes: 7 additions & 7 deletions server-client/src/client-static/src/servers.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ if (location.hostname.startsWith('localhost')) {
servers.push({ name: 'local', address: 'localhost:LEGACYSHELLWEBSOCKETPORT' });
}

// if (location.hostname.startsWith('staging.legacy.onlypuppy7.online')) {
// if (location.hostname.startsWith('staging.shellshock.io')) {
// debug = true;
// servers = [{ name: 'Staging', address: 'staging.legacy.onlypuppy7.online:443' }];
// servicesServer = 'ws://staging.legacy.onlypuppy7.online:4242/';
// servers = [{ name: 'Staging', address: 'staging.shellshock.io:443' }];
// servicesServer = 'ws://staging.shellshock.io:4242/';
// }

// if (location.hostname.startsWith('dev.legacy.onlypuppy7.online')) {
// servers = [{ name: 'Dev (US West)', address: 'gamedev.legacy.onlypuppy7.online:443' }];
// servicesServer = 'ws://dev.legacy.onlypuppy7.online/services/:443';
// if (location.hostname.startsWith('dev.shellshock.io')) {
// servers = [{ name: 'Dev (US West)', address: 'gamedev.shellshock.io:443' }];
// servicesServer = 'ws://dev.shellshock.io/services/:443';
// }

// if (location.hostname.startsWith('localshelldev')) {
// servers = [
// { name: 'Local VM', address: 'localshelldev.bluewizard.com:443' },
// // { name: 'US West', address: 'uswest2.legacy.onlypuppy7.online:443' }
// // { name: 'US West', address: 'uswest2.shellshock.io:443' }
// ];

// servicesServer = 'ws://localshelldev.bluewizard.com:4242/';
Expand Down
4 changes: 2 additions & 2 deletions server-client/src/client-static/src/shellshock.min.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2090,8 +2090,8 @@ function onPageLoaded () {
document.exitPointerLock = document.exitPointerLock || document.mozExitPointerLock || document.webkitExitPointerLock;
var str = "",
missingFeatures = 0;
BABYLON.Engine.isSupported() || (str += '<li>WebGL (<a href="https://legacy.onlypuppy7.online/faq.html#webgl" target="_window">More info</a>)', missingFeatures++);
(!document.exitPointerLock || 0 <= navigator.userAgent.indexOf("10.1.2 Safari")) && (str += '<li>Pointer Lock (<a href="https://legacy.onlypuppy7.online/faq.html#pointerlock" target="_window">More info</a>)', missingFeatures++);
BABYLON.Engine.isSupported() || (str += '<li>WebGL (<a href="'+location.href+'faq.html#webgl" target="_window">More info</a>)', missingFeatures++);
(!document.exitPointerLock || 0 <= navigator.userAgent.indexOf("10.1.2 Safari")) && (str += '<li>Pointer Lock (<a href="'+location.href+'faq.html#pointerlock" target="_window">More info</a>)', missingFeatures++);
localStorage || (str += "<li>LocalStorage", missingFeatures++);
void 0 === new KeyboardEvent("").key && (str += "<li>KeyboardEvent.key", missingFeatures++);

Expand Down
1 change: 1 addition & 0 deletions server-client/src/prepare-modified.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ function prepareModified(ss) {
htmlContent = htmlContent.replace(/LEGACYSHELLDISCORDSERVER/g, ss.config.client.discordServer);
htmlContent = htmlContent.replace(/LEGACYSHELLGITHUB/g, ss.config.client.githubURL);
htmlContent = htmlContent.replace(/LEGACYSHELLSYNCURL/g, ss.config.client.sync_server);
htmlContent = htmlContent.replace(/LEGACYSHELLCLIENTURL/g, ss.config.client.this_url);
htmlContent = htmlContent.replace(/LEGACYSHELLCONFIG/g, ss.distributed_config.replace(/\n/g, '<br>'));

fs.writeFileSync(destinationHtmlPath, htmlContent, 'utf8');
Expand Down
1 change: 1 addition & 0 deletions src/defaultconfig.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# config.yaml, yep
client:
sync_server: "ws://localhost:13371" #this is basically the services server. but its not! this is what the client server will internally use to retrieve its configs and shit. in theory the sync server could put in a different services URL entirely! anyway, if the client and services servers are both running on the same machine, you can keep this as localhost.
this_url: "legacy.onlypuppy7.online" #used in some find and replaces. input the url you want people to access your site via.
port: 13370

services:
Expand Down

0 comments on commit 3236339

Please sign in to comment.