From 6b53bd352f896eec53c0ae44817de7b7fb6c5c43 Mon Sep 17 00:00:00 2001
From: ChocoTaco1 <boldfilter@zoho.com>
Date: Mon, 30 Mar 2020 13:51:12 -0400
Subject: [PATCH] Update NoBaseRape.cs

Changed Invincible Inv mechanic
---
 Classic/scripts/autoexec/NoBaseRape.cs | 45 ++++++++++++++++++--------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/Classic/scripts/autoexec/NoBaseRape.cs b/Classic/scripts/autoexec/NoBaseRape.cs
index 36e672a..f3a43e0 100644
--- a/Classic/scripts/autoexec/NoBaseRape.cs
+++ b/Classic/scripts/autoexec/NoBaseRape.cs
@@ -10,24 +10,14 @@ function StaticShapeData::damageObject(%data, %targetObject, %sourceObject, %pos
    
    %targetname = %targetObject.getDataBlock().getName();    
    
-   //Used on some maps to make invs invincible
-   if( $CurrentMission $= "SmallCrossing" || $CurrentMission $= "Bulwark")
-   {
-		if( %targetObject.invincible && %targetname $= "StationInventory" )
-		{
-			//NBRAssetSound( %game, %sourceObject );
-			return;
-		}
-   }
-   else if(!$Host::TournamentMode && $Host::NoBaseRapeEnabled && $Host::NoBaseRapePlayerCount > $TotalTeamPlayerCount)
+   if(!$Host::TournamentMode && $Host::NoBaseRapeEnabled && $Host::NoBaseRapePlayerCount > $TotalTeamPlayerCount)
    {        		
 		if( %targetname $= "GeneratorLarge" || %targetname $= "StationInventory" || %targetname $= "SolarPanel" ) 
 		{
 			//Notify only if asset is on other team
 			if( %targetObject.team !$= %sourceObject.team )
-			{
 				NBRAssetSound( %game, %sourceObject );
-			}
+			
 			return;
 		}
    }
@@ -35,8 +25,37 @@ 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);
\ No newline at end of file
+    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