Website Style Upgrade ()

* [WebHost] Update WebHost to include modular themes system, remove unused and outdated assets

* Landing Page Updates

* Markdown updates, colors coming later

* Remove testing theme from FF1

* Color updates for markdown styles

* Updates to generated pages, so many updates

* [WebHost] Update WebHost to include modular themes system, remove unused and outdated assets

* Landing Page Updates

* Markdown updates, colors coming later

* Remove testing theme from FF1

* Color updates for markdown styles

* Updates to generated pages, so many updates

* Seed download page improvements

* Add styles to weighted-settings page

* Minor adjustments to styles

* Revert base theme to grass

* Add more items to ArchipIDLE

* [WebHost] Update WebHost to include modular themes system, remove unused and outdated assets

* Landing Page Updates

* Markdown updates, colors coming later

* Remove testing theme from FF1

* Color updates for markdown styles

* Updates to generated pages, so many updates

* Seed download page improvements

* [WebHost] Update WebHost to include modular themes system, remove unused and outdated assets

* Landing Page Updates

* Markdown updates, colors coming later

* Remove testing theme from FF1

* Color updates for markdown styles

* Updates to generated pages, so many updates

* Add styles to weighted-settings page

* Minor adjustments to styles

* Revert base theme to grass

* Add more items to ArchipIDLE

* Improve Archipidle item name

* [WebHost] Update background images, waiting on jungle.png, added partyTime theme

* [WebHost] Fix tab ordering on landing page, remove islands on screen scale, fix tutorial page width scaling

* [WebHost] Final touches to WebHost

* Improve get_world_theme function, add partyTime theme to ArchipIDLE WebWorld

* Remove sending_visible from AutoWorld

* AP Ocarina of Time Client ()

* Core: update jinja ()

* some typing and cleaning, mostly in Fill.py ()

* some typing and cleaning, mostly in Fill.py

* address missing Option types

* resolve a few TODOs discussed in pull request

* SM: Optimize a bit ()

* SM: Optimize a bit

* SM: init bosses only once

* New World Order ()

* Core: update jinja

* SM: Optimize a bit

* AutoWorld: import worlds in alphabetical order, to be predictable rather than arbitrary

Co-authored-by: Hussein Farran <hmfarran@gmail.com>

* Remove references to Z5Client in English OoT setup guide

* Prevent markdown code blocks from overflowing their container

Co-authored-by: espeon65536 <81029175+espeon65536@users.noreply.github.com>
Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com>
Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
Co-authored-by: Hussein Farran <hmfarran@gmail.com>
This commit is contained in:
Chris Wilson 2022-03-28 20:12:17 -04:00 committed by GitHub
parent 14956d27bd
commit 7dcb6f66da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
142 changed files with 1086 additions and 502 deletions
WebHostLib
__init__.py
static
assets
static
styles

View File

@ -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/<string:game>/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/<string:game>/info/<string:lang>')
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/<string:game>/<string:file>/<string:lang>')
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/')

View File

@ -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 `<address>:<port>` on the textfield on top and press enter (if the
server uses password, type in the bottom textfield `/connect <address>:<port> [password]`)
Now you are ready to start your adventure in Hyrule.
Now you are ready to start your adventure in Hyrule.

View File

@ -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"
]

Binary file not shown.

After

(image error) Size: 10 KiB

Binary file not shown.

Before

(image error) Size: 11 KiB

Binary file not shown.

Before

(image error) Size: 8.6 KiB

Binary file not shown.

Before

(image error) Size: 12 KiB

Binary file not shown.

Before

(image error) Size: 9.8 KiB

Binary file not shown.

Before

(image error) Size: 25 KiB

Binary file not shown.

Before

(image error) Size: 1.8 KiB

Binary file not shown.

After

(image error) Size: 8.6 KiB

Binary file not shown.

After

(image error) Size: 8.2 KiB

Binary file not shown.

Before

(image error) Size: 8.6 KiB

Binary file not shown.

Before

(image error) Size: 12 KiB

Binary file not shown.

Before

(image error) Size: 14 KiB

Binary file not shown.

Before

(image error) Size: 11 KiB

Binary file not shown.

Before

(image error) Size: 11 KiB

Binary file not shown.

Before

(image error) Size: 14 KiB

Binary file not shown.

Before

(image error) Size: 11 KiB

Binary file not shown.

Before

(image error) Size: 1.8 KiB

Binary file not shown.

Before

(image error) Size: 1.8 KiB

Binary file not shown.

After

(image error) Size: 25 KiB

Binary file not shown.

After

(image error) Size: 10 KiB

Binary file not shown.

After

(image error) Size: 36 KiB

Binary file not shown.

Before

(image error) Size: 24 KiB

Binary file not shown.

Before

(image error) Size: 31 KiB

Binary file not shown.

Before

(image error) Size: 32 KiB

Binary file not shown.

Before

(image error) Size: 34 KiB

Binary file not shown.

After

(image error) Size: 40 KiB

Binary file not shown.

After

(image error) Size: 6.8 KiB

View File

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 240 38" style="enable-background:new 0 0 240 38;" xml:space="preserve">
<style type="text/css">
.st0{fill:#316B84;}
</style>
<g>
<g>
<path class="st0" d="M59.72,27.96L53.03,4.21L42.25,4.04l1.42,4.37l1.41-0.26l-7.9,24.22h8.44l-0.56-2.27l-0.81-3.27l8.9-5.7
l1.78,11.24h7.97v-4.73L59.72,27.96z M45.62,20.21l3.13-10.84h1.5l2.02,7.44L45.62,20.21z"/>
<path class="st0" d="M78.67,27.96V20.4l-4.11-2.5l3.29-3.78l-0.47-7.46l-2.82-2.45H56.65v5.27l3.81-1.11l2.31,13.36l-2.79,0.73
L61,26.34l5.06-0.52l0.36-6.15l4.32,0.13l3.16,3.62v8.94l12.89,1.49v-5.34L78.67,27.96z M73.27,13.33l-2.18,1.45h-4.64l-0.42-6.57
h5.68l1.55,1.37V13.33z"/>
<polygon class="st0" points="84.65,4.21 93.01,4.21 95.75,6.46 96.26,10.9 92.23,12.43 91.77,9.74 88.97,8.28 85.86,9.82
83.88,15.02 85.51,20.94 88.49,22.38 91.99,20.59 91.99,18.59 96.26,16.96 95.85,22.85 91.81,26.87 84.17,26.55 80.79,23.58
78.87,14.87 80.79,6.94 "/>
<polygon class="st0" points="97.62,4.21 103.33,4.21 102.96,21.08 108.7,20.14 108.34,6.42 113.85,3.28 113.9,19.9 115.75,19.71
115.27,25.86 113.88,25.86 114.27,32.36 108.7,32.36 108.7,26.39 102.96,26.39 102.96,32.36 91.77,33.85 92.2,28.85 97.88,27.96
"/>
<polygon class="st0" points="147.43,28.86 147.43,32.36 162.85,32.36 162.48,25.36 159.5,26 158.89,27.68 154.1,27.24
154.1,21.51 160.81,20.85 160.81,16.48 153.86,16.54 153.86,9.18 158.62,8.43 159.22,9.77 161.85,10.06 162.59,4 147.43,4
147.43,6.54 148.68,7.46 148.68,28.4 "/>
<polygon class="st0" points="163.89,9.24 163.89,4 172.31,4 170.35,26.87 179.55,24.74 179.55,32.36 164.51,32.34 164.65,28.71
165.73,27.84 165.73,9.59 "/>
<path class="st0" d="M193.69,32.36l-0.63-2.51l-2.84-1.89l-4.29-20.14L185.9,4h-11.27l-0.03,3.2l1.87-0.34l-2.79,14.07l-1.37,0.57
v2.85l6.29-1.33l0.4-2.7l4.65-0.89l1.69,12.93H193.69z M179.39,15.11l1.65-6.52l0.89,0.25l0.92,5.45L179.39,15.11z"/>
<polygon class="st0" points="208.47,21.68 210.62,21.12 210.04,18.15 200.51,17.46 198.87,21.13 203.56,21.9 203.32,23.91
200.58,25.19 196.44,23.77 194.48,17.19 196.2,10.02 200.08,8.52 203.31,9.62 202.85,11.75 207.79,13.6 208.83,9.69 204.71,4.21
195.57,4.21 191.24,7.36 189.29,16.87 192.06,27.54 199.03,30.53 203.2,29.3 203.09,32.36 209.01,32.36 209.4,29.95 207.38,28.99
"/>
<path class="st0" d="M230.45,6.26L226.39,4l-8.59-0.01l-4.07,2.86l-2.58,8.9l1.52,11.82l5.61,4.73l7.65,0.01l5.72-4.59l2.47-12.46
L230.45,6.26z M228.23,21.75l-3.95,5.45l-2.16,0.43l-4.6-3.46L216,15.72l2.4-7.02l5.14-0.48l2.97,1.79l1.74,5.83L228.23,21.75z"/>
<path class="st0" d="M116.13,27.48l-0.24,4.88l12.26,0.09l-0.83-5.01l-2.86-0.48l0.14-17.62l2.45-0.42l-0.14-4.85l-10.92,0.36
l0.1,4.6l3.2,0.63l-0.42,17.67L116.13,27.48z"/>
<path class="st0" d="M141.34,4.21l-12.88-0.39v4.26l1.95,0.62v25.15l-1.8,1.41l-0.02,2.63h8.23L136,27.96h6.09l4.57-4.46V7.27
L141.34,4.21z M141.38,20.51l-2.54,1.89l-3.23,0.16L135.4,9.32h3.88l2.1,1.68V20.51z"/>
</g>
<g>
<path class="st0" d="M14.14,11.28c0,0.35-0.02,0.71-0.07,1.05c0.38,0.07,0.76,0.11,1.16,0.11s0.79-0.04,1.16-0.11
c-0.05-0.34-0.07-0.7-0.07-1.05c0-3.23,1.94-6.02,4.72-7.25C20.17,1.68,17.9,0,15.24,0S10.3,1.68,9.42,4.03
C12.2,5.26,14.14,8.04,14.14,11.28z"/>
<path class="st0" d="M18.04,11.28c0,0.16,0.01,0.32,0.02,0.48c0.02,0.3,0.06,0.6,0.13,0.88c0.06,0.28,0.15,0.56,0.25,0.83
c0.11,0.3,0.24,0.58,0.39,0.85c1.42-1.33,3.33-2.15,5.42-2.15s4.01,0.82,5.42,2.15c0.51-0.9,0.79-1.94,0.79-3.04
c0-3.42-2.79-6.22-6.22-6.22c-0.4,0-0.79,0.04-1.16,0.11c-0.28,0.06-0.56,0.13-0.83,0.22c-0.28,0.09-0.56,0.21-0.83,0.35
C19.42,6.77,18.04,8.87,18.04,11.28z"/>
<path class="st0" d="M6.22,12.16c2.1,0,4.01,0.82,5.42,2.15c0.15-0.27,0.28-0.55,0.39-0.85c0.1-0.27,0.19-0.54,0.25-0.83
c0.06-0.28,0.11-0.58,0.13-0.88c0.02-0.15,0.02-0.32,0.02-0.48c0-2.41-1.38-4.51-3.39-5.54C8.77,5.6,8.5,5.49,8.21,5.39
c-0.27-0.1-0.55-0.17-0.83-0.22C7,5.1,6.61,5.06,6.22,5.06C2.79,5.06,0,7.85,0,11.28c0,1.1,0.28,2.14,0.79,3.04
C2.21,12.98,4.12,12.16,6.22,12.16z"/>
<path class="st0" d="M29.21,16.33c-0.18-0.23-0.36-0.44-0.57-0.65c-1.12-1.12-2.67-1.81-4.38-1.81c-1.71,0-3.25,0.69-4.38,1.81
c-0.2,0.2-0.39,0.42-0.56,0.64c-0.18,0.23-0.34,0.47-0.47,0.72c-0.2,0.34-0.36,0.71-0.48,1.09c2.83,1.21,4.81,4.02,4.81,7.28
c0,0.26-0.01,0.52-0.04,0.78c0.37,0.07,0.75,0.1,1.13,0.1c3.43,0,6.22-2.79,6.22-6.22c0-1.11-0.29-2.14-0.8-3.04
C29.54,16.8,29.38,16.56,29.21,16.33z"/>
<path class="st0" d="M12.12,18.14c-0.13-0.38-0.28-0.75-0.48-1.09c-0.14-0.26-0.3-0.5-0.47-0.72c-0.17-0.23-0.36-0.44-0.56-0.64
c-1.12-1.12-2.67-1.81-4.38-1.81s-3.26,0.69-4.38,1.81c-0.21,0.2-0.39,0.42-0.56,0.64c-0.18,0.23-0.34,0.47-0.47,0.72
C0.29,17.94,0,18.98,0,20.08c0,3.43,2.79,6.22,6.22,6.22c0.39,0,0.76-0.03,1.13-0.1c-0.03-0.26-0.04-0.52-0.04-0.78
C7.31,22.15,9.29,19.34,12.12,18.14z"/>
<path class="st0" d="M18.04,19.87c-0.27-0.14-0.55-0.26-0.84-0.35c-0.27-0.09-0.55-0.17-0.84-0.22c-0.37-0.07-0.75-0.1-1.13-0.1
s-0.76,0.03-1.13,0.1c-0.28,0.05-0.57,0.13-0.84,0.22c-0.29,0.1-0.57,0.22-0.84,0.35C10.4,20.9,9.02,23,9.02,25.42
c0,0.07,0,0.14,0.01,0.21c0.01,0.31,0.04,0.61,0.1,0.9c0.05,0.28,0.12,0.57,0.21,0.84c0.82,2.48,3.16,4.27,5.9,4.27
s5.08-1.79,5.9-4.27c0.09-0.27,0.17-0.55,0.21-0.84c0.06-0.3,0.09-0.6,0.1-0.91c0.01-0.07,0.01-0.14,0.01-0.21
C21.45,23,20.07,20.9,18.04,19.87z"/>
</g>
</g>
</svg>

After

(image error) Size: 5.4 KiB

Binary file not shown.

After

(image error) Size: 44 KiB

View File

Before

(image error) Size: 1.9 KiB

After

(image error) Size: 1.9 KiB

Binary file not shown.

Before

Width: 512px  |  Height: 512px  |  Size: 212 KiB

After

Width: 53px  |  Height: 54px  |  Size: 12 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,3 +0,0 @@
#factorio{
margin: 1rem;
}

View File

@ -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;
}

View File

@ -16,7 +16,7 @@
}
#generate-game button{
margin-top: 5px;
margin-top: 35px;
}
#generate-game-form-wrapper{

View File

@ -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;

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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{

View File

@ -1,5 +1,8 @@
#player-tracker-wrapper{
margin: 0;
font-family: LexendDeca-Light, sans-serif;
color: white;
font-size: 14px;
}
#inventory-table{

View File

@ -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;
}

View File

@ -1,3 +0,0 @@
#minecraft{
margin: 1rem;
}

View File

@ -40,8 +40,8 @@
color: white;
font-family: "Minecraftia", monospace;
font-weight: bold;
bottom: 0px;
right: 0px;
bottom: 0;
right: 0;
}
#location-table{

View File

@ -41,7 +41,7 @@
font-family: monospace;
font-weight: bold;
font-size: 1.1em;
bottom: 0px;
bottom: 0;
right: 8px;
}

View File

@ -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;

View File

@ -1,3 +0,0 @@
#subnautica{
margin: 1rem;
}

View File

@ -42,8 +42,8 @@
color: white;
font-family: "Minecraftia", monospace;
font-weight: bold;
bottom: 0px;
right: 0px;
bottom: 0;
right: 0;
}
#location-table{

View File

@ -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;
}

View File

@ -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;
}

Some files were not shown because too many files have changed in this diff Show More