summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-08-20 14:51:50 -0300
committerJesusaves <cpntb1@ymail.com>2019-08-20 14:51:50 -0300
commit961918066426f1eaa4277cd9aeed042ba95b1fec (patch)
tree819c603d4ca26deb272450cb8c8417ff8a071dc4
parentdc4012c557f8c7b4da8c76951ce79deb4f8fcce0 (diff)
downloadserverdata-961918066426f1eaa4277cd9aeed042ba95b1fec.tar.gz
serverdata-961918066426f1eaa4277cd9aeed042ba95b1fec.tar.bz2
serverdata-961918066426f1eaa4277cd9aeed042ba95b1fec.tar.xz
serverdata-961918066426f1eaa4277cd9aeed042ba95b1fec.zip
Update beta.patch2 !!
-rw-r--r--.tools/beta.patch253
1 files changed, 52 insertions, 1 deletions
diff --git a/.tools/beta.patch2 b/.tools/beta.patch2
index 67c10bb32..41a6417fb 100644
--- a/.tools/beta.patch2
+++ b/.tools/beta.patch2
@@ -1,3 +1,15 @@
+diff --git a/src/map/battle.c b/src/map/battle.c
+index fe7a64b51..8698cef67 100644
+--- a/src/map/battle.c
++++ b/src/map/battle.c
+@@ -7417,6 +7417,7 @@ static const struct battle_data {
+ { "features/enable_achievement_system", &battle_config.feature_enable_achievement, 1, 0, 1, },
+ { "ping_timer_inverval", &battle_config.ping_timer_interval, 30, 0, 99999999, },
+ { "ping_time", &battle_config.ping_time, 20, 0, 99999999, },
++ { "hom_bonus_exp_from_master", &battle_config.hom_bonus_exp_from_master, 10, 0, 100, },
+ };
+
+ static bool battle_set_value_sub(int index, int value)
diff --git a/src/map/rodex.c b/src/map/rodex.c
index 766fdc5ea..996576fd3 100644
--- a/src/map/rodex.c
@@ -17,8 +29,21 @@ index 766fdc5ea..996576fd3 100644
static struct rodex_interface rodex_s;
struct rodex_interface *rodex;
+diff --git a/src/map/script.c b/src/map/script.c
+index fe8638ac3..de8122ea3 100644
+--- a/src/map/script.c
++++ b/src/map/script.c
+@@ -16394,6 +16394,8 @@ static BUILDIN(summon)
+ clif->specialeffect(&md->bl,344,AREA);
+ sc_start4(NULL, &md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000);
+ }
++ //mob_id = mob->once_spawn(sd, m, x, y, str, class_, amount, event, size, ai);
++ script_pushint(st, (md) ? md->bl.id : 0);
+ return true;
+ }
+
diff --git a/src/map/status.c b/src/map/status.c
-index f06bb0330..2fd295dc0 100644
+index f06bb0330..1cd69ff18 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3552,7 +3552,7 @@ static void status_calc_regen(struct block_list *bl, struct status_data *st, str
@@ -30,3 +55,29 @@ index f06bb0330..2fd295dc0 100644
if( st->int_ >= 120 )
val += ((st->int_-120)>>1) + 4;
+@@ -4468,17 +4468,23 @@ static unsigned short status_base_atk(const struct block_list *bl, const struct
+ case W_SHOTGUN:
+ case W_GRENADE:
+ flag = 1;
++ break;
++ case W_STAFF:
++ flag = 2;
+ }
+ }
+- if ( flag ) {
++ if ( flag == 1 ) {
+ str = st->dex;
+ dex = st->str;
++ } else if ( flag == 2 ) {
++ str = st->int_;
++ dex = st->dex;
+ } else {
+ str = st->str;
+ dex = st->dex;
+ }
+ #ifdef RENEWAL
+- dstr = str;
++ dstr = str*15/10;
+ #endif
+ //Normally only players have base-atk, but homunc have a different batk
+ // equation, hinting that perhaps non-players should use this for batk.