diff options
| -rw-r--r-- | .tools/applicator.py | 2 | ||||
| -rw-r--r-- | .tools/reapply.patch4 | 4 | ||||
| -rw-r--r-- | conf/messages.conf | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/.tools/applicator.py b/.tools/applicator.py index aa84ce359..6fa8d6e83 100644 --- a/.tools/applicator.py +++ b/.tools/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/.tools/reapply.patch4 b/.tools/reapply.patch4 index df09e40a2..c59bfd931 100644 --- a/.tools/reapply.patch4 +++ b/.tools/reapply.patch4 @@ -41,5 +41,9 @@ ad7ebbedf81c54fdb43f4b4e41aed9fd48543e47 e66f69797332dcaa0ca948287f4f58aad48f66f9 548aa1263b69c2c5551d2c5f3d501ebc82d1e067 +## Add at command for change char sex (@changecharsex) +c2445e45345967a7a80202e794f680e31b1e9b0d +## Extract code for really gain homun exp to separate function +79c2a4b11f5f05eed9ae5535395205236f73b1e4 diff --git a/conf/messages.conf b/conf/messages.conf index b67e84b91..bd765f516 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -441,8 +441,9 @@ 432: change the sex of 433: This character has been banned until 434: Char-server has been asked to %s the character '%.*s'. -//435-449 FREE +//435-448 FREE // Homunculus messages +449: Homunculus Experience Gained Base:%u (%.2f%%) 450: You already have a homunculus // Return pet to egg message |