summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--world/map/conf/atcommand_athena.conf5
-rw-r--r--world/map/conf/battle_athena.conf6
-rw-r--r--world/map/db/const.txt58
-rw-r--r--world/map/npc/009-2/entertainer.txt10
4 files changed, 41 insertions, 38 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..86076009 100644
--- a/world/map/conf/battle_athena.conf
+++ b/world/map/conf/battle_athena.conf
@@ -1,8 +1,5 @@
// eAthena Battle Configuration File
-// Do you want to debug warp points? If set to yes, warp points will appear as flags.(Note 1)
-warp_point_debug: no
-
// When calculating critical, should we take in to account the enimies luck? (Note 1)
enemy_critical: yes
@@ -122,6 +119,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
diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index 6ecbe0ad..c00773e2 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -261,7 +261,6 @@ sc_raiseattackspeed0 37
sc_raiseattackstrength 185
// Emotions
-// Note: client-data/emotes.xml uses the wrong numbers.
EMOTE_DISGUST 1
EMOTE_SURPRISE 2
EMOTE_HAPPY 3
@@ -276,34 +275,35 @@ EMOTE_UPSET 11
EMOTE_PERTURBED 12
EMOTE_SPEECH 13
EMOTE_BLAH 14
-EMOTE_SWEAR 15
-EMOTE_MEOW 16
-EMOTE_LAUGH 17
-EMOTE_CHEERFUL 18
-EMOTE_LOVE 19
-EMOTE_MONEY 20
-EMOTE_SLEEP 21
-EMOTE_REST 22
-EMOTE_BOTHERED 23
-EMOTE_AFRAID 24
-EMOTE_DEAD 25
-EMOTE_SUSPICIOUS 26
-EMOTE_MELANCHOLY 27
-EMOTE_FACEPALM 28
-EMOTE_ANGRY 29
-EMOTE_HEADACHE 30
-EMOTE_BORED 31
-EMOTE_HEART 32
-EMOTE_EMPTY 33
-EMOTE_HALLOWEEN 34
-EMOTE_VICIOUS 35
-EMOTE_JOYFUL 36
-EMOTE_CLEVER 37
-EMOTE_SHY 38
-EMOTE_ALIEN 39
-EMOTE_CURIOUS 40
-EMOTE_PAIN 41
-EMOTE_TEARS 42
+// ManaPlus Emotions
+EMOTE_MEOW 101
+EMOTE_LAUGH 102
+EMOTE_CHEERFUL 103
+EMOTE_LOVE 104
+EMOTE_MONEY 105
+EMOTE_SLEEP 106
+EMOTE_REST 107
+EMOTE_BOTHERED 108
+EMOTE_AFRAID 109
+EMOTE_DEAD 110
+EMOTE_SUSPICIOUS 111
+EMOTE_MELANCHOLY 112
+EMOTE_FACEPALM 113
+EMOTE_ANGRY 114
+EMOTE_HEADACHE 115
+EMOTE_BORED 116
+EMOTE_SWEAR 117
+EMOTE_HEART 118
+EMOTE_EMPTY 119
+EMOTE_HALLOWEEN 120
+EMOTE_VICIOUS 121
+EMOTE_JOYFUL 122
+EMOTE_CLEVER 123
+EMOTE_SHY 124
+EMOTE_ALIEN 125
+EMOTE_TROLL 126
+EMOTE_PAIN 127
+EMOTE_TEARS 128
sfx_skillup 1
sfx_magic_generic 2
diff --git a/world/map/npc/009-2/entertainer.txt b/world/map/npc/009-2/entertainer.txt
index 57119894..61306b25 100644
--- a/world/map/npc/009-2/entertainer.txt
+++ b/world/map/npc/009-2/entertainer.txt
@@ -27,9 +27,13 @@ L_Close:
close;
OnTimer3000:
- emotion rand(EMOTE_DISGUST, EMOTE_TEARS);
- setnpctimer 0;
- end;
+ if(rand(0,1) == 1) goto L_manaplus;
+ emotion rand(EMOTE_DISGUST, EMOTE_BLAH);
+ goto OnInit;
+
+L_manaplus:
+ emotion rand(EMOTE_MEOW, EMOTE_TEARS);
+ goto OnInit;
OnInit:
if (debug >= 2) end;