diff --git a/Client/Application/ViewModels/MapViewModel.cs b/Client/Application/ViewModels/MapViewModel.cs index daae7ef..3fc43d5 100644 --- a/Client/Application/ViewModels/MapViewModel.cs +++ b/Client/Application/ViewModels/MapViewModel.cs @@ -291,7 +291,7 @@ namespace Client.Application.ViewModels public ObservableCollection Path { get; } = new ObservableCollection(); public readonly static float MIN_SCALE = 1; - public readonly static float MAX_SCALE = 64; + public readonly static float MAX_SCALE = 128; private readonly AsyncPathMoverInterface pathMover; private MapImageSelector selector = new MapImageSelector(); private Dictionary blocks = new Dictionary(); diff --git a/L2BotDll/Application.h b/L2BotDll/Application.h index f771a19..b5b7043 100644 --- a/L2BotDll/Application.h +++ b/L2BotDll/Application.h @@ -22,7 +22,7 @@ class Application { public: Application(const VersionAbstractFactory::Version version) : - m_AbstractFactory(VersionAbstractFactory::GetFactory(version, Application::RADIUS)), + m_AbstractFactory(VersionAbstractFactory::GetFactory(version, Application::CREATURE_RADIUS, Application::DROP_RADIUS)), m_Transport(Application::PIPE_NAME), m_WorldHandler ( @@ -72,8 +72,10 @@ private: NamedPipeTransport m_Transport; static const std::wstring PIPE_NAME; - static const uint16_t RADIUS; + static const uint16_t CREATURE_RADIUS; + static const uint16_t DROP_RADIUS; }; const std::wstring Application::PIPE_NAME = std::wstring(L"PipeL2Bot"); -const uint16_t Application::RADIUS = 2000; \ No newline at end of file +const uint16_t Application::CREATURE_RADIUS = 4000; +const uint16_t Application::DROP_RADIUS = 1000; \ No newline at end of file diff --git a/L2BotDll/Versions/Interlude/AbstractFactory.h b/L2BotDll/Versions/Interlude/AbstractFactory.h index 83088a5..b6ced77 100644 --- a/L2BotDll/Versions/Interlude/AbstractFactory.h +++ b/L2BotDll/Versions/Interlude/AbstractFactory.h @@ -29,8 +29,9 @@ namespace Interlude class AbstractFactory : public VersionAbstractFactory { public: - AbstractFactory(const uint16_t radius) : - m_Radius(radius) + AbstractFactory(const uint16_t creatureRadius, const uint16_t dropRadius) : + m_CreatureRadius(creatureRadius), + m_DropRadius(dropRadius) { } @@ -52,7 +53,7 @@ namespace Interlude static auto result = DropRepository( GetNetworkHandler(), factory, - m_Radius + m_DropRadius ); return result; } @@ -62,7 +63,7 @@ namespace Interlude static auto result = NPCRepository( GetNetworkHandler(), factory, - m_Radius + m_CreatureRadius ); return result; } @@ -72,7 +73,7 @@ namespace Interlude static auto result = PlayerRepository( GetNetworkHandler(), factory, - m_Radius + m_CreatureRadius ); return result; } @@ -140,6 +141,7 @@ namespace Interlude } private: - const uint16_t m_Radius; + const uint16_t m_CreatureRadius; + const uint16_t m_DropRadius; }; } \ No newline at end of file diff --git a/L2BotDll/Versions/VersionAbstractFactory.cpp b/L2BotDll/Versions/VersionAbstractFactory.cpp index 6f39050..abc686e 100644 --- a/L2BotDll/Versions/VersionAbstractFactory.cpp +++ b/L2BotDll/Versions/VersionAbstractFactory.cpp @@ -2,12 +2,12 @@ #include "VersionAbstractFactory.h" #include "Interlude/AbstractFactory.h" -const VersionAbstractFactory& VersionAbstractFactory::GetFactory(const Version version, const uint16_t radius) +const VersionAbstractFactory& VersionAbstractFactory::GetFactory(const Version version, const uint16_t creatureRadius, const uint16_t dropRadius) { switch (version) { case Version::interlude: - static Interlude::AbstractFactory interlude = Interlude::AbstractFactory(radius); + static Interlude::AbstractFactory interlude = Interlude::AbstractFactory(creatureRadius, dropRadius); return interlude; } diff --git a/L2BotDll/Versions/VersionAbstractFactory.h b/L2BotDll/Versions/VersionAbstractFactory.h index 9ad4b68..5efa5da 100644 --- a/L2BotDll/Versions/VersionAbstractFactory.h +++ b/L2BotDll/Versions/VersionAbstractFactory.h @@ -47,5 +47,5 @@ public: }; } - static const VersionAbstractFactory& GetFactory(Version version, const uint16_t radius); + static const VersionAbstractFactory& GetFactory(Version version, const uint16_t creatureRadius, const uint16_t dropRadius); }; \ No newline at end of file