From 00389c0d55230c90a0c8681558ab4e18be59a2b0 Mon Sep 17 00:00:00 2001
From: ChocoTaco1 <boldfilter@zoho.com>
Date: Thu, 8 Apr 2021 10:26:42 -0400
Subject: [PATCH] Adjustments

---
 Classic/scripts/autoexec/TacoOverrides.cs    | 16 ++++++++--------
 Classic/scripts/weapons/concussionGrenade.cs |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Classic/scripts/autoexec/TacoOverrides.cs b/Classic/scripts/autoexec/TacoOverrides.cs
index 564c3b7..04e85ae 100755
--- a/Classic/scripts/autoexec/TacoOverrides.cs
+++ b/Classic/scripts/autoexec/TacoOverrides.cs
@@ -152,14 +152,14 @@ function stationTrigger::onEnterTrigger(%data, %obj, %colObj)
 }
 
 //OG Blaster Buff
-// function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC)
-// {
-    //Takes 10 blaster shots to kill a heavy, 13 normal.
-	// if(%targetObject.client.armor $= "Heavy" && %damageType $= $DamageType::Blaster)
-		// %amount *= 1.3;
+function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC)
+{
+    //Takes 11 blaster shots to kill a heavy, 13 normal.
+	if(%targetObject.client.armor $= "Heavy" && %damageType $= $DamageType::Blaster)
+		%amount *= 1.15;
 
-	// Parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC);
-// }
+	Parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC);
+}
 
 // Global water viscosity
 function DefaultGame::missionLoadDone(%game)
@@ -295,7 +295,7 @@ function VehicleData::createPositionMarker(%data, %obj)
 function ConcussionGrenadeThrown::onThrow(%this, %gren)
 {
    AIGrenadeThrown(%gren);
-   %gren.detThread = schedule(1500, %gren, "detonateGrenade", %gren);
+   %gren.detThread = schedule(1800, %gren, "detonateGrenade", %gren);
 }
 
 };
diff --git a/Classic/scripts/weapons/concussionGrenade.cs b/Classic/scripts/weapons/concussionGrenade.cs
index 664d975..6444560 100644
--- a/Classic/scripts/weapons/concussionGrenade.cs
+++ b/Classic/scripts/weapons/concussionGrenade.cs
@@ -161,7 +161,7 @@ datablock ExplosionData(ConcussionGrenadeExplosion)
    camShakeFreq = "4.0 5.0 4.5";
    camShakeAmp = "140.0 140.0 140.0";
    camShakeDuration = 1.0;
-   camShakeRadius = 18.0; //was 15
+   camShakeRadius = 16.5; //was 15
 };
 
 //--------------------------------------------------------------------------
@@ -176,7 +176,7 @@ datablock ItemData(ConcussionGrenadeThrown)
    pickupRadius = 2;
    maxDamage = 0.5;
    explosion = ConcussionGrenadeExplosion;
-   damageRadius        = 18.0; //was 15
+   damageRadius        = 16.5; //was 15
    radiusDamageType    = $DamageType::Grenade;
    kickBackStrength    = 3500;