From 9df0e7744a3ff522a51360e972d9769955118ad9 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sun, 10 Mar 2019 12:58:18 -0400 Subject: [PATCH] Tweaked --- Classic/scripts/DMGame.cs | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Classic/scripts/DMGame.cs b/Classic/scripts/DMGame.cs index 19dcf53..e04fb31 100644 --- a/Classic/scripts/DMGame.cs +++ b/Classic/scripts/DMGame.cs @@ -514,16 +514,6 @@ function ProjectileData::onCollision(%data, %projectile, %targetObject, %modifie } } -function Player::maxInventory(%this, %data) -{ - //chocotaco - just runs as an ammo pack cuz messing with the inv max messes up weapons cycling - //%max = ShapeBase::maxInventory(%this,%data) * 2; - %max = ShapeBase::maxInventory(%this,%data); - //if (%this.getInventory(AmmoPack)) - %max += AmmoPack.max[%data.getName()]; - return %max; -} - function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC) { //Other armors get more damage @@ -534,7 +524,7 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am if(%targetObject.client.armor $= "Heavy") { - %amount *= 1.5; + %amount *= 1.4; } parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC);