|
@@ -2679,19 +2679,19 @@ static void pc_bonus_autospell(std::vector<s_autospell> &spell, uint16 id, uint1
|
|
if ((it.card_id == card_id || it.rate < 0 || rate < 0) && it.id == id && it.lv == lv && it.battle_flag == battle_flag && it.flag == flag) {
|
|
if ((it.card_id == card_id || it.rate < 0 || rate < 0) && it.id == id && it.lv == lv && it.battle_flag == battle_flag && it.flag == flag) {
|
|
if (!battle_config.autospell_stacking && it.rate > 0 && rate > 0) // Stacking disabled
|
|
if (!battle_config.autospell_stacking && it.rate > 0 && rate > 0) // Stacking disabled
|
|
return;
|
|
return;
|
|
- it.rate = util::safe_addition_cap(it.rate, rate, (short)10000);
|
|
|
|
|
|
+ it.rate = util::safe_addition_cap(it.rate, rate, (short)1000);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
struct s_autospell entry = {};
|
|
struct s_autospell entry = {};
|
|
|
|
|
|
- if (rate < -10000 || rate > 10000)
|
|
|
|
- ShowWarning("pc_bonus_autospell: Item bonus rate %d exceeds -10000~10000 range, capping.\n", rate);
|
|
|
|
|
|
+ if (rate < -1000 || rate > 1000)
|
|
|
|
+ ShowWarning("pc_bonus_autospell: Item bonus rate %d exceeds -1000~1000 range, capping.\n", rate);
|
|
|
|
|
|
entry.id = id;
|
|
entry.id = id;
|
|
entry.lv = lv;
|
|
entry.lv = lv;
|
|
- entry.rate = cap_value(rate, -10000, 10000);
|
|
|
|
|
|
+ entry.rate = cap_value(rate, -1000, 1000);
|
|
entry.battle_flag = battle_flag;
|
|
entry.battle_flag = battle_flag;
|
|
entry.card_id = card_id;
|
|
entry.card_id = card_id;
|
|
entry.flag = flag;
|
|
entry.flag = flag;
|
|
@@ -2723,13 +2723,13 @@ static void pc_bonus_autospell_onskill(std::vector<s_autospell> &spell, uint16 s
|
|
|
|
|
|
struct s_autospell entry = {};
|
|
struct s_autospell entry = {};
|
|
|
|
|
|
- if (rate < -10000 || rate > 10000)
|
|
|
|
- ShowWarning("pc_bonus_onskill: Item bonus rate %d exceeds -10000~10000 range, capping.\n", rate);
|
|
|
|
|
|
+ if (rate < -1000 || rate > 1000)
|
|
|
|
+ ShowWarning("pc_bonus_onskill: Item bonus rate %d exceeds -1000~1000 range, capping.\n", rate);
|
|
|
|
|
|
entry.trigger_skill = src_skill;
|
|
entry.trigger_skill = src_skill;
|
|
entry.id = id;
|
|
entry.id = id;
|
|
entry.lv = lv;
|
|
entry.lv = lv;
|
|
- entry.rate = cap_value(rate, -10000, 10000);
|
|
|
|
|
|
+ entry.rate = cap_value(rate, -1000, 1000);
|
|
entry.card_id = card_id;
|
|
entry.card_id = card_id;
|
|
entry.flag = flag;
|
|
entry.flag = flag;
|
|
|
|
|