feat: add force skill using
This commit is contained in:
parent
75a5b842f7
commit
b97a2ea63c
15
Client/Domain/DTO/UseSkillParams.cs
Normal file
15
Client/Domain/DTO/UseSkillParams.cs
Normal file
@ -0,0 +1,15 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Client.Domain.DTO
|
||||
{
|
||||
public struct UseSkillParams
|
||||
{
|
||||
public uint skillId;
|
||||
public bool isForced;
|
||||
public bool isShiftPressed;
|
||||
}
|
||||
}
|
@ -111,7 +111,14 @@ namespace Client.Domain.Service
|
||||
return;
|
||||
}
|
||||
|
||||
SendMessage(OutgoingMessageTypeEnum.UseSkill, id);
|
||||
var data = new UseSkillParams
|
||||
{
|
||||
skillId = id,
|
||||
isForced = isForced,
|
||||
isShiftPressed = isShiftPressed
|
||||
};
|
||||
|
||||
SendMessage(OutgoingMessageTypeEnum.UseSkill, data);
|
||||
}
|
||||
|
||||
public void RequestUseItem(uint id)
|
||||
|
15
L2BotCore/Domain/DTO/UseSkillParams.h
Normal file
15
L2BotCore/Domain/DTO/UseSkillParams.h
Normal file
@ -0,0 +1,15 @@
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
#include "../Events/EventDispatcher.h"
|
||||
#include "../Logger/Logger.h"
|
||||
|
||||
namespace L2Bot::Domain::DTO
|
||||
{
|
||||
struct UseSkillParams
|
||||
{
|
||||
uint32_t skillId;
|
||||
bool isForced;
|
||||
bool isShiftPressed;
|
||||
};
|
||||
}
|
@ -4,6 +4,7 @@
|
||||
#include "../Serializers/IncomingMessageFactoryInterface.h"
|
||||
#include "HeroServiceInterface.h"
|
||||
#include "../Enums/RestartPointTypeEnum.h"
|
||||
#include "../DTO/UseSkillParams.h"
|
||||
|
||||
namespace L2Bot::Domain::Services
|
||||
{
|
||||
@ -38,7 +39,8 @@ namespace L2Bot::Domain::Services
|
||||
m_HeroService.Pickup(message.GetRawContent<uint32_t>());
|
||||
break;
|
||||
case Serializers::IncomingMessage::Type::useSkill:
|
||||
m_HeroService.UseSkill(message.GetRawContent<uint32_t>(), false, false);
|
||||
const auto params = message.GetRawContent<DTO::UseSkillParams>();
|
||||
m_HeroService.UseSkill(params.skillId, params.isForced, params.isShiftPressed);
|
||||
break;
|
||||
case Serializers::IncomingMessage::Type::useItem:
|
||||
m_HeroService.UseItem(message.GetRawContent<uint32_t>());
|
||||
|
@ -201,6 +201,7 @@
|
||||
<ClInclude Include="Domain\Logger\LogLevel.h" />
|
||||
<ClInclude Include="Domain\Serializers\IncomingMessageFactoryInterface.h" />
|
||||
<ClInclude Include="Domain\Serializers\IncomingMessage.h" />
|
||||
<ClInclude Include="Domain\DTO\UseSkillParams.h" />
|
||||
<ClInclude Include="Domain\Services\HeroServiceInterface.h" />
|
||||
<ClInclude Include="Domain\Entities\ChatMessage.h" />
|
||||
<ClInclude Include="Domain\Services\IncomingMessageProcessor.h" />
|
||||
|
@ -243,6 +243,9 @@
|
||||
<ClInclude Include="Domain\Enums\RestartPointTypeEnum.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Domain\DTO\UseSkillParams.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="pch.cpp">
|
||||
|
@ -4,6 +4,7 @@
|
||||
#include "../ThirdParty/json.hpp"
|
||||
#include "Domain/ValueObjects/Vector3.h"
|
||||
#include "Domain/Enums/RestartPointTypeEnum.h"
|
||||
#include "Domain/DTO/UseSkillParams.h"
|
||||
|
||||
using namespace L2Bot::Domain;
|
||||
using json = nlohmann::json;
|
||||
@ -80,7 +81,11 @@ private:
|
||||
return Serializers::IncomingMessage
|
||||
{
|
||||
Serializers::IncomingMessage::Type::useSkill,
|
||||
std::make_shared<uint32_t>(jsonObject.get<uint32_t>())
|
||||
std::make_shared<DTO::UseSkillParams>(
|
||||
jsonObject["skillId"].get<uint32_t>(),
|
||||
jsonObject["isForced"].get<bool>(),
|
||||
jsonObject["isShiftPressed"].get<bool>()
|
||||
)
|
||||
};
|
||||
}
|
||||
else if (type == "UseItem")
|
||||
|
Loading…
Reference in New Issue
Block a user