From 48368e64de02b56cc02995cc4182f8d52278054a Mon Sep 17 00:00:00 2001 From: Natalie Rose Date: Wed, 3 Sep 2025 21:22:03 +1000 Subject: [PATCH] Enable missions (yay Tyleon) --- .gitmodules | 3 +++ bin/add_missions.pl | 2 +- bin/util/update_mission_buildings.pl | 2 +- docker-compose.yml | 1 + lib/Lacuna/DB/Result/Mission.pm | 4 ++-- missions | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) create mode 160000 missions diff --git a/.gitmodules b/.gitmodules index b1944b02..5b5d6a4d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "super-ui"] path = super-ui url = https://gitea.allosaurus-chromatic.ts.net/tlecommunity/super-ui.git +[submodule "missions"] + path = missions + url = https://gitea.allosaurus-chromatic.ts.net/tlecommunity/missions.git diff --git a/bin/add_missions.pl b/bin/add_missions.pl index ff04a051..7284b14d 100644 --- a/bin/add_missions.pl +++ b/bin/add_missions.pl @@ -89,7 +89,7 @@ out((($finish - $start)/60)." minutes have elapsed"); sub get_mission_files { - opendir my $dir, '/data/Lacuna-Mission/missions/'; + opendir my $dir, '/home/lacuna/server/missions/missions/'; my @files = readdir $dir; closedir $dir; my @missions; diff --git a/bin/util/update_mission_buildings.pl b/bin/util/update_mission_buildings.pl index df2b815b..26917b13 100644 --- a/bin/util/update_mission_buildings.pl +++ b/bin/util/update_mission_buildings.pl @@ -9,6 +9,6 @@ $|=1; my %buildings = map { $_ => $_->name } findallmod Lacuna::DB::Result::Building; -my $config = Config::JSON->create('/data/Lacuna-Mission/var/resources.conf'); +my $config = Config::JSON->create('/home/lacuna/server/missions/var/resources.conf'); $config->set('buildings', \%buildings); diff --git a/docker-compose.yml b/docker-compose.yml index a8b03c81..6fe70996 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -196,6 +196,7 @@ services: - ./t:/home/lacuna/server/t - ./var:/home/lacuna/server/var - ./var/www/public/api/api.css:/home/lacuna/server/var/www/public/api/api.css + - ./missions:/home/lacuna/server/missions - ./tmp:/tmp lacuna-server-building-scheduler: diff --git a/lib/Lacuna/DB/Result/Mission.pm b/lib/Lacuna/DB/Result/Mission.pm index 91cc256e..0e26aa4e 100644 --- a/lib/Lacuna/DB/Result/Mission.pm +++ b/lib/Lacuna/DB/Result/Mission.pm @@ -25,7 +25,7 @@ has params => ( lazy => 1, default => sub { my $self = shift; - return Config::JSON->new('/data/Lacuna-Mission/missions/'. $self->mission_file_name); + return Config::JSON->new('/home/lacuna/server/missions/missions/'. $self->mission_file_name); }, ); @@ -561,7 +561,7 @@ sub feed_filename { sub initialize { my ($class, $zone, $filename) = @_; - return undef unless (-f '/data/Lacuna-Mission/missions/'.$filename); + return undef unless (-f '/home/lacuna/server/missions/missions/'.$filename); my $mission = Lacuna->db->resultset('Lacuna::DB::Result::Mission')->new({ zone => $zone, mission_file_name => $filename, diff --git a/missions b/missions new file mode 160000 index 00000000..4027c934 --- /dev/null +++ b/missions @@ -0,0 +1 @@ +Subproject commit 4027c934b06cd91cc4416b45da553cba7f33dbba -- 2.51.2