Merge pull request #1103 from zach2good/enable_pvp

Enable basic PVP

Author: zach2good

scripts/commands/setallegiance.lua

@@ -0,0 +1,42 @@
+---------------------------------------------------------------------------------------------------
+-- func: setallegiance
+-- desc: Sets the players allegiance.
+---------------------------------------------------------------------------------------------------
+cmdprops =
+{
+    permission = 1,
+    parameters = "is"
+}
+
+function error(player, msg)
+    player:PrintToPlayer(msg)
+    player:PrintToPlayer("!setallegiance <allegiance> <player>")
+end
+
+function onTrigger(player, allegiance, target)
+    -- validate target
+    local targ
+    local cursor_target = player:getCursorTarget()
+
+    if target then
+        targ = GetPlayerByName(target)
+        if not targ then
+            error(player, string.format("Player named '%s' not found!", target))
+            return
+        end
+    elseif cursor_target and not cursor_target:isNPC() then
+        targ = cursor_target
+    else
+        targ = player
+    end
+
+    if allegiance == nil or (allegiance < 0 or allegiance > 6) then
+        error(player, "Improper allegiance passed. Valid Values: 0 to 6")
+        return
+    end
+
+    local toString = {"Mob", "Player", "San d'Oria", "Bastok", "Windurst", "Wyverns", "Griffons"}
+
+    player:PrintToPlayer(string.format("You set %s's allegiance to %s", targ:getName(), toString[allegiance + 1]))
+    targ:setAllegiance(allegiance)
+end

src/map/entities/baseentity.h

@@ -135,7 +135,9 @@ enum ALLEGIANCETYPE
     ALLEGIANCE_PLAYER    = 1,
     ALLEGIANCE_SAN_DORIA = 2,
     ALLEGIANCE_BASTOK    = 3,
-    ALLEGIANCE_WINDURST  = 4
+    ALLEGIANCE_WINDURST  = 4,
+    ALLEGIANCE_WYVERNS   = 5,
+    ALLEGIANCE_GRIFFONS  = 6,
 };
 
 enum UPDATETYPE

src/map/entities/battleentity.cpp

@@ -1186,17 +1186,37 @@ bool CBattleEntity::ValidTarget(CBattleEntity* PInitiator, uint16 targetFlags)
     {
         if (!isDead())
         {
-            if (allegiance == (PInitiator->allegiance % 2 == 0 ? PInitiator->allegiance + 1 : PInitiator->allegiance - 1))
+            // Teams PVP
+            if (allegiance >= ALLEGIANCE_WYVERNS &&
+                PInitiator->allegiance >= ALLEGIANCE_WYVERNS)
             {
-                return true;
+                return allegiance != PInitiator->allegiance;
             }
+
+            // Nation PVP
+            if ((allegiance >= ALLEGIANCE_SAN_DORIA && allegiance <= ALLEGIANCE_WINDURST) &&
+                (PInitiator->allegiance >= ALLEGIANCE_SAN_DORIA && PInitiator->allegiance <= ALLEGIANCE_WINDURST))
+            {
+                return allegiance != PInitiator->allegiance;
+            }
+
+            // PVE
+            if (allegiance <= ALLEGIANCE_PLAYER &&
+                PInitiator->allegiance <= ALLEGIANCE_PLAYER)
+            {
+                return allegiance != PInitiator->allegiance;
+            }
+
+            return false;
         }
     }
+
     if ((targetFlags & TARGET_SELF) && (this == PInitiator || (PInitiator->objtype == TYPE_PET &&
         static_cast<CPetEntity*>(PInitiator)->getPetType() == PETTYPE_AUTOMATON && this == PInitiator->PMaster)))
     {
         return true;
     }
+
     return false;
 }
 

src/map/entities/charentity.cpp

@@ -1687,6 +1687,9 @@ void CCharEntity::Die(duration _duration)
     PAI->ClearStateStack();
     PAI->Internal_Die(_duration);
 
+    // If player allegiance is not reset on death they will auto-homepoint
+    allegiance = ALLEGIANCE_PLAYER;
+
     // reraise modifiers
     if (this->getMod(Mod::RERAISE_I) > 0)
         m_hasRaise = 1;

src/map/lua/lua_baseentity.cpp

@@ -4974,6 +4974,8 @@ inline int32 CLuaBaseEntity::setAllegiance(lua_State* L)
     ALLEGIANCETYPE allegiance = (ALLEGIANCETYPE)lua_tointeger(L, 1);
 
     m_PBaseEntity->allegiance = allegiance;
+    m_PBaseEntity->updatemask |= UPDATE_HP;
+
     return 0;
 }