diff options
| -rw-r--r-- | localserver/applicator.py | 20 | ||||
| -rw-r--r-- | localserver/beta.patch2 | 12 | ||||
| -rwxr-xr-x | localserver/build.sh | 4 | ||||
| -rw-r--r-- | localserver/reapply.patch3 | 31 |
4 files changed, 66 insertions, 1 deletions
diff --git a/localserver/applicator.py b/localserver/applicator.py new file mode 100644 index 0000000..7d5761b --- /dev/null +++ b/localserver/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/localserver/beta.patch2 b/localserver/beta.patch2 index f09c482..41a6417 100644 --- a/localserver/beta.patch2 +++ b/localserver/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 diff --git a/localserver/build.sh b/localserver/build.sh index 44970f4..133de9e 100755 --- a/localserver/build.sh +++ b/localserver/build.sh @@ -19,11 +19,13 @@ fi # It will only exist on BETA SERVERS, though if [ -e "./beta.patch2" ] then + echo "Apply server updates ........" + python applicator.py echo "Apply beta.patch2 ........" cd ../../server-code git apply ../tools/localserver/beta.patch2 cd $DIR - mv beta.patch2 .~beta.patch2 + #mv beta.patch2 .~beta.patch2 ls echo "........ Done." fi diff --git a/localserver/reapply.patch3 b/localserver/reapply.patch3 new file mode 100644 index 0000000..05bc2a1 --- /dev/null +++ b/localserver/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 + |