From 15e4ba4a14d912f70b0862bd1f0af9339dcbc6c0 Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Wed, 1 Apr 2015 01:27:04 -0500
Subject: Remove killer/killable Death Clears default pvp Add Player Togglable
 PvP Flag Add Timer to PvP Flag (Anti-Spam) Add getpvpflag builtin

---
 src/map/script-fun.cpp | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'src/map/script-fun.cpp')

diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index 8c25266..bde1458 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -2175,6 +2175,36 @@ void builtin_pvpoff(ScriptState *st)
     }
 }
 
+static
+void builtin_pvp(ScriptState *st)
+{
+    dumb_ptr<map_session_data> sd = script_rid2sd(st);
+    int flag;
+    flag = conv_num(st, &AARG(0));
+    if (flag > 1)
+        flag = 1;
+
+    sd->state.pvpon = flag;
+}
+
+static
+void builtin_getpvpflag(ScriptState *st)
+{
+    dumb_ptr<map_session_data> sd = script_rid2sd(st);
+    int num = conv_num(st, &AARG(0));
+
+    switch (num){
+        case 0:
+            num = sd->state.pvpon;
+            break;
+        case 1:
+            flag = bool(sd->status.option & Opt0::HIDE);
+            break;
+    }
+
+    push_int<ScriptDataInt>(st->stack, num);
+}
+
 /*==========================================
  *      NPCエモーション
  *------------------------------------------
@@ -3078,6 +3108,8 @@ BuiltinFunction builtin_functions[] =
     BUILTIN(getmapflag, "Mi"_s, 'i'),
     BUILTIN(pvpon, "M"_s, '\0'),
     BUILTIN(pvpoff, "M"_s, '\0'),
+    BUILTIN(pvp, "i"_s, '\0'),
+    BUILTIN(getpvpflag, "i"_s, 'i'),
     BUILTIN(emotion, "i"_s, '\0'),
     BUILTIN(mapwarp, "MMxy"_s, '\0'),
     BUILTIN(cmdothernpc, "ss"_s, '\0'),
-- 
cgit v1.2.3-60-g2f50