diff options
| -rw-r--r-- | .tools/applicator.py | 26 | ||||
| -rw-r--r-- | .tools/reapply.patch4 | 37 |
2 files changed, 62 insertions, 1 deletions
diff --git a/.tools/applicator.py b/.tools/applicator.py index e3c795aea..ea9b5f77b 100644 --- a/.tools/applicator.py +++ b/.tools/applicator.py @@ -1,7 +1,7 @@ import subprocess # Open reapply.patch3 -f=open("./reapply.patch3", "r") +f=open("reapply.patch3", "r") subprocess.call("cd ../../server-code", shell=True) for line in f: @@ -18,3 +18,27 @@ for line in f: f.close() +print "Evol porting finished" + + +############################################### +# Open reapply.patch4 (HerculesWS Upstream) +f=open("reapply.patch4", "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://github.com/HerculesWS/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 --exclude=doc/ --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() +print "HercWS porting finished" + diff --git a/.tools/reapply.patch4 b/.tools/reapply.patch4 new file mode 100644 index 000000000..6bb01b2a0 --- /dev/null +++ b/.tools/reapply.patch4 @@ -0,0 +1,37 @@ +############ +# HOWTO: +# git diff v2019.07.28.. --pretty=short + +############ +## v2019.07.28 + +## <Commit Short Summary> +# <full commit ID> + +## [REVERT ME] Fix *atcommand cannot be use when PCBLOCK_COMMANDS is true +# ec43ccf2d3d992386b2ba9d7812bcbd24639b063 + +## Added Elemental Resist Status Icon +#48bc050f9c127fddb0caca65185b265867625667 + +## Add some missing checks into clif.c +6629dfd05f4ebef7862cd2d499b7330acc8d82ac + +## Merge pull request #2518 from Emistry/scriptcommand_setgetiteminfo +f4b5f645cac0e50c7dc3079d9a388eed0b62ad9b + +## Fix an issue that prevents homunculus auto-vaporize on death or skill reset +#310b7dd9b8d2e862657d84cc72bb156e0d2ad226 + +## Fix a bug that caused homunculi's HP and SP to be refilled on login +#29d5ccb4f6f5d94b2991bae6eeb3bf86987bf21c + +## Fix the intimacy requirement check for the homunculus ultimate skills +2bee596ad0bb84a92d878d3d76993ba365c70e2b + +############ +## v2019.08.25 + +## + + |