Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#555 fixed tech prereq checking and tooltips #556

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

#555 fixed tech prereq checking and tooltips #556

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21c5330
#555 fixed prereq checking and tooltips
Nov 19, 2022
de32f28
fixed typo, thx phpstan
Nov 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 36 additions & 38 deletions htdocs/content/research.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,35 @@
$use_img_filter = false;
}

function check_building_requirement(EtoA\Requirement\ObjectRequirement $requirement, array $buildlist): bool
{
return isset($buildlist[$requirement->requiredBuildingId]) && $buildlist[$requirement->requiredBuildingId] >= $requirement->requiredLevel;
}

function check_technology_requirement(EtoA\Requirement\ObjectRequirement $requirement, array $techlist): bool
{
return isset($techlist[$requirement->requiredTechnologyId]) && $techlist[$requirement->requiredTechnologyId]->currentLevel >= $requirement->requiredLevel;
}

function check_requirements(EtoA\Requirement\RequirementsCollection $requirements, array $buildlist, array $techlist, int $techid): bool
{
// check building prerequisites
foreach ($requirements->getBuildingRequirements($techid) as $requirement) {
if (!check_building_requirement($requirement, $buildlist)) {
return false;
}
}

// check technology prerequisites
foreach ($requirements->getTechnologyRequirements($techid) as $requirement) {
if (!check_technology_requirement($requirement, $techlist)) {
return false;
}
}

return true;
}

if (isset($cp)) {
$planet = $planetRepo->find($cp->id);

Expand Down Expand Up @@ -528,18 +557,7 @@


// Check requirements for this building
$requirements_passed = true;
foreach ($requirements->getBuildingRequirements($technology->id) as $requirement) {
if (!isset($buildlist[$requirement->requiredBuildingId]) || $buildlist[$requirement->requiredBuildingId] < $requirement->requiredLevel) {
$requirements_passed = false;
}
}

foreach ($requirements->getTechnologyRequirements($technology->id) as $requirement) {
if (!isset($techlist[$requirement->requiredTechnologyId]) || $techlist[$requirement->requiredTechnologyId]->currentLevel < $requirement->requiredLevel) {
$requirements_passed = false;
}
}
$requirements_passed = check_requirements($requirements, $buildlist, $techlist, $technology->id);

//
// Baumenü
Expand Down Expand Up @@ -767,28 +785,7 @@ function setCountdown()
}

// Check requirements for this tech
$requirements_passed = true;
$b_req_info = array();
$t_req_info = array();
if (isset($b_req[$tech->id]['t']) && count($b_req[$tech->id]['t']) > 0) {
foreach ($b_req[$tech->id]['t'] as $b => $l) {
if (!isset($techlist[$b]->currentLevel) || $techlist[$b]->currentLevel < $l) {
$t_req_info[] = array($b, $l, false);
$requirements_passed = false;
} else
$t_req_info[] = array($b, $l, true);
}
}
if (isset($b_req[$tech->id]['b']) && count($b_req[$tech->id]['b']) > 0) {
foreach ($b_req[$tech->id]['b'] as $id => $level) {
if (!isset($buildlist[$id]) || $buildlist[$id] < $level) {
$requirements_passed = false;
$b_req_info[] = array($id, $level, false);
} else {
$b_req_info[] = array($id, $level, true);
}
}
}
$requirements_passed = check_requirements($requirements, $buildlist, $techlist, $tech->id);

$filterStyleClass = "";
if (!$tech->show && $b_level > 0) {
Expand All @@ -808,12 +805,13 @@ function setCountdown()
/** @var BuildingDataRepository $buildingRepository */
$buildingRepository = $app[BuildingDataRepository::class];
$buildingNames = $buildingRepository->getBuildingNames(true);
foreach ($b_req_info as $v) {
$tmtext .= "<div style=\"color:" . ($v[2] ? '#0f0' : '#f30') . "\">" . $buildingNames[$v[0]] . " Stufe " . $v[1] . "</div>";

foreach ($requirements->getBuildingRequirements($tech->id) as $breq) {
$tmtext .= "<div style=\"color:" . (check_building_requirement($breq, $buildlist) ? '#0f0' : '#f30') . "\">" . $buildingNames[$breq->requiredBuildingId] . " Stufe " . $breq->requiredLevel . "</div>";
}

foreach ($t_req_info as $v) {
$tmtext .= "<div style=\"color:" . ($v[2] ? '#0f0' : '#f30') . "\">" . $technologyNames[$v[0]] . " Stufe " . $v[1] . "</div>";
foreach ($requirements->getTechnologyRequirements($tech->id) as $treq) {
$tmtext .= "<div style=\"color:" . (check_technology_requirement($treq, $techlist) ? '#0f0' : '#f30') . "\">" . $technologyNames[$treq->requiredTechnologyId] . " Stufe " . $treq->requiredLevel . "</div>";
}

$color = '#999';
Expand Down