From 96ff9e5917d02e1755c60b9dfd0c67d84178554b Mon Sep 17 00:00:00 2001
From: shagu <ericmauser@googlemail.com>
Date: Wed, 26 Oct 2016 00:19:11 +0200
Subject: [PATCH] show pvp icon on playerframe or minimap

---
 img/pvp.tga        | Bin 0 -> 2971 bytes
 modules/config.lua |   2 ++
 modules/gui.lua    |   2 ++
 modules/player.lua |  30 ++++++++++++++++++++++++++++--
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 img/pvp.tga

diff --git a/img/pvp.tga b/img/pvp.tga
new file mode 100644
index 0000000000000000000000000000000000000000..088e00a1e4eccf83f4df6f3562b2c561a999c8b6
GIT binary patch
literal 2971
zcmY+G3s6<p6^8!+0qlkH2p~ua^)YIrA#sH9(Ml#dnz_ORqS&OPme?kaHDg|8k~Frp
zR$?Sc9kn&an1DeO%@`cbfHW9!L?b3j0~4`ep%had5g!z45HI(x{{J}@>SeyY&)s+L
zwbov*1MofE`uq_53oq8!Q1UZUN)7`-6`Z${XGw$}a3`5SHjuZ;Ur4#0!#HdMM))x4
zCjm^JC42~uyu|fv60(_tqu~3TH(}Jo0qz_`#zTh0aRIJ%Msmo<*s0yf{gq+bd_&eU
z<0e0XBHH=e10<G26A97mA>r#eK&OL=R^rKB|C{4Dk0P%jX+kfiQ|iM{7>zS5eTiy=
zPe@b>*^QLRKIATURc9_Rq^8L(-QXPgoE#_B<b9G$LjS-4K_rQ6C(Y|P{4<<GE9vIN
zZ{q&hhFQ4=$()~WwD>B2TOq|dnn~&qJ9?0J4q*P{hKVx_cTYBi#sskB1wS(8`7zDw
z=e|zzJaHB4&f|#83t;vlgLkQ6-V%c+!7yfuA$=ZIQsUUDhN$Fz?vv^9Qmv2F&mwIY
zm+o^m$<`U!hG$+k)Lu92J8RfpL7VX}@-hi`?kv^gNdpqc8$SJq;ZTF&M7KF+%*-*2
z&!F0LL-IZH;!!e^K>k4lQ7E5gygIlufV`)SS2a|$8j7n82PrM}KI!csZ;&MCq%2pM
zz2xu2uz0nh?1Eu;jo~d?>ZONsR~QnUtZL?-MI?m4v0TZJN<PB43?H)SoRgOg?;J5~
zEi;syG;BU7y@TWeDIh-}(yB~8NqmlT51cc+d(5!ufT6UWzB*%=o@EG&{f>Kd&g0lT
zr1lXmeTD}Y4dV1QLrsri8x1b~+MMf`oH9JML8^U3F@25bqGjYi7{Qoo|Hi%C_bMHJ
z-mrsaHyO=7LA7x@_aRBWUF|BQWqymwi>|fjx&5QB3`NIXYnQEYzb{-V)dS=Vp-RtX
zETA6?_ql46MvBtDTEo$H!<T)AT~sR*Tu<G5yV{lb&0CjHKVUe^tw*VT*(+{%Ui_2c
zvF8k{3Jr%_m@<#vQhgn7ejGpr(@D-%rRt{gii$^pIn!%6PW76{XZ($-C*7_#i%VOP
zz3c+k74<R$uc5rjhk_Erx?Qxk((vS3!`gQZt2Y}$q7A<<GE}x13U<4yUZQ#LRJk>v
z8?M>m$CNoYvE^VtCQMgGDYpOTWEH<U<2~fp<j>?ijGb}@r@MXF&A2MYdrrF@O|77a
zY17I;sI*oV7*?!j5w%k7Q5F$zx1&OV_<|fFC1f!f<7ASQJD+e}+@nUfl<sMWZs;Gx
zF&^GY+ZV8fuGwLp4l1eqhV{f`*~?n~?M^ooWsL#sss0X;qg0uyWYy#da;MWym3oLG
zdQt2|-qY>)vL}F?<%Z=27T->>^*1P*QC0rY_TckA3#+8qn3R9>%x7eRBV{9>oQC})
z&L1Lk;WfOxEfCY}w`f^+iltCLXsDv)bxf2a&1_%sH@UZ#=!#*(V$^oz<^Av^UO{c2
zc{(ZL2(38V&*s6rY4lrCH`i9ttHYHv*D+$~QVP}+Ea?mQ;FRCf#qBz-lq;w9y6YCH
zH3lf@BIm^~NK_v=Led>68~B76B2kZ%YUKRlMyjl7Ayu7jX45xOT2p$}^jQSOhSf21
zlP9Suc9Hi<iX+V#)D_2&y_h)bN+f+0qBN=MaHH7ZGtW78<u<NWUosr)ax722%<l)-
zf!wZjo^w74d6fg4A&w7fol2m_p#3%e1YJ<gR*j2R#x~FaGqVS<cKblwH~dXu*<a^G
zIZ-!I!2maiBCAdo;w0jbcr~g|v88MvMeeV;%7kY}ZVFgrBU`{UuU<Z1lanai)tjuy
ztM96t(8q~VnaRQcu8?9f(h=_r3H++J{YK2m>q^w+wVhFqXf})cimGPjs^$KbY$8+1
zCwRT2XH<s;oYz>*HH*E(Th{j&M&GYDX%o@wEW$~5XVClU4)PEw$AMa3G>@RcOwNj~
zZVg~`S}%Y5oal`thw3wt9K?%%yb{w%b;=l;7%wjrvl3mWeZo0?Se2?uxx5-v=e9>(
zv_LRbL{gpSSW5s2V|)0U3iB21bE;k^CXqc@zpE>{CE%oOs7^_t{$m0zlHU=Jb7JV2
z?xfl)L22DU0_{rFkxd`pWc9ajeGgIF@;J^`54f9b;r}dOgq`l}Po$DK-KL^RO7xOB
zOnyA9L`T9&J~F&@BN}}ce7r4yN1xFxZaHf-pM#tf*G`#~h48piHl((&M&Do@mB711
zRiX6F8x|hMuR8K9yT-RD{GboPQF=qE$v#O&7IJWQ1aqE4p2vL;mSgXUt5{#8P<N2$
zNc1`m?mq#ce2~yzVn)s(&hL?*lQHCuH#s=}s^0SXS_(YHwJMTN?iv=Pi-eFgEzKkd
p->gw<N#p@Co1_s}e=(niK6wik&Hbr&p*QE@dmo$U&7PZv{{r5+wlDwy

literal 0
HcmV?d00001

diff --git a/modules/config.lua b/modules/config.lua
index 0569d4fd..a6d16721 100644
--- a/modules/config.lua
+++ b/modules/config.lua
@@ -12,6 +12,8 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("unitframes", "player",  "width",            "200")
   pfUI:UpdateConfig("unitframes", "player",  "height",           "50")
   pfUI:UpdateConfig("unitframes", "player",  "pheight",          "10")
+  pfUI:UpdateConfig("unitframes", "player",  "showPVPMinimap",   "0")
+  pfUI:UpdateConfig("unitframes", "player",  "showPVP",          "0")
   pfUI:UpdateConfig("unitframes", "target",  "width",            "200")
   pfUI:UpdateConfig("unitframes", "target",  "height",           "50")
   pfUI:UpdateConfig("unitframes", "target",  "pheight",          "10")
diff --git a/modules/gui.lua b/modules/gui.lua
index a166069c..abcfe2e8 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -513,6 +513,8 @@ pfUI:RegisterModule("gui", function ()
   pfUI.gui:CreateConfig(pfUI.gui.uf, "Player width", pfUI_config.unitframes.player, "width")
   pfUI.gui:CreateConfig(pfUI.gui.uf, "Player height", pfUI_config.unitframes.player, "height")
   pfUI.gui:CreateConfig(pfUI.gui.uf, "Player powerbar height", pfUI_config.unitframes.player, "pheight")
+  pfUI.gui:CreateConfig(pfUI.gui.uf, "Show PvP Icon", pfUI_config.unitframes.player, "showPVP", "checkbox")
+  pfUI.gui:CreateConfig(pfUI.gui.uf, "Align PvP Icon to Minimap", pfUI_config.unitframes.player, "showPVPMinimap", "checkbox")
   pfUI.gui:CreateConfig(pfUI.gui.uf, "Target width", pfUI_config.unitframes.target, "width")
   pfUI.gui:CreateConfig(pfUI.gui.uf, "Target height", pfUI_config.unitframes.target, "height")
   pfUI.gui:CreateConfig(pfUI.gui.uf, "Target powerbar height", pfUI_config.unitframes.target, "pheight")
diff --git a/modules/player.lua b/modules/player.lua
index 4ba67270..89e51791 100644
--- a/modules/player.lua
+++ b/modules/player.lua
@@ -42,12 +42,38 @@ pfUI:RegisterModule("player", function ()
   pfUI.uf.player:RegisterEvent("RAID_TARGET_UPDATE")
   pfUI.uf.player:RegisterEvent("PARTY_LEADER_CHANGED")
   pfUI.uf.player:RegisterEvent("PARTY_LOOT_METHOD_CHANGED")
+  pfUI.uf.player:RegisterEvent("UPDATE_FACTION")
 
   pfUI.uf.player:SetScript("OnEvent", function()
       if ( event == "UNIT_DISPLAYPOWER" and arg1 and arg1 == "player" ) or event == "PLAYER_ENTERING_WORLD" then
         pfUI.uf.player.power.bar:SetValue(0)
       end
+      if event == "UPDATE_FACTION" then
+        if pfUI_config.unitframes.player.showPVP == "1" and UnitIsPVP("player") then
+          if pfUI.uf.player.pvpicon == nil then
+            pfUI.uf.player.pvpicon = CreateFrame("Frame", "pfPvPIcon", UIParent)
+            pfUI.uf.player.pvpicon:SetFrameStrata("HIGH")
+            pfUI.uf.player.pvpicon.texture = pfUI.uf.player.pvpicon:CreateTexture(nil,"DIALOG")
+            pfUI.uf.player.pvpicon.texture:SetTexture("Interface\\AddOns\\pfUI\\img\\pvp")
+            pfUI.uf.player.pvpicon.texture:SetAllPoints(pfUI.uf.player.pvpicon)
+          end
 
+          if pfUI_config.unitframes.player.showPVPMinimap == "1" then
+            pfUI.uf.player.pvpicon:SetWidth(16)
+            pfUI.uf.player.pvpicon:SetHeight(16)
+            pfUI.uf.player.pvpicon:SetParent(pfUI.minimap)
+            pfUI.uf.player.pvpicon:SetPoint("BOTTOMRIGHT", pfUI.minimap, "BOTTOMRIGHT", -5, 5)
+          else
+            pfUI.uf.player.pvpicon:SetWidth(10)
+            pfUI.uf.player.pvpicon:SetHeight(10)
+            pfUI.uf.player.pvpicon:SetParent(pfUI.uf.player.hp.bar)
+            pfUI.uf.player.pvpicon:SetPoint("CENTER", pfUI.uf.player, "BOTTOMLEFT", 0,0)
+          end
+          pfUI.uf.player.pvpicon:Show()
+        elseif pfUI.uf.player.pvpicon then
+          pfUI.uf.player.pvpicon:Hide()
+        end
+      end
       local raidIcon = GetRaidTargetIndex("player")
       if raidIcon then
         SetRaidTargetIconTexture(pfUI.uf.player.hp.raidIcon.texture, raidIcon)
@@ -140,7 +166,7 @@ pfUI:RegisterModule("player", function ()
   pfUI.uf.player.hp.leaderIcon.texture = pfUI.uf.player.hp.leaderIcon:CreateTexture(nil,"BACKGROUND")
   pfUI.uf.player.hp.leaderIcon.texture:SetTexture("Interface\\GROUPFRAME\\UI-Group-LeaderIcon")
   pfUI.uf.player.hp.leaderIcon.texture:SetAllPoints(pfUI.uf.player.hp.leaderIcon)
-  pfUI.uf.player.hp.leaderIcon:SetPoint("TOPLEFT", pfUI.uf.player.hp, "TOPLEFT", -4, 4)
+  pfUI.uf.player.hp.leaderIcon:SetPoint("CENTER", pfUI.uf.player.hp, "TOPLEFT", 0, 0)
   pfUI.uf.player.hp.leaderIcon:Hide()
 
   pfUI.uf.player.hp.lootIcon = CreateFrame("Frame",nil,pfUI.uf.player.hp)
@@ -149,7 +175,7 @@ pfUI:RegisterModule("player", function ()
   pfUI.uf.player.hp.lootIcon.texture = pfUI.uf.player.hp.lootIcon:CreateTexture(nil,"BACKGROUND")
   pfUI.uf.player.hp.lootIcon.texture:SetTexture("Interface\\GROUPFRAME\\UI-Group-MasterLooter")
   pfUI.uf.player.hp.lootIcon.texture:SetAllPoints(pfUI.uf.player.hp.lootIcon)
-  pfUI.uf.player.hp.lootIcon:SetPoint("TOPLEFT", pfUI.uf.player.hp, "LEFT", -4, 4)
+  pfUI.uf.player.hp.lootIcon:SetPoint("CENTER", pfUI.uf.player.hp, "LEFT", 0, 0)
   pfUI.uf.player.hp.lootIcon:Hide()
 
   pfUI.uf.player.hp.raidIcon = CreateFrame("Frame",nil,pfUI.uf.player.hp)