summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/quests/lvl4_weapon_quest.txt2
-rw-r--r--src/map/battle.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/npc/quests/lvl4_weapon_quest.txt b/npc/quests/lvl4_weapon_quest.txt
index e31ea53c3..5f2514068 100644
--- a/npc/quests/lvl4_weapon_quest.txt
+++ b/npc/quests/lvl4_weapon_quest.txt
@@ -1958,7 +1958,7 @@ niflheim,240,193,3 script Kayron#lv4 4_M_NFDEADMAN2,{
if (.@shobu > 1) {
mes "[Kayron]";
mes "Let's see...";
- mes "You won " + shobu + " times.";
+ mes "You won " + .@shobu + " times.";
mes "You must be really";
mes "Without a doubt, you've";
mes "got some pretty good luck~";
diff --git a/src/map/battle.c b/src/map/battle.c
index d32a799ab..74dfde41d 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2452,7 +2452,7 @@ int battle_calc_skillratio(int attack_type, struct block_list *src, struct block
case GN_CART_TORNADO:
{
int strbonus = bst->str;
- skillratio = 50 * skill_lv + (sd ? sd->cart_weight : battle_config.max_cart_weight) / 10 / (150 - strbonus) + 50 * (sd ? pc->checkskill(sd, GN_REMODELING_CART) : 5);
+ skillratio = 50 * skill_lv + (sd ? sd->cart_weight : battle_config.max_cart_weight) / 10 / max(150 - strbonus, 1) + 50 * (sd ? pc->checkskill(sd, GN_REMODELING_CART) : 5);
}
break;
case GN_CARTCANNON: