summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/001-8/mapflags.txt1
-rw-r--r--npc/003-1/quirino.txt8
-rw-r--r--npc/018-7-1/yetifly.txt2
-rw-r--r--npc/functions/hub.txt2
4 files changed, 5 insertions, 8 deletions
diff --git a/npc/001-8/mapflags.txt b/npc/001-8/mapflags.txt
index de6992ae9..ce102fcc6 100644
--- a/npc/001-8/mapflags.txt
+++ b/npc/001-8/mapflags.txt
@@ -1,3 +1,4 @@
001-8 mapflag zone MMO
+001-8 mapflag pvp
001-8 mapflag pvp_noparty
001-8 mapflag pvp_noguild
diff --git a/npc/003-1/quirino.txt b/npc/003-1/quirino.txt
index 4e14eae68..716ef6b10 100644
--- a/npc/003-1/quirino.txt
+++ b/npc/003-1/quirino.txt
@@ -107,16 +107,12 @@ function quirinHonor {
L_SignUp:
// Player cannot be carrying anything
- getinventorylist;
- if(@inventorylist_count>=1) goto L_Full;
+ if(Weight >= 1) goto L_Full;
getcartinventorylist();
if(@cartinventorylist_count>=1) goto L_Full;
// Warp player
- if (rand2(1,2) == 1)
- warp "001-8", rand(42, 57), 42;
- else
- warp "001-8", rand(42, 57), 57;
+ warp "001-8", rand2(42, 57), rand2(42, 57);
// Prevent further movements!
setpcblock(PCBLOCK_SOFT, true);
diff --git a/npc/018-7-1/yetifly.txt b/npc/018-7-1/yetifly.txt
index 30d8d4ed5..5a21de512 100644
--- a/npc/018-7-1/yetifly.txt
+++ b/npc/018-7-1/yetifly.txt
@@ -4,7 +4,7 @@
// Description:
// Yetifly the Mighty
-018-7-1,54,77,0 script Yetifly NPC_YETIFLY,{
+018-7-1,54,78,0 script Yetifly NPC_YETIFLY,{
mesn;
mesq l("Heh, congratulations making it this far. Once again, allow me to present myself:");
next;
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 882bfbe32..26af899b5 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -879,7 +879,7 @@ function script HUB_PvP {
HONOR+=.@honor;
} else {
// Dishonorable... But... Legit?
- if (is_bandit(killedrid))
+ if (is_bandit(killedrid) || getmap() == "001-8")
HONOR+=1;
else
HONOR+=.@honor; // It's negative.