From 77eceb6b2fe0b5984dea2cd8303a4a96f54cf921 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 20 Aug 2019 14:03:35 -0300 Subject: Give EXP to homunculus even if they don't fight (a bonus from master EXP) --- .tools/applicator.py | 20 ++++++++++++++++++++ .tools/reapply.patch3 | 31 +++++++++++++++++++++++++++++++ .tools/scripts/init.sh | 4 ++++ 3 files changed, 55 insertions(+) create mode 100644 .tools/applicator.py create mode 100644 .tools/reapply.patch3 (limited to '.tools') diff --git a/.tools/applicator.py b/.tools/applicator.py new file mode 100644 index 000000000..7d5761b0e --- /dev/null +++ b/.tools/applicator.py @@ -0,0 +1,20 @@ +import subprocess + +# Open reapply.patch3 +f=open("reapply.patch3", "r") +subprocess.call("cd ../../server-code", shell=True) + +for line in f: + if line[0] == "#" or line[0] == "\r" or line[0] == "\n": + continue + print "Downloading patch "+line.replace("\n", "") + subprocess.call("cd ../../server-code ; wget https://gitlab.com/evol/hercules/commit/"+line.replace("\n", "")+".diff", shell=True) + print "Applying patch..." + #subprocess.call("cd ../../server-code ; ls", shell=True) + subprocess.call("cd ../../server-code ; git apply --ignore-whitespace --reject "+line.replace("\n", "")+".diff", shell=True) + print "Patch applied" + subprocess.call("cd ../../server-code ; rm "+line.replace("\n", "")+".diff", shell=True) + print "Patch deleted (success)" + + +f.close() diff --git a/.tools/reapply.patch3 b/.tools/reapply.patch3 new file mode 100644 index 000000000..05bc2a1fa --- /dev/null +++ b/.tools/reapply.patch3 @@ -0,0 +1,31 @@ +############ +## First postponed update +# Added support for mobs to drop items with Random Options +#d34df93e14582b1c2ad43763666d674b7e8440ca +# Fix inter-server deleting zeny from rodex mails when a player requests to take item +9a651bc6c9a65c69f6afe858ec12c7aa42751340 +# Truncate too big time in guild member login time field (Millenium Bug) +a4e2fb4431dfb4c914d0e315d1e43fb05ae489ec +# Before correct client disconnect send disconnect packet and flush socket +1a58bb1f11156baff437b3029feafa0d793ed803 +# Add into unit_data groupId and title. (Unsupported by clif) +cf28f0002c46e9c23e752b7e4b351de1e947f830 +# Add commands getunittitle(GID) and setunittitle(GID, TitleID) +8d732e3127434e576fe4a1203e609a8c6cc19cee + +############ +## Second postponed update +# Adds Option DB and Option Drop Groups DB to be loaded on minimal mode +#2b8463b7d2b64ab122e86b2f9e44cba0b680caf +# Adds delitemidx(index, {amount, accid}), which deletes an item at the given index. +858e732e15c495f3073c8037b9612c6c20390f76 +# getguildonline(gid) +#d9b7fa499ab5ecae677e53d43057671e43b32248 + +############ +## Third postponed update +# If error happend in pc_statusup then send back to client increase value +cdd5789d8fff14572df1e6d801ba9e2afa7b505e +# Homunculus Exp sharing (They get a % from master as bonus - master XP unaffected) +5ac507e88e116e6a11185beace600bde8896c534 + diff --git a/.tools/scripts/init.sh b/.tools/scripts/init.sh index 8fb823781..a78f20088 100755 --- a/.tools/scripts/init.sh +++ b/.tools/scripts/init.sh @@ -112,6 +112,10 @@ function make_server { ls -la ../server-data/plugins if [ -e "../server-data/.tools/beta.patch2" ] then + echo "Download and install Python 2.7 Minimal ........" + aptget_install python2.7-minimal + echo "Download and apply reapply patch ........" + python2.7 ../server-data/.tools/reapply.py echo "Apply beta.patch2 ........" git apply ../server-data/.tools/beta.patch2 echo "........ Done." -- cgit v1.2.3-60-g2f50