diff --git a/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-bottom.png b/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-bottom.png index 9e015337..2a28958e 100644 Binary files a/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-bottom.png and b/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-bottom.png differ diff --git a/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-left.png b/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-left.png index bea205d1..9bc84ff6 100644 Binary files a/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-left.png and b/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-left.png differ diff --git a/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-right.png b/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-right.png index 83aa8c2a..a1e9c7c8 100644 Binary files a/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-right.png and b/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-right.png differ diff --git a/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-top.png b/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-top.png index 29907ba1..bb6ccec3 100644 Binary files a/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-top.png and b/WebHostLib/static/static/backgrounds/cliffs/grass/cliff-top.png differ diff --git a/WebHostLib/static/static/backgrounds/grass/grass-0007-large.png b/WebHostLib/static/static/backgrounds/grass/grass-0007-large.png new file mode 100644 index 00000000..8ca0b5bb Binary files /dev/null and b/WebHostLib/static/static/backgrounds/grass/grass-0007-large.png differ diff --git a/WebHostLib/static/styles/cloudHeader.css b/WebHostLib/static/styles/cloudHeader.css index 4e3c2dc1..98c2357a 100644 --- a/WebHostLib/static/styles/cloudHeader.css +++ b/WebHostLib/static/styles/cloudHeader.css @@ -15,21 +15,23 @@ z-index: 9999; } +#cloud-header #site-title{ + margin-right: 7px; +} + +#cloud-header #cloud-header-spacer{ + flex-grow: 1 +} + #cloud-header #site-title img{ width: 40px; height: 40px; } #cloud-header a{ - color: #67bbab; + color: #2f6b83; text-decoration: none; cursor: pointer; margin-right: 1.2rem; font-size: 1.2rem; } - -@media (width: 800px) { - #cloud-header{ - font-size: 4rem; - } -} diff --git a/WebHostLib/static/styles/generate.css b/WebHostLib/static/styles/generate.css index a0d0e530..bb22cc64 100644 --- a/WebHostLib/static/styles/generate.css +++ b/WebHostLib/static/styles/generate.css @@ -6,10 +6,15 @@ } #generate-game{ - width: 660px; + width: 700px; + min-height: 360px; text-align: center; } +#generate-game p{ + text-align: left; +} + #generate-game-form-wrapper{ width: 100%; text-align: center; diff --git a/WebHostLib/static/styles/globalStyles.css b/WebHostLib/static/styles/globalStyles.css index e60e41f2..9d270b54 100644 --- a/WebHostLib/static/styles/globalStyles.css +++ b/WebHostLib/static/styles/globalStyles.css @@ -8,22 +8,37 @@ html{ background-repeat: repeat; background-size: 250px 250px; margin-top: 110px; + font-family: 'Jost', sans-serif; + font-size: 1.1rem; + color: #000000; } body{ margin: 0; } +a{ + color: #ffef00; +} + button{ - padding: 0.25rem; - margin: 0.25rem; + padding: 8px 12px; border-radius: 4px; } +button.button-grass{ + border: 1px solid black; +} + +button.button-dirt{ + border: 1px solid black; +} + h1, h2, h3, h4, h5, h6{ font-family: HyliaSerif, sans-serif; font-weight: normal; margin: 0; + color: #032605; } h1{ font-size: 3rem; } @@ -48,26 +63,26 @@ h5, h6{ 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-0004.png') repeat; + 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 120px, /* top */ - 20px 140px, /* bottom */ - 140px 20px, /* left */ - 140px 20px, /* right */ - 140px 140px; /* center */ + 20px 71px, /* top */ + 20px 100px, /* bottom */ + 71px 20px, /* left */ + 71px 20px, /* right */ + 525px 525px; /* center */ min-width: 280px; min-height: 280px; - padding-left: 80px; - padding-right: 80px; - padding-top: 76px; - padding-bottom: 106px; + padding-left: 120px; + padding-right: 120px; + padding-top: 100px; + padding-bottom: 120px; } .dirt-island{ diff --git a/WebHostLib/static/styles/hostGame.css b/WebHostLib/static/styles/hostGame.css index 29e28689..5fd401c4 100644 --- a/WebHostLib/static/styles/hostGame.css +++ b/WebHostLib/static/styles/hostGame.css @@ -6,7 +6,8 @@ } #host-game{ - width: 620px; + width: 700px; + min-height: 360px; text-align: center; } diff --git a/WebHostLib/static/styles/islandFooter.css b/WebHostLib/static/styles/islandFooter.css index 47c9d5c6..0bd088db 100644 --- a/WebHostLib/static/styles/islandFooter.css +++ b/WebHostLib/static/styles/islandFooter.css @@ -1,14 +1,20 @@ #island-footer{ - background: url('../static/backgrounds/footer/footer-0003.png') repeat-x bottom; + background: url('../static/backgrounds/footer/footer-0001.png') repeat-x bottom; background-size: auto 90px; display: flex; - flex-direction: column; - justify-content: flex-end; + flex-direction: row; + justify-content: space-between; width: calc(100% - 0.5rem); - height: 90px; padding-left: 0.5rem; - line-height: 30px; + padding-top: 50px; position: fixed; bottom: 0; left: 0; + color: #dfedc6 +} + +#island-footer #links a{ + padding-right: 0.5rem; + padding-left: 0.5rem; + color: #dfedc6; } diff --git a/WebHostLib/static/styles/landing.css b/WebHostLib/static/styles/landing.css index 0a10227d..696377e4 100644 --- a/WebHostLib/static/styles/landing.css +++ b/WebHostLib/static/styles/landing.css @@ -6,19 +6,38 @@ } #landing{ - width: 820px; - min-height: 440px; + width: 860px; + min-height: 320px; } #landing-header{ text-align: center; width: 100%; - margin: 0; + margin-bottom: 50px; +} + +#landing-header h1{ + color: #ffffff; + font-size: 3.5rem; + text-shadow: 1px 1px 7px #000000; + -webkit-text-stroke: 1px #00582e; +} + +#landing-header h4{ + color: #ffffff; + font-size: 1.75rem; + margin-bottom: 0; + text-shadow: 1px 1px 7px #000000; + font-kerning: none; +} + +#landing-header-links{ + padding-bottom: 10px; } #landing-header-links a{ + margin-bottom: 10px; margin-left: 1em; - margin-right: 1em; } #landing-buttons{ @@ -29,14 +48,3 @@ margin-top: 1rem; margin-bottom: 1rem; } - -iframe{ - margin-left: 0.5rem; - border: none; -} - -@media only screen and (max-width: 1300px) { - iframe{ - display: none; - } -} diff --git a/WebHostLib/static/styles/player-settings.css b/WebHostLib/static/styles/player-settings.css index d4ce6a60..18ed6e37 100644 --- a/WebHostLib/static/styles/player-settings.css +++ b/WebHostLib/static/styles/player-settings.css @@ -100,3 +100,7 @@ html{ justify-content: space-between; width: 100%; } + +#player-settings a{ + color: #ffffff; +} diff --git a/WebHostLib/templates/cloudHeader.html b/WebHostLib/templates/cloudHeader.html index e3b92470..144e85a3 100644 --- a/WebHostLib/templates/cloudHeader.html +++ b/WebHostLib/templates/cloudHeader.html @@ -3,9 +3,12 @@ Favicon - Start Game - Host Game - Setup Guide - Player Settings + multiworld randomizer +
+ start game + host game + setup guide + player settings + discord {% endblock %} diff --git a/WebHostLib/templates/generate.html b/WebHostLib/templates/generate.html index fbee6e41..24d66a0e 100644 --- a/WebHostLib/templates/generate.html +++ b/WebHostLib/templates/generate.html @@ -11,7 +11,7 @@ {% include 'cloudHeader.html' %}
-

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

+

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

This page accepts a yaml file containing generator options. You can find a documented example at diff --git a/WebHostLib/templates/islandFooter.html b/WebHostLib/templates/islandFooter.html index d10c3d1c..97745275 100644 --- a/WebHostLib/templates/islandFooter.html +++ b/WebHostLib/templates/islandFooter.html @@ -1,6 +1,12 @@ {% block footer %} -

{% endblock %} diff --git a/WebHostLib/templates/landing.html b/WebHostLib/templates/landing.html index bc37dd6a..047313e1 100644 --- a/WebHostLib/templates/landing.html +++ b/WebHostLib/templates/landing.html @@ -8,38 +8,25 @@ {% block body %} {% include 'cloudHeader.html' %}
+
+

the legend of zelda: a link to the past

+

MULTIWORLD RANDOMIZER

+
-
-

The Legend of Zelda: A Link to the Past

-

MultiWorld Randomizer

- -

This is a randomizer for The Legend of Zelda: A Link to the Past.

-

This is also a multiworld, meaning your items may be placed into other players' worlds, and - other players's items may be placed into your world. When a player picks up an item which does - not belong to them, it is sent back to the player it belongs to over the internet.

-

This website allows you to host a multiworld game, and provides item and location trackers for all - games hosted here.

-

Currently, a locally installed client is required to play. This client should handle patching - your ROM files and connecting to the multiworld server. More information on how to set up a local - client may be found on the - Setup Guide.

-

This website is under active development. As such, your hosted rooms may occasionally disappear, - and there may be bugs. If you do happen to find a bug, please report it - here.

+

This is also a multiworld, meaning it is multiplayer. Your items may be placed into other + players' worlds, and their items may be placed into yours. When a player picks up an item which + does not belong to them, it is sent back to the player it belongs to over the internet.

+

This website allows you to generate and host a multiworld game, and provides item and location + trackers for all games hosted here. To learn how to get started playing, + click here.

+

This website is under active development. If you find a bug, please report it + here.

{{ seeds }} games were created and {{ rooms }} hosted in the last 7 days.

-
{% include 'islandFooter.html' %} {% endblock %} diff --git a/WebHostLib/templates/pageWrapper.html b/WebHostLib/templates/pageWrapper.html index d8fa3408..1392b736 100644 --- a/WebHostLib/templates/pageWrapper.html +++ b/WebHostLib/templates/pageWrapper.html @@ -2,6 +2,8 @@ + + diff --git a/WebHostLib/templates/playerSettings.html b/WebHostLib/templates/playerSettings.html index 731bd1ff..b9eee580 100644 --- a/WebHostLib/templates/playerSettings.html +++ b/WebHostLib/templates/playerSettings.html @@ -15,6 +15,8 @@ This page is used to configure your player settings. You have three presets you can control, which you can access using the dropdown menu below. These settings will be usable when generating a single player game, or you can export them to a .yaml file and use them in a multiworld. + If you already have a settings file you would like to validate, you may do so on the + verification page.