diff --git a/SpawntimeController.php b/SpawntimeController.php index 0f8dd97..d64ec93 100644 --- a/SpawntimeController.php +++ b/SpawntimeController.php @@ -7,7 +7,6 @@ use Nadybot\Core\LoggerWrapper; use Nadybot\Core\Text; use Nadybot\Core\Util; -use Nadybot\Modules\WHEREIS_MODULE\WhereisCoordinates; /** * @author Nadyita (RK5) @@ -25,7 +24,6 @@ */ class SpawntimeController { - public string $moduleName; /** @Inject */ @@ -33,7 +31,7 @@ class SpawntimeController { /** @Inject */ public Text $text; - + /** @Inject */ public Util $util; @@ -63,7 +61,7 @@ public function getLocationBlob(Spawntime $spawntime): string { } return $this->text->makeBlob("locations (" . count($spawntime->coordinates).")", $blob); } - + /** * Return the formatted entry for one mob */ diff --git a/WhereisCoordinates.php b/WhereisCoordinates.php new file mode 100644 index 0000000..7e3ff2c --- /dev/null +++ b/WhereisCoordinates.php @@ -0,0 +1,23 @@ +answer = $spawn->answer; + $this->keywords = $spawn->keywords; + if (isset($spawn->long_name)) { + $this->long_name = $spawn->long_name; + } + $this->name = $spawn->name; + $this->playfield_id = (int)$spawn->playfield_id; + $this->short_name = $spawn->short_name; + $this->xcoord = (int)$spawn->xcoord; + $this->ycoord = (int)$spawn->ycoord; + } +}