diff --git a/TODO.txt b/TODO.txt index 0c19af172..ec3eafe5f 100644 --- a/TODO.txt +++ b/TODO.txt @@ -3,12 +3,14 @@ * double join lobby bug DONE * render player info efficiently DONE 8/11/2024 * better troop addition logic DONE 8/11/2024 -* better expansion, add back directed expansion -* harder to expand on other players (defense) +* better expansion, add back directed expansion DONE 8/11/2024 * use pastel theme for territories -* improve front page +* harder to expand on other players (defense) * add username in front page +* improve front page * upload and start server * make boats larger * have boats not get close to shore -* better algorithm for name render placement \ No newline at end of file +* better algorithm for name render placement +* make coasts look better +* add shader to dim border \ No newline at end of file diff --git a/resources/base.css b/resources/base.css deleted file mode 100644 index 23f824b26..000000000 --- a/resources/base.css +++ /dev/null @@ -1,125 +0,0 @@ -/* - Josh's Custom CSS Reset - https://www.joshwcomeau.com/css/custom-css-reset/ -*/ -*, -*::before, -*::after { - box-sizing: border-box; -} - -* { - margin: 0; -} - -body { - line-height: 1.31; - -webkit-font-smoothing: antialiased; -} - -img, -picture, -video, -canvas, -svg { - display: block; - max-width: 100%; -} - -input, -button, -textarea, -select { - font: inherit; -} - -p, -h1, -h2, -h3, -h4, -h5, -h6 { - overflow-wrap: break-word; -} - -#root, -#__next { - isolation: isolate; -} - -/* Generic margins */ -.m-1_2 { - margin: 0.5em; -} - -.m-1 { - margin: 1em; -} - -.mr-1_2 { - margin-right: 0.5em; -} - -.mr-1 { - margin-right: 1em; -} - -/* Generic padding */ - -.p-1_2 { - padding: 0.5em; -} - -.p-1 { - padding: 1em; -} - -.pt-1 { - padding-top: 1em; -} - -/* Generic widths */ - -.w-100 { - width: 100%; -} - - -/* Typography helpers */ - -.text-center { - text-align: center; -} - -.text-lg { - font-size: 1.25em; -} - -.text-xl { - font-size: 1.4em; -} - -.text-xxl { - font-size: 2em; -} - - -/* Custom Scrollbar */ - -::-webkit-scrollbar { - width: 3px; -} - -::-webkit-scrollbar-track { - background: #f1f1f1; -} - -::-webkit-scrollbar-thumb { - background: #888; - border-radius: 3px; -} - -::-webkit-scrollbar-thumb:hover { - background: #555; -} \ No newline at end of file diff --git a/resources/maps/World.json b/resources/maps/World.json deleted file mode 100644 index 27f498d2b..000000000 --- a/resources/maps/World.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "tiles": ["#000000", "#AAAAAA"] -} diff --git a/resources/themes/overpass-bold.woff b/resources/themes/overpass-bold.woff deleted file mode 100644 index d35502e52..000000000 Binary files a/resources/themes/overpass-bold.woff and /dev/null differ diff --git a/resources/themes/overpass-regular.woff b/resources/themes/overpass-regular.woff deleted file mode 100644 index 8b4c5cc2f..000000000 Binary files a/resources/themes/overpass-regular.woff and /dev/null differ diff --git a/resources/themes/pastel-mm-bg.jpg b/resources/themes/pastel-mm-bg.jpg deleted file mode 100644 index 6c6c6d61f..000000000 Binary files a/resources/themes/pastel-mm-bg.jpg and /dev/null differ diff --git a/resources/themes/pastel.css b/resources/themes/pastel.css deleted file mode 100644 index c2a7c619e..000000000 --- a/resources/themes/pastel.css +++ /dev/null @@ -1,521 +0,0 @@ -@import "../base.css"; - - -/* Fonts */ - -@font-face { - font-family: 'Vanchrome'; - src: url(/resources/themes/vanchrome.woff) format("woff"); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'Overpass'; - src: url(/resources/themes/overpass-regular.woff) format("woff"); - font-weight: 500; - font-style: normal; -} - -@font-face { - font-family: 'Overpass'; - src: url(/resources/themes/overpass-bold.woff) format("woff"); - font-weight: 700; - font-style: normal; -} - - -/* Global variables */ - -:root { - - --color-background: #ddecf5; - - --color-light: #FFFFFF; - - --color-primary-dark: #13415c; - --color-primary: #457493; - --color-primary-medium: #77aac9; - --color-primary-light: #9dc4de; - - --color-secondary-dark: #9c8559; - --color-secondary: #c5b47a; - --color-secondary-medium: #e5d59e; - --color-secondary-light: #f3f3c6; - - --color-danger-dark: #7b1e2b; - --color-danger: #c83446; - --color-danger-medium: #ed6780; - --color-danger-light: #ee92a4; - - --color-success-dark: #4f7348; - --color-success: #82ad77; - --color-success-medium: #a3ce94; - --color-success-light: #c0dcaf; - - --color-copy: #555555; -} - -/* General formatting */ - -body { - font-family: 'Overpass', Arial, Helvetica, sans-serif; - background-color: var(--color-background); - font-size: 100%; - - background-image: url(/resources/themes/pastel-mm-bg.jpg); - background-position: center; - background-size: cover; - background-repeat: no-repeat; -} - -@media screen and (max-width: 1023px) { - body { - font-size: 90% !important; - } -} - -@media screen and (max-width: 767px) { - body { - font-size: 80% !important; - } -} - -h1, -h2 { - font-family: 'Vanchrome'; - font-weight: 500; - text-transform: uppercase; -} - -h2 { - font-size: 2.2em; - color: var(--color-primary-dark); - margin-bottom: 0.375em; -} - -a { - text-decoration: none; - color: var(--color-primary); -} - -a:hover { - text-decoration: none; - color: var(--color-primary-light); -} -a:active { - text-decoration: none; - color: var(--color-primary-dark); -} - - -a > svg { - fill: #EEEEEE !important; - display: inline-block !important; -} - -a > svg:hover, -a > svg:active { - fill: #FFFFFF !important; - transform: scale(1.05); -} - -p { - margin-bottom: 0.8em; -} - - -/* Logo and background */ - -.theme-logo { - background-image: url(/resources/themes/wf-logo-pastel.png); - background-position: center; - background-size: contain; - background-repeat: no-repeat; - margin-bottom: 1em; -} - -.background-blur { - backdrop-filter: blur(5px); -} - -.background-vignette { - box-shadow: 0 0 15em rgba(0, 0, 0, 0.6) inset; -} - -@media screen and (max-width: 1023px) { - .background-vignette { - box-shadow: 0 0 8em rgba(0, 0, 0, 0.6) inset !important; - } -} - -@media screen and (max-width: 767px) { - .background-vignette { - box-shadow: 0 0 4em rgba(0, 0, 0, 0.6) inset !important; - } -} - -/* Layout Windows */ - -.wf-window { - position: absolute; - height: 100vh; - width: 100%; - display: flex; - padding: 1em; -} - -.wf-window-centered { - justify-items: center; - justify-content: center; - align-items: center; - align-content: center; - flex-flow: column; -} - -@media screen and (max-height: 511px) { - .wf-window-centered { - flex-flow: row !important; - } - -} - -.wf-window-spaced { - justify-items: center; - justify-content: space-between; - align-items: center; - align-content: space-between; - flex-flow: column; - pointer-events: none; -} - -/* General elements */ - -.wf-footer { - position: absolute; - height: 2em; width: 100%; - top: calc(100% - 2em); - background-color: rgba(0,0,0,0.2); - color: #CCCCCC; - padding: 0.25em; - text-align: center; - font-size: 0.8em; -} - -.wf-footer a { - color: #CCCCCC; -} - -.wf-footer a:hover { - color: #EEEEEE; -} - -.wf-footer a:active { - color: #AAAAAA; -} - -/* Ingame HUD */ - -.wf-hud-menubar { - height: 4em; - padding: 0.5em; - width: 100%; - display: flex; - flex-direction: row; - align-items: flex-start; - align-content: flex-start; - justify-items: flex-end; - justify-content: flex-end; - pointer-events: all; -} - -/* Layout elements */ - -.wf-grid { - display: grid; - gap: 0.5em; -} - -.wf-grid-1col { - grid-template-columns: 1fr; -} - -.wf-grid-2col { - grid-template-columns: 1fr 1fr; -} - -@media screen and (max-width: 767px) { - .wf-grid-2col { - grid-template-columns: 1fr !important; - } -} - -.wf-grid-gap-lg { - gap: 1em; -} - -.wf-grid-gap-xl { - gap: 2em; -} - -/* Buttons */ - -.wf-btn { - display: inline-block; - text-align: center; - font-family: 'Overpass'; - font-size: 1em; - font-weight: 600; - padding: 0.5em 0.75em 0.5em 0.75em; - color: white; - background-color: #666666; - border: 2px solid #888888; - outline: 1px solid #444444; - outline-offset: -1px; - font-optical-sizing: auto; - text-decoration: none; - cursor: default; -} - -.wf-btn:hover { - background-color: #888888; - border: 2px solid #AAAAAA; - outline: 1px solid #666666; - transform: scale(1.01); - color: white; -} - -.wf-btn:active { - background-color: #444444; - border: 2px solid #888888; - outline: 1px solid #444444; - transform: scale(1.01); - color: white; -} - -.wf-btn-block { - display: block; - width: 100%; -} - -.wf-btn-circle { - padding-left: 0; - padding-right: 0; - border-radius: 100%; - width: 2.625em; - height: 2.625em; - padding-top: 0.45em !important; -} - -.wf-btn-circle > svg { - width: 1.5em; - height: 1.5em; - fill: var(--color-light); - display: block; - margin: 0 auto; -} - -.wf-btn-featured { - font-family: 'Vanchrome', sans-serif; - padding: 0.15em 0.5em; - font-size: 2em; - text-transform: uppercase; - font-weight: 500; -} - -/* Button colors */ - -/* Button colors */ - -.wf-btn-primary { - background-color: var(--color-primary); - border-color: var(--color-primary-medium); - outline-color: var(--color-primary-dark); -} - -.wf-btn-primary:hover { - background-color: var(--color-primary-medium); - border-color: var(--color-primary-light); - outline-color: var(--color-primary); -} - -.wf-btn-primary:active { - background-color: var(--color-primary-dark); - border-color: var(--color-primary-medium); - outline-color: var(--color-primary); -} - -.wf-btn-primary:disabled { - background-color: var(--color-primary-dark); - border-color: var(--color-primary-medium); - outline-color: var(--color-primary); - color: #999999; -} - -.wf-btn-secondary { - background-color: var(--color-secondary); - border-color: var(--color-secondary-medium); - outline-color: var(--color-secondary-dark); -} - -.wf-btn-secondary:hover { - background-color: var(--color-secondary-medium); - border-color: var(--color-secondary-light); - outline-color: var(--color-secondary); -} - -.wf-btn-secondary:active { - background-color: var(--color-secondary-dark); - border-color: var(--color-secondary-medium); - outline-color: var(--color-secondary); -} - -.wf-btn-danger { - background-color: var(--color-danger); - border: 2px solid var(--color-danger-medium); - outline: 1px solid var(--color-danger-dark); -} - -.wf-btn-danger:hover { - background-color: var(--color-danger-medium); - border-color: var(--color-danger-light); - outline-color: var(--color-danger); -} - -.wf-btn-danger:active { - background-color: var(--color-danger-dark); - border-color: var(--color-danger-medium); - outline-color: var(--color-danger); -} - -.wf-btn-success { - background-color: var(--color-success); - border: 2px solid var(--color-success-medium); - outline: 1px solid var(--color-success-dark); -} - -.wf-btn-success:hover { - background-color: var(--color-success-medium); - border-color: var(--color-success-light); - outline-color: var(--color-success); -} - -.wf-btn-success:active { - background-color: var(--color-success-dark); - border-color: var(--color-success-medium); - outline-color: var(--color-success); -} - -/* Panels and Modals */ - -.wf-panel { - background-color: #eeeeeebb; - flex-grow: 0; -} - -.wf-panel-header { - font-family: 'Vanchrome'; - font-size: 2.2em; - font-weight: 500; - text-transform: uppercase; - line-height: 0; - margin: 0; - padding: 0.75em 0.375em !important; - background-color: var(--color-danger); - color: white; - border-bottom: 3px solid var(--color-danger-dark); -} - -a.wf-panel-header-button { - text-decoration: none; - color: white; - float: right; - margin-right: 0.375em; - padding-top: 0.375em; -} - -a.wf-panel-header-button:hover { - color: var(--color-primary-light); -} - -a.wf-panel-header-button:active { - color: var(--color-primary-dark); -} - -.wf-modal-header { - font-size: 1em; - color: var(--color-primary); - margin: -0.5em -0.5em 0.5em -0.5em; - padding: 0.5em 0.5em 0.5em 0.5em; - border-bottom: 3px solid var(--color-primary-light); -} - -a.wf-modal-header-button { - text-decoration: none; - color: var(--color-primary); - float: right; -} - -a.wf-modal-header-button:hover { - color: var(--color-primary-light); -} - -a.wf-modal-header-button:active { - color: var(--color-primary-dark); -} - -.wf-panel-body { - color: var(--color-copy); - padding: 0.5em; - border: 3px solid var(--color-primary-light); - outline: 1px solid var(--color-primary); - outline-offset: -1px; - box-shadow: 0px 3px 2px 0px rgba(0, 0, 0, 0.5); - max-height: 90vh; - overflow: auto; - width: 100%; -} - -.wf-panel-header + .wf-panel-body { - padding: 1em; -} - -.wf-panel-header+.wf-panel-body { - border-top: none; -} - -/* Labels */ - -.wf-lbl { - display: block; - background-color: #CCC; - border-left: 2px solid #999; - padding: 0.375em; -} - -.wf-lbl-danger { - background-color: var(--color-danger-light); - color: var(--color-danger-dark); - border-left: 2px solid var(--color-danger-dark); -} - -/* Form elements */ - -input.wf-form-control { - display: block; - background-color: var(color-form-element-bg); - border: none; - border-bottom: 2px solid var(--color-primary); - padding: 0.375em; - line-height: 1em; -} - -.wf-form-control-error { - border-bottom: 2px solid var(--color-danger) !important; -} - -input.wf-form-control:focus { - border: none; - outline: none; - border-bottom: 2px solid var(--color-secondary); -} diff --git a/resources/themes/pastel.json b/resources/themes/pastel.json deleted file mode 100644 index 37cf1ef5c..000000000 --- a/resources/themes/pastel.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "territory": [ - "saturation * 0.5", - "lightness = 0.75" - ], - "border": [ - "saturation * 0.5", - "lightness = 0.65" - ], - "tiles": [ - "lightness = 0.8" - ], - "tileOverwrite": { - "grass": "rgb(244, 243, 198)", - "water": "rgb(160, 203, 231)" - }, - "shaders": [ - { - "type": "territory-outline", - "color": "rgba(152, 185, 223, 1)", - "thickness": 1 - }, - { - "type": "territory-outline-smooth", - "color": "rgba(255, 255, 255, 0.1)", - "thickness": 15 - }, - { - "type": "territory-inline", - "color": "rgba(201, 187, 139, 1)", - "thickness": 1 - } - ], - "background": "#7ba6c2", - "font": "Overpass" -} \ No newline at end of file diff --git a/resources/themes/vanchrome.woff b/resources/themes/vanchrome.woff deleted file mode 100644 index c3b2f7eab..000000000 Binary files a/resources/themes/vanchrome.woff and /dev/null differ diff --git a/resources/themes/wf-logo-pastel.png b/resources/themes/wf-logo-pastel.png deleted file mode 100644 index e8a08066d..000000000 Binary files a/resources/themes/wf-logo-pastel.png and /dev/null differ