From 37fd34fb3f25280efa979e95b4a2a0d70a431a25 Mon Sep 17 00:00:00 2001
From: INeedBots <ineedbots@outlook.com>
Date: Fri, 12 Mar 2021 18:32:10 -0600
Subject: [PATCH] iw4x

---
 userraw/maps/mp/gametypes/dd.gsc | 51 ++++++++++++++++++++++++++------
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/userraw/maps/mp/gametypes/dd.gsc b/userraw/maps/mp/gametypes/dd.gsc
index 03b7dc6..4179ad8 100644
--- a/userraw/maps/mp/gametypes/dd.gsc
+++ b/userraw/maps/mp/gametypes/dd.gsc
@@ -221,32 +221,62 @@ onStartGameType()
 	level.spawnMaxs = ( 0, 0, 0 );	
 	
 	
-	maps\mp\gametypes\_spawnlogic::addSpawnPoints( game["defenders"], "mp_dd_spawn_defender" );	
+	if ( getDvar( "mapname" ) == "mp_shipment_long" )
+		maps\mp\gametypes\_spawnlogic::addSpawnPoints( game["defenders"], "mp_cha_spawn_axis" );
+	else
+		maps\mp\gametypes\_spawnlogic::addSpawnPoints( game["defenders"], "mp_dd_spawn_defender" );
+	
 	maps\mp\gametypes\_spawnlogic::addSpawnPoints( game["defenders"], "mp_dd_spawn_defender_a", true );
 	maps\mp\gametypes\_spawnlogic::addSpawnPoints( game["defenders"], "mp_dd_spawn_defender_b", true );
 	
-	maps\mp\gametypes\_spawnlogic::placeSpawnPoints( "mp_dd_spawn_defender_start" );
-	
-	maps\mp\gametypes\_spawnlogic::addSpawnPoints( game["attackers"], "mp_dd_spawn_attacker" );
+	if ( getDvar( "mapname" ) == "mp_shipment_long" )
+		maps\mp\gametypes\_spawnlogic::placeSpawnPoints( "mp_cha_spawn_axis_start" );
+	else
+		maps\mp\gametypes\_spawnlogic::placeSpawnPoints( "mp_dd_spawn_defender_start" );
+
+	if ( getDvar( "mapname" ) == "mp_shipment_long" )
+		maps\mp\gametypes\_spawnlogic::addSpawnPoints( game["attackers"], "mp_cha_spawn_allies" );
+	else
+		maps\mp\gametypes\_spawnlogic::addSpawnPoints( game["attackers"], "mp_dd_spawn_attacker" );
+		
 	maps\mp\gametypes\_spawnlogic::addSpawnPoints( game["attackers"], "mp_dd_spawn_attacker_a", true );
 	maps\mp\gametypes\_spawnlogic::addSpawnPoints( game["attackers"], "mp_dd_spawn_attacker_b", true );
 	
-	maps\mp\gametypes\_spawnlogic::placeSpawnPoints( "mp_dd_spawn_attacker_start" );
+	if ( getDvar( "mapname" ) == "mp_shipment_long" )
+		maps\mp\gametypes\_spawnlogic::placeSpawnPoints( "mp_cha_spawn_allies_start" );
+	else
+		maps\mp\gametypes\_spawnlogic::placeSpawnPoints( "mp_dd_spawn_attacker_start" );
 	
-	level.spawn_defenders = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_defender" );
+	if ( getDvar( "mapname" ) == "mp_shipment_long" )
+		level.spawn_attackers = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_cha_spawn_axis" );
+	else
+		level.spawn_attackers = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_defender" );
+		
 	level.spawn_defenders_a = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_defender_a" );
 	level.spawn_defenders_a = array_combine( level.spawn_defenders, level.spawn_defenders_a );
 	level.spawn_defenders_b = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_defender_b" );
 	level.spawn_defenders_b = array_combine( level.spawn_defenders, level.spawn_defenders_b );
 	
-	level.spawn_attackers = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_attacker" );
+	if ( getDvar( "mapname" ) == "mp_shipment_long" )
+		level.spawn_attackers = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_cha_spawn_allies" );
+	else
+		level.spawn_attackers = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_attacker" );
+		
 	level.spawn_attackers_a = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_attacker_a" );
 	level.spawn_attackers_a = array_combine( level.spawn_attackers, level.spawn_attackers_a );
 	level.spawn_attackers_b = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_attacker_b" );
 	level.spawn_attackers_b = array_combine( level.spawn_attackers, level.spawn_attackers_b );
 	
-	level.spawn_defenders_start = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_defender_start" );
-	level.spawn_attackers_start = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_attacker_start" );
+	if ( getDvar( "mapname" ) == "mp_shipment_long" )
+	{
+		level.spawn_defenders_start = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_cha_spawn_axis_start" );
+		level.spawn_attackers_start = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_cha_spawn_allies_start" );
+	}
+	else
+	{
+		level.spawn_defenders_start = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_defender_start" );
+		level.spawn_attackers_start = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_attacker_start" );
+	}
 	
 	level.mapCenter = maps\mp\gametypes\_spawnlogic::findBoxCenter( level.spawnMins, level.spawnMaxs );
 	level.aPlanted = false;
@@ -728,6 +758,9 @@ bombHandler( player, destType )
 		
 		thread playSoundinSpace( "exp_suitcase_bomb_main", explosionOrigin );
 		
+		sabBomb = getEnt( "sab_bomb", "targetname" );
+		sabBomb Delete();
+		
 		if ( isDefined( self.exploderIndex ) )
 			exploder( self.exploderIndex );