summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-04-13 21:26:06 -0500
committerWushin <pasekei@gmail.com>2015-04-13 21:26:06 -0500
commit4f675ed7028fb7c720d1adc633c01f3a08f3c7b5 (patch)
tree67b81b6ae05102057b9d6319dad1fe9e737681ee
parent654edaa6863ad41bf8e734ada1ba727fc6d8a1d7 (diff)
parent13ab3942963d6478c287cbeaf9e7c8fb1b55d24d (diff)
downloadserverdata-4f675ed7028fb7c720d1adc633c01f3a08f3c7b5.tar.gz
serverdata-4f675ed7028fb7c720d1adc633c01f3a08f3c7b5.tar.bz2
serverdata-4f675ed7028fb7c720d1adc633c01f3a08f3c7b5.tar.xz
serverdata-4f675ed7028fb7c720d1adc633c01f3a08f3c7b5.zip
Merge pull request #319 from wushin/pvp-conf-change
Added player_pvp_time amount of time inbetween calling @pvp
-rw-r--r--world/map/conf/atcommand_athena.conf5
-rw-r--r--world/map/conf/battle_athena.conf3
2 files changed, 5 insertions, 3 deletions
diff --git a/world/map/conf/atcommand_athena.conf b/world/map/conf/atcommand_athena.conf
index 5f8f3a50..fc6b71fe 100644
--- a/world/map/conf/atcommand_athena.conf
+++ b/world/map/conf/atcommand_athena.conf
@@ -4,6 +4,7 @@
help: 0
servertime: 0
email: 0
+pvp: 0
//gm: 100
// 40: developers
@@ -42,6 +43,7 @@ spawn: 50
summon: 50
// 60: game masters
+charpvp: 60
charstatsall: 60
pvpoff: 60
pvpon: 60
@@ -50,8 +52,6 @@ killmonster: 60
killmonster2: 60
ipcheck: 60
storeall: 60
-killable: 60
-charkillable: 60
alive: 60
blvl: 60
jlvl: 60
@@ -67,7 +67,6 @@ charskreset: 60
charwipe: 60
charsave: 60
kill: 60
-killer: 60
recall: 60
revive: 60
charwarp: 60
diff --git a/world/map/conf/battle_athena.conf b/world/map/conf/battle_athena.conf
index 6e80b1e7..d2d68dda 100644
--- a/world/map/conf/battle_athena.conf
+++ b/world/map/conf/battle_athena.conf
@@ -122,6 +122,9 @@ basic_skill_check: no
// If you attack a monster, it will attack you back regardless of this setting. (I think)
player_invincible_time: 5000
+// PvP delay for spammers
+player_pvp_time: 5000
+
// Will there be a minimum skill dmg even if there is a miss?
skill_min_damage: no