Merge pull request #56 from x3Karma/main

Add One in the Chamber and The Hidden to available playlists

2 files changed, 224 insertions, 73 deletions

diff --git a/Northstar.Custom/keyvalues/playlists_v2.txt b/Northstar.Custom/keyvalues/playlists_v2.txt
index 813accb6..37734025 100644
--- a/Northstar.Custom/keyvalues/playlists_v2.txt
+++ b/Northstar.Custom/keyvalues/playlists_v2.txt
@@ -202,6 +202,45 @@ playlists
 				gamemode_score_hint #GAMEMODE_SCORE_HINT_TDM
 			}
 		}
+		chamber
+		{
+			inherit defaults
+			vars
+			{
+				name #PL_chamber
+				lobbytitle #PL_chamber_lobby
+				description #PL_chamber_desc
+				hint #PL_chamber_hint
+				abbreviation #PL_chamber_abbr
+				max_players 12
+				max_teams 12
+				classic_mp 1
+
+				gamemode_score_hint #GAMEMODE_SCORE_HINT_FFA
+				gamemode_bullet_001	#GAMEMODE_BULLET_FFA_001
+				gamemode_bullet_002	#GAMEMODE_BULLET_FFA_002
+				gamemode_bullet_003	#GAMEMODE_BULLET_FFA_003
+				gamemode_bullet_004	#GAMEMODE_BULLET_FFA_004
+				gamemode_bullet_005	#GAMEMODE_BULLET_FFA_005
+			}
+		}
+		hidden
+		{
+			inherit defaults
+			vars
+			{
+				name #PL_hidden
+				lobbytitle #PL_hidden_lobby
+				description #PL_hidden_desc
+				hint #PL_hidden_hint
+				abbreviation #PL_hidden_abbr
+				max_players 16
+				max_teams 2
+				classic_mp 1
+
+				gamemode_score_hint #GAMEMODE_SCORE_HINT_TDM
+			}
+		}
 	}
 	Playlists
 	{
@@ -225,18 +264,18 @@ playlists
 				{
 					maps
 					{
-					    mp_forwardbase_kodai 1
-                        mp_grave 1
-                        mp_homestead 1
-                        mp_thaw 1
-                        mp_black_water_canal 1
-                        mp_eden 1
-                        mp_drydock 1
-                        mp_crashsite3 1
-                        mp_complex3 1
-                        mp_angel_city 1
-                        mp_colony02 1
-                        mp_glitch 1
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
 						mp_lf_stacks 1
 						mp_lf_deck 1
 						mp_lf_meadow 1
@@ -269,18 +308,19 @@ playlists
 				{
 					maps
 					{
-					    mp_forwardbase_kodai 1
-                        mp_grave 1
-                        mp_homestead 1
-                        mp_thaw 1
-                        mp_black_water_canal 1
-                        mp_eden 1
-                        mp_drydock 1
-                        mp_crashsite3 1
-                        mp_complex3 1
-                        mp_angel_city 1
-                        mp_colony02 1
-                        mp_glitch 1
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
+						mp_lf_stacks 1
 						mp_relic02 1
 						mp_wargames 1
 						mp_rise 1
@@ -307,18 +347,19 @@ playlists
 				{
 					maps
 					{
-					    mp_forwardbase_kodai 1
-                        mp_grave 1
-                        mp_homestead 1
-                        mp_thaw 1
-                        mp_black_water_canal 1
-                        mp_eden 1
-                        mp_drydock 1
-                        mp_crashsite3 1
-                        mp_complex3 1
-                        mp_angel_city 1
-                        mp_colony02 1
-                        mp_glitch 1
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
+						mp_lf_stacks 1
 						mp_lf_stacks 1
 						mp_lf_deck 1
 						mp_lf_meadow 1
@@ -360,18 +401,19 @@ playlists
 				{
 					maps
 					{
-					    mp_forwardbase_kodai 1
-                        mp_grave 1
-                        mp_homestead 1
-                        mp_thaw 1
-                        mp_black_water_canal 1
-                        mp_eden 1
-                        mp_drydock 1
-                        mp_crashsite3 1
-                        mp_complex3 1
-                        mp_angel_city 1
-                        mp_colony02 1
-                        mp_glitch 1
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
+						mp_lf_stacks 1
 						mp_lf_stacks 1
 						mp_lf_deck 1
 						mp_lf_meadow 1
@@ -408,18 +450,19 @@ playlists
 				{
 					maps
 					{
-					    mp_forwardbase_kodai 1
-                        mp_grave 1
-                        mp_homestead 1
-                        mp_thaw 1
-                        mp_black_water_canal 1
-                        mp_eden 1
-                        mp_drydock 1
-                        mp_crashsite3 1
-                        mp_complex3 1
-                        mp_angel_city 1
-                        mp_colony02 1
-                        mp_glitch 1
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
+						mp_lf_stacks 1
 						mp_lf_stacks 1
 						mp_lf_deck 1
 						mp_lf_meadow 1
@@ -459,18 +502,19 @@ playlists
 				{
 					maps
 					{
-					    mp_forwardbase_kodai 1
-                        mp_grave 1
-                        mp_homestead 1
-                        mp_thaw 1
-                        mp_black_water_canal 1
-                        mp_eden 1
-                        mp_drydock 1
-                        mp_crashsite3 1
-                        mp_complex3 1
-                        mp_angel_city 1
-                        mp_colony02 1
-                        mp_glitch 1
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
+						mp_lf_stacks 1
 						mp_relic02 1
 						mp_wargames 1
 						mp_rise 1
@@ -640,5 +684,101 @@ playlists
 				}
 			}
 		}
+		chamber
+		{
+			inherit defaults
+			vars
+			{
+				name #PL_chamber
+				lobbytitle #PL_chamber_lobby
+				description #PL_chamber_desc
+				abbreviation #PL_chamber_abbr
+				image ps
+				//mixtape_slot 7
+				mixtape_timeout 120
+				visible 0
+			}
+			gamemodes
+			{
+				chamber
+				{
+					maps
+					{
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
+						mp_lf_stacks 1
+						mp_lf_stacks 1
+						mp_lf_deck 1
+						mp_lf_meadow 1
+						mp_lf_traffic 1
+						mp_lf_township 1
+						mp_lf_uma 1
+						mp_relic02 1
+						mp_wargames 1
+						mp_rise 1
+						mp_coliseum 1
+						mp_coliseum_column 1
+					}
+				}
+			}
+		}
+		hidden
+		{
+			inherit defaults
+			vars
+			{
+				name #PL_hidden
+				lobbytitle #PL_hidden_lobby
+				description #PL_hidden_desc
+				abbreviation #PL_hidden_abbr
+				image ps
+				//mixtape_slot 7
+				mixtape_timeout 120
+				visible 0
+			}
+			gamemodes
+			{
+				hidden
+				{
+					maps
+					{
+						mp_forwardbase_kodai 1
+						mp_grave 1
+						mp_homestead 1
+						mp_thaw 1
+						mp_black_water_canal 1
+						mp_eden 1
+						mp_drydock 1
+						mp_crashsite3 1
+						mp_complex3 1
+						mp_angel_city 1
+						mp_colony02 1
+						mp_glitch 1
+						mp_lf_stacks 1
+						mp_lf_stacks 1
+						mp_lf_deck 1
+						mp_lf_meadow 1
+						mp_lf_traffic 1
+						mp_lf_township 1
+						mp_lf_uma 1
+						mp_relic02 1
+						mp_wargames 1
+						mp_rise 1
+						mp_coliseum 1
+						mp_coliseum_column 1
+					}
+				}
+			}
+		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Northstar.Custom/keyvalues/scripts/weapons/mp_weapon_wingman.txt b/Northstar.Custom/keyvalues/scripts/weapons/mp_weapon_wingman.txt
new file mode 100644
index 00000000..8255df15
--- /dev/null
+++ b/Northstar.Custom/keyvalues/scripts/weapons/mp_weapon_wingman.txt
@@ -0,0 +1,11 @@
+WeaponData

+{

+	Mods

+	{

+        	one_in_the_chamber

+		{

+            		damage_near_value "9999"

+            		damage_far_value "9999"

+		}

+	}

+}
\ No newline at end of file