From e73ec0069d1d82700ca094434c9bf7b2b436140d Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Tue, 17 Nov 2020 07:29:53 -0500 Subject: [PATCH] Moved --- Classic/scripts/autoexec/TacoOverrides.cs | 14 -------------- Classic/scripts/projectiles.cs | 7 +++++++ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/Classic/scripts/autoexec/TacoOverrides.cs b/Classic/scripts/autoexec/TacoOverrides.cs index eff96ae..e85a4a8 100644 --- a/Classic/scripts/autoexec/TacoOverrides.cs +++ b/Classic/scripts/autoexec/TacoOverrides.cs @@ -200,20 +200,6 @@ function GameBaseData::onAdd(%data, %obj) %obj.target = -1; } -//Fix for shocklance spawn invinciblity on spawn -function ShockLanceImage::onFire(%this, %obj, %slot) -{ - %p = parent::onFire(%this, %obj, %slot); - - if(%obj.client > 0) - { - %obj.setInvincibleMode(0, 0.00); - %obj.setInvincible( false ); - } - - return %p; -} - }; // Prevent package from being activated if it is already diff --git a/Classic/scripts/projectiles.cs b/Classic/scripts/projectiles.cs index 2fe7cf5..4132798 100644 --- a/Classic/scripts/projectiles.cs +++ b/Classic/scripts/projectiles.cs @@ -393,6 +393,13 @@ function TargetingLaserImage::onFire(%data,%obj,%slot) function ShockLanceImage::onFire(%this, %obj, %slot) { + //Added Spawn Invinciblity check + if(%obj.client > 0) + { + %obj.setInvincibleMode(0, 0.00); + %obj.setInvincible( false ); + } + // z0dd - ZOD, 4/10/04. ilys - Added rapidfire shocklance fix if(%obj.cantfire !$= "") return;