Added new CombatFlag ini setting COMBAT_ATTACK_NOAGGREIVED (#1342)

* Added new CombatFlag ini setting COMBAT_ATTACK_NOAGGREIVED

In the old behavior (55i/55r/56b/56c) we were not guilty when we hit a murderer. Now when we attack a criminal or murderer we are guilty towards that person. An ini setting option has been added for this behavior. Although this is a normal behavior in OSI, it can be perceived as a problem since not every server designs games like OSI.

---------

Co-authored-by: cbnolok <cbnolok@gmail.com>

Author: canerksk

Changelog.txt

@@ -3957,9 +3957,9 @@ Added: 'H' shortcut for variables to get the value as hexadecimal.
 	LOCAL.ReflectDamage (r/w) = The amount of damage that will be reflected to this other party
 	LOCAL.ReduceDamage (r/w) = Amount to be deducted from damage received
 	LOCAL.DamageType (r/w) = Type of damage received (Default: DAMAGE_FIXED andDAMAGE_REACTIVE)
-NOTE: 
-    1. If no ReflectDamage or ReduceDamage values are entered, the system defaults to the Reactive Armor Effect value.
-    2. No damage amount can be less than 1.
+	NOTE:
+		1. If no ReflectDamage or ReduceDamage values ​​are entered, the system defaults to the Reactive Armor Effect value.
+		2. No damage amount can be less than 1.
 
 4-12-2024, canerksk
 - Fixed: Sphere crash troubleshooting if a player has no CHATNAME value and remove a channel.
@@ -4021,3 +4021,5 @@ NOTE:
 22-04-2024, canerksk
 - Added: New item function, CARVECORPSE: carves a corpse with SRC = char carving the corpse. 
 - Added: New ini RevealFlag setting REVEALF_ONHORSE, to allow or disallow stealth walking if you are on a mount.
+- Added: new ini CombatFlags setting COMBAT_ATTACK_NOAGGREIVED.
+	In the old behavior (55i/55r/56b/56c) we were not guilty when we hit a murderer. Now when we attack a criminal or murderer we are guilty towards that person. An ini setting option has been added for this behavior. Although this is a normal behavior in OSI, it can be perceived as a problem since not every server designs games like OSI.

src/game/CServerConfig.h

@@ -126,7 +126,8 @@ enum COMBATFLAGS_TYPE
                                             //   WARNING: doesn't work with Gargoyles due to the new animation packet not accepting a custom animation duration!
     COMBAT_FIRSTHIT_INSTANT     = 0x20000,  // The first hit in a fight doesn't wait for the recoil time (OSI like)
 	COMBAT_NPC_BONUSDAMAGE		= 0x40000,	// NPC will get full bonus damage from various sources.
-    COMBAT_PARALYZE_CANSWING    = 0x80000   // Characters can continue attacking while paralyzed. (Old sphere behaviour)
+    COMBAT_PARALYZE_CANSWING    = 0x80000,   // Characters can continue attacking while paralyzed. (Old sphere behaviour)
+    COMBAT_ATTACK_NOAGGREIVED   = 0x100000, // Not being criminal when attacking the murderer (Old sphere behaviour)
 };
 
 /**

src/game/chars/CCharFight.cpp

@@ -345,11 +345,14 @@ bool CChar::OnAttackedBy(CChar * pCharSrc, bool fCommandPet, bool fShouldReveal)
 
     bool fAggreived = false;
     word wMemTypes = MEMORY_HARMEDBY | MEMORY_IRRITATEDBY;
-    if (!pCharSrc->Memory_FindObjTypes(this, MEMORY_AGGREIVED))
+    if (!IsSetCombatFlags(COMBAT_ATTACK_NOAGGREIVED))
     {
-        // I'm the one being attacked first
-        fAggreived = true;
-        wMemTypes |= MEMORY_AGGREIVED;
+        if (!pCharSrc->Memory_FindObjTypes(this, MEMORY_AGGREIVED))
+        {
+            // I'm the one being attacked first
+            fAggreived = true;
+            wMemTypes |= MEMORY_AGGREIVED;
+        }
     }
     Memory_AddObjTypes(pCharSrc, wMemTypes);
 	Attacker_Add(pCharSrc);

src/sphere.ini

@@ -419,6 +419,7 @@ SuppressCapitals=0
 // COMBAT_FIRSTHIT_INSTANT	020000 // The first hit in a fight doesn't wait for the recoil time (OSI like)
 // COMBAT_NPC_BONUSDAMAGE	040000 // Npc get bonus damage from various sources such as CombatBonus, CombatBonusPercent, IncreaseDam, Anatomy, Tactics etc. See revision from 12-11-2019 for more details.
 // COMBAT_PARALYZE_CANSWING	080000 // Characters can continue attacking while paralyzed. (Old sphere behaviour)
+// COMBAT_ATTACK_NOAGGREIVED 0100000 // Not being criminal when attacking the murderer (Old sphere behaviour)
 //CombatFlags=0
 
 // If COMBAT_ARCHERYCANMOVE is not enabled, wait this much tenth of seconds (minimum=0) after the player