summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.tools/beta.patch29
-rw-r--r--npc/003-3/malindou.txt2
2 files changed, 2 insertions, 9 deletions
diff --git a/.tools/beta.patch2 b/.tools/beta.patch2
index 000ef6d72..80ee2077b 100644
--- a/.tools/beta.patch2
+++ b/.tools/beta.patch2
@@ -159,15 +159,6 @@ diff --git a/src/map/status.c b/src/map/status.c
index 63e71c9dc..b0fb430f7 100644
--- a/src/map/status.c
+++ b/src/map/status.c
-@@ -3553,7 +3553,7 @@ static void status_calc_regen(struct block_list *bl, struct status_data *st, str
-
- regen->hp = cap_value(val, reg_flag, SHRT_MAX);
-
-- val = 1 + (st->int_/6) + (st->max_sp/100);
-+ val = 1 + (st->int_/5) + (st->max_sp/100);
- if( st->int_ >= 120 )
- val += ((st->int_-120)>>1) + 4;
-
@@ -4469,17 +4469,23 @@ static int status_base_atk(const struct block_list *bl, const struct status_data
case W_SHOTGUN:
case W_GRENADE:
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index 2cb33fcd0..6b879eb41 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -565,6 +565,8 @@ OnInit:
query_sql("UPDATE `storage` SET `opt_val0` = '15', `opt_val1` = '0', `opt_idx1` = '0' WHERE (`opt_idx1`=`opt_idx0`) AND (`opt_val0` > '15' AND `opt_val1` > '15')");
query_sql("UPDATE `guild_storage` SET `opt_val0` = '15', `opt_val1` = '0', `opt_idx1` = '0' WHERE (`opt_idx1`=`opt_idx0`) AND (`opt_val0` > '15' AND `opt_val1` > '15')");
query_sql("UPDATE `rodex_items` SET `opt_val0` = '15', `opt_val1` = '0', `opt_idx1` = '0' WHERE (`opt_idx1`=`opt_idx0`) AND (`opt_val0` > '15' AND `opt_val1` > '15')");
+
+ // Magic v3
debugmes "";
debugmes "* Tolchi mess cleanup";
debugmes "";