diff --git a/small_scripts/README.md b/small_scripts/README.md index 1369ed3..5a42157 100644 --- a/small_scripts/README.md +++ b/small_scripts/README.md @@ -6,16 +6,17 @@ Simple drag and drop scripts Change the team names to custom names depending on the game mode +## disable_damages.gsc + +Disable melee knifing damage. +Also prevents players from dying to their own grenades and rockets. +Note that if you shoot enough rockets (around 20/30) you can still kill yourself. +This also doesn't prevent players from killing themselves when they hold a frag grenade in their hands. + ## disable_nuke_killstreak.gsc Prevent players from obtaining the nuke/M.O.A.B killstreak when they have enough kills. -## disable_self_explosive_damage.gsc - -Prevents players from dying to their own grenades and rockets. -Note that if you shoot enough rockets (around 20/30) you can still kill yourself. -This also doesn't prevent players from killing themselves when they hold a frag grenade in their hands. - ## display_player_stats.gsc Display the player's killstreak, total kills and deaths on top of the screen diff --git a/small_scripts/disable_self_explosive_damage.gsc b/small_scripts/disable_damages.gsc similarity index 63% rename from small_scripts/disable_self_explosive_damage.gsc rename to small_scripts/disable_damages.gsc index 0e88147..16d73e0 100644 --- a/small_scripts/disable_self_explosive_damage.gsc +++ b/small_scripts/disable_damages.gsc @@ -1,10 +1,10 @@ Init() { level.callbackplayerdamagestub = level.callbackplayerdamage; - level.callbackplayerdamage = ::DisableSelfExplosiveDamage; + level.callbackplayerdamage = ::DisableDamages; } -DisableSelfExplosiveDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, timeOffset ) +DisableDamages( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, timeOffset ) { if (isDefined(eAttacker)) { @@ -12,6 +12,7 @@ DisableSelfExplosiveDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDea { if (eAttacker.guid == self.guid) { + // Disable explosive damage on self switch (sMeansOfDeath) { case "MOD_PROJECTILE_SPLASH": iDamage = 0; @@ -22,6 +23,14 @@ DisableSelfExplosiveDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDea break; } } + else + { + // Disable melee knifing damage + if (sMeansOfDeath == "MOD_MELEE") + { + iDamage = 0; + } + } } }