diff options
| author | shennetsind <ind@henn.et> | 2013-11-30 14:44:56 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-30 14:44:56 -0200 |
| commit | 4e20f139fa7d0ebd6de30fde9b91ec5e235981d2 (patch) | |
| tree | c42b4af0c8a7be63ef7ff7fc56fcfd017e982cd1 /conf | |
| parent | 6fc1cae2088dd9f450e15728ca4bf4a82fcb8070 (diff) | |
| parent | c952fe0da69ebd5371004d6737a4e2e54859b9b0 (diff) | |
| download | hercules-4e20f139fa7d0ebd6de30fde9b91ec5e235981d2.tar.gz hercules-4e20f139fa7d0ebd6de30fde9b91ec5e235981d2.tar.bz2 hercules-4e20f139fa7d0ebd6de30fde9b91ec5e235981d2.tar.xz hercules-4e20f139fa7d0ebd6de30fde9b91ec5e235981d2.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/battle/battle.conf | 1 | ||||
| -rw-r--r-- | conf/messages.conf | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/battle/battle.conf b/conf/battle/battle.conf index 70062a16e..5b72f5ff9 100644 --- a/conf/battle/battle.conf +++ b/conf/battle/battle.conf @@ -54,6 +54,7 @@ player_damage_delay_rate: 100 undead_detect_type: 0 // Does HP recover if hit by an attribute that's same as your own? (Note 1) +// (Will not work in Renewal) attribute_recover: no // What is the minimum and maximum hitrate of normal attacks? diff --git a/conf/messages.conf b/conf/messages.conf index aae0596af..ba63dc73a 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -621,7 +621,8 @@ 652: Expanded Super Baby 653: Kagerou 654: Oboro -655: Unknown Job +655: Rebellion +656: Unknown Job // MvP Tomb // Added here so it can be easily translated @@ -667,7 +668,6 @@ 691: Sura T 692: Genetic T 693: Shadow Chaser T -694: Rebellion //------------------------------------ |