summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-07-30 00:58:15 -0300
committerJesusaves <cpntb1@ymail.com>2019-07-30 00:58:15 -0300
commit94588ed14f0c6491bb1af0877cd1506f836b2c86 (patch)
treeb2bf9cadbdbf8d1c1dfa53dfe454b230afd66493
parent057c595824a5ef93f4461054987c6cc8afdd2a7b (diff)
downloadserverdata-94588ed14f0c6491bb1af0877cd1506f836b2c86.tar.gz
serverdata-94588ed14f0c6491bb1af0877cd1506f836b2c86.tar.bz2
serverdata-94588ed14f0c6491bb1af0877cd1506f836b2c86.tar.xz
serverdata-94588ed14f0c6491bb1af0877cd1506f836b2c86.zip
Apply beta.patch2
-rw-r--r--.tools/beta.patch232
-rwxr-xr-x.tools/scripts/init.sh10
2 files changed, 40 insertions, 2 deletions
diff --git a/.tools/beta.patch2 b/.tools/beta.patch2
new file mode 100644
index 000000000..67c10bb32
--- /dev/null
+++ b/.tools/beta.patch2
@@ -0,0 +1,32 @@
+diff --git a/src/map/rodex.c b/src/map/rodex.c
+index 766fdc5ea..996576fd3 100644
+--- a/src/map/rodex.c
++++ b/src/map/rodex.c
+@@ -34,11 +34,11 @@
+
+ // NOTE : These values are hardcoded into the client
+ // Cost of each Attached Item
+-#define ATTACHITEM_COST 2500
++#define ATTACHITEM_COST 500
+ // Percent of Attached Zeny that will be paid as Tax
+-#define ATTACHZENY_TAX 2
++#define ATTACHZENY_TAX 0
+ // Maximun number of messages that can be sent in one day
+-#define DAILY_MAX_MAILS 100
++#define DAILY_MAX_MAILS 3
+
+ static struct rodex_interface rodex_s;
+ struct rodex_interface *rodex;
+diff --git a/src/map/status.c b/src/map/status.c
+index f06bb0330..2fd295dc0 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
+
+ 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;
+
diff --git a/.tools/scripts/init.sh b/.tools/scripts/init.sh
index 2bdeebc42..8fb823781 100755
--- a/.tools/scripts/init.sh
+++ b/.tools/scripts/init.sh
@@ -110,6 +110,12 @@ function aptget_install {
function make_server {
ls -la ../server-data
ls -la ../server-data/plugins
+ if [ -e "../server-data/.tools/beta.patch2" ]
+ then
+ echo "Apply beta.patch2 ........"
+ git apply ../server-data/.tools/beta.patch2
+ echo "........ Done."
+ fi
echo source src/evol/tools/vars.sh
source ./src/evol/tools/vars.sh
check_error $?
@@ -175,14 +181,14 @@ function do_init {
cd server-code/src ; git checkout master # v2018.09.23 # 2018-09-24 # s20180713?
check_error $?
#: ' #Use this to force an old version. You need s20190422 for this.
- echo "Begin diff experiment"
+ echo "Rolling server back to correct version"
cd ..
git diff master 41b5d5e9b6f14fd26197958aec29a02858dff299 > x.diff
ls
head -n 25 x.diff
tail -n 40 x.diff
git apply --reject --whitespace=nowarn x.diff
- echo "====================================== DIFFED"
+ echo "====================================== CHANGES APPLIED"
git status
ls --recursive|grep ".rej"
echo "====================================== Continuing..."