From 6dd17f1e729fba0323e05f8d5a3c7e4ad5733d20 Mon Sep 17 00:00:00 2001 From: seifert10 Date: Sun, 25 Jan 2015 14:04:58 -0200 Subject: Update lvl4_weapon_quest.txt if (.@shobu > 1) { mes "[Kayron]"; mes "Let's see..."; mes "You won " + shobu + " times."; mes "You must be really"; mes "Without a doubt, you've"; mes "got some pretty good luck~"; next; mes "[Kayron]"; mes "Alright, I'll keep my end of the bargain. Give me the materials"; mes "and some time to finish preparing. I'll talk to you later, okay?"; close; } mes "You won " + shobu + " times."; should be: mes "You won " + .@shobu + " times."; --- npc/quests/lvl4_weapon_quest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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~"; -- cgit v1.2.3-70-g09d2 From bfcda537fe2cb34b88a65914b511ac78f432196c Mon Sep 17 00:00:00 2001 From: malufett Date: Fri, 30 Jan 2015 00:11:30 +0800 Subject: Fixed Bug#8416 -http://hercules.ws/board/tracker/issue-8416-geneticcart-tornado/?gopid=23982#entry23982 Signed-off-by: malufett --- src/map/battle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: -- cgit v1.2.3-70-g09d2