m_iInmuneDamage bit variable

Mikk155 · Apr 3, 2024 · b7b850b · b7b850b
1 parent 5ce53bb
commit b7b850b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 4 deletions.
diff --git a/entitydata/BaseClass.json b/entitydata/BaseClass.json
@@ -509,6 +509,12 @@
             }
         }
     },
+    "m_iInmuneDamage":
+    {
+        "title": "Inmune to damage bits",
+        "type": "integer",
+        "description": "Set the bits of damage that this entity is inmune to, for example set 2 and this entity won't take any damage from bullets, see <a href=\"../features/damage_bits.html\">Damage Bits</a>"
+    },
     "CCustomModels":
     {
         "model_replacement_filename":

diff --git a/entitydata/SolidClass/func_breakable.json b/entitydata/SolidClass/func_breakable.json
@@ -3,7 +3,7 @@
     {
         "atributes":
         {
-            "base": "Angles, Global, Breakable, Target, FireTargets, CBaseDelay, CReplacemetFile, rendersettings, _minlight, ZHLT",
+            "base": "Angles, Global, Breakable, m_iInmuneDamage, Target, FireTargets, CBaseDelay, CReplacemetFile, rendersettings, _minlight, ZHLT",
             "title": "Breakable Object"
         },
         "spawnflags":

diff --git a/entitydata/SolidClass/func_pushable.json b/entitydata/SolidClass/func_pushable.json
@@ -3,7 +3,7 @@
     {
         "atributes":
         {
-            "base": "Angles, Global, Breakable, Target, FireTargets, CBaseDelay, CReplacemetFile, rendersettings, _minlight, ZHLT",
+            "base": "Angles, Global, Breakable, m_iInmuneDamage, Target, FireTargets, CBaseDelay, CReplacemetFile, rendersettings, _minlight, ZHLT",
             "title": "Pushable object"
         },
         "size":

diff --git a/src/game/server/entities/CBaseEntity.h b/src/game/server/entities/CBaseEntity.h
@@ -650,6 +650,8 @@ class SINGLE_INHERITANCE CBaseEntity
 
 	int m_appearflag_notin = (int)appearflags::DEFAULT;
 	int m_appearflag_onlyin = (int)appearflags::DEFAULT;
+
+	int m_iInmuneDamage = 0;
 };
 
 inline bool FNullEnt(CBaseEntity* ent) { return (ent == nullptr) || FNullEnt(ent->edict()); }

diff --git a/src/game/server/entities/NPCs/combat.cpp b/src/game/server/entities/NPCs/combat.cpp
@@ -821,8 +821,12 @@ bool CBaseMonster::TakeDamage(CBaseEntity* inflictor, CBaseEntity* attacker, flo
 	float flTake;
 	Vector vecDir;
 
-	if( 0 == pev->takedamage || FBitSet( pev->flags, FL_GODMODE ) )
+	if( pev->takedamage == DAMAGE_NO
+	|| FBitSet( pev->flags, FL_GODMODE )
+	|| ( m_iInmuneDamage > 0 && ( bitsDamageType & m_iInmuneDamage ) != 0 ) )
+	{
 		return false;
+	}
 
 	if (!IsAlive())
 	{

diff --git a/src/game/server/entities/cbase.cpp b/src/game/server/entities/cbase.cpp
@@ -635,6 +635,11 @@ bool CBaseEntity::RequiredKeyValue(KeyValueData* pkvd)
 			}
 		}
 	}
+	else if( FStrEq( pkvd->szKeyName, "m_iInmuneDamage" ) )
+	{
+		m_iInmuneDamage = atoi( pkvd->szValue );
+		return true;
+	}
 
 	return false;
 }
@@ -719,8 +724,13 @@ bool CBaseEntity::TakeDamage(CBaseEntity* inflictor, CBaseEntity* attacker, floa
 {
 	Vector vecTemp;
 
-	if (0 == pev->takedamage)
+	if( pev->takedamage == DAMAGE_NO
+	|| FBitSet( pev->flags, FL_GODMODE )
+	|| ( m_iInmuneDamage > 0 && ( bitsDamageType & m_iInmuneDamage ) != 0 ) )
+	{
 		return false;
+	}
+
 
 	// UNDONE: some entity types may be immune or resistant to some bitsDamageType