beaming impossible during ion storm

st-universe · Jan 22, 2025 · cc891d2 · cc891d2
1 parent 4136670
commit cc891d2
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 3 deletions.
diff --git a/src/Lib/Interaction/InteractionCheckType.php b/src/Lib/Interaction/InteractionCheckType.php
@@ -23,6 +23,7 @@ enum InteractionCheckType
     case EXPECT_TARGET_UNWARPED;
     case EXPECT_TARGET_SAME_USER;
     case EXPECT_TARGET_ALSO_IN_FINISHED_WEB;
+    case EXPECT_TARGET_DOCKED_OR_NO_ION_STORM;
 
     public function getReason(string $placeholder = ''): string
     {
@@ -37,9 +38,10 @@ public function getReason(string $placeholder = ''): string
             self::EXPECT_TARGET_NOT_NPC => 'Aktion nicht möglich, der Spieler ist NPC!',
             self::EXPECT_TARGET_UNSHIELDED => 'Das Ziel hat die Schilde aktiviert',
             self::EXPECT_TARGET_UNWARPED => 'Das Ziel hat den Warpantrieb aktiviert',
-            self::EXPECT_TARGET_SAME_USER => throw new SanityCheckException('Tried to interact with entity of other user'),
             self::EXPECT_TARGET_ALSO_IN_FINISHED_WEB => 'Das Ziel ist nicht mit im Energienetz gefangen',
+            self::EXPECT_TARGET_DOCKED_OR_NO_ION_STORM => 'Beamen nicht möglich während eines Ionensturms',
             self::EXPECT_SOURCE_TACHYON => throw new SanityCheckException('Tried to interact with cloaked entity without active tachyon'),
+            self::EXPECT_TARGET_SAME_USER => throw new SanityCheckException('Tried to interact with entity of other user'),
             self::EXPECT_TARGET_UNCLOAKED => throw new SanityCheckException('Tried to interact with cloaked entity')
         };
     }

diff --git a/src/Lib/Interaction/Member/ColonyMember.php b/src/Lib/Interaction/Member/ColonyMember.php
@@ -3,6 +3,7 @@
 namespace Stu\Lib\Interaction\Member;
 
 use Override;
+use Stu\Component\Anomaly\Type\AnomalyTypeEnum;
 use Stu\Lib\Interaction\InteractionCheckType;
 use Stu\Module\Ship\Lib\TholianWebUtilInterface;
 use Stu\Orm\Entity\ColonyInterface;
@@ -38,6 +39,13 @@ public function canBeAccessedFrom(
         callable $shouldCheck
     ): ?InteractionCheckType {
 
+        if (
+            $shouldCheck(InteractionCheckType::EXPECT_TARGET_DOCKED_OR_NO_ION_STORM)
+            && $this->colony->getLocation()->hasAnomaly(AnomalyTypeEnum::ION_STORM)
+        ) {
+            return InteractionCheckType::EXPECT_TARGET_DOCKED_OR_NO_ION_STORM;
+        }
+
         if (
             $shouldCheck(InteractionCheckType::EXPECT_TARGET_ALSO_IN_FINISHED_WEB)
             && $this->tholianWebUtil->isTargetOutsideFinishedTholianWeb($other->get(), $this->colony)

diff --git a/src/Lib/Interaction/Member/InteractionMemberFactory.php b/src/Lib/Interaction/Member/InteractionMemberFactory.php
@@ -5,6 +5,7 @@
 use RuntimeException;
 use Stu\Component\Spacecraft\Nbs\NbsUtilityInterface;
 use Stu\Lib\Interaction\EntityWithInteractionCheckInterface;
+use Stu\Lib\Transfer\CommodityTransferInterface;
 use Stu\Module\Ship\Lib\TholianWebUtilInterface;
 use Stu\Orm\Entity\ColonyInterface;
 use Stu\Orm\Entity\SpacecraftInterface;
@@ -14,7 +15,8 @@ class InteractionMemberFactory implements InteractionMemberFactoryInterface
 {
     public function __construct(
         private NbsUtilityInterface $nbsUtility,
-        private TholianWebUtilInterface $tholianWebUtil
+        private TholianWebUtilInterface $tholianWebUtil,
+        private CommodityTransferInterface $commodityTransfer
     ) {}
 
     public function createMember(EntityWithInteractionCheckInterface $entity): InteractionMemberInterface
@@ -23,7 +25,7 @@ public function createMember(EntityWithInteractionCheckInterface $entity): Inter
             return new ColonyMember($this->tholianWebUtil, $entity);
         }
         if ($entity instanceof SpacecraftInterface) {
-            return new SpacecraftMember($this->nbsUtility, $this->tholianWebUtil, $entity);
+            return new SpacecraftMember($this->nbsUtility, $this->tholianWebUtil, $this->commodityTransfer, $entity);
         }
         if ($entity instanceof TrumfieldInterface) {
             return new TrumfieldMember($entity);

diff --git a/src/Lib/Interaction/Member/SpacecraftMember.php b/src/Lib/Interaction/Member/SpacecraftMember.php
@@ -3,8 +3,10 @@
 namespace Stu\Lib\Interaction\Member;
 
 use Override;
+use Stu\Component\Anomaly\Type\AnomalyTypeEnum;
 use Stu\Component\Spacecraft\Nbs\NbsUtilityInterface;
 use Stu\Lib\Interaction\InteractionCheckType;
+use Stu\Lib\Transfer\CommodityTransferInterface;
 use Stu\Module\Ship\Lib\TholianWebUtilInterface;
 use Stu\Orm\Entity\MapInterface;
 use Stu\Orm\Entity\SpacecraftInterface;
@@ -16,6 +18,7 @@ class SpacecraftMember implements InteractionMemberInterface
     public function __construct(
         private NbsUtilityInterface $nbsUtility,
         private TholianWebUtilInterface $tholianWebUtil,
+        private CommodityTransferInterface $commodityTransfer,
         private SpacecraftInterface $spacecraft
     ) {}
 
@@ -64,6 +67,16 @@ public function canBeAccessedFrom(
         callable $shouldCheck
     ): ?InteractionCheckType {
 
+        $otherEntity = $other->get();
+        if (
+            $otherEntity instanceof SpacecraftInterface
+            && $shouldCheck(InteractionCheckType::EXPECT_TARGET_DOCKED_OR_NO_ION_STORM)
+            && $this->spacecraft->getLocation()->hasAnomaly(AnomalyTypeEnum::ION_STORM)
+            && !$this->commodityTransfer->isDockTransfer($this->spacecraft, $otherEntity)
+        ) {
+            return InteractionCheckType::EXPECT_TARGET_DOCKED_OR_NO_ION_STORM;
+        }
+
         if (
             $shouldCheck(InteractionCheckType::EXPECT_TARGET_SAME_USER)
             && $this->spacecraft->getUser() !== $other->getUser()

diff --git a/src/Module/Colony/Lib/Gui/ColonyScanPanel.php b/src/Module/Colony/Lib/Gui/ColonyScanPanel.php
@@ -49,6 +49,7 @@ protected function loadLayers(): void
         $panelLayerCreation = $this->panelLayerCreation
             ->addShipCountLayer($showCloaked, null, SpacecraftCountLayerTypeEnum::ALL, 0)
             ->addSystemLayer()
+            ->addAnomalyLayer()
             ->addColonyShieldLayer();
 
         if ($this->colonyFunctionManager->hasFunction($this->colony, BuildingFunctionEnum::BUILDING_FUNCTION_SUBSPACE_TELESCOPE)) {

diff --git a/src/Module/Game/Action/Transfer/Transfer.php b/src/Module/Game/Action/Transfer/Transfer.php
@@ -77,6 +77,7 @@ public function handle(GameControllerInterface $game): void
                 InteractionCheckType::EXPECT_SOURCE_UNWARPED,
                 InteractionCheckType::EXPECT_SOURCE_UNSHIELDED,
                 InteractionCheckType::EXPECT_TARGET_NO_VACATION,
+                InteractionCheckType::EXPECT_TARGET_DOCKED_OR_NO_ION_STORM,
                 InteractionCheckType::EXPECT_TARGET_UNWARPED,
                 InteractionCheckType::EXPECT_TARGET_UNCLOAKED,
                 InteractionCheckType::EXPECT_TARGET_UNSHIELDED

diff --git a/tests/StuMocks.php b/tests/StuMocks.php
@@ -9,6 +9,7 @@
 use Stu\Config\StuContainer;
 use Stu\Lib\Component\ComponentEnumInterface;
 use Stu\Lib\Component\ComponentLoaderInterface;
+use Stu\Lib\Map\VisualPanel\Layer\PanelLayerCreation;
 
 class StuMocks
 {
@@ -44,6 +45,7 @@ public function registerStubbedComponent(ComponentEnumInterface $componentEnum):
     public function reset(): void
     {
         request::setMockVars(null);
+        PanelLayerCreation::$skippedLayers = [];
         $this->getStuContainer()->clearAdditionalServices();
         $this->getStuContainer()
             ->get(ComponentLoaderInterface::class)

diff --git a/tests/inttest/html/AllViewControllerTest.php b/tests/inttest/html/AllViewControllerTest.php
@@ -8,6 +8,8 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use ReflectionClass;
 use Stu\Config\Init;
+use Stu\Lib\Map\VisualPanel\Layer\PanelLayerCreation;
+use Stu\Lib\Map\VisualPanel\Layer\PanelLayerEnum;
 use Stu\Module\Control\ViewControllerInterface;
 use Stu\Module\Game\Component\GameComponentEnum;
 use Stu\StuMocks;
@@ -96,6 +98,8 @@ public static function getAllViewControllerDataProvider(): array
     #[DataProvider('getAllViewControllerDataProvider')]
     public function testHandle(string $key): void
     {
+        PanelLayerCreation::$skippedLayers[] = PanelLayerEnum::ANOMALIES->value;
+
         $this->snapshotKey = $key;
 
         $this->renderSnapshot(