From d8c370a57f7329a50941e14dfcd7c6f72f015800 Mon Sep 17 00:00:00 2001 From: blurryface Date: Thu, 25 Apr 2024 03:18:23 +0200 Subject: [PATCH 01/15] NEW IP :bangbang: --- template/includes/hero.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/includes/hero.twig b/template/includes/hero.twig index c695865..f5f860e 100644 --- a/template/includes/hero.twig +++ b/template/includes/hero.twig @@ -11,7 +11,7 @@
Server address: - + Version: 1.8.9
From 2a530c7bff4b4773be5dc818ad22509d67027639 Mon Sep 17 00:00:00 2001 From: blurryface Date: Thu, 25 Apr 2024 03:42:34 +0200 Subject: [PATCH 02/15] , --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 06d48ae..03004ba 100644 --- a/index.php +++ b/index.php @@ -32,7 +32,7 @@ 'short' => 'cnk', 'short_description' => 'Chunkia is based in a chaotic landscape', 'description' => 'In the chaos of Minecraft, chunk errors are inevitable. Chunkia is based in one.', - ) + ), 'ttk' => array( 'name' => 'The Toaster-Königreich', 'flag' => 'https://raw.theclashfruit.me/Lupancham/CRSS/main/Nations/The%20Toaster-K%C3%B6nigreich/The%20Toaster-K%C3%B6nigreich%20Flag.png', From 2a62ac00b24ea66513de449dc175f20c9501419b Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Fri, 10 May 2024 18:05:02 +0200 Subject: [PATCH 03/15] fix: only run upload task on main branch --- .gitea/workflows/upload.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/upload.yml b/.gitea/workflows/upload.yml index a3a7fd2..112338b 100644 --- a/.gitea/workflows/upload.yml +++ b/.gitea/workflows/upload.yml @@ -1,6 +1,9 @@ -name: ️Upload Website +name: Upload Website -on: [ push ] +on: + push: + branches: + - main jobs: sftp: From aeb2e7fd43bc132df12853498f6b7a015ef3f344 Mon Sep 17 00:00:00 2001 From: blurryface Date: Sun, 12 May 2024 01:16:13 +0200 Subject: [PATCH 04/15] 1.9 Signed-off-by: Forgejo <> --- template/includes/hero.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/includes/hero.twig b/template/includes/hero.twig index f5f860e..2170e33 100644 --- a/template/includes/hero.twig +++ b/template/includes/hero.twig @@ -12,7 +12,7 @@
Server address: - Version: 1.8.9 + Version: 1.9.4
From fc5495ab13a43da2e6cec831c9d62837a4ea5b92 Mon Sep 17 00:00:00 2001 From: blryface <124838505+blryface@users.noreply.github.com> Date: Sat, 18 May 2024 16:58:50 -0300 Subject: [PATCH 05/15] Remove DRR, add companies template, add Fedbank --- index.php | 17 ++++++++++------- template/companies.twig | 22 ++++++++++++++++++++++ template/company.twig | 25 +++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 template/companies.twig create mode 100644 template/company.twig diff --git a/index.php b/index.php index 0bc0cc7..12dfb0f 100644 --- a/index.php +++ b/index.php @@ -19,13 +19,6 @@ 'short_description' => 'The first nation, prev. known as ROP.', 'description' => 'The first nation on CRSS, previously known as ROP.', ), - 'drr' => array( - 'name' => 'Democratic Republic of Rayland', - 'flag' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Nations/Democratic%20Republic%20of%20Rayland/bannre.png', - 'short' => 'drr', - 'short_description' => 'Short description of D.R.R.', - 'description' => 'Full description of D.R.R', //does this support html and line breaks - ), 'cnk' => array( 'name' => 'Chunkia', 'flag' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Nations/Chunkia/chunkia512.png', @@ -41,6 +34,16 @@ 'description' => 'In the vast landsacpe of CRSS, The Toaster-Königreich is one of the most industrialized Marxist district of CRSS. With Charge Industries as one of the main government controlled company in the nation.', ) ); + + $companies = array( + 'fbk' => array( + 'name' => 'FedBank', + 'logo' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Nations/Republic%20of%20Panorama/Flag.svg', + 'short' => 'fbk', + 'short_description' => 'An International Bank, owned by the PSF government', + 'description' => 'FedBank is an International bank owned and controlled by the Panorama Socialist Federation\'s Government. The main building is in PSF, but there is a FedBank in TTK too.' + ) + ); if(isset($_SESSION['user'])) { $dbUser = $mysql->getUserRecordFromId($_SESSION['user']['id']); diff --git a/template/companies.twig b/template/companies.twig new file mode 100644 index 0000000..32a49d1 --- /dev/null +++ b/template/companies.twig @@ -0,0 +1,22 @@ +{% include 'includes/head.twig' with {'pageTitle': 'Companies'} %} + +{% include 'includes/hero.twig' %} + +{% include 'includes/nav.twig' with {'page': 'companies'} %} + +
+

Companies

+
+ {% for company in companies %} + +

{{ company.name }}

+

{{ company.short_description }}

+ + + {% endfor %} +
+ +
+ +{% include 'includes/footer.twig' %} +{% include 'includes/foot.twig' %} \ No newline at end of file diff --git a/template/company.twig b/template/company.twig new file mode 100644 index 0000000..8ccaabb --- /dev/null +++ b/template/company.twig @@ -0,0 +1,25 @@ +{% include 'includes/head.twig' with {'pageTitle': company.name} %} + +{% include 'includes/hero.twig' %} + +{% include 'includes/nav.twig' with {'page': 'company'} %} + +
+
    +
  • + code: {{ company.short }} +
    • +
  • + name: {{ company.name }} +
    • +
  • + flag: {{ company.name }}'s flag. +
    • +
  • + description: {{company.description}} +
    • +
+
+ +{% include 'includes/footer.twig' %} +{% include 'includes/foot.twig' %} \ No newline at end of file From be92698ffee4997e3f9beee2671c4ec41d34b8eb Mon Sep 17 00:00:00 2001 From: blryface <124838505+blryface@users.noreply.github.com> Date: Sat, 18 May 2024 17:07:45 -0300 Subject: [PATCH 06/15] companies --- index.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/index.php b/index.php index 12dfb0f..8ae3772 100644 --- a/index.php +++ b/index.php @@ -85,6 +85,14 @@ echo $twig->render('nations.twig'); }); + $router->get('/companies', function() { + global $twig; + + $twig->addGlobal('pageUri', '/companies'); + + echo $twig->render('companies.twig'); + }); + $router->get('/gallery', function() { global $twig; From f813ddc0079e12807a4fc9432da23e945769cf38 Mon Sep 17 00:00:00 2001 From: blryface <124838505+blryface@users.noreply.github.com> Date: Sat, 18 May 2024 17:10:23 -0300 Subject: [PATCH 07/15] pls work --- template/companies.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/companies.twig b/template/companies.twig index 32a49d1..8410a9e 100644 --- a/template/companies.twig +++ b/template/companies.twig @@ -8,7 +8,7 @@

Companies

{% for company in companies %} - +

{{ company.name }}

{{ company.short_description }}

From bf7b0d9920f15d9d504612f410ce0277faa85455 Mon Sep 17 00:00:00 2001 From: blryface <124838505+blryface@users.noreply.github.com> Date: Sat, 18 May 2024 17:14:49 -0300 Subject: [PATCH 08/15] uhhhh was it this --- index.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/index.php b/index.php index 8ae3772..f33fb3f 100644 --- a/index.php +++ b/index.php @@ -151,6 +151,21 @@ } }); + $router->get('/company/([a-z]+)', function ($company) { + global $twig, $mysql, $companies; + + $twig->addGlobal('pageUri', '/company/' . $company); + + if(!$companies[$company]) { + http_response_code(404); + + echo $twig->render('404.twig'); + } else { + echo $twig->render('nation.twig', array('nation' => $companies[$company])); + } + }); + + $router->get('/u/([a-z0-9_\.]+)', function($name) { global $twig, $mysql, $discord; From a5fbe399b0e27ced468674ef2c5db8990fe91303 Mon Sep 17 00:00:00 2001 From: blryface <124838505+blryface@users.noreply.github.com> Date: Sat, 18 May 2024 17:18:07 -0300 Subject: [PATCH 09/15] aaaaaaaaaaaaaaaaaaaaaaaaa --- index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/index.php b/index.php index f33fb3f..1e5480b 100644 --- a/index.php +++ b/index.php @@ -65,6 +65,7 @@ $twig->addGlobal('playerCount', $json); $twig->addGlobal('nations', $nations); + $twig->addGlobal('companies', $companies); $twig->addGlobal('dc_uri', 'https://discord.com/api/oauth2/authorize?client_id=1144248396467683338&redirect_uri=' . urlencode($_ENV['DISCORD_REDIRECT']) . '&response_type=code&scope=identify%20guilds&state=' . urlencode($_SERVER['REQUEST_URI'])); $twig->addGlobal('reduced', isset($_GET['reduced'])); From fc16d400a26e3d1735a3b623202abf77675eb7f2 Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Fri, 24 May 2024 18:50:59 +0200 Subject: [PATCH 10/15] fix: parse to floats instead of ints --- js/map.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/map.js b/js/map.js index 19b9769..172e6f0 100644 --- a/js/map.js +++ b/js/map.js @@ -50,21 +50,21 @@ markers.forEach(marker => { ropMarkers .addLayer( L.marker([ - parseInt(coords[0]), parseInt(coords[1]) + parseFloat(coords[0]), parseFloat(coords[1]) ]).bindPopup(marker.name) ); break; case 'drr': drrMarkers.addLayer( L.marker([ - parseInt(coords[0]), parseInt(coords[1]) + parseFloat(coords[0]), parseFloat(coords[1]) ]).bindPopup(marker.name) ); break; default: miscMarkers.addLayer( L.marker([ - parseInt(coords[0]), parseInt(coords[1]) + parseFloat(coords[0]), parseFloat(coords[1]) ]).bindPopup(marker.name) ); break; @@ -94,8 +94,8 @@ let map = L.map('map', { projection: L.Projection.LonLat }), }).setView([ - parseInt(center.split(';')[1]), - parseInt(center.split(';')[0]) + parseFloat(center.split(';')[1]), + parseFloat(center.split(';')[0]) ], 2); let baseMaps = { From 21235a71e22512be1d2744c0919a31b3dad2e9bc Mon Sep 17 00:00:00 2001 From: KTrain5169 Date: Sat, 25 May 2024 12:45:33 +0200 Subject: [PATCH 11/15] Clarified the cheating rule (the first one) Please just... word it better somewhat Signed-off-by: Forgejo <> --- template/index.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/index.twig b/template/index.twig index 8db6f67..7fdc6fe 100644 --- a/template/index.twig +++ b/template/index.twig @@ -30,7 +30,7 @@

Rules

  1. - The usage of modified clients that gives unfair advantage to players is not permitted. Even if you only use certain cheats, such as FullBright and InvMove, you'll still get banned. TL;DR Do not cheat.
    + The usage of modified clients that gives unfair advantage to players (i.e. cheat clients) is not permitted. Even if you only use these clients for legit functions, such as FullBright, you'll still get banned. TL;DR Do not cheat.
  2. Do not modify (or destroy) other players' constructions, or take their items, without their permission. TL;DR Do not grief or steal.
    From 706e6b789bdecf6023cd6fcf578b3bc94f3dc8f7 Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Sun, 26 May 2024 10:20:41 +0200 Subject: [PATCH 12/15] feat: add rob --- index.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/index.php b/index.php index 1e5480b..5e810f8 100644 --- a/index.php +++ b/index.php @@ -32,6 +32,13 @@ 'short' => 'ttk', 'short_description' => 'The Toaster-Königreich is the Industrialized Nation of CRSS', 'description' => 'In the vast landsacpe of CRSS, The Toaster-Königreich is one of the most industrialized Marxist district of CRSS. With Charge Industries as one of the main government controlled company in the nation.', + ), + 'rob' => array( + 'name' => 'Republic of Budapest', + 'flag' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Nations/The%20Toaster-K%C3%B6nigreich/The%20Toaster-K%C3%B6nigreich%20Flag.png', + 'short' => 'ttk', + 'short_description' => 'Republic of Budapest is a country located to the west of the map.', + 'description' => 'Republic of Budapest is a country located to the west of the map.', ) ); From 6ffe9bedbd8f37307a095c3a360df76f4ff911dd Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Sun, 26 May 2024 10:21:30 +0200 Subject: [PATCH 13/15] fix: change the flag too oops --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 5e810f8..916fee0 100644 --- a/index.php +++ b/index.php @@ -35,7 +35,7 @@ ), 'rob' => array( 'name' => 'Republic of Budapest', - 'flag' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Nations/The%20Toaster-K%C3%B6nigreich/The%20Toaster-K%C3%B6nigreich%20Flag.png', + 'flag' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Nations/Republic%20of%20Budapest/Assets/Flag.svg', 'short' => 'ttk', 'short_description' => 'Republic of Budapest is a country located to the west of the map.', 'description' => 'Republic of Budapest is a country located to the west of the map.', From 9513ee214eca8e21946803ab55c55ac606e50b07 Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Sun, 26 May 2024 10:23:28 +0200 Subject: [PATCH 14/15] fix: also update the short to rob smh I should check if I changed everything --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 916fee0..9c915b5 100644 --- a/index.php +++ b/index.php @@ -36,7 +36,7 @@ 'rob' => array( 'name' => 'Republic of Budapest', 'flag' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Nations/Republic%20of%20Budapest/Assets/Flag.svg', - 'short' => 'ttk', + 'short' => 'rob', 'short_description' => 'Republic of Budapest is a country located to the west of the map.', 'description' => 'Republic of Budapest is a country located to the west of the map.', ) From cc30163ed7a3fe2263f095c8ab33bb5f4a211678 Mon Sep 17 00:00:00 2001 From: worldwidepixel <58098422+worldwidepixel@users.noreply.github.com> Date: Tue, 28 May 2024 19:23:54 -0700 Subject: [PATCH 15/15] Add northern to /companies --- index.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/index.php b/index.php index 9c915b5..5d4fd13 100644 --- a/index.php +++ b/index.php @@ -49,6 +49,13 @@ 'short' => 'fbk', 'short_description' => 'An International Bank, owned by the PSF government', 'description' => 'FedBank is an International bank owned and controlled by the Panorama Socialist Federation\'s Government. The main building is in PSF, but there is a FedBank in TTK too.' + ), + 'ntn' => array( + 'name' => 'Northern', + 'logo' => 'https://raw.theclashfruit.me/CRSS/CRSS/main/Companies/Chunkia/northern.svg', + 'short' => 'ntn', + 'short_description' => 'The Northern Company.', + 'description' => 'Creators of the H1 and the Northern Complex, Northern is dedicated to improving the CRSS experience.' ) );