summaryrefslogtreecommitdiff
path: root/npc/functions/hub.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/functions/hub.txt')
-rw-r--r--npc/functions/hub.txt17
1 files changed, 8 insertions, 9 deletions
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 046eb7f40..2dc883545 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -18,6 +18,10 @@ function script HUB_Login {
if (CLEANUP < gettimetick(2)-CHEST_WAITTIME)
deletearray RNGTREASURE_DATE;
+ // PVP Cooldown cleaning
+ if (CLEANUP < gettimetick(2)-PVP_WAITTIME)
+ deletearray PVP_COOLDOWN;
+
return;
}
@@ -276,19 +280,14 @@ function script HUB_PvP {
// This is an official PVP Map
if (ispvpmap(.@m$)) {
// Honorable Death
- if (.@honor) {
+ if (.@honor >= 0) {
HONOR+=.@honor;
} else {
// Dishonorable... But... Legit?
- if (is_bandit(killedrid)) {
+ if (is_bandit(killedrid))
HONOR+=1;
- } else {
- // Did the defensor cheat? (within Level+30% rule)
- if (BaseLevel < readparam(BaseLevel, killedrid)*13/10)
- HONOR+=1; // Ehhhhhh............ Well.
- else
- HONOR+=.@honor; // It's negative.
- }
+ else
+ HONOR+=.@honor; // It's negative.
}
// It was a duel!