[FEATURE] Expert PvP

config.lua.dist

@@ -69,6 +69,12 @@ blackSkulledDeathMana = 0
 fieldOwnershipDuration = 5 * 1000
 loginProtectionPeriod = 10 * 1000
 
+-- Expert PvP
+-- NOTE: toggleExpertPvp enables the PvP frames, similar to Tibia RL.
+toggleExpertPvp = true
+canWalkThroughOtherPlayers = false
+canWalkThroughMagicWalls = false
+
 cleanProtectionZones = false
 
 -- Connection Config

src/config/config_enums.hpp

@@ -351,6 +351,9 @@ enum ConfigKey_t : uint16_t {
 	FIELD_OWNERSHIP,
 	BEDS_ONLY_PREMIUM,
 	LOGIN_PROTECTION,
+	TOGGLE_EXPERT_PVP,
+	EXPERT_PVP_CANWALKTHROUGHOTHERPLAYERS,
+	EXPERT_PVP_CANWALKTHROUGHMAGICWALLS,
 	SPELL_NAME_INSTEAD_WORDS,
 	LOG_PLAYERS_STATEMENTS,
 	ROOK_SYSTEM,

src/config/configmanager.cpp

@@ -172,6 +172,9 @@ bool ConfigManager::load() {
 	loadBoolConfig(L, HALF_LOSS_MAGIC, "halfLossMagicLevel", true);
 	loadBoolConfig(L, CHAIN_SYSTEM_VIP_ONLY, "chainSystemVipOnly", false);
 	loadBoolConfig(L, BEDS_ONLY_PREMIUM, "bedsOnlyPremium", true);
+	loadBoolConfig(L, TOGGLE_EXPERT_PVP, "toggleExpertPvp", false);
+	loadBoolConfig(L, EXPERT_PVP_CANWALKTHROUGHOTHERPLAYERS, "canWalkThroughOtherPlayers", false);
+	loadBoolConfig(L, EXPERT_PVP_CANWALKTHROUGHMAGICWALLS, "canWalkThroughMagicWalls", false);
 	loadBoolConfig(L, SPELL_NAME_INSTEAD_WORDS, "spellNameInsteadOfWords", false);
 	loadBoolConfig(L, LOG_PLAYERS_STATEMENTS, "logPlayersStatements", false);
 	loadBoolConfig(L, ROOK_SYSTEM, "toggleRookSystem", false);

src/creatures/combat/combat.cpp

@@ -347,6 +347,8 @@
 
 				if (isProtected(attackerPlayer, targetPlayer)) {
 					return RETURNVALUE_YOUMAYNOTATTACKTHISPLAYER;
+				} else if (!attackerPlayer->canCombat(targetPlayer)) {
+					return RETURNVALUE_ADJUSTYOURCOMBAT;
 				}
 
 				// nopvp-zone
@@ -374,6 +376,8 @@
 
 					if (isProtected(masterAttackerPlayer, targetPlayer)) {
 						return RETURNVALUE_YOUMAYNOTATTACKTHISPLAYER;
+					} else if (!masterAttackerPlayer->canCombat(targetPlayer)) {
+						return RETURNVALUE_ADJUSTYOURCOMBAT;
 					}
 				}
 			}
@@ -393,8 +397,14 @@
 					return RETURNVALUE_YOUMAYNOTATTACKTHISCREATURE;
 				}
 
-				if (target->isSummon() && target->getMaster()->getPlayer() && target->getZoneType() == ZONE_NOPVP) {
-					return RETURNVALUE_ACTIONNOTPERMITTEDINANOPVPZONE;
+				if (g_game().getOwnerPlayer(target)) {
+					if (target->getZoneType() == ZONE_NOPVP) {
+						return RETURNVALUE_ACTIONNOTPERMITTEDINANOPVPZONE;
+					} else if (g_configManager().getBoolean(TOGGLE_EXPERT_PVP) && isProtected(attackerPlayer, targetPlayer)) {
+						return RETURNVALUE_YOUMAYNOTATTACKTHISCREATURE;
+					} else if (!attackerPlayer->canCombat(target)) {
+						return RETURNVALUE_ADJUSTYOURCOMBAT;
+					}
 				}
 			} else if (attacker->getMonster()) {
 				const auto &targetMaster = target->getMaster();
@@ -403,6 +413,16 @@
 					if (!attackerMaster || !attackerMaster->getPlayer()) {
 						return RETURNVALUE_YOUMAYNOTATTACKTHISCREATURE;
 					}
+				} else if (g_configManager().getBoolean(TOGGLE_EXPERT_PVP)) {
+					if (g_game().getOwnerPlayer(target)) {
+						if (target->getZoneType() == ZONE_NOPVP) {
+							return RETURNVALUE_ACTIONNOTPERMITTEDINANOPVPZONE;
+						} else if (isProtected(attackerPlayer, targetPlayer)) {
+							return RETURNVALUE_YOUMAYNOTATTACKTHISCREATURE;
+						} else if (!attackerPlayer->canCombat(target)) {
+							return RETURNVALUE_ADJUSTYOURCOMBAT;
+						}
+					}
 				}
 			}
 		} else if (target && target->getNpc()) {
@@ -2235,6 +2255,11 @@
 //**********************************************************//
 
 void MagicField::onStepInField(const std::shared_ptr<Creature> &creature) {
+	const auto &target = g_game().getOwnerPlayer(creature);
+	if (target && !isAggressive(target)) {
+		return;
+	}
+
 	// remove magic walls/wild growth
 	if ((!isBlocking() && g_game().getWorldType() == WORLD_TYPE_NO_PVP && id == ITEM_MAGICWALL_SAFE) || id == ITEM_WILDGROWTH_SAFE) {
 		if (!creature->isInGhostMode()) {
@@ -2375,6 +2400,19 @@
 	return 0;
 }
 
+bool MagicField::isAggressive(const std::shared_ptr<Player> &player) const {
+	if (!g_configManager().getBoolean(TOGGLE_EXPERT_PVP) && g_configManager().getBoolean(EXPERT_PVP_CANWALKTHROUGHMAGICWALLS)) {
+		return true;
+	}
+
+	const auto &caster = g_game().getOwnerPlayer(getOwnerId());
+	if (!caster || pvpMode == PVP_MODE_RED_FIST) {
+		return true;
+	}
+
+	return caster->isAggressiveCreature(player, pvpMode == PVP_MODE_WHITE_HAND, createTime) || pvpMode == PVP_MODE_YELLOW_HAND && player->getSkull() != SKULL_NONE;
+}
+
 MatrixArea::MatrixArea(uint32_t initRows, uint32_t initCols) :
 	centerX(0), centerY(0), rows(initRows), cols(initCols) {
 	data_ = new bool*[rows];

src/creatures/combat/combat.hpp

@@ -19,6 +19,7 @@
 
 #include "items/item.hpp"
 #include "lua/global/baseevents.hpp"
+#include "creatures/creatures_definitions.hpp"
 
 class Condition;
 class Creature;
@@ -327,6 +328,9 @@ class MagicField final : public Item {
 	CombatType_t getCombatType() const;
 	int32_t getDamage() const;
 	void onStepInField(const std::shared_ptr<Creature> &creature);
+	bool isAggressive(const std::shared_ptr<Player> &player) const;
+
+	PvpMode_t pvpMode = PVP_MODE_DOVE;
 
 private:
 	int64_t createTime;

src/creatures/combat/condition.cpp

@@ -1796,7 +1796,7 @@ bool ConditionDamage::doDamage(const std::shared_ptr<Creature> &creature, int32_
 	}
 
 	if (!creature->isAttackable() || Combat::canDoCombat(attacker, creature, damage.primary.type != COMBAT_HEALING) != RETURNVALUE_NOERROR) {
-		if (!creature->isInGhostMode() && !creature->getNpc()) {
+		if (!creature->isInGhostMode() && !creature->getNpc() && !g_configManager().getBoolean(TOGGLE_EXPERT_PVP)) {
 			g_game().addMagicEffect(creature->getPosition(), CONST_ME_POFF);
 		}
 		return false;