diff --git a/WebHostLib/__init__.py b/WebHostLib/__init__.py index 6d31ac15..2ebfe11c 100644 --- a/WebHostLib/__init__.py +++ b/WebHostLib/__init__.py @@ -70,6 +70,12 @@ app.url_map.converters["suuid"] = B64UUIDConverter app.jinja_env.filters['suuid'] = lambda value: base64.urlsafe_b64encode(value.bytes).rstrip(b'=').decode('ascii') +def get_world_theme(game_name: str): + if game_name in AutoWorldRegister.world_types: + return AutoWorldRegister.world_types[game_name].web.theme + return 'grass' + + @app.before_request def register_session(): session.permanent = True # technically 31 days after the last visit @@ -97,13 +103,13 @@ def weighted_settings(): # Player settings pages @app.route('/games//player-settings') def player_settings(game): - return render_template(f"player-settings.html", game=game) + return render_template(f"player-settings.html", game=game, theme=get_world_theme(game)) # Game Info Pages @app.route('/games//info/') def game_info(game, lang): - return render_template('gameInfo.html', game=game, lang=lang) + return render_template('gameInfo.html', game=game, lang=lang, theme=get_world_theme(game)) # List of supported games @@ -118,7 +124,7 @@ def games(): @app.route('/tutorial///') def tutorial(game, file, lang): - return render_template("tutorial.html", game=game, file=file, lang=lang) + return render_template("tutorial.html", game=game, file=file, lang=lang, theme=get_world_theme(game)) @app.route('/tutorial/') diff --git a/WebHostLib/static/assets/playerTracker.js b/WebHostLib/static/assets/lttp-tracker.js similarity index 100% rename from WebHostLib/static/assets/playerTracker.js rename to WebHostLib/static/assets/lttp-tracker.js diff --git a/WebHostLib/static/assets/tutorial/zelda3/msu1_en.md b/WebHostLib/static/assets/tutorial/A Link to the Past/msu1_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/zelda3/msu1_en.md rename to WebHostLib/static/assets/tutorial/A Link to the Past/msu1_en.md diff --git a/WebHostLib/static/assets/tutorial/zelda3/msu1_es.md b/WebHostLib/static/assets/tutorial/A Link to the Past/msu1_es.md similarity index 100% rename from WebHostLib/static/assets/tutorial/zelda3/msu1_es.md rename to WebHostLib/static/assets/tutorial/A Link to the Past/msu1_es.md diff --git a/WebHostLib/static/assets/tutorial/zelda3/msu1_fr.md b/WebHostLib/static/assets/tutorial/A Link to the Past/msu1_fr.md similarity index 100% rename from WebHostLib/static/assets/tutorial/zelda3/msu1_fr.md rename to WebHostLib/static/assets/tutorial/A Link to the Past/msu1_fr.md diff --git a/WebHostLib/static/assets/tutorial/zelda3/multiworld_de.md b/WebHostLib/static/assets/tutorial/A Link to the Past/multiworld_de.md similarity index 100% rename from WebHostLib/static/assets/tutorial/zelda3/multiworld_de.md rename to WebHostLib/static/assets/tutorial/A Link to the Past/multiworld_de.md diff --git a/WebHostLib/static/assets/tutorial/zelda3/multiworld_en.md b/WebHostLib/static/assets/tutorial/A Link to the Past/multiworld_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/zelda3/multiworld_en.md rename to WebHostLib/static/assets/tutorial/A Link to the Past/multiworld_en.md diff --git a/WebHostLib/static/assets/tutorial/zelda3/multiworld_es.md b/WebHostLib/static/assets/tutorial/A Link to the Past/multiworld_es.md similarity index 100% rename from WebHostLib/static/assets/tutorial/zelda3/multiworld_es.md rename to WebHostLib/static/assets/tutorial/A Link to the Past/multiworld_es.md diff --git a/WebHostLib/static/assets/tutorial/zelda3/multiworld_fr.md b/WebHostLib/static/assets/tutorial/A Link to the Past/multiworld_fr.md similarity index 100% rename from WebHostLib/static/assets/tutorial/zelda3/multiworld_fr.md rename to WebHostLib/static/assets/tutorial/A Link to the Past/multiworld_fr.md diff --git a/WebHostLib/static/assets/tutorial/zelda3/plando_en.md b/WebHostLib/static/assets/tutorial/A Link to the Past/plando_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/zelda3/plando_en.md rename to WebHostLib/static/assets/tutorial/A Link to the Past/plando_en.md diff --git a/WebHostLib/static/assets/tutorial/archipelago/advanced_settings_en.md b/WebHostLib/static/assets/tutorial/Archipelago/advanced_settings_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/archipelago/advanced_settings_en.md rename to WebHostLib/static/assets/tutorial/Archipelago/advanced_settings_en.md diff --git a/WebHostLib/static/assets/tutorial/archipelago/commands_en.md b/WebHostLib/static/assets/tutorial/Archipelago/commands_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/archipelago/commands_en.md rename to WebHostLib/static/assets/tutorial/Archipelago/commands_en.md diff --git a/WebHostLib/static/assets/tutorial/archipelago/plando_en.md b/WebHostLib/static/assets/tutorial/Archipelago/plando_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/archipelago/plando_en.md rename to WebHostLib/static/assets/tutorial/Archipelago/plando_en.md diff --git a/WebHostLib/static/assets/tutorial/archipelago/setup_en.md b/WebHostLib/static/assets/tutorial/Archipelago/setup_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/archipelago/setup_en.md rename to WebHostLib/static/assets/tutorial/Archipelago/setup_en.md diff --git a/WebHostLib/static/assets/tutorial/archipelago/triggers_en.md b/WebHostLib/static/assets/tutorial/Archipelago/triggers_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/archipelago/triggers_en.md rename to WebHostLib/static/assets/tutorial/Archipelago/triggers_en.md diff --git a/WebHostLib/static/assets/tutorial/archipelago/using_website_en.md b/WebHostLib/static/assets/tutorial/Archipelago/using_website_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/archipelago/using_website_en.md rename to WebHostLib/static/assets/tutorial/Archipelago/using_website_en.md diff --git a/WebHostLib/static/assets/tutorial/factorio/connect-to-ap-server.png b/WebHostLib/static/assets/tutorial/Factorio/connect-to-ap-server.png similarity index 100% rename from WebHostLib/static/assets/tutorial/factorio/connect-to-ap-server.png rename to WebHostLib/static/assets/tutorial/Factorio/connect-to-ap-server.png diff --git a/WebHostLib/static/assets/tutorial/factorio/factorio-download.png b/WebHostLib/static/assets/tutorial/Factorio/factorio-download.png similarity index 100% rename from WebHostLib/static/assets/tutorial/factorio/factorio-download.png rename to WebHostLib/static/assets/tutorial/Factorio/factorio-download.png diff --git a/WebHostLib/static/assets/tutorial/factorio/setup_en.md b/WebHostLib/static/assets/tutorial/Factorio/setup_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/factorio/setup_en.md rename to WebHostLib/static/assets/tutorial/Factorio/setup_en.md diff --git a/WebHostLib/static/assets/tutorial/ff1/multiworld_en.md b/WebHostLib/static/assets/tutorial/Final Fantasy/multiworld_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/ff1/multiworld_en.md rename to WebHostLib/static/assets/tutorial/Final Fantasy/multiworld_en.md diff --git a/WebHostLib/static/assets/tutorial/meritous/setup_en.md b/WebHostLib/static/assets/tutorial/Meritous/setup_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/meritous/setup_en.md rename to WebHostLib/static/assets/tutorial/Meritous/setup_en.md diff --git a/WebHostLib/static/assets/tutorial/minecraft/minecraft_en.md b/WebHostLib/static/assets/tutorial/Minecraft/minecraft_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/minecraft/minecraft_en.md rename to WebHostLib/static/assets/tutorial/Minecraft/minecraft_en.md diff --git a/WebHostLib/static/assets/tutorial/minecraft/minecraft_es.md b/WebHostLib/static/assets/tutorial/Minecraft/minecraft_es.md similarity index 100% rename from WebHostLib/static/assets/tutorial/minecraft/minecraft_es.md rename to WebHostLib/static/assets/tutorial/Minecraft/minecraft_es.md diff --git a/WebHostLib/static/assets/tutorial/minecraft/minecraft_sv.md b/WebHostLib/static/assets/tutorial/Minecraft/minecraft_sv.md similarity index 100% rename from WebHostLib/static/assets/tutorial/minecraft/minecraft_sv.md rename to WebHostLib/static/assets/tutorial/Minecraft/minecraft_sv.md diff --git a/WebHostLib/static/assets/tutorial/zelda5/setup_en.md b/WebHostLib/static/assets/tutorial/Ocarina of Time/setup_en.md similarity index 87% rename from WebHostLib/static/assets/tutorial/zelda5/setup_en.md rename to WebHostLib/static/assets/tutorial/Ocarina of Time/setup_en.md index a62a78ed..0c0f25b9 100644 --- a/WebHostLib/static/assets/tutorial/zelda5/setup_en.md +++ b/WebHostLib/static/assets/tutorial/Ocarina of Time/setup_en.md @@ -10,31 +10,29 @@ As we are using Bizhawk, this guide is only applicable to Windows and Linux syst - Version 2.3.1 and later are supported. Version 2.7 is recommended for stability. - Detailed installation instructions for Bizhawk can be found at the above link. - Windows users must run the prereq installer first, which can also be found at the above link. -- An Archipelago client for Ocarina of Time. There are two options available: - - The built-in Archipelago client, which can be installed [here](https://github.com/ArchipelagoMW/Archipelago/releases) - (select `Ocarina of Time Client` during installation). This client is kept up-to-date with the latest Archipelago version - and will always be supported. - - Z5Client, which can be installed [here](https://github.com/ArchipelagoMW/Z5Client/releases), and its associated Lua script `ootMulti.lua`. +- The built-in Archipelago client, which can be installed [here](https://github.com/ArchipelagoMW/Archipelago/releases) + (select `Ocarina of Time Client` during installation). - An Ocarina of Time v1.0 ROM. ## Configuring Bizhawk Once Bizhawk has been installed, open Bizhawk and change the following settings: -- Go to Config > Customize. Switch to the Advanced tab, then switch the Lua Core from "NLua+KopiLua" to "Lua+LuaInterface". - This is required for the Lua script to function correctly. -- Under Config > Customize > Advanced, make sure the box for AutoSaveRAM is checked, and click the 5s button. This reduces - the possibility of losing save data in emulator crashes. -- Under Config > Customize, check the "Run in background" and "Accept background input" boxes. This will allow you to continue - playing in the background, even if another window is selected. +- Go to Config > Customize. Switch to the Advanced tab, then switch the Lua Core from "NLua+KopiLua" to + "Lua+LuaInterface". This is required for the Lua script to function correctly. +- Under Config > Customize > Advanced, make sure the box for AutoSaveRAM is checked, and click the 5s button. + This reduces the possibility of losing save data in emulator crashes. +- Under Config > Customize, check the "Run in background" and "Accept background input" boxes. This will allow you to + continue playing in the background, even if another window is selected. - Under Config > Hotkeys, many hotkeys are listed, with many bound to common keys on the keyboard. You will likely want to disable most of these, which you can do quickly using `Esc`. -- If playing with a controller, when you bind controls, disable "P1 A Up", "P1 A Down", "P1 A Left", and "P1 A Right" as these interfere - with aiming if bound. Set directional input using the Analog tab instead. +- If playing with a controller, when you bind controls, disable "P1 A Up", "P1 A Down", "P1 A Left", and "P1 A Right" + as these interfere with aiming if bound. Set directional input using the Analog tab instead. -It is strongly recommended to associate N64 rom extensions (\*.n64, \*.z64) to the Bizhawk we've just installed. To do so, we -simply have to search any N64 rom we happened to own, right click and select "Open with...", unfold the list that -appears and select the bottom option "Look for another application", then browse to the Bizhawk folder and select EmuHawk.exe. +It is strongly recommended to associate N64 rom extensions (\*.n64, \*.z64) to the Bizhawk we've just installed. +To do so, we simply have to search any N64 rom we happened to own, right click and select "Open with...", unfold +the list that appears and select the bottom option "Look for another application", then browse to the Bizhawk folder +and select EmuHawk.exe. ## Configuring your YAML file @@ -397,23 +395,18 @@ When you join a multiworld game, you will be asked to provide your YAML file to the host will provide you with either a link to download your data file, or with a zip file containing everyone's data files. Your data file should have a `.apz5` extension. -Double-click on your `.apz5` file to start your client and start the ROM patch process. Once the process is finished (this -can take a while), the client and the emulator will be started automatically (if you associated the extension to the emulator as -recommended). +Double-click on your `.apz5` file to start your client and start the ROM patch process. Once the process is finished +(this can take a while), the client and the emulator will be started automatically (if you associated the extension +to the emulator as recommended). ### Connect to the Multiserver Once both the client and the emulator are started, you must connect them. Within the emulator click on the "Tools" menu and select "Lua Console". Click the folder button or press Ctrl+O to open a Lua script. -If you are using the Archipelago OoTClient, navigate to your Archipelago install folder and open `data/lua/OOT/oot_connector.lua`. - -If you are using Z5Client, find the `ootMulti.lua` file and open it. - -Note: If using Z5Client, we strongly advise you don't open any menus in Bizhawk while the emulator and Z5Client are connected, as the script will halt -and force-disconnect from the server. If you get disconnected just double-click on the script again. +Navigate to your Archipelago install folder and open `data/lua/OOT/oot_connector.lua`. To connect the client to the multiserver simply put `
:` on the textfield on top and press enter (if the server uses password, type in the bottom textfield `/connect
: [password]`) -Now you are ready to start your adventure in Hyrule. \ No newline at end of file +Now you are ready to start your adventure in Hyrule. diff --git a/WebHostLib/static/assets/tutorial/zelda5/setup_es.md b/WebHostLib/static/assets/tutorial/Ocarina of Time/setup_es.md similarity index 100% rename from WebHostLib/static/assets/tutorial/zelda5/setup_es.md rename to WebHostLib/static/assets/tutorial/Ocarina of Time/setup_es.md diff --git a/WebHostLib/static/assets/tutorial/raft/setup_en.md b/WebHostLib/static/assets/tutorial/Raft/setup_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/raft/setup_en.md rename to WebHostLib/static/assets/tutorial/Raft/setup_en.md diff --git a/WebHostLib/static/assets/tutorial/ror2/setup_en.md b/WebHostLib/static/assets/tutorial/Risk of Rain 2/setup_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/ror2/setup_en.md rename to WebHostLib/static/assets/tutorial/Risk of Rain 2/setup_en.md diff --git a/WebHostLib/static/assets/tutorial/rogue-legacy/rogue-legacy_en.md b/WebHostLib/static/assets/tutorial/Rogue Legacy/rogue-legacy_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/rogue-legacy/rogue-legacy_en.md rename to WebHostLib/static/assets/tutorial/Rogue Legacy/rogue-legacy_en.md diff --git a/WebHostLib/static/assets/tutorial/smz3/multiworld_en.md b/WebHostLib/static/assets/tutorial/SMZ3/multiworld_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/smz3/multiworld_en.md rename to WebHostLib/static/assets/tutorial/SMZ3/multiworld_en.md diff --git a/WebHostLib/static/assets/tutorial/secret-of-evermore/multiworld_en.md b/WebHostLib/static/assets/tutorial/Secret of Evermore/multiworld_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/secret-of-evermore/multiworld_en.md rename to WebHostLib/static/assets/tutorial/Secret of Evermore/multiworld_en.md diff --git a/WebHostLib/static/assets/tutorial/slay-the-spire/slay-the-spire_en.md b/WebHostLib/static/assets/tutorial/Slay the Spire/slay-the-spire_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/slay-the-spire/slay-the-spire_en.md rename to WebHostLib/static/assets/tutorial/Slay the Spire/slay-the-spire_en.md diff --git a/WebHostLib/static/assets/tutorial/sm64ex/setup_en.md b/WebHostLib/static/assets/tutorial/Super Mario 64/setup_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/sm64ex/setup_en.md rename to WebHostLib/static/assets/tutorial/Super Mario 64/setup_en.md diff --git a/WebHostLib/static/assets/tutorial/super-metroid/multiworld_en.md b/WebHostLib/static/assets/tutorial/Super Metroid/multiworld_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/super-metroid/multiworld_en.md rename to WebHostLib/static/assets/tutorial/Super Metroid/multiworld_en.md diff --git a/WebHostLib/static/assets/tutorial/timespinner/setup_de.md b/WebHostLib/static/assets/tutorial/Timespinner/setup_de.md similarity index 100% rename from WebHostLib/static/assets/tutorial/timespinner/setup_de.md rename to WebHostLib/static/assets/tutorial/Timespinner/setup_de.md diff --git a/WebHostLib/static/assets/tutorial/timespinner/setup_en.md b/WebHostLib/static/assets/tutorial/Timespinner/setup_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/timespinner/setup_en.md rename to WebHostLib/static/assets/tutorial/Timespinner/setup_en.md diff --git a/WebHostLib/static/assets/tutorial/v6/setup_en.md b/WebHostLib/static/assets/tutorial/VVVVVV/setup_en.md similarity index 100% rename from WebHostLib/static/assets/tutorial/v6/setup_en.md rename to WebHostLib/static/assets/tutorial/VVVVVV/setup_en.md diff --git a/WebHostLib/static/assets/tutorial/tutorials.json b/WebHostLib/static/assets/tutorial/tutorials.json index f263fe68..1b52d5f9 100644 --- a/WebHostLib/static/assets/tutorial/tutorials.json +++ b/WebHostLib/static/assets/tutorial/tutorials.json @@ -8,8 +8,8 @@ "files": [ { "language": "English", - "filename": "archipelago/setup_en.md", - "link": "archipelago/setup/en", + "filename": "Archipelago/setup_en.md", + "link": "Archipelago/setup/en", "authors": [ "alwaysintreble" ] @@ -22,8 +22,8 @@ "files": [ { "language": "English", - "filename": "archipelago/using_website.md", - "link": "archipelago/using_website/en", + "filename": "Archipelago/using_website.md", + "link": "Archipelago/using_website/en", "authors": [ "alwaysintreble" ] @@ -36,8 +36,8 @@ "files": [ { "language": "English", - "filename": "archipelago/commands_en.md", - "link": "archipelago/commands/en", + "filename": "Archipelago/commands_en.md", + "link": "Archipelago/commands/en", "authors": [ "jat2980", "Ijwu" @@ -51,8 +51,8 @@ "files": [ { "language": "English", - "filename": "archipelago/advanced_settings_en.md", - "link": "archipelago/advanced_settings/en", + "filename": "Archipelago/advanced_settings_en.md", + "link": "Archipelago/advanced_settings/en", "authors": [ "alwaysintreble", "Alchav" @@ -66,8 +66,8 @@ "files": [ { "language": "English", - "filename": "archipelago/triggers_en.md", - "link": "archipelago/triggers/en", + "filename": "Archipelago/triggers_en.md", + "link": "Archipelago/triggers/en", "authors": [ "alwaysintreble" ] @@ -80,8 +80,8 @@ "files": [ { "language": "English", - "filename": "archipelago/plando_en.md", - "link": "archipelago/plando/en", + "filename": "Archipelago/plando_en.md", + "link": "Archipelago/plando/en", "authors": [ "alwaysintreble", "Alchav" @@ -100,32 +100,32 @@ "files": [ { "language": "English", - "filename": "zelda3/multiworld_en.md", - "link": "zelda3/multiworld/en", + "filename": "A Link to the Past/multiworld_en.md", + "link": "A Link to the Past/multiworld/en", "authors": [ "Farrak Kilhn" ] }, { "language": "Deutsch", - "filename": "zelda3/multiworld_de.md", - "link": "zelda3/multiworld/de", + "filename": "A Link to the Past/multiworld_de.md", + "link": "A Link to the Past/multiworld/de", "authors": [ "Fischfilet" ] }, { "language": "Español", - "filename": "zelda3/multiworld_es.md", - "link": "zelda3/multiworld/es", + "filename": "A Link to the Past/multiworld_es.md", + "link": "A Link to the Past/multiworld/es", "authors": [ "Edos" ] }, { "language": "Français", - "filename": "zelda3/multiworld_fr.md", - "link": "zelda3/multiworld/fr", + "filename": "A Link to the Past/multiworld_fr.md", + "link": "A Link to the Past/multiworld/fr", "authors": [ "Coxla" ] @@ -138,24 +138,24 @@ "files": [ { "language": "English", - "filename": "zelda3/msu1_en.md", - "link": "zelda3/msu1/en", + "filename": "A Link to the Past/msu1_en.md", + "link": "A Link to the Past/msu1/en", "authors": [ "Farrak Kilhn" ] }, { "language": "Español", - "filename": "zelda3/msu1_es.md", - "link": "zelda3/msu1/es", + "filename": "A Link to the Past/msu1_es.md", + "link": "A Link to the Past/msu1/es", "authors": [ "Edos" ] }, { "language": "Français", - "filename": "msu1_fr.md", - "link": "zelda3/msu1/fr", + "filename": "A Link to the Past/msu1_fr.md", + "link": "A Link to the Past/msu1/fr", "authors": [ "Coxla" ] @@ -187,16 +187,16 @@ "files": [ { "language": "English", - "filename": "zelda5/setup_en.md", - "link": "zelda5/setup/en", + "filename": "Ocarina of Time/setup_en.md", + "link": "Ocarina of Time/setup/en", "authors": [ "Edos" ] }, { "language": "Spanish", - "filename": "zelda5/setup_es.md", - "link": "zelda5/setup/es", + "filename": "Ocarina of Time/setup_es.md", + "link": "Ocarina of Time/setup/es", "authors": [ "Edos" ] @@ -214,8 +214,8 @@ "files": [ { "language": "English", - "filename": "factorio/setup_en.md", - "link": "factorio/setup/en", + "filename": "Factorio/setup_en.md", + "link": "Factorio/setup/en", "authors": [ "Berserker", "Farrak Kilhn" @@ -234,8 +234,8 @@ "files": [ { "language": "English", - "filename": "meritous/setup_en.md", - "link": "meritous/setup/en", + "filename": "Meritous/setup_en.md", + "link": "Meritous/setup/en", "authors": [ "KewlioMZX" ] @@ -253,24 +253,24 @@ "files": [ { "language": "English", - "filename": "minecraft/minecraft_en.md", - "link": "minecraft/minecraft/en", + "filename": "Minecraft/minecraft_en.md", + "link": "Minecraft/minecraft/en", "authors": [ "Kono Tyran" ] }, { "language": "Spanish", - "filename": "minecraft/minecraft_es.md", - "link": "minecraft/minecraft/es", + "filename": "Minecraft/minecraft_es.md", + "link": "Minecraft/minecraft/es", "authors": [ "Edos" ] }, { "language": "Swedish", - "filename": "minecraft/minecraft_sv.md", - "link": "minecraft/minecraft/sv", + "filename": "Minecraft/minecraft_sv.md", + "link": "Minecraft/minecraft/sv", "authors": [ "Albinum" ] @@ -288,8 +288,8 @@ "files": [ { "language": "English", - "filename": "ror2/setup_en.md", - "link": "ror2/setup/en", + "filename": "Risk of Rain 2/setup_en.md", + "link": "Risk of Rain 2/setup/en", "authors": [ "Ijwu" ] @@ -307,8 +307,8 @@ "files": [ { "language": "English", - "filename": "raft/setup_en.md", - "link": "raft/setup/en", + "filename": "Raft/setup_en.md", + "link": "Raft/setup/en", "authors": [ "SunnyBat", "Awareqwx" @@ -327,16 +327,16 @@ "files": [ { "language": "English", - "filename": "timespinner/setup_en.md", - "link": "timespinner/setup/en", + "filename": "Timespinner/setup_en.md", + "link": "Timespinner/setup/en", "authors": [ "Jarno" ] }, { "language": "German", - "filename": "timespinner/setup_de.md", - "link": "timespinner/setup/de", + "filename": "Timespinner/setup_de.md", + "link": "Timespinner/setup/de", "authors": [ "Grrmo", "Fynxes", @@ -394,8 +394,8 @@ "files": [ { "language": "English", - "filename": "super-metroid/multiworld_en.md", - "link": "super-metroid/multiworld/en", + "filename": "Super Metroid/multiworld_en.md", + "link": "Super Metroid/multiworld/en", "authors": [ "Farrak Kilhn" ] @@ -413,8 +413,8 @@ "files": [ { "language": "English", - "filename": "secret-of-evermore/multiworld_en.md", - "link": "secret-of-evermore/multiworld/en", + "filename": "Secret of Evermore/multiworld_en.md", + "link": "Secret of Evermore/multiworld/en", "authors": [ "Black Sliver" ] @@ -432,8 +432,8 @@ "files": [ { "language": "English", - "filename": "ff1/multiworld_en.md", - "link": "ff1/multiworld/en", + "filename": "Final Fantasy/multiworld_en.md", + "link": "Final Fantasy/multiworld/en", "authors": [ "jat2980" ] @@ -451,8 +451,8 @@ "files": [ { "language": "English", - "filename": "rogue-legacy/rogue-legacy_en.md", - "link": "rogue-legacy/rogue-legacy/en", + "filename": "Rogue Legacy/rogue-legacy_en.md", + "link": "Rogue Legacy/rogue-legacy/en", "authors": [ "Phar" ] @@ -470,8 +470,8 @@ "files": [ { "language": "English", - "filename": "slay-the-spire/slay-the-spire_en.md", - "link": "slay-the-spire/slay-the-spire/en", + "filename": "Slay the Spire/slay-the-spire_en.md", + "link": "Slay the Spire/slay-the-spire/en", "authors": [ "Phar" ] @@ -489,8 +489,8 @@ "files": [ { "language": "English", - "filename": "sm64ex/setup_en.md", - "link": "sm64ex/setup/en", + "filename": "Super Mario 64/setup_en.md", + "link": "Super Mario 64/setup/en", "authors": [ "N00byKing" ] @@ -508,8 +508,8 @@ "files": [ { "language": "English", - "filename": "v6/setup_en.md", - "link": "v6/setup/en", + "filename": "VVVVVV/setup_en.md", + "link": "VVVVVV/setup/en", "authors": [ "N00byKing" ] diff --git a/WebHostLib/static/static/backgrounds/dirt.png b/WebHostLib/static/static/backgrounds/dirt.png new file mode 100644 index 00000000..4ac930ed Binary files /dev/null and b/WebHostLib/static/static/backgrounds/dirt.png differ diff --git a/WebHostLib/static/static/backgrounds/dirt/dirt-0001.png b/WebHostLib/static/static/backgrounds/dirt/dirt-0001.png deleted file mode 100644 index fabdaf4d..00000000 Binary files a/WebHostLib/static/static/backgrounds/dirt/dirt-0001.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/dirt/dirt-0002.png b/WebHostLib/static/static/backgrounds/dirt/dirt-0002.png deleted file mode 100644 index 55af91b2..00000000 Binary files a/WebHostLib/static/static/backgrounds/dirt/dirt-0002.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/dirt/dirt-0003.png b/WebHostLib/static/static/backgrounds/dirt/dirt-0003.png deleted file mode 100644 index 5eed4d4e..00000000 Binary files a/WebHostLib/static/static/backgrounds/dirt/dirt-0003.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/dirt/dirt-0004.png b/WebHostLib/static/static/backgrounds/dirt/dirt-0004.png deleted file mode 100644 index 70213cd6..00000000 Binary files a/WebHostLib/static/static/backgrounds/dirt/dirt-0004.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/dirt/dirt-0005-large.png b/WebHostLib/static/static/backgrounds/dirt/dirt-0005-large.png deleted file mode 100644 index 99f0db16..00000000 Binary files a/WebHostLib/static/static/backgrounds/dirt/dirt-0005-large.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/dirt/dirt-grass-single.png b/WebHostLib/static/static/backgrounds/dirt/dirt-grass-single.png deleted file mode 100644 index 2a38799d..00000000 Binary files a/WebHostLib/static/static/backgrounds/dirt/dirt-grass-single.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/grass-flowers.png b/WebHostLib/static/static/backgrounds/grass-flowers.png new file mode 100644 index 00000000..464fdbe5 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/grass-flowers.png differ diff --git a/WebHostLib/static/static/backgrounds/grass.png b/WebHostLib/static/static/backgrounds/grass.png new file mode 100644 index 00000000..b88c33de Binary files /dev/null and b/WebHostLib/static/static/backgrounds/grass.png differ diff --git a/WebHostLib/static/static/backgrounds/grass/grass-0001.png b/WebHostLib/static/static/backgrounds/grass/grass-0001.png deleted file mode 100644 index 638426b9..00000000 Binary files a/WebHostLib/static/static/backgrounds/grass/grass-0001.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/grass/grass-0002.png b/WebHostLib/static/static/backgrounds/grass/grass-0002.png deleted file mode 100644 index 2742b21a..00000000 Binary files a/WebHostLib/static/static/backgrounds/grass/grass-0002.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/grass/grass-0003.png b/WebHostLib/static/static/backgrounds/grass/grass-0003.png deleted file mode 100644 index c446f36e..00000000 Binary files a/WebHostLib/static/static/backgrounds/grass/grass-0003.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/grass/grass-0004.png b/WebHostLib/static/static/backgrounds/grass/grass-0004.png deleted file mode 100644 index 44f3e6f1..00000000 Binary files a/WebHostLib/static/static/backgrounds/grass/grass-0004.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/grass/grass-0005.png b/WebHostLib/static/static/backgrounds/grass/grass-0005.png deleted file mode 100644 index c5a4b331..00000000 Binary files a/WebHostLib/static/static/backgrounds/grass/grass-0005.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/grass/grass-0006.png b/WebHostLib/static/static/backgrounds/grass/grass-0006.png deleted file mode 100644 index f0d3109b..00000000 Binary files a/WebHostLib/static/static/backgrounds/grass/grass-0006.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/grass/grass-0007-large.png b/WebHostLib/static/static/backgrounds/grass/grass-0007-large.png deleted file mode 100644 index 8ca0b5bb..00000000 Binary files a/WebHostLib/static/static/backgrounds/grass/grass-0007-large.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/grass/grass-flower-single.png b/WebHostLib/static/static/backgrounds/grass/grass-flower-single.png deleted file mode 100644 index e8a7d905..00000000 Binary files a/WebHostLib/static/static/backgrounds/grass/grass-flower-single.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/grass/grass-single.png b/WebHostLib/static/static/backgrounds/grass/grass-single.png deleted file mode 100644 index f60031d0..00000000 Binary files a/WebHostLib/static/static/backgrounds/grass/grass-single.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/header/party-time-header.png b/WebHostLib/static/static/backgrounds/header/party-time-header.png new file mode 100644 index 00000000..799f32f2 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/header/party-time-header.png differ diff --git a/WebHostLib/static/static/backgrounds/ice.png b/WebHostLib/static/static/backgrounds/ice.png new file mode 100644 index 00000000..fcf7299b Binary files /dev/null and b/WebHostLib/static/static/backgrounds/ice.png differ diff --git a/WebHostLib/static/static/backgrounds/jungle.png b/WebHostLib/static/static/backgrounds/jungle.png new file mode 100644 index 00000000..e27d7e99 Binary files /dev/null and b/WebHostLib/static/static/backgrounds/jungle.png differ diff --git a/WebHostLib/static/static/backgrounds/oceans/oceans-0002.png b/WebHostLib/static/static/backgrounds/ocean.png similarity index 100% rename from WebHostLib/static/static/backgrounds/oceans/oceans-0002.png rename to WebHostLib/static/static/backgrounds/ocean.png diff --git a/WebHostLib/static/static/backgrounds/oceans/oceans-0001.png b/WebHostLib/static/static/backgrounds/oceans/oceans-0001.png deleted file mode 100644 index f85c3d91..00000000 Binary files a/WebHostLib/static/static/backgrounds/oceans/oceans-0001.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/oceans/oceans-0003.png b/WebHostLib/static/static/backgrounds/oceans/oceans-0003.png deleted file mode 100644 index 95ad97dc..00000000 Binary files a/WebHostLib/static/static/backgrounds/oceans/oceans-0003.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/oceans/oceans-0004.png b/WebHostLib/static/static/backgrounds/oceans/oceans-0004.png deleted file mode 100644 index afb9e2cc..00000000 Binary files a/WebHostLib/static/static/backgrounds/oceans/oceans-0004.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/oceans/oceans-0005.png b/WebHostLib/static/static/backgrounds/oceans/oceans-0005.png deleted file mode 100644 index 84679576..00000000 Binary files a/WebHostLib/static/static/backgrounds/oceans/oceans-0005.png and /dev/null differ diff --git a/WebHostLib/static/static/backgrounds/party-time.png b/WebHostLib/static/static/backgrounds/party-time.png new file mode 100644 index 00000000..ad00851b Binary files /dev/null and b/WebHostLib/static/static/backgrounds/party-time.png differ diff --git a/WebHostLib/static/static/branding/header-logo.png b/WebHostLib/static/static/branding/header-logo.png new file mode 100644 index 00000000..e5d7f9b4 Binary files /dev/null and b/WebHostLib/static/static/branding/header-logo.png differ diff --git a/WebHostLib/static/static/branding/header-logo.svg b/WebHostLib/static/static/branding/header-logo.svg new file mode 100644 index 00000000..3e225009 --- /dev/null +++ b/WebHostLib/static/static/branding/header-logo.svg @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WebHostLib/static/static/branding/landing-logo.png b/WebHostLib/static/static/branding/landing-logo.png new file mode 100644 index 00000000..1f2b967a Binary files /dev/null and b/WebHostLib/static/static/branding/landing-logo.png differ diff --git a/WebHostLib/static/static/button-images/button-a.png b/WebHostLib/static/static/button-images/island-button-a.png similarity index 100% rename from WebHostLib/static/static/button-images/button-a.png rename to WebHostLib/static/static/button-images/island-button-a.png diff --git a/WebHostLib/static/static/button-images/button-b.png b/WebHostLib/static/static/button-images/island-button-b.png similarity index 100% rename from WebHostLib/static/static/button-images/button-b.png rename to WebHostLib/static/static/button-images/island-button-b.png diff --git a/WebHostLib/static/static/button-images/button-c.png b/WebHostLib/static/static/button-images/island-button-c.png similarity index 100% rename from WebHostLib/static/static/button-images/button-c.png rename to WebHostLib/static/static/button-images/island-button-c.png diff --git a/WebHostLib/static/static/decorations/rock-a.png b/WebHostLib/static/static/decorations/rock-in-water.png similarity index 100% rename from WebHostLib/static/static/decorations/rock-a.png rename to WebHostLib/static/static/decorations/rock-in-water.png diff --git a/WebHostLib/static/static/backgrounds/dirt/rock-single.png b/WebHostLib/static/static/decorations/rock-single.png similarity index 100% rename from WebHostLib/static/static/backgrounds/dirt/rock-single.png rename to WebHostLib/static/static/decorations/rock-single.png diff --git a/WebHostLib/static/static/favicon.ico b/WebHostLib/static/static/favicon.ico index 252bdcad..cfa2d361 100644 Binary files a/WebHostLib/static/static/favicon.ico and b/WebHostLib/static/static/favicon.ico differ diff --git a/WebHostLib/static/static/fonts/HyliaSerifBeta-Regular.otf b/WebHostLib/static/static/fonts/HyliaSerifBeta-Regular.otf deleted file mode 100644 index 5e2677d6..00000000 Binary files a/WebHostLib/static/static/fonts/HyliaSerifBeta-Regular.otf and /dev/null differ diff --git a/WebHostLib/static/static/fonts/LexendDeca-ExtraLight.ttf b/WebHostLib/static/static/fonts/LexendDeca-ExtraLight.ttf new file mode 100644 index 00000000..68229e43 Binary files /dev/null and b/WebHostLib/static/static/fonts/LexendDeca-ExtraLight.ttf differ diff --git a/WebHostLib/static/static/fonts/LexendDeca-Light.ttf b/WebHostLib/static/static/fonts/LexendDeca-Light.ttf new file mode 100644 index 00000000..df16a799 Binary files /dev/null and b/WebHostLib/static/static/fonts/LexendDeca-Light.ttf differ diff --git a/WebHostLib/static/static/fonts/LexendDeca-Medium.ttf b/WebHostLib/static/static/fonts/LexendDeca-Medium.ttf new file mode 100644 index 00000000..2c656345 Binary files /dev/null and b/WebHostLib/static/static/fonts/LexendDeca-Medium.ttf differ diff --git a/WebHostLib/static/static/fonts/LexendDeca-Regular.ttf b/WebHostLib/static/static/fonts/LexendDeca-Regular.ttf new file mode 100644 index 00000000..736bed8e Binary files /dev/null and b/WebHostLib/static/static/fonts/LexendDeca-Regular.ttf differ diff --git a/WebHostLib/static/static/fonts/LondrinaSolid-Light.ttf b/WebHostLib/static/static/fonts/LondrinaSolid-Light.ttf new file mode 100644 index 00000000..651cf53a Binary files /dev/null and b/WebHostLib/static/static/fonts/LondrinaSolid-Light.ttf differ diff --git a/WebHostLib/static/static/fonts/LondrinaSolid-Regular.ttf b/WebHostLib/static/static/fonts/LondrinaSolid-Regular.ttf new file mode 100644 index 00000000..7bf49231 Binary files /dev/null and b/WebHostLib/static/static/fonts/LondrinaSolid-Regular.ttf differ diff --git a/WebHostLib/static/styles/factorio/factorio.css b/WebHostLib/static/styles/factorio/factorio.css deleted file mode 100644 index 8039500b..00000000 --- a/WebHostLib/static/styles/factorio/factorio.css +++ /dev/null @@ -1,3 +0,0 @@ -#factorio{ - margin: 1rem; -} diff --git a/WebHostLib/static/styles/games.css b/WebHostLib/static/styles/games.css deleted file mode 100644 index 7ba4e2bb..00000000 --- a/WebHostLib/static/styles/games.css +++ /dev/null @@ -1,61 +0,0 @@ -#games{ - max-width: 1000px; - margin-left: auto; - margin-right: auto; - background-color: rgba(0, 0, 0, 0.15); - border-radius: 8px; - padding: 1rem; - color: #eeffeb; -} - -#games p{ - margin-top: 0.25rem; -} - -#games code{ - background-color: #d9cd8e; - border-radius: 4px; - padding-left: 0.25rem; - padding-right: 0.25rem; - color: #000000; -} - -#games #user-message{ - display: none; - width: calc(100% - 8px); - background-color: #ffe86b; - border-radius: 4px; - color: #000000; - padding: 4px; - text-align: center; -} - -#games h1{ - font-size: 2.5rem; - font-weight: normal; - border-bottom: 1px solid #ffffff; - width: 100%; - margin-bottom: 0.5rem; - color: #ffffff; - text-shadow: 1px 1px 4px #000000; -} - -#games h2{ - font-size: 2rem; - font-weight: normal; - border-bottom: 1px solid #ffffff; - width: 100%; - margin-bottom: 0.5rem; - color: #ffe993; - text-transform: lowercase; - text-shadow: 1px 1px 2px #000000; -} - -#games h3, #games h4, #games h5, #games h6{ - color: #ffffff; - text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); -} - -#games a{ - color: #ffef00; -} diff --git a/WebHostLib/static/styles/generate.css b/WebHostLib/static/styles/generate.css index e0b3f5ec..8b77d981 100644 --- a/WebHostLib/static/styles/generate.css +++ b/WebHostLib/static/styles/generate.css @@ -16,7 +16,7 @@ } #generate-game button{ - margin-top: 5px; + margin-top: 35px; } #generate-game-form-wrapper{ diff --git a/WebHostLib/static/styles/globalStyles.css b/WebHostLib/static/styles/globalStyles.css index b4470a3a..c20bab6b 100644 --- a/WebHostLib/static/styles/globalStyles.css +++ b/WebHostLib/static/styles/globalStyles.css @@ -1,10 +1,35 @@ -@font-face { - font-family: "HyliaSerif"; - src: url('../static/fonts/HyliaSerifBeta-Regular.otf') format("opentype"); +@font-face{ + font-family: LexendDeca-ExtraLight; + src: url("../../static/static/fonts/LexendDeca-ExtraLight.ttf"); +} + +@font-face{ + font-family: LexendDeca-Light; + src: url("../../static/static/fonts/LexendDeca-Light.ttf"); +} + +@font-face{ + font-family: LexendDeca-Regular; + src: url("../../static/static/fonts/LexendDeca-Regular.ttf"); +} + +@font-face{ + font-family: LexendDeca-Medium; + src: url("../../static/static/fonts/LexendDeca-Medium.ttf"); +} + +@font-face{ + font-family: LondrinaSolid-Regular; + src: url("../../static/static/fonts/LondrinaSolid-Regular.ttf"); +} + +@font-face{ + font-family: LondrinaSolid-Light; + src: url("../../static/static/fonts/LondrinaSolid-Light.ttf"); } html{ - font-family: 'Jost', sans-serif; + font-family: LexendDeca-ExtraLight, sans-serif; font-size: 1.1rem; color: #000000; } @@ -15,10 +40,11 @@ body{ a{ color: #ffef00; + text-decoration: none; + font-family: LexendDeca-Regular, sans-serif; } button{ - font-family: Jost, sans-serif; font-weight: 500; font-size: 0.9rem; padding: 10px 17px 11px 16px; /* top right bottom left */ @@ -49,7 +75,6 @@ button.button-dirt{ } h1, h2, h3, h4, h5, h6{ - font-family: HyliaSerif, sans-serif; font-weight: normal; margin: 0; color: #032605; @@ -67,38 +92,6 @@ h5, h6{ margin-bottom: 0.5rem; } -.grass-island{ - background: - url('../static/backgrounds/cliffs/grass/cliff-top-left-corner.png') top left no-repeat, - url('../static/backgrounds/cliffs/grass/cliff-top-right-corner.png') top right no-repeat, - url('../static/backgrounds/cliffs/grass/cliff-bottom-left-corner.png') bottom left no-repeat, - url('../static/backgrounds/cliffs/grass/cliff-bottom-right-corner.png') bottom right no-repeat, - url('../static/backgrounds/cliffs/grass/cliff-top.png') top repeat-x, - url('../static/backgrounds/cliffs/grass/cliff-bottom.png') bottom repeat-x, - url('../static/backgrounds/cliffs/grass/cliff-left.png') left repeat-y, - url('../static/backgrounds/cliffs/grass/cliff-right.png') right repeat-y, - url('../static/backgrounds/grass/grass-0007-large.png') repeat; - - background-size: - 140px 120px, /* top-left */ - 140px 120px, /* top-right */ - 140px 140px, /* bottom-left */ - 140px 140px, /* bottom-right */ - 20px 71px, /* top */ - 20px 100px, /* bottom */ - 71px 20px, /* left */ - 71px 20px, /* right */ - 525px 525px; /* center */ - - min-width: 280px; - min-height: 280px; - - padding-left: 120px; - padding-right: 120px; - padding-top: 100px; - padding-bottom: 120px; -} - .user-message{ width: 50%; min-width: 500px; diff --git a/WebHostLib/static/styles/header/dirtHeader.css b/WebHostLib/static/styles/header/dirtHeader.css deleted file mode 100644 index a94fd2fd..00000000 --- a/WebHostLib/static/styles/header/dirtHeader.css +++ /dev/null @@ -1,9 +0,0 @@ -html{ - background-image: url('../../static/backgrounds/dirt/dirt-0005-large.png'); - background-repeat: repeat; - background-size: 900px 900px; -} - -#base-header{ - background: url('../../static/backgrounds/header/dirt-header.png') repeat-x; -} diff --git a/WebHostLib/static/styles/header/grassHeader.css b/WebHostLib/static/styles/header/grassHeader.css deleted file mode 100644 index 7229272d..00000000 --- a/WebHostLib/static/styles/header/grassHeader.css +++ /dev/null @@ -1,9 +0,0 @@ -html{ - background-image: url('../../static/backgrounds/grass/grass-0007-large.png'); - background-repeat: repeat; - background-size: 650px 650px; -} - -#base-header { - background: url('../../static/backgrounds/header/grass-header.png') repeat-x; -} diff --git a/WebHostLib/static/styles/header/oceanHeader.css b/WebHostLib/static/styles/header/oceanHeader.css deleted file mode 100644 index 9cea5b28..00000000 --- a/WebHostLib/static/styles/header/oceanHeader.css +++ /dev/null @@ -1,9 +0,0 @@ -html{ - background-image: url('../../static/backgrounds/oceans/oceans-0002.png'); - background-repeat: repeat; - background-size: 250px 250px; -} - -#base-header{ - background: url('../../static/backgrounds/header/ocean-header.png') repeat-x; -} diff --git a/WebHostLib/static/styles/hostRoom.css b/WebHostLib/static/styles/hostRoom.css index cd1cf35b..94ec24bf 100644 --- a/WebHostLib/static/styles/hostRoom.css +++ b/WebHostLib/static/styles/hostRoom.css @@ -1,11 +1,17 @@ #host-room{ - width: calc(100% - 5rem); + width: 60%; margin-left: auto; margin-right: auto; background-color: rgba(0, 0, 0, 0.15); border-radius: 8px; padding: 1rem; color: #eeffeb; + font-family: LexendDeca-Light, sans-serif; + line-height: 24px; +} + +#host-room div{ + line-height: 26px; } #host-room a{ @@ -16,36 +22,37 @@ border: 1px solid #000000; padding: 3px; border-radius: 3px; - width: 500px; + width: 50%; + margin-top: 25px; + margin-bottom: 6px; } -#host-room table { - border-spacing: 0px; +#host-room table{ + border-collapse: collapse; + margin-top: 20px; + margin-bottom: 0.5rem; + width: 100%; } -#host-room table tbody{ - background-color: #dce2bd; +#host-room table th{ + text-align: left; + padding: 10px; + border: 1px solid white; + font-size: 20px; + font-family: LexendDeca-Regular, sans-serif; } -#host-room table tbody tr:hover{ - background-color: #e2eabb; +#host-room table td{ + border: 1px solid white; + text-align: left; + padding: 10px; } -#host-room table tbody td{ - padding: 4px 6px; - color: black; -} - -#host-room table tbody a{ - color: #234ae4; -} - -#host-room table thead td{ - background-color: #b0a77d; - color: black; - top: 0; -} - -#host-room table tbody td{ - border: 1px solid #bba967; +#host-room #logger{ + margin-top: 0; + padding: 0.5rem 0.25rem; + background-color: #b5e9a4; + border: 1px solid #2a6c2f; + border-radius: 6px; + color: #000000; } diff --git a/WebHostLib/static/styles/landing.css b/WebHostLib/static/styles/landing.css index 40f85bb1..ea142942 100644 --- a/WebHostLib/static/styles/landing.css +++ b/WebHostLib/static/styles/landing.css @@ -16,17 +16,18 @@ html{ text-align: center; } -#landing-header h1{ - color: #ffffff; - font-size: 3.5rem; - text-shadow: 1px 1px 7px #000000; - -webkit-text-stroke: 1px #00582e; +#landing-header #landing-logo{ + margin-left: auto; + margin-right: auto; + margin-top: 10px; + height: 140px; z-index: 10; } #landing-header h4{ color: #ffffff; - font-size: 1.75rem; + font-size: 36px; + margin-top: -10px; margin-bottom: 0; text-shadow: 1px 1px 7px #000000; font-kerning: none; @@ -44,18 +45,19 @@ html{ display: block; text-align: center; background-repeat: no-repeat; - font-family: HyliaSerif, sans-serif; font-kerning: none; text-decoration: none; text-shadow: 1px 1px 7px #000000; color: #ffffff; - font-size: 1.4rem; + font-size: 25px; + text-transform: uppercase; + font-family: LondrinaSolid-Light, sans-serif; } #far-left-button{ - top: 115px; + top: 160px; left: calc(50% - 416px - 200px - 75px); - background-image: url("/static/static/button-images/button-a.png"); + background-image: url("/static/static/button-images/island-button-a.png"); background-size: 200px auto; width: 200px; height: calc(156px - 40px); @@ -64,44 +66,44 @@ html{ } #mid-left-button{ - top: 320px; + top: 365px; left: calc(50% - 416px - 200px + 140px); - background-image: url("/static/static/button-images/button-b.png"); + background-image: url("/static/static/button-images/island-button-b.png"); background-size: 260px auto; width: 260px; height: calc(130px - 35px); - padding-top: 35px; + padding-top: 43px; } #mid-button{ - top: 400px; + top: 445px; left: calc(50% - 100px); - background-image: url("/static/static/button-images/button-a.png"); + background-image: url("/static/static/button-images/island-button-a.png"); background-size: 200px auto; width: 200px; height: calc(156px - 38px); - padding-top: 38px; + padding-top: 40px; } #mid-right-button{ - top: 300px; + top: 345px; left: calc(50% + 416px - 166px); - background-image: url("/static/static/button-images/button-c.png"); + background-image: url("/static/static/button-images/island-button-c.png"); background-size: 250px auto; width: calc(250px - 20px); height: calc(180px - 90px); - padding-top: 90px; + padding-top: 94px; padding-left: 20px; } #far-right-button{ - top: 125px; + top: 170px; left: calc(50% + 416px + 75px); - background-image: url("/static/static/button-images/button-b.png"); + background-image: url("/static/static/button-images/island-button-b.png"); background-size: 260px auto; width: 260px; height: calc(130px - 35px); - padding-top: 35px; + padding-top: 42px; } #landing-clouds{ @@ -144,6 +146,13 @@ html{ animation-iteration-count: infinite; } +#landing #first-line{ + font-family: LondrinaSolid-Light, sans-serif; + font-size: 25px; + margin: 20px 0; + text-transform: uppercase; +} + @keyframes c1-float{ from{ left: 10px; @@ -220,8 +229,11 @@ html{ margin-right: auto; } -#landing #first-line{ - font-weight: 500; +#landing-body{ + font-family: LexendDeca-Light, sans-serif; + font-size: 18px; + color: #ffffff; + line-height: 30px; } #landing .variable{ @@ -241,36 +253,36 @@ html{ } #landing-deco-1{ - top: 480px; + top: 525px; left: calc(50% - 276px); } #landing-deco-2{ - top: 250px; - left: calc(50% + 150px); + top: 355px; + left: calc(50% + 110px); } #landing-deco-3{ - top: 350px; + top: 395px; left: calc(50% - 150px); } #landing-deco-4{ - top: 290px; + top: 335px; left: calc(50% - 580px); } #landing-deco-5{ - top: 90px; + top: 135px; left: calc(50% + 450px); } #landing-deco-6{ - top: 462px; + top: 507px; left: calc(50% + 196px); } -@media all and (max-width: 1520px){ +@media all and (max-width: 1580px){ #landing-clouds #cloud1, #landing-clouds #cloud2, #landing-clouds #cloud3{ display: none; } @@ -282,17 +294,7 @@ html{ #landing{ order: 2; } #landing-links{ - height: auto; - flex-direction: column; - } - - #landing-links a{ - position: relative; - margin-left: auto; - margin-right: auto; - margin-bottom: 1rem; - top: auto; - left: auto; + display: none; } .landing-deco{ diff --git a/WebHostLib/static/styles/playerTracker.css b/WebHostLib/static/styles/lttp-tracker.css similarity index 94% rename from WebHostLib/static/styles/playerTracker.css rename to WebHostLib/static/styles/lttp-tracker.css index d5f47efe..899a8f69 100644 --- a/WebHostLib/static/styles/playerTracker.css +++ b/WebHostLib/static/styles/lttp-tracker.css @@ -1,5 +1,8 @@ #player-tracker-wrapper{ margin: 0; + font-family: LexendDeca-Light, sans-serif; + color: white; + font-size: 14px; } #inventory-table{ diff --git a/WebHostLib/static/styles/markdown.css b/WebHostLib/static/styles/markdown.css index ff2e924b..dce13558 100644 --- a/WebHostLib/static/styles/markdown.css +++ b/WebHostLib/static/styles/markdown.css @@ -4,10 +4,12 @@ max-width: 70rem; margin-left: auto; margin-right: auto; + margin-bottom: 30px; background-color: rgba(0, 0, 0, 0.15); border-radius: 8px; - padding: 1rem 1rem 3rem; - color: #eeffeb; + padding: 25px 30px 30px; + font-family: LexendDeca-Light, sans-serif; + font-size: 19px; } .markdown img{ @@ -19,36 +21,34 @@ margin-top: 0; } -.markdown a{ - color: #ffef00; -} +.markdown a{} .markdown h1{ - font-size: 2.5rem; + font-size: 52px; font-weight: normal; - border-bottom: 1px solid #ffffff; + font-family: LondrinaSolid-Regular, sans-serif; + text-transform: uppercase; cursor: pointer; width: 100%; - margin-bottom: 0.5rem; - color: #ffffff; text-shadow: 1px 1px 4px #000000; } .markdown h2{ - font-size: 2rem; + font-size: 38px; font-weight: normal; - border-bottom: 1px solid #ffffff; + font-family: LondrinaSolid-Light, sans-serif; cursor: pointer; width: 100%; + margin-top: 20px; margin-bottom: 0.5rem; - color: #ffe993; text-transform: lowercase; text-shadow: 1px 1px 2px #000000; } .markdown h3{ - font-size: 1.70rem; - font-weight: normal; + font-size: 26px; + font-family: LexendDeca-Regular, sans-serif; + text-transform: none; text-align: left; cursor: pointer; width: 100%; @@ -56,28 +56,25 @@ } .markdown h4{ - font-size: 1.5rem; - font-weight: normal; + font-family: LexendDeca-Regular, sans-serif; + text-transform: none; + font-size: 24px; cursor: pointer; - margin-bottom: 0.5rem; + margin-bottom: 24px; } .markdown h5{ - font-size: 1.25rem; - font-weight: normal; + font-family: LexendDeca-Regular, sans-serif; + text-transform: none; + font-size: 22px; cursor: pointer; } .markdown h6{ - font-size: 1.25rem; - font-weight: normal; - cursor: pointer; - color: #434343; -} - -.markdown h3, .markdown h4, .markdown h5,.markdown h6{ - color: #ffffff; - text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); + font-family: LexendDeca-Regular, sans-serif; + text-transform: none; + font-size: 20px; + cursor: pointer;; } .markdown h4, .markdown h5,.markdown h6{ @@ -98,23 +95,6 @@ } -.markdown pre{ - margin-top: 0; - padding: 0.5rem 0.25rem; - background-color: #ffeeab; - border: 1px solid #9f916a; - border-radius: 6px; - color: #000000; -} - -.markdown code{ - background-color: #ffeeab; - border-radius: 4px; - padding-left: 0.25rem; - padding-right: 0.25rem; - color: #000000; -} - .markdown #tutorial-video-container{ width: 100%; text-align: center; @@ -132,13 +112,23 @@ .markdown table th{ text-align: left; - font-weight: bold; - border: 1px solid #eeffeb; - padding: 0.25rem; + padding: 10px; + border: 1px solid white; + font-size: 20px; + font-family: LexendDeca-Regular, sans-serif; } .markdown table td{ + border: 1px solid white; text-align: left; - border: 1px solid #eeffeb; - padding: 0.25rem; + padding: 10px; +} + +.markdown pre{ + overflow-x: auto; +} + +strong{ + font-family: LexendDeca-Medium, sans-serif; + font-weight: normal; } diff --git a/WebHostLib/static/styles/minecraft/minecraft.css b/WebHostLib/static/styles/minecraft/minecraft.css deleted file mode 100644 index 063cc624..00000000 --- a/WebHostLib/static/styles/minecraft/minecraft.css +++ /dev/null @@ -1,3 +0,0 @@ -#minecraft{ - margin: 1rem; -} diff --git a/WebHostLib/static/styles/minecraftTracker.css b/WebHostLib/static/styles/minecraftTracker.css index 45b8a381..224cdcdc 100644 --- a/WebHostLib/static/styles/minecraftTracker.css +++ b/WebHostLib/static/styles/minecraftTracker.css @@ -40,8 +40,8 @@ color: white; font-family: "Minecraftia", monospace; font-weight: bold; - bottom: 0px; - right: 0px; + bottom: 0; + right: 0; } #location-table{ diff --git a/WebHostLib/static/styles/ootTracker.css b/WebHostLib/static/styles/ootTracker.css index 579ed377..ec3cc1ad 100644 --- a/WebHostLib/static/styles/ootTracker.css +++ b/WebHostLib/static/styles/ootTracker.css @@ -41,7 +41,7 @@ font-family: monospace; font-weight: bold; font-size: 1.1em; - bottom: 0px; + bottom: 0; right: 8px; } diff --git a/WebHostLib/static/styles/player-settings.css b/WebHostLib/static/styles/player-settings.css index 8684f943..4b64448c 100644 --- a/WebHostLib/static/styles/player-settings.css +++ b/WebHostLib/static/styles/player-settings.css @@ -1,5 +1,5 @@ html{ - background-image: url('../static/backgrounds/grass/grass-0007-large.png'); + background-image: url('../static/backgrounds/grass.png'); background-repeat: repeat; background-size: 650px 650px; } @@ -47,7 +47,6 @@ html{ #player-settings h1{ font-size: 2.5rem; font-weight: normal; - border-bottom: 1px solid #ffffff; width: 100%; margin-bottom: 0.5rem; color: #ffffff; @@ -55,9 +54,8 @@ html{ } #player-settings h2{ - font-size: 2rem; + font-size: 40px; font-weight: normal; - border-bottom: 1px solid #ffffff; width: 100%; margin-bottom: 0.5rem; color: #ffe993; @@ -102,6 +100,19 @@ html{ flex-grow: 1; } +#player-settings .left{ + margin-right: 10px; +} + +#player-settings .right{ + margin-left: 10px; +} + +#player-settings table{ + margin-bottom: 30px; + width: 100%; +} + #player-settings table .select-container{ display: flex; flex-direction: row; @@ -133,6 +144,13 @@ html{ cursor: default; } +#player-settings th, #player-settings td{ + border: none; + padding: 3px; + font-size: 17px; + vertical-align: middle; +} + @media all and (max-width: 1000px), all and (orientation: portrait){ #player-settings #game-options{ justify-content: flex-start; diff --git a/WebHostLib/static/styles/subnautica/subnautica.css b/WebHostLib/static/styles/subnautica/subnautica.css deleted file mode 100644 index d97d458b..00000000 --- a/WebHostLib/static/styles/subnautica/subnautica.css +++ /dev/null @@ -1,3 +0,0 @@ -#subnautica{ - margin: 1rem; -} diff --git a/WebHostLib/static/styles/supermetroidTracker.css b/WebHostLib/static/styles/supermetroidTracker.css index c2595a50..5c7d36e9 100644 --- a/WebHostLib/static/styles/supermetroidTracker.css +++ b/WebHostLib/static/styles/supermetroidTracker.css @@ -42,8 +42,8 @@ color: white; font-family: "Minecraftia", monospace; font-weight: bold; - bottom: 0px; - right: 0px; + bottom: 0; + right: 0; } #location-table{ diff --git a/WebHostLib/static/styles/supportedGames.css b/WebHostLib/static/styles/supportedGames.css new file mode 100644 index 00000000..f86ab581 --- /dev/null +++ b/WebHostLib/static/styles/supportedGames.css @@ -0,0 +1,33 @@ +#games{ + width: 60%; + margin: auto auto 30px; +} + +#games h2, #games h3, #games h4, #games h5, #games h6 { + text-transform: none; + cursor: unset; +} + +#games h1{ + font-size: 60px; + cursor: unset; +} + +#games h2{ + color: #93dcff; + margin-bottom: 2px; +} + +#games a{ + font-size: 16px; +} + +#games .link-spacer{ + margin: 0 6px; + color: #fffc95; +} + +#games p{ + line-height: 25px; + margin-bottom: 7px; +} diff --git a/WebHostLib/static/styles/header/baseHeader.css b/WebHostLib/static/styles/themes/base.css similarity index 78% rename from WebHostLib/static/styles/header/baseHeader.css rename to WebHostLib/static/styles/themes/base.css index 1d501917..0dbdf5f6 100644 --- a/WebHostLib/static/styles/header/baseHeader.css +++ b/WebHostLib/static/styles/themes/base.css @@ -12,7 +12,6 @@ html{ position: fixed; top: 0; left: 0; - font-family: HyliaSerif, sans-serif; padding: 10px; line-height: 2rem; z-index: 9999; @@ -28,13 +27,17 @@ html{ padding-right: 7px; } +#base-header-right{ + margin-top: 4px; +} + #base-header #site-title{ margin-right: 7px; } #base-header #site-title img{ - width: 40px; - height: 40px; + height: 38px; + margin-top: 4px; } #base-header a{ @@ -42,5 +45,7 @@ html{ text-decoration: none; cursor: pointer; margin-right: 1.2rem; - font-size: 1.2rem; + font-size: 22px; + font-family: LondrinaSolid-Light, sans-serif; + text-transform: uppercase; } diff --git a/WebHostLib/static/styles/themes/dirt.css b/WebHostLib/static/styles/themes/dirt.css new file mode 100644 index 00000000..8f054040 --- /dev/null +++ b/WebHostLib/static/styles/themes/dirt.css @@ -0,0 +1,64 @@ +html{ + background-image: url("../../static/backgrounds/dirt.png"); + background-repeat: repeat; + background-size: 400px 400px; +} + +body{ + color: #ffffff; +} + +#base-header{ + background: url('../../static/backgrounds/header/dirt-header.png') repeat-x; +} + +.markdown { + background-color: rgba(0, 0, 0, 0.25) !important; +} + +h1{ + color: #ffffff; +} + +h2{ + color: #c8e79f; +} + +h3, h4, h5,h6{ + color: #ffffff; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); +} + +table th{ + +} + +table td{ + +} + +a{ + color: #ffd891; +} + +pre{ + margin-top: 0; + padding: 0.5rem 0.25rem; + background-color: #d1c3ab; + border: 1px solid #2a6c2f; + border-radius: 6px; + color: #000000; +} + +pre code{ + border: none; +} + +code{ + background-color: #d1c3ab; + border-radius: 4px; + border: 1px solid #5c4c31; + padding-left: 0.25rem; + padding-right: 0.25rem; + color: #000000; +} diff --git a/WebHostLib/static/styles/themes/grass-flowers.css b/WebHostLib/static/styles/themes/grass-flowers.css new file mode 100644 index 00000000..8006593d --- /dev/null +++ b/WebHostLib/static/styles/themes/grass-flowers.css @@ -0,0 +1,64 @@ +html{ + background-image: url("../../static/backgrounds/grass-flowers.png"); + background-repeat: repeat; + background-size: 400px 400px; +} + +body{ + color: #ffffff; +} + +#base-header { + background: url('../../static/backgrounds/header/grass-header.png') repeat-x; +} + +.markdown { + background-color: rgba(0, 0, 0, 0.30) !important; +} + +h1{ + color: #ffffff; +} + +h2{ + color: #5aff6a; +} + +h3, h4, h5,h6{ + color: #ffffff; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); +} + +table th{ + +} + +table td{ + +} + +a{ + color: #fff80f; +} + +pre{ + margin-top: 0; + padding: 0.5rem 0.25rem; + background-color: #b5e9a4; + border: 1px solid #2a6c2f; + border-radius: 6px; + color: #000000; +} + +pre code{ + border: none; +} + +code{ + background-color: #b5e9a4; + border-radius: 4px; + border: 1px solid #2a6c2f; + padding-left: 0.25rem; + padding-right: 0.25rem; + color: #000000; +} diff --git a/WebHostLib/static/styles/themes/grass.css b/WebHostLib/static/styles/themes/grass.css new file mode 100644 index 00000000..79611804 --- /dev/null +++ b/WebHostLib/static/styles/themes/grass.css @@ -0,0 +1,64 @@ +html{ + background-image: url("../../static/backgrounds/grass.png"); + background-repeat: repeat; + background-size: 400px 400px; +} + +body{ + color: #ffffff; +} + +#base-header { + background: url('../../static/backgrounds/header/grass-header.png') repeat-x; +} + +.markdown { + background-color: rgba(0, 0, 0, 0.30) !important; +} + +h1{ + color: #ffffff; +} + +h2{ + color: #5aff6a; +} + +h3, h4, h5,h6{ + color: #ffffff; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); +} + +table th{ + +} + +table td{ + +} + +a{ + color: #fff80f; +} + +pre{ + margin-top: 0; + padding: 0.5rem 0.25rem; + background-color: #b5e9a4; + border: 1px solid #2a6c2f; + border-radius: 6px; + color: #000000; +} + +pre code{ + border: none; +} + +code{ + background-color: #b5e9a4; + border-radius: 4px; + border: 1px solid #2a6c2f; + padding-left: 0.25rem; + padding-right: 0.25rem; + color: #000000; +} diff --git a/WebHostLib/static/styles/themes/ice.css b/WebHostLib/static/styles/themes/ice.css new file mode 100644 index 00000000..d8768dcb --- /dev/null +++ b/WebHostLib/static/styles/themes/ice.css @@ -0,0 +1,64 @@ +html{ + background-image: url('../../static/backgrounds/ice.png'); + background-repeat: repeat; + background-size: 400px 400px; +} + +body{ + color: #ffffff; +} + +#base-header { + background: url('../../static/backgrounds/header/ocean-header.png') repeat-x; +} + +.markdown { + background-color: rgba(5, 10, 42, 0.58) !important; +} + +h1{ + color: #ffffff; +} + +h2{ + color: #ffcccc; +} + +h3, h4, h5,h6{ + color: #ffffff; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); +} + +table th{ + +} + +table td{ + +} + +a{ + color: #ffee75; +} + +pre{ + margin-top: 0; + padding: 0.5rem 0.25rem; + background-color: #cae2e9; + border: 1px solid #5d7d87; + border-radius: 6px; + color: #000000; +} + +pre code{ + border: none; +} + +code{ + background-color: #cae2e9; + border-radius: 4px; + border: 1px solid #5d7d87; + padding-left: 0.25rem; + padding-right: 0.25rem; + color: #000000; +} diff --git a/WebHostLib/static/styles/themes/jungle.css b/WebHostLib/static/styles/themes/jungle.css new file mode 100644 index 00000000..a6808658 --- /dev/null +++ b/WebHostLib/static/styles/themes/jungle.css @@ -0,0 +1,64 @@ +html{ + background-image: url("../../static/backgrounds/jungle.png"); + background-repeat: repeat; + background-size: 450px 450px; +} + +body{ + color: #ffffff; +} + +#base-header { + background: url('../../static/backgrounds/header/grass-header.png') repeat-x; +} + +.markdown { + background-color: rgba(0, 0, 0, 0.46) !important; +} + +h1{ + color: #ffffff; +} + +h2{ + color: #7bdf27; +} + +h3, h4, h5,h6{ + color: #ffffff; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); +} + +table th{ + +} + +table td{ + +} + +a{ + color: #ffd438; +} + +pre{ + margin-top: 0; + padding: 0.5rem 0.25rem; + background-color: #accf90; + border: 1px solid #578134; + border-radius: 6px; + color: #000000; +} + +pre code{ + border: none; +} + +code{ + background-color: #accf90; + border-radius: 4px; + border: 1px solid #578134; + padding-left: 0.25rem; + padding-right: 0.25rem; + color: #000000; +} diff --git a/WebHostLib/static/styles/themes/ocean-island.css b/WebHostLib/static/styles/themes/ocean-island.css new file mode 100644 index 00000000..2b45fb9d --- /dev/null +++ b/WebHostLib/static/styles/themes/ocean-island.css @@ -0,0 +1,74 @@ +html{ + background-image: url('../../static/backgrounds/ocean.png'); + background-repeat: repeat; + background-size: 250px 250px; + font-family: LexendDeca-Light, sans-serif; + font-size: 18px; + color: #ffffff; + line-height: 30px; +} + +#base-header{ + background: url('../../static/backgrounds/header/ocean-header.png') repeat-x; +} + +div header{ + font-family: LondrinaSolid-Light, sans-serif; + font-size: 25px; + margin: 20px 0; + text-transform: uppercase; +} + +h1{ + font-family: LondrinaSolid-Light, sans-serif; + text-transform: uppercase; + color: #ffffff; + margin-top: 10px; + margin-bottom: 30px; +} + +.grass-island{ + background: + url('../../static/backgrounds/cliffs/grass/cliff-top-left-corner.png') top left no-repeat, + url('../../static/backgrounds/cliffs/grass/cliff-top-right-corner.png') top right no-repeat, + url('../../static/backgrounds/cliffs/grass/cliff-bottom-left-corner.png') bottom left no-repeat, + url('../../static/backgrounds/cliffs/grass/cliff-bottom-right-corner.png') bottom right no-repeat, + url('../../static/backgrounds/cliffs/grass/cliff-top.png') top repeat-x, + url('../../static/backgrounds/cliffs/grass/cliff-bottom.png') bottom repeat-x, + url('../../static/backgrounds/cliffs/grass/cliff-left.png') left repeat-y, + url('../../static/backgrounds/cliffs/grass/cliff-right.png') right repeat-y, + url('../../static/backgrounds/grass.png') repeat; + + background-size: + 140px 120px, /* top-left */ + 140px 120px, /* top-right */ + 140px 140px, /* bottom-left */ + 140px 140px, /* bottom-right */ + 20px 71px, /* top */ + 20px 100px, /* bottom */ + 71px 20px, /* left */ + 71px 20px, /* right */ + 525px 525px; /* center */ + + min-width: 280px; + min-height: 280px; + + padding: 100px 120px 120px; +} + +pre{ + margin-top: 0; + padding: 0.5rem 0.25rem; + background-color: #ffeeab; + border: 1px solid #9f916a; + border-radius: 6px; + color: #000000; +} + +code{ + background-color: #ffeeab; + border-radius: 4px; + padding-left: 0.25rem; + padding-right: 0.25rem; + color: #000000; +} diff --git a/WebHostLib/static/styles/themes/ocean.css b/WebHostLib/static/styles/themes/ocean.css new file mode 100644 index 00000000..fcfaa7f9 --- /dev/null +++ b/WebHostLib/static/styles/themes/ocean.css @@ -0,0 +1,65 @@ +html{ + background-image: url('../../static/backgrounds/ocean.png'); + background-repeat: repeat; + background-size: 400px 400px; +} + +body{ + color: #ffffff; +} + +#base-header{ + background: url('../../static/backgrounds/header/ocean-header.png') repeat-x; +} + +.markdown { + background-color: rgba(17, 35, 62, 0.55) !important; +} + +h1{ + color: #ffffff; +} + +h2{ + color: #93dcff; +} + +h3, h4, h5,h6{ + color: #ffffff; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); +} + +table th{ + +} + +table td{ + +} + +a{ + color: #fffc95; +} + +pre{ + margin-top: 0; + padding: 0.5rem 0.25rem; + background-color: #83a8e1; + border: 1px solid #4c658b; + border-radius: 6px; + color: #000000; + overflow-x: auto; +} + +pre code{ + border: none; +} + +code{ + background-color: #83a8e1; + border-radius: 4px; + border: 1px solid #4c658b; + padding-left: 0.25rem; + padding-right: 0.25rem; + color: #000000; +} diff --git a/WebHostLib/static/styles/themes/party-time.css b/WebHostLib/static/styles/themes/party-time.css new file mode 100644 index 00000000..1e2041b8 --- /dev/null +++ b/WebHostLib/static/styles/themes/party-time.css @@ -0,0 +1,64 @@ +html{ + background-image: url("../../static/backgrounds/party-time.png"); + background-repeat: repeat; + background-size: 350px 350px; +} + +body{ + color: #ffffff; +} + +#base-header { + background: url('../../static/backgrounds/header/party-time-header.png') repeat-x; +} + +.markdown { + background-color: rgba(26, 5, 48, 0.8) !important; +} + +h1{ + color: #ffffff; +} + +h2{ + color: #ff5884; +} + +h3, h4, h5,h6{ + color: #ffffff; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); +} + +table th{ + +} + +table td{ + +} + +a{ + color: #b1fd5e; +} + +pre{ + margin-top: 0; + padding: 0.5rem 0.25rem; + background-color: #b08ed5; + border: 1px solid #6d5687; + border-radius: 6px; + color: #000000; +} + +pre code{ + border: none; +} + +code{ + background-color: #b08ed5; + border-radius: 4px; + border: 1px solid #6d5687; + padding-left: 0.25rem; + padding-right: 0.25rem; + color: #000000; +} diff --git a/WebHostLib/static/styles/timespinnerTracker.css b/WebHostLib/static/styles/timespinnerTracker.css index a0012d04..e4e47f9e 100644 --- a/WebHostLib/static/styles/timespinnerTracker.css +++ b/WebHostLib/static/styles/timespinnerTracker.css @@ -40,8 +40,8 @@ color: white; font-family: "Minecraftia", monospace; font-weight: bold; - bottom: 0px; - right: 0px; + bottom: 0; + right: 0; } #location-table{ diff --git a/WebHostLib/static/styles/tracker.css b/WebHostLib/static/styles/tracker.css index c6e84aea..e203d9e9 100644 --- a/WebHostLib/static/styles/tracker.css +++ b/WebHostLib/static/styles/tracker.css @@ -47,8 +47,17 @@ div.dataTables_wrapper.no-footer .dataTables_scrollBody{ border: none; } +table.dataTable{ + color: #000000; +} + +table.dataTable thead{ + font-family: LexendDeca-Regular, sans-serif; +} + table.dataTable tbody{ background-color: #dce2bd; + font-family: LexendDeca-Light, sans-serif; } table.dataTable tbody tr:hover{ diff --git a/WebHostLib/static/styles/tutorialLanding.css b/WebHostLib/static/styles/tutorialLanding.css index d1d71012..0a36da8e 100644 --- a/WebHostLib/static/styles/tutorialLanding.css +++ b/WebHostLib/static/styles/tutorialLanding.css @@ -1,100 +1,43 @@ -#tutorial-landing{ - display: flex; - flex-direction: column; - max-width: 70rem; - margin-left: auto; - margin-right: auto; - background-color: rgba(0, 0, 0, 0.15); - border-radius: 8px; - padding: 1rem 1rem 3rem; - color: #eeffeb; -} +#tutorial-landing{} -#tutorial-landing p{ - margin: 0; -} - -#tutorial-landing a{ - color: #ffef00; - text-decoration: none; +#tutorial-landing h2, #tutorial-landing h3, #tutorial-landing h4, #tutorial-landing h5, #tutorial-landing h6 { + text-transform: none; + cursor: unset; } #tutorial-landing h1{ - font-size: 2.5rem; - font-weight: normal; - border-bottom: 1px solid #ffffff; - width: 100%; - margin-bottom: 0.5rem; - color: #ffffff; - text-shadow: 1px 1px 4px #000000; + font-size: 60px; + cursor: unset; } #tutorial-landing h2{ - font-size: 2rem; - font-weight: normal; - border-bottom: 1px solid #ffffff; - width: 100%; - margin-bottom: 0.5rem; - color: #ffe993; - text-transform: lowercase; - text-shadow: 1px 1px 2px #000000; + color: #fff677; + margin-bottom: 2px; + margin-top: 33px; + font-size: 44px; } -#tutorial-landing h3{ - font-size: 1.70rem; - font-weight: normal; - text-align: left; - width: 100%; - margin-bottom: 0.5rem; +#tutorial-landing a{ + font-size: 16px; } -#tutorial-landing h4{ - font-size: 1.5rem; - font-weight: normal; - margin-bottom: 0.5rem; +#tutorial-landing .link-spacer{ + margin: 0 6px; + color: #fffc95; } -#tutorial-landing h5{ - font-size: 1.25rem; - font-weight: normal; -} - -#tutorial-landing h6{ - font-size: 1.25rem; - font-weight: normal; - color: #434343; -} - -#tutorial-landing h3, #tutorial-landing h4, #tutorial-landing h5,#tutorial-landing h6{ - color: #ffffff; - text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); +#tutorial-landing p{ + line-height: 25px; + margin-bottom: 7px; + font-size: 17px; } #tutorial-landing ul{ - -} - -#tutorial-landing ol{ - + font-size: 17px; + margin-top: 0; + margin-bottom: 26px; } #tutorial-landing li{ - -} - -#tutorial-landing pre{ - margin-top: 0; - padding: 0.5rem 0.25rem; - background-color: #ffeeab; - border: 1px solid #9f916a; - border-radius: 6px; - color: #000000; -} - -#tutorial-landing code{ - background-color: #ffeeab; - border-radius: 4px; - padding-left: 0.25rem; - padding-right: 0.25rem; - color: #000000; + line-height: 22px; } diff --git a/WebHostLib/static/styles/weighted-settings.css b/WebHostLib/static/styles/weighted-settings.css index 959a288c..7639fa1c 100644 --- a/WebHostLib/static/styles/weighted-settings.css +++ b/WebHostLib/static/styles/weighted-settings.css @@ -1,5 +1,5 @@ html{ - background-image: url('../static/backgrounds/grass/grass-0007-large.png'); + background-image: url('../static/backgrounds/grass.png'); background-repeat: repeat; background-size: 650px 650px; scroll-padding-top: 90px; @@ -45,7 +45,6 @@ html{ } #weighted-settings p.setting-description{ - font-weight: bold; margin: 0 0 1rem; } @@ -64,7 +63,16 @@ html{ width: 100%; } +#weighted-settings table th, #weighted-settings table td{ + border: none; +} + +#weighted-settings table td{ + padding: 5px; +} + #weighted-settings table .td-left{ + font-family: LexendDeca-Regular, sans-serif; padding-right: 1rem; width: 200px; } @@ -233,13 +241,14 @@ html{ width: 100%; margin-bottom: 0.5rem; color: #ffe993; - text-transform: lowercase; + text-transform: none; text-shadow: 1px 1px 2px #000000; } #weighted-settings h3, #weighted-settings h4, #weighted-settings h5, #weighted-settings h6{ color: #ffffff; text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); + text-transform: none; } #weighted-settings a{ diff --git a/WebHostLib/static/styles/zelda3/zelda3.css b/WebHostLib/static/styles/zelda3/zelda3.css deleted file mode 100644 index bf00d4a2..00000000 --- a/WebHostLib/static/styles/zelda3/zelda3.css +++ /dev/null @@ -1,3 +0,0 @@ -#zelda3{ - margin: 1rem; -} diff --git a/WebHostLib/templates/gameInfo.html b/WebHostLib/templates/gameInfo.html index dddd709f..c5ebba82 100644 --- a/WebHostLib/templates/gameInfo.html +++ b/WebHostLib/templates/gameInfo.html @@ -10,7 +10,7 @@ {% endblock %} {% block body %} - {% include 'header/grassHeader.html' %} + {% include 'header/'+theme+'Header.html' %}
diff --git a/WebHostLib/templates/generate.html b/WebHostLib/templates/generate.html index 341fde34..8b07940f 100644 --- a/WebHostLib/templates/generate.html +++ b/WebHostLib/templates/generate.html @@ -8,14 +8,14 @@ {% endblock %} {% block body %} - {% include 'header/oceanHeader.html' %} + {% include 'header/oceanIslandHeader.html' %}

Generate Game{% if race %} (Race Mode){% endif %}

This page allows you to generate a game by uploading a config file or a zip file containing config files. If you do not have a config (.yaml) file yet, you may create one on the game's settings page, - which you can find via the supported games list. + which you can find on the supported games list.

Note: This website will always generate games using the current release version of Archipelago, diff --git a/WebHostLib/templates/header/baseHeader.html b/WebHostLib/templates/header/baseHeader.html index eb8a86a0..a76835b5 100644 --- a/WebHostLib/templates/header/baseHeader.html +++ b/WebHostLib/templates/header/baseHeader.html @@ -1,14 +1,13 @@ {% block head %} - + {% endblock %} {% block header %}

supported games diff --git a/WebHostLib/templates/header/dirtHeader.html b/WebHostLib/templates/header/dirtHeader.html index 80255458..01249090 100644 --- a/WebHostLib/templates/header/dirtHeader.html +++ b/WebHostLib/templates/header/dirtHeader.html @@ -1,5 +1,5 @@ {% block head %} - + {% endblock %} {% include 'header/baseHeader.html' %} diff --git a/WebHostLib/templates/header/grassFlowersHeader.html b/WebHostLib/templates/header/grassFlowersHeader.html new file mode 100644 index 00000000..081763fe --- /dev/null +++ b/WebHostLib/templates/header/grassFlowersHeader.html @@ -0,0 +1,5 @@ +{% block head %} + +{% endblock %} + +{% include 'header/baseHeader.html' %} diff --git a/WebHostLib/templates/header/grassHeader.html b/WebHostLib/templates/header/grassHeader.html index 8a1e5e2f..7e74247c 100644 --- a/WebHostLib/templates/header/grassHeader.html +++ b/WebHostLib/templates/header/grassHeader.html @@ -1,5 +1,5 @@ {% block head %} - + {% endblock %} {% include 'header/baseHeader.html' %} diff --git a/WebHostLib/templates/header/iceHeader.html b/WebHostLib/templates/header/iceHeader.html new file mode 100644 index 00000000..b98d424d --- /dev/null +++ b/WebHostLib/templates/header/iceHeader.html @@ -0,0 +1,5 @@ +{% block head %} + +{% endblock %} + +{% include 'header/baseHeader.html' %} diff --git a/WebHostLib/templates/header/jungleHeader.html b/WebHostLib/templates/header/jungleHeader.html new file mode 100644 index 00000000..d6f34cf0 --- /dev/null +++ b/WebHostLib/templates/header/jungleHeader.html @@ -0,0 +1,5 @@ +{% block head %} + +{% endblock %} + +{% include 'header/baseHeader.html' %} diff --git a/WebHostLib/templates/header/oceanHeader.html b/WebHostLib/templates/header/oceanHeader.html index f7869b63..4ac1ab45 100644 --- a/WebHostLib/templates/header/oceanHeader.html +++ b/WebHostLib/templates/header/oceanHeader.html @@ -1,5 +1,5 @@ {% block head %} - + {% endblock %} {% include 'header/baseHeader.html' %} diff --git a/WebHostLib/templates/header/oceanIslandHeader.html b/WebHostLib/templates/header/oceanIslandHeader.html new file mode 100644 index 00000000..269a018d --- /dev/null +++ b/WebHostLib/templates/header/oceanIslandHeader.html @@ -0,0 +1,5 @@ +{% block head %} + +{% endblock %} + +{% include 'header/baseHeader.html' %} diff --git a/WebHostLib/templates/header/partyTimeHeader.html b/WebHostLib/templates/header/partyTimeHeader.html new file mode 100644 index 00000000..b2c29941 --- /dev/null +++ b/WebHostLib/templates/header/partyTimeHeader.html @@ -0,0 +1,5 @@ +{% block head %} + +{% endblock %} + +{% include 'header/baseHeader.html' %} diff --git a/WebHostLib/templates/hostGame.html b/WebHostLib/templates/hostGame.html index 7e3c9b31..55d155c7 100644 --- a/WebHostLib/templates/hostGame.html +++ b/WebHostLib/templates/hostGame.html @@ -8,7 +8,7 @@ {% endblock %} {% block body %} - {% include 'header/oceanHeader.html' %} + {% include 'header/oceanIslandHeader.html' %}
diff --git a/WebHostLib/templates/hostRoom.html b/WebHostLib/templates/hostRoom.html index 281811e8..75307989 100644 --- a/WebHostLib/templates/hostRoom.html +++ b/WebHostLib/templates/hostRoom.html @@ -10,11 +10,11 @@
{% if room.owner == session["_id"] %} Room created from Seed #{{ room.seed.id|suuid }} -
+
{% endif %} {% if room.tracker %} This room has a Multiworld Tracker enabled. -
+
{% endif %} This room will be closed after {{ room.timeout//60//60 }} hours of inactivity. Should you wish to continue later, @@ -31,10 +31,8 @@ placeholder="Server Command. /help to list them, list gets appended to log.">
- - Log:
- + + + @@ -69,12 +70,12 @@ {{ checks_done[area] }} / {{ checks_in_area[area] }} {% if key_locations and "Universal" not in key_locations %} - {{ inventory[small_key_ids[area]] if area in key_locations else 'N/A' }} + {{ inventory[small_key_ids[area]] if area in key_locations else '—' }} {% endif %} {% if big_key_locations %} - {{ '✔' if area in big_key_locations and inventory[big_key_ids[area]] else ('N/A' if area not in big_key_locations else '') }} + {{ '✔' if area in big_key_locations and inventory[big_key_ids[area]] else ('—' if area not in big_key_locations else '') }} {% endif %} diff --git a/WebHostLib/templates/macros.html b/WebHostLib/templates/macros.html index cb345976..663f3581 100644 --- a/WebHostLib/templates/macros.html +++ b/WebHostLib/templates/macros.html @@ -11,11 +11,11 @@ - - - - - + + + + + diff --git a/WebHostLib/templates/pageWrapper.html b/WebHostLib/templates/pageWrapper.html index 33c22e34..ec7888ac 100644 --- a/WebHostLib/templates/pageWrapper.html +++ b/WebHostLib/templates/pageWrapper.html @@ -2,15 +2,13 @@ - - {% block head %} - MultiWorld + Archipelago {% endblock %} diff --git a/WebHostLib/templates/player-settings.html b/WebHostLib/templates/player-settings.html index aebbccb9..50b9e3cb 100644 --- a/WebHostLib/templates/player-settings.html +++ b/WebHostLib/templates/player-settings.html @@ -2,6 +2,7 @@ {% block head %} {{ game }} Settings + @@ -10,8 +11,8 @@ {% endblock %} {% block body %} - {% include 'header/grassHeader.html' %} -
+ {% include 'header/'+theme+'Header.html' %} +

Player Settings

Choose the options you would like to play with! You may generate a single-player game from this page, diff --git a/WebHostLib/templates/seedError.html b/WebHostLib/templates/seedError.html index d8f95a1c..0f5850da 100644 --- a/WebHostLib/templates/seedError.html +++ b/WebHostLib/templates/seedError.html @@ -7,7 +7,7 @@ {% endblock %} {% block body %} - {% include 'header/oceanHeader.html' %} + {% include 'header/oceanIslandHeader.html' %}

Generation failed

diff --git a/WebHostLib/templates/startPlaying.html b/WebHostLib/templates/startPlaying.html index 2502d102..157d6de2 100644 --- a/WebHostLib/templates/startPlaying.html +++ b/WebHostLib/templates/startPlaying.html @@ -7,7 +7,7 @@ {% endblock %} {% block body %} - {% include 'header/oceanHeader.html' %} + {% include 'header/oceanIslandHeader.html' %}
@@ -19,7 +19,7 @@

To start playing a game, you'll first need to generate a randomized game. - You'll need to upload either a config file or a zip file containing one more more config files. + You'll need to upload either a config file or a zip file containing one more config files.

If you have already generated a game and just need to host it, this site can
diff --git a/WebHostLib/templates/supportedGames.html b/WebHostLib/templates/supportedGames.html index 90e16781..fb5c0ab1 100644 --- a/WebHostLib/templates/supportedGames.html +++ b/WebHostLib/templates/supportedGames.html @@ -2,24 +2,25 @@ {% block head %} Player Settings - + + {% endblock %} {% block body %} - {% include 'header/grassHeader.html' %} -
+ {% include 'header/oceanHeader.html' %} +

Currently Supported Games

{% for game_name, world in worlds.items() | sort %} -

{{ game_name }}

+

{{ game_name }}

+ {{ world.__doc__ | default("No description provided.", true) }}
+ Game Page + | {% if world.web.settings_page is string %} Settings Page -
{% elif world.web.settings_page %} Settings Page -
{% endif %} - {{ world.__doc__ | default("No description provided.", true) }}

{% endfor %}
diff --git a/WebHostLib/templates/tutorial.html b/WebHostLib/templates/tutorial.html index b4d95c4c..d3a7e0a0 100644 --- a/WebHostLib/templates/tutorial.html +++ b/WebHostLib/templates/tutorial.html @@ -1,7 +1,7 @@ {% extends 'pageWrapper.html' %} {% block head %} - {% include 'header/grassHeader.html' %} + {% include 'header/'+theme+'Header.html' %} Archipelago {% endblock %} {% block body %} -
+

Archipelago Guides

Loading...

diff --git a/WebHostLib/templates/viewSeed.html b/WebHostLib/templates/viewSeed.html index 410b2206..e252fb06 100644 --- a/WebHostLib/templates/viewSeed.html +++ b/WebHostLib/templates/viewSeed.html @@ -8,7 +8,7 @@ {% endblock %} {% block body %} - {% include 'header/oceanHeader.html' %} + {% include 'header/oceanIslandHeader.html' %}

Seed Info

diff --git a/WebHostLib/templates/waitSeed.html b/WebHostLib/templates/waitSeed.html index 16465121..9041b901 100644 --- a/WebHostLib/templates/waitSeed.html +++ b/WebHostLib/templates/waitSeed.html @@ -8,7 +8,7 @@ {% endblock %} {% block body %} - {% include 'header/oceanHeader.html' %} + {% include 'header/oceanIslandHeader.html' %}

Generation in Progress

diff --git a/WebHostLib/templates/weighted-settings.html b/WebHostLib/templates/weighted-settings.html index de842682..9ce097c3 100644 --- a/WebHostLib/templates/weighted-settings.html +++ b/WebHostLib/templates/weighted-settings.html @@ -2,6 +2,7 @@ {% block head %} {{ game }} Settings + @@ -11,7 +12,7 @@ {% block body %} {% include 'header/grassHeader.html' %} -
+

Weighted Settings

Weighted Settings allows you to choose how likely a particular option is to be used in game generation. diff --git a/worlds/AutoWorld.py b/worlds/AutoWorld.py index ee31b89a..fd0555fa 100644 --- a/worlds/AutoWorld.py +++ b/worlds/AutoWorld.py @@ -78,6 +78,10 @@ class WebWorld: # display a settings page. Can be a link to an out-of-ap settings tool too. settings_page: Union[bool, str] = True + # Choose a theme for your /game/* pages + # Available: dirt, grass, grassFlowers, ice, jungle, ocean, partyTime + theme = "grass" + class World(metaclass=AutoWorldRegister): """A World object encompasses a game's Items, Locations, Rules and additional data or functionality required. diff --git a/worlds/archipidle/Items.py b/worlds/archipidle/Items.py index fbed97c4..c98117ae 100644 --- a/worlds/archipidle/Items.py +++ b/worlds/archipidle/Items.py @@ -149,4 +149,54 @@ item_table = ( 'Sega Dreamcast', 'Mario\'s Overalls', 'Betamax Player', + 'Stray Lego', + 'Chocolate Chip Pancakes', + 'Two Blueberry Muffins', + 'Nintendo 64 Controller with a Perfect Thumbstick', + 'Cuckoo Crossing the Road', + 'One Eyed, One Horned, Flying Purple People-Eater', + 'Love Potion Number Nine', + 'Wireless Headphones', + 'Festive Keychain', + 'Bundle of Twisted Cables', + 'Plank of Wood', + 'Broken Ant Farm', + 'Thirty-six American Dollars', + 'Can of Shaving Cream', + 'Blue Hair Dye', + 'Mug Engraved with the AP Logo', + 'Tube of Toothpaste', + 'Album of Elevator Music', + 'Headlight Fluid', + 'Tickets to the Renaissance Faire', + 'Bag of Golf Balls', + 'Box of Packing Peanuts', + 'Bottle of Peanut Butter', + 'Breath of the Wild Cookbook', + 'Stardew Valley Cookbook', + 'Thirteen Angry Chickens', + 'Bowl of Cereal', + 'Rubber Snake', + 'Stale Sunflower Seeds', + 'Alarm Clock Without a Snooze Button', + 'Wet Pineapple', + 'Set of Scented Candles', + 'Adorable Stuffed Animal', + 'The Broodwitch', + 'Old Photo Album', + 'Trade Quest Item', + 'Pair of Fancy Boots', + 'Shoddy Pickaxe', + 'Adventurer\'s Sword', + 'Cute Puppy', + 'Box of Matches', + 'Set of Allen Wrenches', + 'Glass of Water', + 'Magic Shaggy Carpet', + 'Macaroni and Cheese', + 'Chocolate Chip Cookie Dough Ice Cream', + 'Fresh Strawberries', + 'Delicious Tacos', + 'The Krabby Patty Recipe', + 'Map to Waldo\'s Location', ) diff --git a/worlds/archipidle/__init__.py b/worlds/archipidle/__init__.py index e670bd2a..36d63738 100644 --- a/worlds/archipidle/__init__.py +++ b/worlds/archipidle/__init__.py @@ -1,7 +1,11 @@ from BaseClasses import Item, MultiWorld, Region, Location, Entrance from .Items import item_table from .Rules import set_rules -from ..AutoWorld import World +from ..AutoWorld import World, WebWorld + + +class ArchipIDLEWebWorld(WebWorld): + theme = 'partyTime' class ArchipIDLEWorld(World): @@ -11,6 +15,7 @@ class ArchipIDLEWorld(World): game = "ArchipIDLE" topology_present = False data_version = 1 + web = ArchipIDLEWebWorld() item_name_to_id = {} start_id = 9000

IdNameGameDownload LinkTracker PageIdNameGameDownload LinkTracker Page