summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-05-20 08:41:15 -0300
committerJesusaves <cpntb1@ymail.com>2020-05-20 08:41:15 -0300
commitf4ba013c08bbcd8a8815d5959dbd74ba40516019 (patch)
tree9242a349babafae90bdd1e0f3b2d0714502d013d
parenta9cc0a955692b23e02b17f920145564ba79b8482 (diff)
downloadtools-f4ba013c08bbcd8a8815d5959dbd74ba40516019.tar.gz
tools-f4ba013c08bbcd8a8815d5959dbd74ba40516019.tar.bz2
tools-f4ba013c08bbcd8a8815d5959dbd74ba40516019.tar.xz
tools-f4ba013c08bbcd8a8815d5959dbd74ba40516019.zip
Patch Level 12
-rw-r--r--localserver/applicator.py2
-rw-r--r--localserver/reapply.patch48
2 files changed, 9 insertions, 1 deletions
diff --git a/localserver/applicator.py b/localserver/applicator.py
index aa84ce3..6fa8d6e 100644
--- a/localserver/applicator.py
+++ b/localserver/applicator.py
@@ -33,7 +33,7 @@ for line in f:
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/ --exclude=tools/ --exclude=db/ --reject "+line.replace("\n", "")+".diff", shell=True)
+ subprocess.call("cd ../../server-code ; git apply --ignore-whitespace --exclude=doc/ --exclude=tools/ --exclude=db/ --exclude=npc/ --exclude=conf/ --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)"
diff --git a/localserver/reapply.patch4 b/localserver/reapply.patch4
index df09e40..92e4535 100644
--- a/localserver/reapply.patch4
+++ b/localserver/reapply.patch4
@@ -41,5 +41,13 @@ ad7ebbedf81c54fdb43f4b4e41aed9fd48543e47
e66f69797332dcaa0ca948287f4f58aad48f66f9
548aa1263b69c2c5551d2c5f3d501ebc82d1e067
+## Add at command for change char sex (@changecharsex)
+c2445e45345967a7a80202e794f680e31b1e9b0d
+
+## Extract code for really gain homun exp to separate function
+79c2a4b11f5f05eed9ae5535395205236f73b1e4
+
+## Use enum battle_dmg_type in related functions
+008706f9bd90c207f3df46bc920f5295c89124a1