diff --git a/assets/dk.css b/assets/dk.css index d8f2143..4fce2c3 100644 --- a/assets/dk.css +++ b/assets/dk.css @@ -4,12 +4,22 @@ for legibility and design, but keep the soul of the original project. */ +@font-face { + font-family: 'Seagram'; + src: url('/assets/fonts/seagram.ttf') format('truetype'); + font-display: swap; +} + :root { color: #222; font-family: Cambria, Cochin, Georgia, Times, 'Times New Roman', serif; font-size: 16px; } +.seagram { + font-family: 'Seagram', Cambria, Cochin, Georgia, Times, 'Times New Roman', serif; +} + * { margin: 0; padding: 0; @@ -26,10 +36,13 @@ body { i { font-style: italic; } b { font-weight: bold; } -h1 { font-size: 2rem; font-weight: bold; } -h2 { font-size: 1.7rem; font-weight: bold; } -h3 { font-size: 1.4rem; font-weight: bold; } -h4 { font-size: 1.1rem; font-weight: bold; } +h1, h2, h3, h4, h5 { + font-family: 'Seagram', Cambria, Cochin, Georgia, Times, 'Times New Roman', serif; +} +h1 { font-size: 2rem; } +h2 { font-size: 1.7rem; } +h3 { font-size: 1.4rem; } +h4 { font-size: 1.1rem; } div#container { max-width: 1024px; @@ -56,17 +69,20 @@ section#game { margin: 1rem 0; border-top: 2px solid #000; - & > aside { - padding: 0.5rem; - } - - & > aside > section:not(:last-child) { - margin-bottom: 1rem; + & > aside > section:not(:last-of-type) { + margin-bottom: 0.5rem; + padding-bottom: 1rem; + border-bottom: 2px solid black; } & > aside > section { display: flex; flex-direction: column; + padding: 0.5rem; + + h5 { + margin-bottom: 0.25rem; + } } & > aside#left { @@ -267,6 +283,10 @@ form.standard { margin-bottom: 0.5rem; } +.mb-025 { + margin-bottom: 0.25rem; +} + div.town { & > section:not(:last-child) { margin-bottom: 2rem; @@ -294,7 +314,7 @@ button.img-button { div#statbars { display: flex; justify-content: space-around; - margin: 1rem 0; + margin-top: 1rem; & > div.stat { display: flex; diff --git a/assets/fonts/seagram.ttf b/assets/fonts/seagram.ttf new file mode 100644 index 0000000..765faa8 Binary files /dev/null and b/assets/fonts/seagram.ttf differ diff --git a/data/dk.db b/data/dk.db index 1616cbd..46857de 100644 Binary files a/data/dk.db and b/data/dk.db differ diff --git a/go.mod b/go.mod index 18cfee9..2da4b7b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module dk go 1.25.0 require ( - git.sharkk.net/Sharkk/Sashimi v1.0.1 + git.sharkk.net/Sharkk/Sashimi v1.1.1 git.sharkk.net/Sharkk/Sushi v1.2.0 github.com/valyala/fasthttp v1.65.0 ) diff --git a/go.sum b/go.sum index cd607f6..7407c92 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -git.sharkk.net/Sharkk/Sashimi v1.0.1 h1:5YMmxnCgcsyasg5J91AS5FVzzJoDZ17I3J4hlJyyMR4= -git.sharkk.net/Sharkk/Sashimi v1.0.1/go.mod h1:wTMnO6jo34LIjpDJ0qToq14RbwP6Uf4HtdWDmqxrdAM= +git.sharkk.net/Sharkk/Sashimi v1.1.1 h1:ST7YQjnQq3ydAKy/Kerx89cx+b/mXDOq7W/ll1aX1jA= +git.sharkk.net/Sharkk/Sashimi v1.1.1/go.mod h1:wTMnO6jo34LIjpDJ0qToq14RbwP6Uf4HtdWDmqxrdAM= git.sharkk.net/Sharkk/Sushi v1.2.0 h1:RwOCZmgaOqtkmuK2Z7/esdLbhSXJZphsOsWEHni4Sss= git.sharkk.net/Sharkk/Sushi v1.2.0/go.mod h1:S84ACGkuZ+BKzBO4lb5WQnm5aw9+l7VSO2T1bjzxL3o= github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ= diff --git a/internal/components/asides.go b/internal/components/asides.go index e5cfd89..92e5a6c 100644 --- a/internal/components/asides.go +++ b/internal/components/asides.go @@ -21,6 +21,10 @@ func LeftAside(ctx sushi.Ctx) map[string]any { user := ctx.UserValue("user").(*users.User) + if user.Currently == "In Town" { + data["town"], _ = towns.ByCoords(user.X, user.Y) + } + // Build owned town maps list if user.Towns != "" { townMap := helpers.NewOrderedMap[int, *towns.Town]() diff --git a/internal/components/town.go b/internal/components/town.go index cc74ba0..5e023a5 100644 --- a/internal/components/town.go +++ b/internal/components/town.go @@ -9,7 +9,7 @@ import ( ) func GenerateTownNews() string { - title := `
+ Hey there! +
{/block} diff --git a/templates/leftside.html b/templates/leftside.html index 4533b6c..1e85102 100644 --- a/templates/leftside.html +++ b/templates/leftside.html @@ -1,13 +1,13 @@You wake up feeling refreshed and ready for action!
@@ -22,4 +22,4 @@ {/if} {/if}Buying maps will put the town in your Travel To box, and it won't cost you as many TP to get there.
Click a town name to purchase its map.
diff --git a/templates/town/shop.html b/templates/town/shop.html index 8bce181..0209281 100644 --- a/templates/town/shop.html +++ b/templates/town/shop.html @@ -2,7 +2,7 @@ {block "content"}Buying weapons will increase your Attack. Buying armor and shields will increase your Defense.
Click an item name to purchase it.
diff --git a/templates/town/town.html b/templates/town/town.html index d134e32..e1b4818 100644 --- a/templates/town/town.html +++ b/templates/town/town.html @@ -3,7 +3,7 @@ {block "content"}