From 75a8f520a62ddd7e2c325e72b344036111880e25 Mon Sep 17 00:00:00 2001 From: Aleos Date: Fri, 9 Feb 2018 13:27:39 -0500 Subject: [PATCH] Corrected Heat Barrel bonuses (#2882) * Fixes #2875. * Attack was not factoring in coins. * Corrected fixed cast time to also factor in coins. Thanks to @rye305! --- src/map/status.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/map/status.cpp b/src/map/status.cpp index 9e40840c1c..3b423fed1f 100644 --- a/src/map/status.cpp +++ b/src/map/status.cpp @@ -10948,10 +10948,16 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty val2 = src->id; break; case SC_HEAT_BARREL: - //kRO Update 2016-05-25 - val2 = val1 * 5; // -fixed casttime - val3 = 6 + val1 * 2; // ATK - val4 = 25 + val1 * 5; // -hit + { + uint8 n = 10; + if (sd) + n = (uint8)sd->spiritball_old; + + //kRO Update 2016-05-25 + val2 = n * 5; // -fixed casttime + val3 = (6 + val1 * 2) * n; // ATK + val4 = 25 + val1 * 5; // -hit + } break; case SC_P_ALTER: {