Merge pull request #385 from FrozenSand/instagib_update

Instagib: when active, display a gamemode explanation text
FrozenSand · Feb 1, 2017 · 5577dcf · 5577dcf
2 parents cf1e226 + 3e40de3
commit 5577dcf
Show file tree

Hide file tree

Showing 24 changed files with 142 additions and 55 deletions.
diff --git a/menu/ui/authkey.menu b/menu/ui/authkey.menu
@@ -1,7 +1,7 @@
 #include "ui/menudef.h"
 
 {
-	/* @Barbatos 07/28/2012 for 4.2
+	/* 
 	* Auth system - page to enter the auth key
 	*/
 
@@ -127,7 +127,6 @@
 			decoration
 		}
 
-		//@Barbatos - 4.2.008 - added current modversion
 		itemDef {
 			name version2
 			rect 0 400 640 40

diff --git a/menu/ui/betacredit.menu b/menu/ui/betacredit.menu
@@ -125,7 +125,6 @@
 			decoration
 		}
 
-		//@Barbatos - 4.2.008 - added current modversion
 		itemDef {
 			name version2
 			rect 0 400 640 40

diff --git a/menu/ui/betacredit_back.menu b/menu/ui/betacredit_back.menu
@@ -123,7 +123,6 @@
 			decoration
 		}
 
-		//@Barbatos - 4.2.008 - added current modversion
 		itemDef {
 			name version2
 			rect 0 400 640 40

diff --git a/menu/ui/disconnect.menu b/menu/ui/disconnect.menu
@@ -1,7 +1,7 @@
 #include "ui/menudef.h"
 
 {
-	/* @Barbatos 08/01/2012 for 4.2
+	/* 
 	* Auth system - disconnect confirmation popup menu
 	*/
 

diff --git a/menu/ui/findplayer.menu b/menu/ui/findplayer.menu
@@ -4,8 +4,6 @@
 // SERVER INFORMATION POPUP MENU //
 ///////////////////////////////////
 
-// Revised by Fenix for 4.2.011
-
 {
 
 	menuDef {

diff --git a/menu/ui/ingame_options.menu b/menu/ui/ingame_options.menu
@@ -1203,7 +1203,6 @@
 			visible 1
 		}
 
-		//@Fenix - added for cg_drawKillLog
 		itemDef {
 			name showkillsinfo
 			group gun

diff --git a/menu/ui/ingame_player.menu b/menu/ui/ingame_player.menu
@@ -25,6 +25,23 @@
 			decoration
 		}
 
+		// INSTAGIB CATCHER
+		itemDef {
+			name gear
+			rect -2 -2 644 484
+			style WINDOW_STYLE_FILLED
+			type 1
+			forecolor 1 1 1 0
+			backcolor 0 0 0 0
+			border 0
+			bordercolor .5 .5 .5 1
+			visible 1
+			action { hide gear }
+			mouseEnter { hide gear }
+			cvarTest "g_instagib"
+			hideCvar { "0" }
+		}
+
 		//  BUTTONS	//
 
 		itemDef {

diff --git a/menu/ui/ingame_rcon.menu b/menu/ui/ingame_rcon.menu
@@ -845,7 +845,6 @@
 			decoration
 		}
 
-		//@Fenix - NUKE
 		itemDef {
 			name player
 			type 1
@@ -881,7 +880,6 @@
 			decoration
 		}
 
-		//@Fenix - smite
 		itemDef {
 			name player
 			type 1

diff --git a/menu/ui/ingame_select_player.menu b/menu/ui/ingame_select_player.menu
@@ -2,7 +2,6 @@
 {
 
 	// INGAME SELECT PLAYER MENU
-	// Revised by Fenix for 4.2.010 - Changed the whole skin selection behavior
 
 	////////////////////////////
 	// STANDARD MENU CREATION //

diff --git a/menu/ui/ingame_select_player_readme.menu b/menu/ui/ingame_select_player_readme.menu
@@ -2,7 +2,6 @@
 {
 
 	// INGAME SELECT PLAYER README MENU
-	// Revised by Fenix for 4.2.010 - Changed the whole skin selection behavior
 
 	////////////////////////////
 	// STANDARD MENU CREATION //

diff --git a/menu/ui/ingame_select_team.menu b/menu/ui/ingame_select_team.menu
@@ -64,6 +64,22 @@
 			hideCvar { "11" }
 		}
 
+		// INSTAGIB CATCHER
+		itemDef {
+			name geartab
+			rect -2 -2 644 484
+			style WINDOW_STYLE_FILLED
+			type 1
+			forecolor 1 1 1 0
+			backcolor 0 0 0 0
+			border 0
+			bordercolor .5 .5 .5 1
+			visible 1
+			action { hide geartab }
+			mouseEnter { hide geartab }
+			cvarTest "g_instagib"
+			hideCvar { "0" }
+		}
 
 		itemDef {
 			name teamtab
@@ -130,7 +146,6 @@
 			decoration
 		}
 
-		//@Barbatos added LMS 05/09/2012
 		itemDef	{
 			name type
 			text "Last Man Standing"
@@ -215,7 +230,6 @@
 			decoration
 		}
 
-		//@Fenix - added JUMP mode 05/11/2012
 		itemDef	{
 			name type
 			text "Jump"
@@ -228,7 +242,6 @@
 			decoration
 		}
 
-		//@BladeKiller - added Freeze Tag mode 12/11/2013
 		itemDef	{
 			name type
 			text "Freeze Tag"
@@ -277,7 +290,6 @@
 			decoration
 		}
 
-		//@Barbatos 05/09/2012 added LMS
 		itemDef	{
 			name lastmanstanding
 			wrapped
@@ -442,7 +454,6 @@
 		}
 
 
-		//@Fenix 31/10/2012 added Jump Mode
 		itemDef {
 			name jump
 			wrapped
@@ -462,7 +473,6 @@
 			decoration
 		}
 
-		//@BladeKiller 12/11/2013 added Freeze Tag
 		itemDef	{
 			name freeze_tag
 			wrapped
@@ -510,6 +520,90 @@
 			decoration
 		}
 
+		// INSTAGIB INFO // 
+
+		itemDef {
+			name instagib
+			rect 446 114 111 116
+			type 1
+			style WINDOW_STYLE_FILLED
+			forecolor 1 1 1 1
+			backcolor 0 0 0 .3
+			border 1
+			bordercolor .6 .1 .1 1
+			bordersize 1
+			visible 1
+			mouseEnter { show instagibinfo}
+			mouseExit { hide instagibinfo }
+			cvarTest "g_instagib"
+			showCvar { "1" } 
+		}
+
+		itemDef {
+			textstyle 1 
+			name instagib
+			rect 446 114 111 116
+			type 0
+			wrapped
+			text "INSTAGIB\r"
+			textscale .30
+			textalign 0
+			textalignx 23
+			textaligny 63
+			style 1
+			forecolor 1 0 0 1
+			backcolor 0 0 0 0
+			border 0
+			bordersize 1
+			bordercolor 1 1 1 1
+			visible 1
+			decoration
+			cvarTest "g_instagib"
+			showCvar { "1" }
+		}
+
+		itemDef {
+			name instagibinfo
+			rect 83 114 343 276
+			type 0
+			style WINDOW_STYLE_FILLED
+			forecolor 1 1 1 1
+			backcolor 0 0 0 .99
+			border 1
+			bordercolor 1 1 1 1
+			bordersize 1
+			visible 0
+			mouseEnter { show instagibinfo}
+			mouseExit { hide instagibinfo }
+		}
+
+		itemDef	{
+			name instagibinfo
+			text "^1INSTAGIB"
+			textscale .33
+			forecolor 1 1 1 1
+			rect 94 144 100 30
+			visible 0
+			decoration
+		}
+
+		itemDef	{
+			name instagibinfo
+			wrapped
+			text "Everyone is equipped with a deadly FS-Tod50. Every shot \r"
+			"kills. Every slice kills. The FS-Tod50 can penetrate targets\r"
+			"and ricochet off walls, if fired in a flat angle.\r\r"
+			"Every other aspect of the gamemode stays unchanged."
+			style 1
+			textscale .24
+			textalignx 0
+			textaligny 20
+			forecolor 1 1 1 1
+			backcolor 0 0 0 0
+			rect 93 154 323 226
+			visible 0
+			decoration
+		}
 
 		// TEAM BUTTONS 	//
 
@@ -594,7 +688,7 @@
 			mouseEnter { setcolor backcolor 0 0 .55 1 }
 			mouseExit { setcolor backcolor 0 0 0 .6 }
 			cvarTest "g_gametype"
-			hideCvar { "0" ; "1" ; "9" ; "11"} //@Barbatos 05/09/2012 added LMS //@Fenix 30/10/2012 added Jump Mode
+			hideCvar { "0" ; "1" ; "9" ; "11"} // FFA, LMS, JUMP, GG
 		}
 
 		itemDef {
@@ -614,7 +708,7 @@
 			visible 1
 			decoration
 			cvarTest "g_gametype"
-			hideCvar { "0" ; "1" ; "9" ; "11"}
+			hideCvar { "0" ; "1" ; "9" ; "11"} 
 		}
 
 		itemDef {
@@ -635,7 +729,7 @@
 			mouseEnter { setcolor backcolor 0 0 .55 1 }
 			mouseExit { setcolor backcolor 0 0 0 .6 }
 			cvarTest "g_gametype"
-			hideCvar { "0" ; "1" ; "9" ; "11"} //@Barbatos 05/09/2012 added LMS	//@Fenix 30/10/2012 added Jump Mode
+			hideCvar { "0" ; "1" ; "9" ; "11"} 
 		}
 
 		itemDef {
@@ -645,8 +739,8 @@
 			text "Blue"
 			textscale .25
 			textalign 1
-			textalignx 55     //107
-			textaligny 19    	//26
+			textalignx 55
+			textaligny 19
 			style 1
 			forecolor 1 1 1 1
 			backcolor 0 0 0 0

diff --git a/menu/ui/ingame_system.menu b/menu/ui/ingame_system.menu
@@ -105,7 +105,7 @@
 		}
 
 
-		//@Barbatos: removed for now
+		// Removed for now
 		/*
 		itemDef {
 			name bumpy_button
@@ -414,7 +414,7 @@
 			action { play "sound/misc/kcaction.wav" }
 		}
 
-		//27's BUMPY STUFF - Added By NulL @Barbatos: removed for now
+		//27's BUMPY STUFF - Added By NulL -- removed for now
 
 		/*
 		itemDef {

diff --git a/menu/ui/joinserver.menu b/menu/ui/joinserver.menu
@@ -844,7 +844,7 @@
 			mouseExit { setitemcolor backcolor 0 0 0 0 }
 		}
 
-		//@Barbatos: removed PB - added Urban Terror Accounts filter
+		// Removed PB - added Urban Terror Accounts filter
 		itemDef {
 			name viewAccounts
 			type ITEM_TYPE_MULTI
@@ -868,7 +868,7 @@
 			mouseExit { setitemcolor backcolor 0 0 0 0 }
 		}
 
-		//@Barbatos: view private servers list (servers protected with a password)
+		// View private servers list (servers protected with a password)
 		itemDef {
 			name viewBE
 			type ITEM_TYPE_MULTI