diff --git a/Classic/scripts/autoexec/NoBaseRape.cs b/Classic/scripts/autoexec/NoBaseRape.cs index f3a43e0..8b47f44 100644 --- a/Classic/scripts/autoexec/NoBaseRape.cs +++ b/Classic/scripts/autoexec/NoBaseRape.cs @@ -10,6 +10,10 @@ function StaticShapeData::damageObject(%data, %targetObject, %sourceObject, %pos %targetname = %targetObject.getDataBlock().getName(); + //Used on some maps to make invs invincible + if( %targetObject.invincible && %targetname $= "StationInventory" ) + return; + if(!$Host::TournamentMode && $Host::NoBaseRapeEnabled && $Host::NoBaseRapePlayerCount > $TotalTeamPlayerCount) { if( %targetname $= "GeneratorLarge" || %targetname $= "StationInventory" || %targetname $= "SolarPanel" ) @@ -25,37 +29,4 @@ function StaticShapeData::damageObject(%data, %targetObject, %sourceObject, %pos parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType); } -function loadMissionStage2() -{ - parent::loadMissionStage2(); - - if( $CurrentMission $= "SmallCrossing" || $CurrentMission $= "Bulwark" ) - { - if (!isActivePackage(InvincibleInvToggle)) - activatePackage(InvincibleInvToggle); - } - else if (isActivePackage(InvincibleInvToggle)) - deactivatePackage(InvincibleInvToggle); -} - -}; - -// Prevent package from being activated if it is already -if (!isActivePackage(NoBaseRape)) - activatePackage(NoBaseRape); - -package InvincibleInvToggle -{ - -function StaticShapeData::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType) -{ - %targetname = %targetObject.getDataBlock().getName(); - - //Used on some maps to make invs invincible - if( %targetObject.invincible && %targetname $= "StationInventory" ) - return; - - parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType); -} - }; \ No newline at end of file