summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/actions/commands.cpp9
-rw-r--r--src/being/being.cpp27
-rw-r--r--src/being/being.h3
-rw-r--r--src/gui/windows/skilldialog.cpp82
-rw-r--r--src/gui/windows/skilldialog.h20
5 files changed, 114 insertions, 27 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index dc4d70765..e1779ec92 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -1135,6 +1135,7 @@ impHandler(skill)
if (sz > 2)
text = vect[2];
}
+ // +++ add here also cast type and offsets
if (text.empty())
{
skillDialog->useSkill(skillId,
@@ -1142,7 +1143,9 @@ impHandler(skill)
level,
false,
"",
- CastType::Default);
+ CastType::Default,
+ 0,
+ 0);
}
else
{
@@ -1151,7 +1154,9 @@ impHandler(skill)
level,
true,
text,
- CastType::Default);
+ CastType::Default,
+ 0,
+ 0);
}
return true;
}
diff --git a/src/being/being.cpp b/src/being/being.cpp
index c146ecb00..2737f2b8a 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -5422,3 +5422,30 @@ void Being::stopCast(const bool b)
if (b && mAction == BeingAction::CAST)
setAction(BeingAction::STAND, 0);
}
+
+void Being::fixDirectionOffsets(int &offsetX,
+ int &offsetY) const
+{
+ const uint8_t dir = mDirection;
+ if (dir & BeingDirection::DOWN)
+ {
+ // do nothing
+ }
+ else if (dir & BeingDirection::UP)
+ {
+ offsetX = -offsetX;
+ offsetY = -offsetY;
+ }
+ else if (dir & BeingDirection::LEFT)
+ {
+ const int tmp = offsetY;
+ offsetY = offsetX;
+ offsetX = -tmp;
+ }
+ else if (dir & BeingDirection::RIGHT)
+ {
+ const int tmp = offsetY;
+ offsetY = -offsetX;
+ offsetX = tmp;
+ }
+}
diff --git a/src/being/being.h b/src/being/being.h
index 90c57a4ae..40658fa68 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -1068,6 +1068,9 @@ class Being notfinal : public ActorSprite,
const int range,
const int waitTimeTicks);
+ void fixDirectionOffsets(int &offsetX,
+ int &offsetY) const;
+
protected:
void drawPlayerSpriteAt(Graphics *restrict const graphics,
const int x,
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 41f63899e..69e5f5bf3 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -179,7 +179,9 @@ void SkillDialog::action(const ActionEvent &event)
info->customSelectedLevel,
info->useTextParameter,
std::string(),
- info->customCastType);
+ info->customCastType,
+ info->customOffsetX,
+ info->customOffsetY);
}
}
else if (eventId == "close")
@@ -628,17 +630,30 @@ void SkillDialog::useItem(const int itemId,
const SkillInfo *const info = (*it).second;
CastTypeT castType = CastType::Default;
+ int offsetX = 0;
+ int offsetY = 0;
+
if (!data.empty())
{
- // +++ read only cast type from data
- castType = static_cast<CastTypeT>(atoi(data.c_str()));
+ std::vector<int> vect;
+ splitToIntVector(vect, data, ' ');
+ const size_t sz = vect.size();
+ if (sz > 0)
+ castType = static_cast<CastTypeT>(vect[0]);
+ if (sz > 2)
+ {
+ offsetX = vect[1];
+ offsetY = vect[2];
+ }
}
useSkill(info,
autoTarget,
level,
false,
std::string(),
- castType);
+ castType,
+ offsetX,
+ offsetY);
}
void SkillDialog::updateTabSelection()
@@ -751,7 +766,9 @@ void SkillDialog::useSkill(const int skillId,
int level,
const bool withText,
const std::string &text,
- CastTypeT castType)
+ CastTypeT castType,
+ const int offsetX,
+ const int offsetY)
{
SkillInfo *const info = skillDialog->getSkill(skillId);
if (!info)
@@ -763,7 +780,9 @@ void SkillDialog::useSkill(const int skillId,
level,
withText,
text,
- castType);
+ castType,
+ offsetX,
+ offsetY);
}
void SkillDialog::useSkill(const SkillInfo *const info,
@@ -771,7 +790,9 @@ void SkillDialog::useSkill(const SkillInfo *const info,
int level,
const bool withText,
const std::string &text,
- const CastTypeT castType)
+ const CastTypeT castType,
+ const int offsetX,
+ const int offsetY)
{
if (!info || !localPlayer)
return;
@@ -793,7 +814,9 @@ void SkillDialog::useSkill(const SkillInfo *const info,
autoTarget,
level,
withText,
- text);
+ text,
+ offsetX,
+ offsetY);
break;
case CastType::Target:
{
@@ -803,7 +826,9 @@ void SkillDialog::useSkill(const SkillInfo *const info,
level,
withText,
text,
- being);
+ being,
+ offsetX,
+ offsetY);
break;
}
case CastType::Position:
@@ -816,7 +841,9 @@ void SkillDialog::useSkill(const SkillInfo *const info,
withText,
text,
x,
- y);
+ y,
+ offsetX,
+ offsetY);
break;
}
case CastType::Self:
@@ -826,7 +853,9 @@ void SkillDialog::useSkill(const SkillInfo *const info,
level,
withText,
text,
- localPlayer);
+ localPlayer,
+ offsetX,
+ offsetY);
break;
}
}
@@ -836,7 +865,9 @@ void SkillDialog::useSkillTarget(const SkillInfo *const info,
int level,
const bool withText,
const std::string &text,
- const Being *being)
+ const Being *being,
+ int offsetX,
+ int offsetY)
{
SkillType::SkillType type = info->type;
if ((type & SkillType::Attack) != 0)
@@ -874,8 +905,9 @@ void SkillDialog::useSkillTarget(const SkillInfo *const info,
{
if (!being)
return;
- const int x = being->getTileX();
- const int y = being->getTileY();
+ being->fixDirectionOffsets(offsetX, offsetY);
+ const int x = being->getTileX() + offsetX;
+ const int y = being->getTileY() + offsetY;
if (info->useTextParameter)
{
if (withText)
@@ -931,26 +963,30 @@ void SkillDialog::useSkillPosition(const SkillInfo *const info,
const bool withText,
const std::string &text,
const int x,
- const int y)
+ const int y,
+ int offsetX,
+ int offsetY)
{
SkillType::SkillType type = info->type;
if ((type & SkillType::Ground) != 0)
{
+ localPlayer->fixDirectionOffsets(offsetX, offsetY);
if (info->useTextParameter)
{
if (withText)
{
skillHandler->usePos(info->id,
level,
- x, y,
+ x + offsetX,
+ y + offsetY,
text);
}
else
{
const SkillData *data = info->getData1(level);
textSkillListener.setSkill(info->id,
- x,
- y,
+ x + offsetX,
+ y + offsetY,
level);
TextDialog *const dialog = CREATEWIDGETR(TextDialog,
// TRANSLATORS: text skill dialog header
@@ -968,7 +1004,8 @@ void SkillDialog::useSkillPosition(const SkillInfo *const info,
{
skillHandler->usePos(info->id,
level,
- x, y);
+ x + offsetX,
+ y + offsetY);
}
}
else if ((type & SkillType::Support) != 0)
@@ -1008,7 +1045,9 @@ void SkillDialog::useSkillDefault(const SkillInfo *const info,
const AutoTarget autoTarget,
int level,
const bool withText,
- const std::string &text)
+ const std::string &text,
+ int offsetX,
+ int offsetY)
{
SkillType::SkillType type = info->type;
if ((type & SkillType::Attack) != 0)
@@ -1049,6 +1088,9 @@ void SkillDialog::useSkillDefault(const SkillInfo *const info,
int x = 0;
int y = 0;
viewport->getMouseTile(x, y);
+ localPlayer->fixDirectionOffsets(offsetX, offsetY);
+ x += offsetX;
+ y += offsetY;
if (info->useTextParameter)
{
if (withText)
diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h
index 4adf813af..a24f44a5f 100644
--- a/src/gui/windows/skilldialog.h
+++ b/src/gui/windows/skilldialog.h
@@ -145,14 +145,18 @@ class SkillDialog final : public Window,
int level,
const bool withText,
const std::string &text,
- CastTypeT castType);
+ CastTypeT castType,
+ const int offsetX,
+ const int offsetY);
static void useSkill(const SkillInfo *const info,
const AutoTarget autoTarget,
int level,
const bool withText,
const std::string &text,
- const CastTypeT castType);
+ const CastTypeT castType,
+ const int offsetX,
+ const int offsetY);
SkillData *getSkillData(const int id) const;
@@ -176,21 +180,27 @@ class SkillDialog final : public Window,
const AutoTarget autoTarget,
int level,
const bool withText,
- const std::string &text);
+ const std::string &text,
+ int offsetX,
+ int offsetY);
static void useSkillTarget(const SkillInfo *const info,
const AutoTarget autoTarget,
int level,
const bool withText,
const std::string &text,
- const Being *being);
+ const Being *being,
+ int offsetX,
+ int offsetY);
static void useSkillPosition(const SkillInfo *const info,
int level,
const bool withText,
const std::string &text,
const int x,
- const int y);
+ const int y,
+ int offsetX,
+ int offsetY);
void addSkillDuration(SkillInfo *const skill);
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-30 03:43:13 +0000