Added a challenge for flying the 3 major airline alliances
This commit is contained in:
@@ -171,6 +171,11 @@ class UserProfileController extends Controller
|
||||
default => null,
|
||||
};
|
||||
|
||||
$majorAlliances = match($achievement->internal_name){
|
||||
'airlines_alliances.all_major_alliances' => Alliance::MAJOR_ALLIANCES,
|
||||
default => [],
|
||||
};
|
||||
|
||||
$continents = match($achievement->internal_name){
|
||||
'countries_continents.all_continent_pairs_one_way', 'countries_continents.all_continent_pairs_both_ways' => Continent::all()->toArray(),
|
||||
default => [],
|
||||
@@ -207,6 +212,7 @@ class UserProfileController extends Controller
|
||||
'continents' => $continents,
|
||||
'aircraft_families' => $aircraftFamilies,
|
||||
'achievementCount' => $user->unlockedAchievements()->count(),
|
||||
'majorAlliances' => Alliance::whereIn('internal_name', $majorAlliances)->get(),
|
||||
'canView' => $canView,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -26,6 +26,9 @@ class Alliance extends Model
|
||||
'skyteam' => 'airlines_alliances.all_skyteam',
|
||||
];
|
||||
|
||||
const array MAJOR_ALLIANCES = ['skyteam', 'oneworld', 'star_alliance'];
|
||||
|
||||
|
||||
public function airlines(): HasMany
|
||||
{
|
||||
return $this->hasMany(Airline::class);
|
||||
|
||||
@@ -28,6 +28,12 @@ class AirlinesAndAlliancesChecker extends BaseChecker
|
||||
|
||||
$check = fn(string $alliance): int => $flownAllianceAirlines->get($alliance, 0);
|
||||
|
||||
$majorAlliancesFlown = collect(Alliance::MAJOR_ALLIANCES)
|
||||
->filter(fn(string $alliance) => $check($alliance) > 0)
|
||||
->count();
|
||||
|
||||
$this->awardProgress($majorAlliancesFlown, 'airlines_alliances.all_major_alliances');
|
||||
|
||||
$this->awardProgress($check('skyteam'), 'airlines_alliances.all_skyteam');
|
||||
$this->awardProgress($check('oneworld'), 'airlines_alliances.all_oneworld');
|
||||
$this->awardProgress($check('star_alliance'), 'airlines_alliances.all_star_alliance');
|
||||
@@ -40,6 +46,8 @@ class AirlinesAndAlliancesChecker extends BaseChecker
|
||||
|
||||
$checkGroup = fn(array $group): int => $flownAirlines->intersect($group)->count();
|
||||
|
||||
|
||||
|
||||
$this->awardProgress($checkGroup(self::ME_3), 'airlines_alliances.me3');
|
||||
$this->awardProgress($checkGroup(self::US_3), 'airlines_alliances.us3');
|
||||
$this->awardProgress($checkGroup(self::CN_3), 'airlines_alliances.cn3');
|
||||
|
||||
Reference in New Issue
Block a user