summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKenpachi Developer <Kenpachi.Developer@gmx.de>2020-03-13 04:47:07 +0100
committerKenpachi Developer <Kenpachi.Developer@gmx.de>2020-03-14 22:35:10 +0100
commit876cfa678d5e9a43d1ce419bd9d8300d9c8c6b36 (patch)
tree525da1bd9b2da883472270f47e92473bc5785627 /src
parent7c6e21a9057b07929b55de23ae67299434edb6db (diff)
downloadhercules-876cfa678d5e9a43d1ce419bd9d8300d9c8c6b36.tar.gz
hercules-876cfa678d5e9a43d1ce419bd9d8300d9c8c6b36.tar.bz2
hercules-876cfa678d5e9a43d1ce419bd9d8300d9c8c6b36.tar.xz
hercules-876cfa678d5e9a43d1ce419bd9d8300d9c8c6b36.zip
Make skills cast by Improvised Song ignore all requirements
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index e779e9859..1022700fe 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -14058,8 +14058,8 @@ static int skill_check_condition_castbegin(struct map_session_data *sd, uint16 s
if (sd->chat_id != 0)
return 0;
- if ((sd->autocast.itemskill_conditions_checked || !sd->autocast.itemskill_check_conditions)
- && sd->autocast.type == AUTOCAST_ITEM) {
+ if (((sd->autocast.itemskill_conditions_checked || !sd->autocast.itemskill_check_conditions)
+ && sd->autocast.type == AUTOCAST_ITEM) || sd->autocast.type == AUTOCAST_IMPROVISE) {
return 1;
}
@@ -15024,8 +15024,8 @@ static int skill_check_condition_castend(struct map_session_data *sd, uint16 ski
if (sd->chat_id != 0)
return 0;
- if ((sd->autocast.itemskill_conditions_checked || !sd->autocast.itemskill_check_conditions)
- && sd->autocast.type == AUTOCAST_ITEM) {
+ if (((sd->autocast.itemskill_conditions_checked || !sd->autocast.itemskill_check_conditions)
+ && sd->autocast.type == AUTOCAST_ITEM) || sd->autocast.type == AUTOCAST_IMPROVISE) {
return 1;
}
@@ -15230,8 +15230,10 @@ static int skill_consume_requirement(struct map_session_data *sd, uint16 skill_i
nullpo_ret(sd);
- if (!sd->autocast.itemskill_check_conditions && sd->autocast.type == AUTOCAST_ITEM)
+ if ((!sd->autocast.itemskill_check_conditions && sd->autocast.type == AUTOCAST_ITEM)
+ || sd->autocast.type == AUTOCAST_IMPROVISE) {
return 1;
+ }
req = skill->get_requirement(sd,skill_id,skill_lv);