Merge pull request #18 from XLabsProject/develop

merge dev into master

.github/release.sh

@@ -4,14 +4,14 @@ sudo apt update >> /dev/null && sudo apt install zip -y >> /dev/null # Ensure zi
 cd iw4x/
 cd iw4x_00/
 zip -r iw4x_00.iwd *
-find . ! -name 'iw4x_00.iwd' -type d -exec rm -rf {} +
-find . ! -name 'iw4x_00.iwd' -type f -exec rm -rf {} +
-cd ..
+mv iw4x_00.iwd ../
+cd .. 
+rm -rf iw4x_00/
 cd iw4x_01/
 zip -r iw4x_01.iwd *
-find . ! -name 'iw4x_01.iwd' -type d -exec rm -rf {} +
-find . ! -name 'iw4x_01.iwd' -type f -exec rm -rf {} +
+mv iw4x_01.iwd ../
 cd ..
+rm -rf iw4x_01/
 cd ..
 rm LICENSE
 rm README.md

iw4x/iw4x_00/default_mp_controller.cfg

@@ -4,6 +4,7 @@
 // Virtual axis are : VA_SIDE, VA_FORWARD, VA_UP, VA_YAW, VA_PITCH, VA_ATTACK
 //==========================================================================================
 
+set gpad_enabled 1
 set gpad_sticksConfig "thumbstick_default"
 set gpad_buttonsConfig "buttons_default"
 

iw4x/iw4x_00/maps/mp/gametypes/_menus.gsc

@@ -1,9 +1,21 @@
 #include maps\mp\_utility;
 
+/*
+	Author: Intricate, Diamante
+	Dvars:
+		- scr_player_forceautoassign <bool>
+		false - (default) default game behaviour
+		true - players will be automatically assigned to a team
+
+		Notes: fs_game check was removed as the default value is now false.
+		If a server owner decides to set it to true, its their choice regardless of loaded mods.
+		Mods should replace this file in case of conflicts.
+*/
+
 init()
 {
-	//Intricate - Create DVAR for forcing auto assign, useful for server that would like it.
-	SetDvarIfUninitialized("scr_player_forceautoassign", true);
+	SetDvarIfUninitialized( "scr_player_forceautoassign", false );
+
 	if ( !isDefined( game["gamestarted"] ) )
 	{
 		game["menu_team"] = "team_marinesopfor";
@@ -348,9 +360,8 @@ beginClassChoice( forceNewChoice )
 
 beginTeamChoice()
 {
-	//Intricate - We put the auto assign where the actual team selection is. Also make sure that a mod isn't loaded, mainly to prevent bugs with them.
-	if( GetDvar("scr_player_forceautoassign") && GetDvar("fs_game") == ""  )
-		self notify("menuresponse", game["menu_team"], "autoassign");
+	if ( getDvarInt( "scr_player_forceautoassign" ) != 0 )
+		self notify( "menuresponse", game["menu_team"], "autoassign");		
 	else
 		self openpopupMenu( game["menu_team"] );
 	
@@ -360,7 +371,7 @@ beginTeamChoice()
 showMainMenuForTeam()
 {
 	assert( self.pers["team"] == "axis" || self.pers["team"] == "allies" );
-	
+
 	team = self.pers["team"];
 	
 	// menu_changeclass_team is the one where you choose one of the n classes to play as.

iw4x/iw4x_00/maps/mp/oilrig.gsc

@@ -4,9 +4,7 @@
 
 main()
 {
-
 	maps\mp\_load::main();
-	
 
 	game[ "attackers" ] = "allies";
 	game[ "defenders" ] = "axis";
@@ -14,38 +12,37 @@ main()
 	maps\mp\_compass::setupMiniMap( "compass_map_oilrig_lvl_3" );
 	setdvar( "compassmaxrange", "4000" );
 
-	array_thread( getentarray( "breach_solid", "targetname" ), ::self_delete );
+	array_thread( getentarray( "breach_solid", "targetname" ), ::selfDelete );
 
 	array_thread( getentarray( "compassTriggers", "targetname" ), ::compass_triggers_think );
-	
-	
-	CreateRamps((1676, 1330, -70), (2489, 1844, 900));
-	CreateRamps((-965, 256, -200), (-854, -77, 54));
-	thread custom_killtrigger();
+
+	CreateRamps( ( 1676, 1330, -70 ), ( 2489, 1844, 900 ) );
+	CreateRamps( ( -965, 256, -200 ), ( -854, -77, 54 ) );
+	thread customKilltrigger();
 	thread level_think();
 	thread level_think2();
 }
 
-self_delete()
+selfDelete()
 {
-	self delete();
+	self delete ();
 }
 
-
-custom_killtrigger()
+// Kills the player if he goes under them map
+customKilltrigger()
 {
-	while (true)
+	while ( true )
 	{
 		wait 0.1;
 
-		foreach (player in level.players)
+		foreach ( player in level.players )
 		{
-			if (!isDefined(player) || !isPlayer(player))
+			if ( !isDefined( player ) || !isPlayer( player ) )
 			{
 				continue;
 			}
 
-			if (player.origin[2] < -350.0)
+			if ( player.origin[2] < -350.0 )
 			{
 				player suicide();
 			}
@@ -56,8 +53,9 @@ custom_killtrigger()
 
 compass_triggers_think()
 {
-	assertex( isdefined( self.script_noteworthy ), "compassTrigger at " + self.origin + " needs to have a script_noteworthy with the name of the minimap to use" );
-	while( true )
+	assertex( isDefined( self.script_noteworthy ), "compassTrigger at " + self.origin + " needs to have a script_noteworthy with the name of the minimap to use" );
+
+	while ( true )
 	{
 		wait( 1 );
 		self waittill( "trigger" );
@@ -65,56 +63,52 @@ compass_triggers_think()
 	}
 }
 
-CreateRamps(top, bottom)
+CreateRamps( top, bottom )
 {
-	D = Distance(top, bottom);
-	blocks = roundUp(D/30);
+	D = Distance( top, bottom );
+	blocks = ceil( D / 30 );
 	CX = top[0] - bottom[0];
 	CY = top[1] - bottom[1];
 	CZ = top[2] - bottom[2];
-	XA = CX/blocks;
-	YA = CY/blocks;
-	ZA = CZ/blocks;
-	CXY = Distance((top[0], top[1], 0), (bottom[0], bottom[1], 0));
-	Temp = VectorToAngles(top - bottom);
-	BA = (Temp[2], Temp[1] + 90, Temp[0]);
-	for(b = 0; b < blocks; b++){
-		block = spawn("script_model", (bottom + ((XA, YA, ZA) * b)));
+	XA = CX / blocks;
+	YA = CY / blocks;
+	ZA = CZ / blocks;
+	CXY = Distance( ( top[0], top[1], 0 ), ( bottom[0], bottom[1], 0 ) );
+	Temp = VectorToAngles( top - bottom );
+	BA = ( Temp[2], Temp[1] + 90, Temp[0] );
+
+	for ( b = 0; b < blocks; b++ )
+	{
+		block = spawn( "script_model", ( bottom + ( ( XA, YA, ZA ) * b ) ) );
 		//block setModel("com_plasticcase_friendly");
 		block.angles = BA;
 		block Solid();
 		block CloneBrushmodelToScriptmodel( level.airDropCrateCollision );
 		wait 0.01;
 	}
-	block = spawn("script_model", (bottom + ((XA, YA, ZA) * blocks) - (0, 0, 5)));
+
+	block = spawn( "script_model", ( bottom + ( ( XA, YA, ZA ) * blocks ) - ( 0, 0, 5 ) ) );
 	//block setModel("com_plasticcase_friendly");
-	block.angles = (BA[0], BA[1], 0);
+	block.angles = ( BA[0], BA[1], 0 );
 	block Solid();
 	block CloneBrushmodelToScriptmodel( level.airDropCrateCollision );
 	wait 0.01;
 }
 
-
-roundUp( floatVal )
-{
-	if ( int( floatVal ) != floatVal )
-		return int( floatVal+1 );
-	else
-		return int( floatVal );
-}
-
-
 level_think()
 {
 
-	/*-----------------------
-	MOVING DERRICK DRILL THING
-	-------------------------*/
+	/*
+		-----------------------
+	    MOVING DERRICK DRILL THING
+	    -------------------------
+	*/
 	eDerrick_thing = getent( "derrick_thing", "targetname" );
 	eDerrick_thing.origin = eDerrick_thing.origin + ( 0, 0, -2816 );
-	assert( isdefined( eDerrick_thing ) );
+	assert( isDefined( eDerrick_thing ) );
 	time = 2;
 	speed = 300;
+
 	while ( true )
 	{
 		eDerrick_thing rotatevelocity( ( 0, speed, 0 ), time );
@@ -122,27 +116,29 @@ level_think()
 	}
 
 }
+
 level_think2()
 {
 	model1 = getent( "fx_spotlight_beam", "targetname" );
 	model2 = getent( "com_blackhawk_spotlight_on_mg_setup", "targetname" );
-	assert( isdefined( model1 ) );
-	assert( isdefined( model2 ) );
-	
+	assert( isDefined( model1 ) );
+	assert( isDefined( model2 ) );
+
 	time = 10;
+
 	while ( true )
 	{
-		model1 rotateto(model1.angles+(0,45,0),time);
-		model2 rotateto(model2.angles+(0,45,0),time);
+		model1 rotateto( model1.angles + ( 0, 45, 0 ), time );
+		model2 rotateto( model2.angles + ( 0, 45, 0 ), time );
 		wait( time );
-		model1 rotateto(model1.angles+(0,-45,0),time);
-		model2 rotateto(model2.angles+(0,-45,0),time);
+		model1 rotateto( model1.angles + ( 0, -45, 0 ), time );
+		model2 rotateto( model2.angles + ( 0, -45, 0 ), time );
 		wait( time );
-		model1 rotateto(model1.angles+(10,45,0),time);
-		model2 rotateto(model2.angles+(10,45,0),time);
+		model1 rotateto( model1.angles + ( 10, 45, 0 ), time );
+		model2 rotateto( model2.angles + ( 10, 45, 0 ), time );
 		wait( time );
-		model1 rotateto(model1.angles+(-10,-45,0),time);
-		model2 rotateto(model2.angles+(-10,-45,0),time);
+		model1 rotateto( model1.angles + ( -10, -45, 0 ), time );
+		model2 rotateto( model2.angles + ( -10, -45, 0 ), time );
 		wait( time );
 	}
 

iw4x/iw4x_00/mp/basemaps.arena

@@ -587,76 +587,3 @@
     axischar    "opforce_composite"
     environment "desert"
 }
-
-
-{
-    map         "mp_backlot"
-    longname    "MPUI_BACKLOT"
-    gametype    "dm war sab sab2 dom sd sd2 hc koth"
-    description "MPUI_DESC_MAP_BACKLOT"
-    mapimage    "preview_mp_backlot"
-    mapoverlay  "compass_overlay_map_blank"
-    allieschar  "us_army"
-    axischar    "opforce_composite"
-    environment "desert"
-}
-
-{
-    map         "mp_farm"
-    longname    "MPUI_FARM"
-    gametype    "dm war sab sab2 dom sd sd2 hc koth"
-    description "MPUI_DESC_MAP_FARM"
-    mapimage    "preview_mp_farm"
-    mapoverlay  "compass_overlay_map_blank"
-    allieschar  "us_army"
-    axischar    "opforce_airborne"
-    environment "forest"
-}
-
-{
-    map         "mp_countdown"
-    longname    "MPUI_COUNTDOWN"
-    gametype    "dm war sab sab2 dom sd sd2 hc koth"
-    description "MPUI_DESC_MAP_COUNTDOWN"
-    mapimage    "preview_mp_countdown"
-    mapoverlay  "compass_overlay_map_blank"
-    allieschar  "us_army"
-    axischar    "opforce_airborne"
-    environment "urban"
-}
-
-{
-    map         "mp_pipeline"
-    longname    "MPUI_PIPELINE"
-    gametype    "dm war sab sab2 dom sd sd2 hc koth"
-    description "MPUI_DESC_MAP_PIPELINE"
-    mapimage    "preview_mp_pipeline"
-    mapoverlay  "compass_overlay_map_blank"
-    allieschar  "us_army"
-    axischar    "opforce_airborne"
-    environment "forest"
-}
-
-{
-    map         "mp_crash_snow"
-    longname    "MPUI_CRASH_SNOW"
-    gametype    "dm war sab sab2 dom sd sd2 hc koth"
-    description "MPUI_DESC_MAP_CRASH_SNOW"
-    mapimage    "preview_mp_crash_snow"
-    mapoverlay  "compass_overlay_map_blank"
-    allieschar  "socom_141_arctic"
-    axischar    "opforce_arctic"
-    environment "arctic"
-}
-
-{
-    map         "mp_carentan"
-    longname    "MPUI_CARENTAN"
-    gametype    "dm war sab sab2 dom sd sd2 hc koth"
-    description "MPUI_DESC_MAP_CARENTAN"
-    mapimage    "preview_mp_carentan"
-    mapoverlay  "compass_overlay_map_blank"
-    allieschar  "us_army"
-    axischar    "opforce_airborne"
-    environment "urban"
-}

iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu

@@ -102,7 +102,7 @@ menuDef
 	PC_OPTIONS_SECTION_TITLE(MENU_TITLE)
 
 	PC_OPTIONS_DVARYESNO_RAW(0, "@MENU_GAMEPAD_ENABLED", "gpad_enabled", ON_GAMEPAD_ENABLED_TOGGLE;, "@MPUI_DESC_GAMEPAD_ENABLED", when(0), 1)
-	PC_OPTIONS_SEPERATOR(0)
+	PC_OPTIONS_SEPERATOR_VIS(0, ON_GPAD_ENABLED)
 
 	PC_OPTIONS_DVARYESNO_RAW(1, "@MENU_LOOK_INVERSION", "input_invertPitch", ;, "@MPUI_DESC_LOOK_INVERSION", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 	PC_OPTIONS_STRLIST_RAW(2, "@MENU_THUMBSTICK_LAYOUT", "gpad_sticksConfig", 
@@ -122,7 +122,7 @@ menuDef
 	PC_OPTIONS_FLOATLIST_RAW(4, "@MENU_GPAD_STYLE", "gpad_style", {"@MENU_GPAD_XBOX_CAPS" 0 "@MENU_GPAD_PS_CAPS" 1}, ;, "@MPUI_DESC_GPAD_STYLE", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 	PC_OPTIONS_DVARYESNO_RAW(5, "@MENU_SLOWDOWN_ENABLED", "gpad_slowdown_enabled", ;, "@MPUI_DESC_SLOWDOWN_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 	PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_LOCKON_ENABLED", "gpad_lockon_enabled", ;, "@MPUI_DESC_LOCKON_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
-	PC_OPTIONS_SEPERATOR(6)
+	PC_OPTIONS_SEPERATOR_VIS(6, ON_GPAD_ENABLED)
 	PC_OPTIONS_DVARSLIDER_RAW(7, "@MENU_LOOK_SENSITIVITY", "input_viewSensitivity", 0.5, 4, 1.0, ;, ;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED, ON_GPAD_ENABLED)
 	PC_OPTIONS_FLOATLIST_RAW(8, "@MENU_LOOK_SENSITIVITY_PRESET", "input_viewSensitivity", 
 		{"@MENU_SENSITIVITY_LOW_CAPS" SENSITIVITY_1 "@MENU_SENSITIVITY_MEDIUM_CAPS" SENSITIVITY_2 "3" SENSITIVITY_3

iw4x/iw4x_00/ui_mp/pc_options_look.menu

@@ -74,7 +74,7 @@ menuDef
 		exp											text(dvarString("sensitivity"))
 	}
 
-	PC_OPTIONS_DVARSLIDER(0, "@MENU_MOUSE_SENSITIVITY", "sensitivity", 0.01, 100, 5, ;, ;, ;, when(0))
+	PC_OPTIONS_DVARSLIDER(0, "@MENU_MOUSE_SENSITIVITY", "sensitivity", 0.1, 10, 5, ;, ;, ;, when(0))
 	PC_OPTIONS_DVARYESNO(1, "@MENU_INVERT_MOUSE", "ui_mousePitch", uiscript updateui_mousePitch;, when(0))
 
 	PC_OPTIONS_SEPERATOR(1)
@@ -89,4 +89,4 @@ menuDef
 	PC_OPTIONS_KEYBINDSTATUS
 
 	ITEM_BUTTON_BACK(ON_MENU_ESC)
-}
+}