show anomaly warning

st-universe · Dec 2, 2023 · fb63451 · fb63451
1 parent 2606807
commit fb63451
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 10 deletions.
diff --git a/src/Module/Ship/View/ShowShip/ShowShip.php b/src/Module/Ship/View/ShowShip/ShowShip.php
@@ -22,7 +22,6 @@
 use Stu\Module\Database\View\Category\Tal\DatabaseCategoryTalFactoryInterface;
 use Stu\Module\Logging\LoggerUtilFactoryInterface;
 use Stu\Module\Logging\LoggerUtilInterface;
-use Stu\Module\Ship\Lib\Battle\FightLibInterface;
 use Stu\Module\Ship\Lib\ShipLoaderInterface;
 use Stu\Module\Ship\Lib\ShipRumpSpecialAbilityEnum;
 use Stu\Module\Ship\Lib\ShipWrapperFactoryInterface;
@@ -33,6 +32,7 @@
 use Stu\Orm\Entity\ShipInterface;
 use Stu\Orm\Entity\StationShipRepairInterface;
 use Stu\Orm\Entity\UserInterface;
+use Stu\Orm\Repository\AnomalyRepositoryInterface;
 use Stu\Orm\Repository\AstroEntryRepositoryInterface;
 use Stu\Orm\Repository\DatabaseUserRepositoryInterface;
 use Stu\Orm\Repository\ShipyardShipQueueRepositoryInterface;
@@ -77,7 +77,7 @@ final class ShowShip implements ViewControllerInterface
 
     private ShipCrewCalculatorInterface $shipCrewCalculator;
 
-    private FightLibInterface $fightLib;
+    private AnomalyRepositoryInterface $anomalyRepository;
 
     public function __construct(
         SessionInterface $session,
@@ -95,7 +95,7 @@ public function __construct(
         ColonyLibFactoryInterface $colonyLibFactory,
         ShipUiFactoryInterface $shipUiFactory,
         ShipCrewCalculatorInterface $shipCrewCalculator,
-        FightLibInterface $fightLib,
+        AnomalyRepositoryInterface $anomalyRepository,
         LoggerUtilFactoryInterface $loggerUtilFactory
     ) {
         $this->session = $session;
@@ -115,7 +115,9 @@ public function __construct(
         $this->colonyLibFactory = $colonyLibFactory;
         $this->shipUiFactory = $shipUiFactory;
         $this->shipCrewCalculator = $shipCrewCalculator;
-        $this->fightLib = $fightLib;
+        $this->anomalyRepository = $anomalyRepository;
+
+        //$this->loggerUtil->init('SHOW', LoggerEnum::LEVEL_ERROR);
     }
 
     public function handle(GameControllerInterface $game): void
@@ -196,7 +198,7 @@ public function handle(GameControllerInterface $game): void
         $game->setTemplateVar('CAN_COLONIZE', $canColonize);
         $game->setTemplateVar('OWNS_CURRENT_COLONY', $ownsCurrentColony);
         $game->setTemplateVar('CURRENT_COLONY', $colony);
-        $game->setTemplateVar('FIGHT_LIB', $this->fightLib);
+        $game->setTemplateVar('CLOSEST_ANOMALY_DISTANCE', $this->anomalyRepository->getClosestAnomalyDistance($ship));
 
         $userLayers = $user->getUserLayers();
         if ($ship->hasTranswarp()) {

diff --git a/src/Module/Twig/TwigHelper.php b/src/Module/Twig/TwigHelper.php
@@ -9,6 +9,7 @@
 use Stu\Component\Colony\ColonyMenuEnum;
 use Stu\Component\Game\ModuleViewEnum;
 use Stu\Lib\Colony\PlanetFieldHostInterface;
+use Stu\Lib\ModuleScreen\GradientColorInterface;
 use Stu\Module\Colony\Lib\ColonyEpsProductionPreviewWrapper;
 use Stu\Module\Colony\Lib\ColonyLibFactoryInterface;
 use Stu\Module\Colony\Lib\ColonyProductionPreviewWrapper;
@@ -35,18 +36,22 @@ class TwigHelper
 
     private ColonyLibFactoryInterface $colonyLibFactory;
 
+    private GradientColorInterface $gradientColor;
+
     public function __construct(
         Environment $environment,
         Parser $parser,
         ConfigInterface $config,
         FightLibInterface $fightLib,
-        ColonyLibFactoryInterface $colonyLibFactory
+        ColonyLibFactoryInterface $colonyLibFactory,
+        GradientColorInterface $gradientColor
     ) {
         $this->environment = $environment;
         $this->parser = $parser;
         $this->config = $config;
         $this->fightLib = $fightLib;
         $this->colonyLibFactory = $colonyLibFactory;
+        $this->gradientColor = $gradientColor;
     }
 
     public function registerGlobalVariables(): void
@@ -189,5 +194,10 @@ private function registerFunctions(): void
             return uniqid();
         });
         $this->environment->addFunction($getUniqIdFunction);
+
+        $gradientColorFunction = new TwigFunction('gradientColor', function (int $value, int $lowest, int $highest): string {
+            return $this->gradientColor->calculateGradientColor($value, $lowest, $highest);
+        });
+        $this->environment->addFunction($gradientColorFunction);
     }
 }
diff --git a/src/Orm/Repository/AnomalyRepository.php b/src/Orm/Repository/AnomalyRepository.php
@@ -5,8 +5,11 @@
 namespace Stu\Orm\Repository;
 
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\NoResultException;
 use Stu\Orm\Entity\Anomaly;
 use Stu\Orm\Entity\AnomalyInterface;
+use Stu\Orm\Entity\Map;
+use Stu\Orm\Entity\ShipInterface;
 
 /**
  * @extends EntityRepository<Anomaly>
@@ -48,4 +51,44 @@ public function findAllActive(): array
             )
             ->getResult();
     }
+
+    public function getClosestAnomalyDistance(ShipInterface $ship): ?int
+    {
+        $map = $ship->getMap();
+        if ($map === null) {
+            return null;
+        }
+
+        $range = $ship->getSensorRange() * 2;
+
+        try {
+            return (int)$this->getEntityManager()->createQuery(
+                sprintf(
+                    'SELECT SQRT(ABS(m.cx - :x) * ABS(m.cx - :x) + ABS(m.cy - :y) * ABS(m.cy - :y)) as foo
+                    FROM %s a
+                    JOIN %s m
+                    WITH a.map_id = m.id
+                    WHERE (m.cx BETWEEN :startX AND :endX)
+                    AND (m.cy BETWEEN :startY AND :endY)
+                    AND m.layer = :layer
+                    ORDER BY foo ASC',
+                    Anomaly::class,
+                    Map::class
+                )
+            )
+                ->setMaxResults(1)
+                ->setParameters([
+                    'layer' => $map->getLayer(),
+                    'x' => $map->getX(),
+                    'y' => $map->getY(),
+                    'startX' => $map->getX() - $range,
+                    'endX' => $map->getX() +  $range,
+                    'startY' => $map->getY() - $range,
+                    'endY' => $map->getY() +  $range
+                ])
+                ->getSingleScalarResult();
+        } catch (NoResultException) {
+            return null;
+        }
+    }
 }
diff --git a/src/Orm/Repository/AnomalyRepositoryInterface.php b/src/Orm/Repository/AnomalyRepositoryInterface.php
@@ -5,6 +5,7 @@
 use Doctrine\Persistence\ObjectRepository;
 use Stu\Orm\Entity\Anomaly;
 use Stu\Orm\Entity\AnomalyInterface;
+use Stu\Orm\Entity\ShipInterface;
 
 /**
  * @extends ObjectRepository<Anomaly>
@@ -24,4 +25,6 @@ public function delete(AnomalyInterface $anomaly): void;
      * @return array<AnomalyInterface>
      */
     public function findAllActive(): array;
+
+    public function getClosestAnomalyDistance(ShipInterface $ship): ?int;
 }
diff --git a/src/html/ship/ship.twig b/src/html/ship/ship.twig
@@ -249,7 +249,7 @@
 				</div>
 				<br />
 				{{ control_mid(WRAPPER, ASTRO_STATE_SYSTEM, ASTRO_STATE_REGION, TACHYON_ACTIVE, STARSYSTEM_ENTRY_TAL,
-				CURRENT_COLONY, CAN_COLONIZE)
+				CURRENT_COLONY, CAN_COLONIZE, CLOSEST_ANOMALY_DISTANCE)
 				}}
 				{{ control_right(WRAPPER, CONSTRUCTION_PROGRESS_WRAPPER, POSSIBLE_STATIONS, MODULE_SELECTORS,
 				USER_LAYERS)
@@ -275,7 +275,7 @@
 			</td>
 			<td style="vertical-align: top; width: 33%;">
 				{{ control_mid(WRAPPER, ASTRO_STATE_SYSTEM, ASTRO_STATE_REGION, TACHYON_ACTIVE, STARSYSTEM_ENTRY_TAL,
-				CURRENT_COLONY, CAN_COLONIZE)
+				CURRENT_COLONY, CAN_COLONIZE, CLOSEST_ANOMALY_DISTANCE)
 				}}
 			</td>
 			<td style="vertical-align: top; width: 33%;">

diff --git a/src/html/shipcontrol/control_mid.twig b/src/html/shipcontrol/control_mid.twig
@@ -1,5 +1,5 @@
 {% macro control_mid(wrapper, astroStateSystem, astroStateRegion, isTachyonActive, starSystemEntryTal, currentColony,
-canColonize) %}
+canColonize, closestAnomalyDistance) %}
 
 {% from 'html/macros.twig' import onClickShip %}
 
@@ -292,11 +292,16 @@ canColonize) %}
             {{ _self.influenceArea(ship.getCurrentMapField.getInfluenceArea.getBase.getUser) }}
             {% endif %}
             {% set anomalies = ship.getLocation.getAnomalies %}
+            {% if not anomalies.isEmpty %}
             {% for anomaly in anomalies %}
             <br />
             {% include anomaly.getAnomalyType.getTemplate %}
             {% endfor %}
-
+            {% elseif closestAnomalyDistance %}
+            <br />
+            <span style="border: 2px solid {{ gradientColor(closestAnomalyDistance, ship.getSensorRange * 2, 1) }}"
+                title="Es wurde eine Anomalie in der Nähe detektiert">Anomalie in der Nähe</span>
+            {% endif %}
         </td>
         {% if starSystem %}
         <td>